From e71f144c40c4c228c815e5fd5b8085a55a6201af Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Mon, 21 Jun 2010 15:53:42 +0000
Subject: [PATCH] Started preferences simplifying

---
 src/GUI.cpp         | 25 +++++++++++++++----------
 src/options_imp.cpp |  7 -------
 src/options_imp.h   |  1 -
 src/preferences.h   |  5 +++++
 src/ui/options.ui   | 45 +++++++++++++++++----------------------------
 5 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/src/GUI.cpp b/src/GUI.cpp
index 507b4dbff..a2a676246 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -548,24 +548,30 @@ void GUI::closeEvent(QCloseEvent *e) {
   const bool goToSystrayOnExit = settings.value(QString::fromUtf8("Preferences/General/CloseToTray"), false).toBool();
   if(!force_exit && systrayIcon && goToSystrayOnExit && !this->isHidden()) {
     hide();
-    //e->ignore();
     e->accept();
     return;
   }
   if(settings.value(QString::fromUtf8("Preferences/General/ExitConfirm"), true).toBool() && BTSession->hasActiveTorrents()) {
-    show();
-    if(!isMaximized())
-      showNormal();
     if(e->spontaneous() || force_exit) {
-      if(QMessageBox::question(this,
-                               tr("Are you sure you want to quit?")+QString::fromUtf8(" -- ")+tr("qBittorrent"),
-                               tr("Some files are currently transferring.\nAre you sure you want to quit qBittorrent?"),
-                               tr("&Yes"), tr("&No"),
-                               QString(), 0, 1)) {
+      if(!isVisible())
+        show();
+      QMessageBox confirmBox(QMessageBox::Question, tr("Are you sure you want to quit?")+QString::fromUtf8(" -- ")+tr("qBittorrent"),
+                             tr("Some files are currently transferring.\nAre you sure you want to quit qBittorrent?"));
+      QPushButton *noBtn = confirmBox.addButton(tr("No"), QMessageBox::NoRole);
+      QPushButton *yesBtn = confirmBox.addButton(tr("Yes"), QMessageBox::YesRole);
+      QPushButton *alwaysBtn = confirmBox.addButton(tr("Always"), QMessageBox::YesRole);
+      confirmBox.setDefaultButton(yesBtn);
+      confirmBox.exec();
+      if(!confirmBox.clickedButton() || confirmBox.clickedButton() == noBtn) {
+        // Cancel exit
         e->ignore();
         force_exit = false;
         return;
       }
+      if(confirmBox.clickedButton() == alwaysBtn) {
+        // Remember choice
+        Preferences::setConfirmOnExit(false);
+      }
     }
   }
   hide();
@@ -580,7 +586,6 @@ void GUI::closeEvent(QCloseEvent *e) {
   qApp->exit();
 }
 
-
 // Display window to create a torrent
 void GUI::on_actionCreate_torrent_triggered() {
   if(createTorrentDlg) {
diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index ed161bd4b..9d8ddf9a9 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -193,7 +193,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
   // General tab
   connect(comboI18n, SIGNAL(currentIndexChanged(int)), this, SLOT(enableApplyButton()));
   connect(comboStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(enableApplyButton()));
-  connect(checkConfirmExit, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
   connect(checkSpeedInTitle, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
   connect(checkAltRowColors, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
   connect(checkNoSystray, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
@@ -386,7 +385,6 @@ void options_imp::saveOptions(){
   settings.beginGroup("General");
   settings.setValue(QString::fromUtf8("Locale"), getLocale());
   settings.setValue(QString::fromUtf8("Style"), getStyle());
-  settings.setValue(QString::fromUtf8("ExitConfirm"), confirmOnExit());
   settings.setValue(QString::fromUtf8("SpeedInTitleBar"), speedInTitleBar());
   settings.setValue(QString::fromUtf8("AlternatingRowColors"), checkAltRowColors->isChecked());
   settings.setValue(QString::fromUtf8("SystrayEnabled"), systrayIntegration());
@@ -617,7 +615,6 @@ void options_imp::loadOptions(){
   // General preferences
   setLocale(Preferences::getLocale());
   setStyle(Preferences::getStyle());
-  checkConfirmExit->setChecked(Preferences::confirmOnExit());
   checkSpeedInTitle->setChecked(Preferences::speedInTitleBar());
   checkAltRowColors->setChecked(Preferences::useAlternatingRowColors());
   checkNoSystray->setChecked(!Preferences::systrayIntegration());
@@ -982,10 +979,6 @@ bool options_imp::closeToTray() const{
   return checkCloseToSystray->isChecked();
 }
 
-bool options_imp::confirmOnExit() const{
-  return checkConfirmExit->isChecked();
-}
-
 bool options_imp::isQueueingSystemEnabled() const {
   return checkEnableQueueing->isChecked();
 }
diff --git a/src/options_imp.h b/src/options_imp.h
index f9639895f..ff633d656 100644
--- a/src/options_imp.h
+++ b/src/options_imp.h
@@ -67,7 +67,6 @@ protected:
   // General options
   QString getLocale() const;
   QString getStyle() const;
-  bool confirmOnExit() const;
   bool speedInTitleBar() const;
   bool systrayIntegration() const;
   bool minimizeToTray() const;
diff --git a/src/preferences.h b/src/preferences.h
index e81108247..4e30db55f 100644
--- a/src/preferences.h
+++ b/src/preferences.h
@@ -87,6 +87,11 @@ public:
     settings.setValue(QString::fromUtf8("Preferences/General/DeleteTorrentsFilesAsDefault"), del);
   }
 
+  static void setConfirmOnExit(bool confirm) {
+    QSettings settings("qBittorrent", "qBittorrent");
+    settings.setValue(QString::fromUtf8("Preferences/General/ExitConfirm"), confirm);
+  }
+
   static bool confirmOnExit() {
     QSettings settings("qBittorrent", "qBittorrent");
     return settings.value(QString::fromUtf8("Preferences/General/ExitConfirm"), true).toBool();
diff --git a/src/ui/options.ui b/src/ui/options.ui
index 71081e384..caa4bdcfe 100644
--- a/src/ui/options.ui
+++ b/src/ui/options.ui
@@ -242,7 +242,7 @@
              <x>0</x>
              <y>0</y>
              <width>506</width>
-             <height>571</height>
+             <height>543</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -335,16 +335,6 @@
                  </item>
                 </layout>
                </item>
-               <item>
-                <widget class="QCheckBox" name="checkConfirmExit">
-                 <property name="text">
-                  <string>Ask for confirmation on exit when download list is not empty</string>
-                 </property>
-                 <property name="checked">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
                <item>
                 <widget class="QCheckBox" name="checkDisplayToolbar">
                  <property name="text">
@@ -571,7 +561,7 @@ QGroupBox {
            <property name="geometry">
             <rect>
              <x>0</x>
-             <y>-298</y>
+             <y>0</y>
              <width>632</width>
              <height>686</height>
             </rect>
@@ -1116,8 +1106,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>524</width>
-             <height>398</height>
+             <width>447</width>
+             <height>288</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_28">
@@ -1361,8 +1351,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>524</width>
-             <height>406</height>
+             <width>364</width>
+             <height>328</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_33">
@@ -1776,7 +1766,7 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>506</width>
+             <width>459</width>
              <height>407</height>
             </rect>
            </property>
@@ -2193,8 +2183,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>524</width>
-             <height>406</height>
+             <width>475</width>
+             <height>308</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_16">
@@ -2627,8 +2617,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>524</width>
-             <height>406</height>
+             <width>287</width>
+             <height>124</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_21">
@@ -2724,8 +2714,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>524</width>
-             <height>406</height>
+             <width>213</width>
+             <height>221</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -2891,8 +2881,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>524</width>
-             <height>406</height>
+             <width>445</width>
+             <height>192</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_24">
@@ -3066,8 +3056,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>524</width>
-             <height>406</height>
+             <width>98</width>
+             <height>28</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_36"/>
@@ -3115,7 +3105,6 @@ QGroupBox {
   <tabstop>tabOption</tabstop>
   <tabstop>comboI18n</tabstop>
   <tabstop>comboStyle</tabstop>
-  <tabstop>checkConfirmExit</tabstop>
   <tabstop>checkSpeedInTitle</tabstop>
   <tabstop>checkNoSystray</tabstop>
   <tabstop>checkCloseToSystray</tabstop>