Merge pull request #58 from KitsuneRal/save-window-state

Save geometry of the main window and state of dock widgets
quotient-im · Sep 11, 2016 · be73028 · be73028
2 parents e07368c + ad36fca
commit be73028
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 26 deletions.
diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
@@ -48,47 +48,69 @@ MainWindow::MainWindow()
     connect( roomListDock, &RoomListDock::roomSelected, chatRoomWidget, &ChatRoomWidget::setRoom );
     connect( roomListDock, &RoomListDock::roomSelected, userListDock, &UserListDock::setRoom );
     systemTray = new SystemTray(this);
-    systemTray->show();
+    createMenu();
+    loadSettings();
     show();
+    systemTray->show();
     QTimer::singleShot(0, this, SLOT(initialize()));
 }
 
 MainWindow::~MainWindow()
 {
 }
 
-void MainWindow::enableDebug()
+void MainWindow::createMenu()
 {
-    chatRoomWidget->enableDebug();
-}
+    // Connection menu
+    auto connectionMenu = menuBar()->addMenu(tr("&Connection"));
 
-void MainWindow::initialize()
-{
-    auto menuBar = new QMenuBar();
-    { // Connection menu
-        auto connectionMenu = menuBar->addMenu(tr("&Connection"));
+    loginAction = connectionMenu->addAction(tr("&Login..."));
+    connect( loginAction, &QAction::triggered, [=]{ showLoginWindow(); } );
 
-        loginAction = connectionMenu->addAction(tr("&Login..."));
-        connect( loginAction, &QAction::triggered, [=]{ showLoginWindow(); } );
+    logoutAction = connectionMenu->addAction(tr("&Logout"));
+    connect( logoutAction, &QAction::triggered, [=]{ logout(); } );
+    logoutAction->setEnabled(false); // we start in a logged out state
 
-        logoutAction = connectionMenu->addAction(tr("&Logout"));
-        connect( logoutAction, &QAction::triggered, this, &MainWindow::logout );
-        logoutAction->setEnabled(false); // we start in a logged out state
+    connectionMenu->addSeparator();
 
-        connectionMenu->addSeparator();
+    auto quitAction = connectionMenu->addAction(tr("&Quit"));
+    quitAction->setShortcut(QKeySequence::Quit);
+    connect( quitAction, &QAction::triggered, qApp, &QApplication::closeAllWindows );
 
-        auto quitAction = connectionMenu->addAction(tr("&Quit"));
-        quitAction->setShortcut(QKeySequence::Quit);
-        connect( quitAction, &QAction::triggered, qApp, &QApplication::quit );
-    }
-    { // Room menu
-        auto roomMenu = menuBar->addMenu(tr("&Room"));
+    // Room menu
+    auto roomMenu = menuBar()->addMenu(tr("&Room"));
 
-        auto joinRoomAction = roomMenu->addAction(tr("&Join Room..."));
-        connect( joinRoomAction, &QAction::triggered, this, &MainWindow::showJoinRoomDialog );
-    }
+    auto joinRoomAction = roomMenu->addAction(tr("&Join Room..."));
+    connect( joinRoomAction, &QAction::triggered, [=]{ showJoinRoomDialog(); } );
+}
+
+void MainWindow::loadSettings()
+{
+    QMatrixClient::SettingsGroup sg("UI/MainWindow");
+    if (sg.contains("normal_geometry"))
+        setGeometry(sg.value("normal_geometry").toRect());
+    if (sg.value("maximized").toBool())
+        showMaximized();
+    if (sg.contains("parts_state"))
+        restoreState(sg.value("window_parts_state").toByteArray());
+}
+
+void MainWindow::saveSettings() const
+{
+    QMatrixClient::SettingsGroup sg("UI/MainWindow");
+    sg.setValue("normal_geometry", normalGeometry());
+    sg.setValue("maximized", isMaximized());
+    sg.setValue("window_parts_state", saveState());
+    sg.sync();
+}
+
+void MainWindow::enableDebug()
+{
+    chatRoomWidget->enableDebug();
+}
 
-    setMenuBar(menuBar);
+void MainWindow::initialize()
+{
     invokeLogin();
 }
 
@@ -211,7 +233,7 @@ void MainWindow::connectionError(QString error)
 void MainWindow::closeEvent(QCloseEvent* event)
 {
     setConnection(nullptr);
-
+    saveSettings();
     event->accept();
 }
 

diff --git a/client/mainwindow.h b/client/mainwindow.h
@@ -73,7 +73,10 @@ class MainWindow: public QMainWindow
 
         SystemTray* systemTray;
 
+        void createMenu();
         void invokeLogin();
+        void loadSettings();
+        void saveSettings() const;
 };
 
 #endif // MAINWINDOW_H