Merge pull request mpc-qt#304 from tbertels/panels_state

Add a setting to remember panels state and keep last window geometry setting active

Author: cmdrkotori

main.cpp

@@ -873,6 +873,8 @@ void Flow::setupFlowConnections()
             this, &Flow::settingswindow_rememberFilePosition);
     connect(settingsWindow, &SettingsWindow::rememberWindowGeometry,
             this, &Flow::settingswindow_rememberWindowGeometry);
+    connect(settingsWindow, &SettingsWindow::rememberPanels,
+            this, &Flow::settingswindow_rememberPanels);
     connect(settingsWindow, &SettingsWindow::mprisIpc,
             this, &Flow::settingswindow_mprisIpc);
     connect(settingsWindow, &SettingsWindow::stylesheetIsFusion,
@@ -1198,16 +1200,16 @@ QVariantMap Flow::favoritesToVMap() const
 
 QVariantMap Flow::windowsToVMap_v2()
 {
-    if (!rememberWindowGeometry)
-        return QVariantMap();
-
     windowManager.clearJson();
-    windowManager.saveDocks(mainWindow->dockHost());
-    windowManager.saveWindow(settingsWindow);
-    windowManager.saveWindow(propertiesWindow);
-    windowManager.saveWindow(logWindow);
-    windowManager.saveWindow(libraryWindow);
-    windowManager.saveAppWindow(mainWindow);
+    if (rememberPanels)
+        windowManager.saveDocks(mainWindow->dockHost());
+    if (rememberWindowGeometry) {
+        windowManager.saveWindow(settingsWindow);
+        windowManager.saveWindow(propertiesWindow);
+        windowManager.saveWindow(logWindow);
+        windowManager.saveWindow(libraryWindow);
+    }
+    windowManager.saveAppWindow(mainWindow, rememberWindowGeometry, rememberPanels);
     return windowManager.json();
 }
 
@@ -1494,6 +1496,12 @@ void Flow::settingswindow_rememberWindowGeometry(bool yes)
     this->rememberWindowGeometry = yes;
 }
 
+void Flow::settingswindow_rememberPanels(bool yes)
+{
+    // Remember our preference to save the panels state when we exit
+    this->rememberPanels = yes;
+}
+
 void Flow::settingswindow_keymapData(const QVariantMap &keyMap)
 {
     // Remember the keymap (shortcuts) data

main.h

@@ -91,6 +91,7 @@ private slots:
     void settingswindow_rememberHistory(bool yes, bool onlyVideos);
     void settingswindow_rememberFilePosition(bool yes);
     void settingswindow_rememberWindowGeometry(bool yes);
+    void settingswindow_rememberPanels(bool yes);
     void settingswindow_keymapData(const QVariantMap &keyMap);
     void settingswindow_mprisIpc(bool enabled);
     void settingswindow_stylesheetIsFusion(bool yes);
@@ -149,6 +150,7 @@ private slots:
     bool rememberHistoryOnlyForVideos = true;
     bool rememberFilePosition = false;
     bool rememberWindowGeometry = false;
+    bool rememberPanels = false;
     bool nowPlayingDisplayingSubtitles = true;
     bool nowPlayingNoSubtitleTracks = false;
     bool repeatAfter = false;

platform/windowmanager.cpp

@@ -33,12 +33,18 @@ QVariantMap WindowManager::json()
     return json_;
 }
 
-void WindowManager::saveAppWindow(MainWindow *window)
+void WindowManager::saveAppWindow(MainWindow *window, bool rememberWindowGeometry, bool rememberPanels)
 {
+    QVariantMap geometry;
+    QVariantMap panels;
+    if (rememberWindowGeometry)
+        geometry = Helpers::rectToVmap(QRect(window->geometry().topLeft(),
+                                            window->size()));
+    if (rememberPanels)
+        panels = window->state();
     QVariantMap data = {
-        { keyGeometry, Helpers::rectToVmap(QRect(window->geometry().topLeft(),
-                                            window->size())) },
-        { keyState, window->state() },
+        { keyGeometry, geometry },
+        { keyState, panels },
         { keyMaximized, window->isMaximized() }
     };
     json_.insert(window->objectName(), data);

platform/windowmanager.h

@@ -34,7 +34,7 @@ class WindowManager : public QObject
     void setJson(const QVariantMap &json);
     QVariantMap json();
 
-    void saveAppWindow(MainWindow *window);
+    void saveAppWindow(MainWindow *window, bool rememberWindowGeometry, bool rememberPanels);
     void saveDocks(QMainWindow *dockHost);
     void saveWindow(QWidget *window);
 

settingswindow.cpp

@@ -373,7 +373,6 @@ void SettingsWindow::disableWindowManagment()
 {
     // Wayland breaks applications
     ui->playerLimitProportions->setDisabled(true);
-    ui->playerRememberWindowGeometry->setDisabled(true);
     ui->playbackAutoCenterWindow->setDisabled(true);
 }
 
@@ -720,6 +719,7 @@ void SettingsWindow::sendSignals()
     emit rememberFilePosition(WIDGET_LOOKUP(ui->playerRememberFilePosition).toBool());
     emit rememberSelectedPlaylist(WIDGET_LOOKUP(ui->playerRememberLastPlaylist).toBool());
     emit rememberWindowGeometry(WIDGET_LOOKUP(ui->playerRememberWindowGeometry).toBool());
+    emit rememberPanels(WIDGET_LOOKUP(ui->playerRememberPanels).toBool());
     emit rememberPanNScan(WIDGET_LOOKUP(ui->playerRememberPanScanZoom).toBool());
 
     emit mprisIpc(WIDGET_LOOKUP(ui->ipcMpris).toBool());
@@ -1098,6 +1098,7 @@ void SettingsWindow::setFreestanding(bool freestanding)
     ui->playerRememberFilePosition->setVisible(yes);
     ui->playerRememberLastPlaylist->setVisible(false /*yes*/);
     ui->playerRememberWindowGeometry->setVisible(yes);
+    ui->playerRememberPanels->setVisible(yes);
     ui->playerRememberPanScanZoom->setVisible(false /*yes*/);
     ui->playerHistoryBox->setEnabled(yes);
     ui->webTcpIpBox->setEnabled(yes);

settingswindow.h

@@ -90,6 +90,7 @@ class SettingsWindow : public QWidget
     void rememberFilePosition(bool yes);
     void rememberSelectedPlaylist(bool yes);
     void rememberWindowGeometry(bool yes);
+    void rememberPanels(bool yes);
     void rememberPanNScan(bool yes);
 
     void mprisIpc(bool enabled);

settingswindow.ui

@@ -234,6 +234,16 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QCheckBox" name="playerRememberPanels">
+                <property name="text">
+                 <string>Remember panels state</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="QCheckBox" name="playerRememberPanScanZoom">
                 <property name="text">