merged toolbars into restoreToolbars() and saveToolbars()

added centerOnMainWindowMonitor(), now also used by validation dialog
added overloads for splitter, used by main splitter
fixed saveState() for QMainWindow calling the wrong function

1 files changed, 8 insertions, 20 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 85be8563..6e6e3d22 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2261,14 +2261,8 @@ void MainWindow::readSettings(const Settings& settings)
 {
   settings.restoreGeometry(this);
   settings.restoreState(this);
-
-  if (auto v=settings.geometry().getToolbarSize()) {
-    setToolbarSize(*v);
-  }
-
-  if (auto v=settings.geometry().getToolbarButtonStyle()) {
-    setToolbarButtonStyle(*v);
-  }
+  settings.geometry().restoreToolbars(this);
+  settings.restoreState(ui->splitter);
 
   if (auto v=settings.geometry().getMenubarVisible()) {
     showMenuBar(*v);
@@ -2278,10 +2272,6 @@ void MainWindow::readSettings(const Settings& settings)
     showStatusBar(*v);
   }
 
-  if (auto v=settings.geometry().getMainSplitterState()) {
-    ui->splitter->restoreState(*v);
-  }
-
   {
     auto v = settings.geometry().getFiltersVisible().value_or(false);
     setCategoryListVisible(v);
@@ -2366,14 +2356,12 @@ void MainWindow::storeSettings(Settings& s) {
     s.saveState(this);
     s.saveGeometry(this);
 
-    settings.setValue("toolbar_size", ui->toolBar->iconSize());
-    settings.setValue("toolbar_button_style", static_cast<int>(ui->toolBar->toolButtonStyle()));
-    settings.setValue("menubar_visible", m_menuBarVisible);
-    settings.setValue("statusbar_visible", m_statusBarVisible);
-    settings.setValue("window_split", ui->splitter->saveState());
-    QScreen *screen = this->window()->windowHandle()->screen();
-    int screenId = QGuiApplication::screens().indexOf(screen);
-    settings.setValue("window_monitor", screenId);
+    s.geometry().setMenubarVisible(m_menuBarVisible);
+    s.geometry().saveToolbars(this);
+    s.geometry().setStatusbarVisible(m_statusBarVisible);
+    s.saveState(ui->splitter);
+    s.geometry().saveMainWindowMonitor(this);
+
     settings.setValue("browser_geometry", m_IntegratedBrowser.saveGeometry());
     settings.setValue("filters_visible", ui->displayCategoriesBtn->isChecked());