* simpler & improved management of window geometry

Author: liamstask

mchelper/trunk/include/Inspector.h

@@ -48,6 +48,7 @@ private slots:
   MainWindow *mainWindow;
   QTimer infoTimer;
   void setLabelsRole(QPalette::ColorRole role);
+  void closeEvent(QCloseEvent *e);
 };
 
 #endif // INSPECTOR_H

mchelper/trunk/source/Inspector.cpp

@@ -18,10 +18,12 @@
 #include "Inspector.h"
 #include <QSettings>
 
+#define INSPECTOR_GEOM  "inspector/geometry"
+
 /*
  A dialog for getting/setting general info about a Make Controller
 */
-Inspector::Inspector(MainWindow *mainWindow) : QDialog( 0 )
+Inspector::Inspector(MainWindow *mainWindow) : QDialog(0)
 {
   this->mainWindow = mainWindow;
   setupUi(this);
@@ -42,10 +44,7 @@ Inspector::Inspector(MainWindow *mainWindow) : QDialog( 0 )
   connect(dhcpBox, SIGNAL(clicked(bool)), this, SLOT(onAnyValueEdited()));
 
   QSettings settings;
-  QPoint inspectorPos = settings.value("inspector_pos").toPoint();
-  if(!inspectorPos.isNull())
-    move(inspectorPos);
-
+  restoreGeometry(settings.value(INSPECTOR_GEOM).toByteArray());
   resize(gridLayout->sizeHint());
 }
 
@@ -56,6 +55,13 @@ void Inspector::loadAndShow( )
   show();
 }
 
+void Inspector::closeEvent(QCloseEvent *e)
+{
+  QSettings settings;
+  settings.setValue(INSPECTOR_GEOM, saveGeometry());
+  e->accept();
+}
+
 /*
   Populate the line edits with the board's info.
   This should only be called when there's new info for the board,
@@ -82,16 +88,16 @@ void Inspector::setData(Board* board)
 */
 void Inspector::clear( )
 {
-  nameEdit->setText("");
-  serialEdit->setText("");
-  versionEdit->setText("");
-  freememEdit->setText("");
-  ipEdit->setText("");
-  netmaskEdit->setText("");
-  gatewayEdit->setText("");
-  listenPortEdit->setText("");
-  sendPortEdit->setText("");
-  dhcpBox->setCheckState( Qt::Unchecked );
+  nameEdit->text().clear();
+  serialEdit->text().clear();
+  versionEdit->text().clear();
+  freememEdit->text().clear();
+  ipEdit->text().clear();
+  netmaskEdit->text().clear();
+  gatewayEdit->text().clear();
+  listenPortEdit->text().clear();
+  sendPortEdit->text().clear();
+  dhcpBox->setChecked(false);
 }
 
 /*
@@ -110,7 +116,7 @@ void Inspector::onFinished()
 void Inspector::getBoardInfo()
 {
   Board *board = mainWindow->getCurrentBoard();
-  if(board)
+  if (board)
     board->sendMessage("/system/info-internal");
 }
 
@@ -121,15 +127,14 @@ void Inspector::getBoardInfo()
 */
 void Inspector::onApply()
 {
-  Board* board = mainWindow->getCurrentBoard( );
-  if( board == NULL )
+  Board* board = mainWindow->getCurrentBoard();
+  if (board == NULL)
     return;
 
   QStringList msgs;
 
   QString newName = nameEdit->text();
-  if( !newName.isEmpty() && board->name != newName )
-  {
+  if (!newName.isEmpty() && board->name != newName) {
     msgs << QString( "/system/name %1" ).arg( QString( "\"%1\"" ).arg( newName ) );
     mainWindow->setBoardName( board->key(), QString( "%1 : %2" ).arg(newName).arg(board->key()) );
   }
@@ -161,10 +166,9 @@ void Inspector::onApply()
   if( !newPort.isEmpty() && board->udp_send_port != newPort )
     msgs << QString( "/network/osc_udp_send_port %1" ).arg( newPort );
 
-  setLabelsRole( QPalette::WindowText );
-  if( msgs.size( ) > 0 )
-  {
-    board->sendMessage( msgs );
+  setLabelsRole(QPalette::WindowText);
+  if (!msgs.isEmpty()) {
+    board->sendMessage(msgs);
     mainWindow->updateBoardInfo(board);
     mainWindow->message(msgs, MsgType::Command, board->location());
   }
@@ -178,7 +182,7 @@ void Inspector::onRevert()
 {
   setLabelsRole(QPalette::WindowText);
   Board *brd = mainWindow->getCurrentBoard();
-  if(brd)
+  if (brd)
     setData(brd);
 }
 
@@ -189,16 +193,16 @@ void Inspector::onAnyValueEdited()
 
 void Inspector::setLabelsRole(QPalette::ColorRole role)
 {
-  nameLabel->setForegroundRole( role );
-  sernumLabel->setForegroundRole( role );
-  versionLabel->setForegroundRole( role );
-  freememLabel->setForegroundRole( role );
-  ipLabel->setForegroundRole( role );
-  netmaskLabel->setForegroundRole( role );
-  gatewayLabel->setForegroundRole( role );
-  listenPortLabel->setForegroundRole( role );
-  sendPortLabel->setForegroundRole( role );
-  dhcpBox->setForegroundRole( role ); // how to actually get at the text?
+  nameLabel->setForegroundRole(role);
+  sernumLabel->setForegroundRole(role);
+  versionLabel->setForegroundRole(role);
+  freememLabel->setForegroundRole(role);
+  ipLabel->setForegroundRole(role);
+  netmaskLabel->setForegroundRole(role);
+  gatewayLabel->setForegroundRole(role);
+  listenPortLabel->setForegroundRole(role);
+  sendPortLabel->setForegroundRole(role);
+  dhcpBox->setForegroundRole(role); // how to actually get at the text?
 }
 
 

mchelper/trunk/source/MainWindow.cpp

@@ -31,6 +31,9 @@
 #include "Uploader.h"
 #include "About.h"
 
+#define MAINWIN_GEOM  "mainwindow/geometry"
+#define MAINWIN_SPLITTER "mainwindow/splitter"
+
 /**
   MainWindow represents, not surprisingly, the main window of the application.
   It handles all the menu items and the UI.
@@ -99,21 +102,8 @@ MainWindow::MainWindow(bool no_ui, QWidget *parent) : QMainWindow(parent)
 void MainWindow::readSettings()
 {
   QSettings settings;
-  QSize size = settings.value("size").toSize();
-  if (size.isValid())
-    resize(size);
-
-  QPoint mainWinPos = settings.value("mainwindow_pos").toPoint();
-  if (!mainWinPos.isNull())
-    move(mainWinPos);
-
-  QList<QVariant> splitterSettings = settings.value("splitterSizes").toList();
-  if (!splitterSettings.isEmpty()) {
-    QList<int> splitterSizes;
-    foreach (const QVariant & setting, splitterSettings)
-      splitterSizes << setting.toInt();
-    ui.splitter->setSizes(splitterSizes);
-  }
+  restoreGeometry(settings.value(MAINWIN_GEOM).toByteArray());
+  ui.splitter->restoreState(settings.value(MAINWIN_SPLITTER).toByteArray());
 
   QStringList commands = settings.value( "commands" ).toStringList();
   foreach (const QString & cmd, commands)
@@ -141,15 +131,8 @@ void MainWindow::setMaxMessages(int msgs)
 void MainWindow::writeSettings()
 {
   QSettings settings;
-  settings.setValue("size", size());
-  settings.setValue("mainwindow_pos", pos());
-  settings.setValue("inspector_pos", inspector->pos());
-
-  QList<QVariant> splitterSettings;
-  QList<int> splitterSizes = ui.splitter->sizes();
-  foreach (int splitterSize, splitterSizes)
-    splitterSettings << splitterSize;
-  settings.setValue("splitterSizes", splitterSettings);
+  settings.setValue(MAINWIN_GEOM, saveGeometry());
+  settings.setValue(MAINWIN_SPLITTER, ui.splitter->saveState());
 
   QStringList commands;
   for (int i = 0; i < ui.commandLine->count(); i++)