Merge pull request #70 from saturneric/dev/2.0.8/saturnericv2.0.9

Develop 2.0.9.1

1 files changed, 12 insertions, 14 deletions

diff --git a/src/ui/settings/SettingsAppearance.cpp b/src/ui/dialog/settings/SettingsAppearance.cpp
index 7e54c9f8..17471a0d 100644
--- a/src/ui/settings/SettingsAppearance.cpp
+++ b/src/ui/dialog/settings/SettingsAppearance.cpp
@@ -114,11 +114,10 @@ AppearanceTab::AppearanceTab(QWidget* parent) : QWidget(parent) {
  * appropriately
  **********************************/
 void AppearanceTab::SetSettings() {
+  SettingsObject general_settings_state("general_settings_state");
 
-  SettingsObject main_windows_state("main_windows_state");
-
-  int width = main_windows_state.Check("icon_size").Check("width", 24),
-      height = main_windows_state.Check("icon_size").Check("height", 24);
+  int width = general_settings_state.Check("icon_size").Check("width", 24),
+      height = general_settings_state.Check("icon_size").Check("height", 24);
 
   auto icon_size = QSize(width, height);
 
@@ -136,7 +135,7 @@ void AppearanceTab::SetSettings() {
 
   // icon_style
   int s_icon_style =
-      main_windows_state.Check("icon_style", Qt::ToolButtonTextUnderIcon);
+      general_settings_state.Check("icon_style", Qt::ToolButtonTextUnderIcon);
   auto icon_style = static_cast<Qt::ToolButtonStyle>(s_icon_style);
 
   switch (icon_style) {
@@ -153,10 +152,10 @@ void AppearanceTab::SetSettings() {
       break;
   }
 
-  bool window_save = main_windows_state.Check("window_save", true);
+  bool window_save = general_settings_state.Check("window_save", true);
   if (window_save) window_size_check_box_->setCheckState(Qt::Checked);
 
-  auto info_font_size = main_windows_state.Check("info_font_size", 10);
+  auto info_font_size = general_settings_state.Check("font_size", 10);
   if (info_font_size < 9 || info_font_size > 18) info_font_size = 10;
   info_board_font_size_spin_->setValue(info_font_size);
 }
@@ -167,7 +166,7 @@ void AppearanceTab::SetSettings() {
  *************************************/
 void AppearanceTab::ApplySettings() {
 
-  SettingsObject main_windows_state("main_windows_state");
+  SettingsObject general_settings_state("general_settings_state");
 
   int icon_size = 24;
   switch (icon_size_group_->checkedId()) {
@@ -182,8 +181,8 @@ void AppearanceTab::ApplySettings() {
       break;
   }
 
-  main_windows_state["icon_size"]["width"] = icon_size;
-  main_windows_state["icon_size"]["height"] = icon_size;
+  general_settings_state["icon_size"]["width"] = icon_size;
+  general_settings_state["icon_size"]["height"] = icon_size;
 
   auto icon_style = Qt::ToolButtonTextUnderIcon;
   switch (icon_style_group_->checkedId()) {
@@ -198,12 +197,11 @@ void AppearanceTab::ApplySettings() {
       break;
   }
 
-  main_windows_state["icon_style"] = icon_style;
-
-  main_windows_state["window_save"] = window_size_check_box_->isChecked();
+  general_settings_state["icon_style"] = icon_style;
 
-  main_windows_state["info_font_size"] = info_board_font_size_spin_->value();
+  general_settings_state["window_save"] = window_size_check_box_->isChecked();
 
+  general_settings_state["info_font_size"] = info_board_font_size_spin_->value();
 }
 
 }  // namespace GpgFrontend::UI