- Save / Restore preferences dialog size and position on restart

- Make use of new Preferences in GUI constructor

src/GUI.cpp

@@ -79,8 +79,7 @@ using namespace libtorrent;
 GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), displaySpeedInTitle(false), force_exit(false) {
   setupUi(this);
   setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
-  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  systrayIntegration = Preferences::systrayIntegration();
-  systrayIntegration = settings.value(QString::fromUtf8("Preferences/General/SystrayEnabled"), true).toBool();
   systrayCreator = 0;
   // Create tray icon
   if (QSystemTrayIcon::isSystemTrayAvailable()) {
@@ -179,13 +178,8 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   // Add torrent given on command line
   processParams(torrentCmdLine);
   // Initialize Web UI
-  httpServer = 0;
+  if(Preferences::isWebUiEnabled()) {
-  if(settings.value("Preferences/WebUI/Enabled", false).toBool())
+    initWebUi(Preferences::getWebUiUsername(), Preferences::getWebUiPassword(), Preferences::getWebUiPort());
-  {
-    quint16 port = settings.value("Preferences/WebUI/Port", 8080).toUInt();
-    QString username = settings.value("Preferences/WebUI/Username", "").toString();
-    QString password = settings.value("Preferences/WebUI/Password", "").toString();
-    initWebUi(username, password, port);
   }
   // Use a tcp server to allow only one instance of qBittorrent
   localServer = new QLocalServer();
@@ -244,8 +238,8 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   readSettings();
   properties->readSettings();
 
-  if(settings.value(QString::fromUtf8("Preferences/General/StartMinimized"), false).toBool()) {
+  if(Preferences::startMinimized()) {
-    this->setWindowState(Qt::WindowMinimized);
+    setWindowState(Qt::WindowMinimized);
   }
 
   scrapeTimer = new QTimer(this);

src/options_imp.cpp

@@ -261,7 +261,7 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
   // Tab selection mecanism
   connect(tabSelection, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWidgetItem*)));
   // Adapt size
-  adaptToScreenSize();
+  loadWindowState();
   show();
 }
 
@@ -304,7 +304,21 @@ void options_imp::useStyle(){
   }
 }
 
-void options_imp::adaptToScreenSize() {
+void options_imp::loadWindowState() {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  resize(settings.value(QString::fromUtf8("Preferences/State/size"), sizeFittingScreen()).toSize());
+  QPoint p = settings.value(QString::fromUtf8("Preferences/State/pos"), QPoint()).toPoint();
+  if(!p.isNull())
+    move(p);
+}
+
+void options_imp::saveWindowState() const {
+  QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  settings.setValue(QString::fromUtf8("Preferences/State/size"), size());
+  settings.setValue(QString::fromUtf8("Preferences/State/pos"), pos());
+}
+
+QSize options_imp::sizeFittingScreen() {
   int scrn = 0;
   QWidget *w = this->topLevelWidget();
 
@@ -318,8 +332,9 @@ void options_imp::adaptToScreenSize() {
   QRect desk(QApplication::desktop()->availableGeometry(scrn));
   if(width() > desk.width() || height() > desk.height()) {
     if(desk.width() > 0 && desk.height() > 0)
-      resize(desk.width(), desk.height());
+      return QSize(desk.width(), desk.height());
   }
+  return size();
 }
 
 void options_imp::saveOptions(){
@@ -925,6 +940,7 @@ void options_imp::on_buttonBox_accepted(){
     this->hide();
     emit status_changed();
   }
+  saveWindowState();
   accept();
 }
 

src/options_imp.h

@@ -46,16 +46,18 @@ class QCloseEvent;
 class options_imp : public QDialog, private Ui::Dialog {
   Q_OBJECT
 
-  private:
+private:
   QButtonGroup choiceLanguage;
   QStringList locales;
   QAbstractButton *applyButton;
 
-  public:
+public:
   // Contructor / Destructor
   options_imp(QWidget *parent=0);
   ~options_imp();
+  QSize sizeFittingScreen();
 
+protected:
   // Methods
   void saveOptions();
   void loadOptions();
@@ -133,7 +135,7 @@ class options_imp : public QDialog, private Ui::Dialog {
   QString webUiUsername() const;
   QString webUiPassword() const;
 
-  protected slots:
+protected slots:
   void enableUploadLimit(bool checked);
   void enableDownloadLimit(bool checked);
   void enableTempPathInput(bool checked);
@@ -165,14 +167,15 @@ class options_imp : public QDialog, private Ui::Dialog {
   void setSystrayOptionsState(bool checked);
   void enableWebUi(bool checkBoxValue);
   void changePage(QListWidgetItem*, QListWidgetItem*);
-    void adaptToScreenSize();
+  void loadWindowState();
+  void saveWindowState() const;
   void on_randomButton_clicked();
 
-  public slots:
+public slots:
   void setLocale(QString locale);
   void useStyle();
 
-  signals:
+signals:
   void status_changed() const;
   void exitWithCancel();
 };