From f0e7accae8e48abd52758dad74a1760a373ae1d3 Mon Sep 17 00:00:00 2001
From: Romolo Manfredini <romoloman@github.com>
Date: Sun, 19 Jan 2014 10:01:48 +0100
Subject: [PATCH] Properly reset windows geometry and state

---
 companion/src/mainwindow.cpp          | 33 ++++++++-------------------
 companion/src/mainwindow.h            |  1 -
 companion/src/modeledit/modeledit.cpp |  8 +++++++
 companion/src/modeledit/modeledit.h   |  3 +++
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 6dccb36f8..948e2a8e7 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -94,6 +94,8 @@ downloadDialog_forWait(NULL)
             this, SLOT(setActiveSubWindow(QWidget*)));
 
     MaxRecentFiles=MAX_RECENT;
+    QSettings settings("companion", "companion");
+    restoreGeometry(settings.value("mainWindowGeometry").toByteArray());
     createActions();
     createMenus();
     createToolBars();
@@ -115,7 +117,6 @@ downloadDialog_forWait(NULL)
     
     // give time to the splash to disappear and main window to open before starting updates
     int updateDelay = 1000;
-    QSettings settings("companion", "companion");
     bool showSplash = settings.value("show_splash", true).toBool();
     if (showSplash) 
 	updateDelay += (SPLASH_TIME*1000); 
@@ -609,11 +610,13 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
 
 void MainWindow::closeEvent(QCloseEvent *event)
 {
+    QSettings settings("companion", "companion");
+    settings.setValue("mainWindowGeometry", saveGeometry());
+    settings.setValue("mainWindowState", saveState());
     mdiArea->closeAllSubWindows();
     if (mdiArea->currentSubWindow()) {
       event->ignore();
     } else {
-      writeSettings();
       event->accept();
     }
 }
@@ -1876,6 +1879,7 @@ QMenu *MainWindow::createProfilesMenu()
 void MainWindow::createToolBars()
 {
     fileToolBar = addToolBar(tr("File"));
+    fileToolBar->setObjectName("File");
     fileToolBar->addAction(newAct);
     fileToolBar->addAction(openAct);
     QToolButton * recentToolButton = new QToolButton;
@@ -1913,6 +1917,7 @@ void MainWindow::createToolBars()
     fileToolBar->addAction(compareAct);
 
     editToolBar = addToolBar(tr("Edit"));
+    editToolBar->setObjectName("Edit");
     editToolBar->addAction(cutAct);
     editToolBar->addAction(copyAct);
     editToolBar->addAction(pasteAct);
@@ -1920,6 +1925,7 @@ void MainWindow::createToolBars()
     
     burnToolBar = new QToolBar(tr("Write"));
     addToolBar( Qt::LeftToolBarArea, burnToolBar );
+    burnToolBar->setObjectName("Write");
     burnToolBar->addAction(burnToAct);
     burnToolBar->addAction(burnFromAct);
     burnToolBar->addSeparator();
@@ -1932,6 +1938,7 @@ void MainWindow::createToolBars()
     burnToolBar->addAction(burnConfigAct);
 
     helpToolBar = addToolBar(tr("Help"));
+    helpToolBar->setObjectName("Help");
     helpToolBar->addAction(checkForUpdatesAct);
     helpToolBar->addAction(aboutAct);
 }
@@ -1944,10 +1951,7 @@ void MainWindow::createStatusBar()
 void MainWindow::readSettings()
 {
     QSettings settings("companion", "companion");
-    bool maximized = settings.value("maximized", false).toBool();
-    QPoint pos = settings.value("pos", QPoint(200, 200)).toPoint();
-    QSize size = settings.value("size", QSize(400, 400)).toSize();
-
+    restoreState(settings.value("mainWindowState").toByteArray());
     checkCompanion9x = settings.value("startup_check_companion9x", true).toBool();
     checkFW = settings.value("startup_check_fw", true).toBool();
     MaxRecentFiles =settings.value("history_size",10).toInt();
@@ -1960,23 +1964,6 @@ void MainWindow::readSettings()
       settings.endGroup();
       settings.endGroup();
     }
-    if (maximized) {
-      setWindowState(Qt::WindowMaximized);
-    } else {
-      move(pos);
-      resize(size);
-    }
-}
-
-void MainWindow::writeSettings()
-{
-    QSettings settings("companion", "companion");
-
-    settings.setValue("maximized", isMaximized());
-    if(!isMaximized()) {
-      settings.setValue("pos", pos());
-      settings.setValue("size", size());
-    }
 }
 
 MdiChild *MainWindow::activeMdiChild()
diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h
index 6d203bf1e..300bac507 100644
--- a/companion/src/mainwindow.h
+++ b/companion/src/mainwindow.h
@@ -134,7 +134,6 @@ private:
     void createToolBars();
     void createStatusBar();
     void readSettings();
-    void writeSettings();
     void updateRecentFileActions();
     void updateProfilesActions();
     int getFileType(const QString &fullFileName);
diff --git a/companion/src/modeledit/modeledit.cpp b/companion/src/modeledit/modeledit.cpp
index fcdc68108..d5417e8ea 100644
--- a/companion/src/modeledit/modeledit.cpp
+++ b/companion/src/modeledit/modeledit.cpp
@@ -20,6 +20,8 @@ ModelEdit::ModelEdit(RadioData & radioData, int modelId, bool openWizard, bool i
   generalSettings(generalSettings)
 {
   ui->setupUi(this);
+  QSettings settings("companion", "companion");
+  restoreGeometry(settings.value("modelEditGeometry").toByteArray());  
   addTab(new Setup(this, model), tr("Setup"));
   addTab(new HeliPanel(this, model), tr("Heli"));
   addTab(new FlightModes(this, model, radioData.generalSettings), tr("Flight Modes"));
@@ -40,6 +42,12 @@ ModelEdit::~ModelEdit()
   delete ui;
 }
 
+void ModelEdit::closeEvent(QCloseEvent *event)
+{
+    QSettings settings("companion", "companion");
+    settings.setValue("modelEditGeometry", saveGeometry());
+}
+
 class VerticalScrollArea : public QScrollArea
 {
   public:
diff --git a/companion/src/modeledit/modeledit.h b/companion/src/modeledit/modeledit.h
index 4208a7190..9450d90d4 100644
--- a/companion/src/modeledit/modeledit.h
+++ b/companion/src/modeledit/modeledit.h
@@ -15,6 +15,9 @@ class ModelEdit : public QDialog
   public:
     explicit ModelEdit(RadioData & radioData, int modelId , bool openWizard =false, bool inNew =false, QWidget *parent = 0);
     ~ModelEdit();
+  
+  protected:
+    void closeEvent(QCloseEvent *event);
 
   signals:
     void modified();