fix(ui): fix button style problem

6 files changed, 44 insertions, 30 deletions

diff --git a/src/ui/dialog/settings/SettingsAppearance.cpp b/src/ui/dialog/settings/SettingsAppearance.cpp
index 11a59985..17471a0d 100644
--- a/src/ui/dialog/settings/SettingsAppearance.cpp
+++ b/src/ui/dialog/settings/SettingsAppearance.cpp
@@ -114,10 +114,10 @@ AppearanceTab::AppearanceTab(QWidget* parent) : QWidget(parent) {
  * appropriately
  **********************************/
 void AppearanceTab::SetSettings() {
-  SettingsObject main_windows_state("main_windows_state");
+  SettingsObject general_settings_state("general_settings_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);
 
@@ -135,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) {
@@ -152,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);
 }
@@ -165,7 +165,8 @@ void AppearanceTab::SetSettings() {
  * write them to settings-file
  *************************************/
 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()) {
@@ -180,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()) {
@@ -196,11 +197,11 @@ void AppearanceTab::ApplySettings() {
       break;
   }
 
-  main_windows_state["icon_style"] = icon_style;
+  general_settings_state["icon_style"] = icon_style;
 
-  main_windows_state["window_save"] = window_size_check_box_->isChecked();
+  general_settings_state["window_save"] = window_size_check_box_->isChecked();
 
-  main_windows_state["info_font_size"] = info_board_font_size_spin_->value();
+  general_settings_state["info_font_size"] = info_board_font_size_spin_->value();
 }
 
 }  // namespace GpgFrontend::UI
diff --git a/src/ui/main_window/GeneralMainWindow.cpp b/src/ui/main_window/GeneralMainWindow.cpp
index 42e53ac3..7df73aba 100644
--- a/src/ui/main_window/GeneralMainWindow.cpp
+++ b/src/ui/main_window/GeneralMainWindow.cpp
@@ -77,20 +77,24 @@ void GpgFrontend::UI::GeneralMainWindow::slot_restore_settings() noexcept {
       size_ = {width, height};
     }
 
-    int width = general_windows_state.Check("icon_size").Check("width", 24),
-        height = general_windows_state.Check("icon_size").Check("height", 24);
+
+    // appearance
+    SettingsObject general_settings_state("general_settings_state");
+
+    int width = general_settings_state.Check("icon_size").Check("width", 24),
+        height = general_settings_state.Check("icon_size").Check("height", 24);
     LOG(INFO) << "icon_size" << width << height;
 
     icon_size_ = {width, height};
-    font_size_ = general_windows_state.Check("font_size", 10);
+    font_size_ = general_settings_state.Check("font_size", 10);
 
     this->setIconSize(icon_size_);
 
     // icon_style
     int s_icon_style =
-        general_windows_state.Check("icon_style", Qt::ToolButtonTextUnderIcon);
-    auto icon_style = static_cast<Qt::ToolButtonStyle>(s_icon_style);
-    this->setToolButtonStyle(icon_style);
+        general_settings_state.Check("icon_style", Qt::ToolButtonTextUnderIcon);
+    this->setToolButtonStyle(static_cast<Qt::ToolButtonStyle>(s_icon_style));
+    icon_style_ = toolButtonStyle();
 
   } catch (...) {
     LOG(ERROR) << name_ << "error";
@@ -113,12 +117,17 @@ void GpgFrontend::UI::GeneralMainWindow::slot_save_settings() noexcept {
     general_windows_state["window_size"]["height"] = size_.height();
     general_windows_state["window_save"] = true;
 
+    SettingsObject general_settings_state("general_settings_state");
+
     // icon size
-    general_windows_state["icon_size"]["width"] = icon_size_.width();
-    general_windows_state["icon_size"]["height"] = icon_size_.height();
+    general_settings_state["icon_size"]["width"] = icon_size_.width();
+    general_settings_state["icon_size"]["height"] = icon_size_.height();
 
     // font size
-    general_windows_state["font_size"] = font_size_;
+    general_settings_state["font_size"] = font_size_;
+
+    // tool button style
+    general_settings_state["icon_style"] = this->toolButtonStyle();
 
   } catch (...) {
     LOG(ERROR) << name_ << "error";
diff --git a/src/ui/main_window/GeneralMainWindow.h b/src/ui/main_window/GeneralMainWindow.h
index 6718a074..71327100 100644
--- a/src/ui/main_window/GeneralMainWindow.h
+++ b/src/ui/main_window/GeneralMainWindow.h
@@ -56,8 +56,9 @@ class GeneralMainWindow : public QMainWindow {
    */
   void closeEvent(QCloseEvent* event);
 
-  QSize icon_size_{};  ///<
-  int font_size_{};    ///<
+  QSize icon_size_{};               ///<
+  int font_size_{};                 ///<
+  Qt::ToolButtonStyle icon_style_;  ///<
 
  private slots:
   /**
diff --git a/src/ui/main_window/KeyMgmt.cpp b/src/ui/main_window/KeyMgmt.cpp
index b6e81e94..6dc2b14f 100644
--- a/src/ui/main_window/KeyMgmt.cpp
+++ b/src/ui/main_window/KeyMgmt.cpp
@@ -250,7 +250,7 @@ void KeyMgmt::create_tool_bars() {
   generateToolButton->setIcon(QIcon(":key_generate.png"));
   generateToolButton->setText(_("Generate"));
   generateToolButton->setToolTip(_("Generate A New Keypair or Subkey"));
-  generateToolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+  generateToolButton->setToolButtonStyle(icon_style_);
   keyToolBar->addWidget(generateToolButton);
 
   // add button with popup menu for import
@@ -260,7 +260,7 @@ void KeyMgmt::create_tool_bars() {
   toolButton->setIcon(QIcon(":key_import.png"));
   toolButton->setToolTip(_("Import key"));
   toolButton->setText(_("Import Key"));
-  toolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+  toolButton->setToolButtonStyle(icon_style_);
   keyToolBar->addWidget(toolButton);
 
   keyToolBar->addSeparator();
diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp
index 8260934f..e3e4c0ab 100644
--- a/src/ui/main_window/MainWindow.cpp
+++ b/src/ui/main_window/MainWindow.cpp
@@ -167,6 +167,9 @@ void MainWindow::restore_settings() {
     bool save_key_checked = true;
     general.lookupValue("save_key_checked", save_key_checked);
 
+    // set appearance
+    import_button_->setToolButtonStyle(icon_style_);
+
     try {
       LOG(INFO) << "restore settings default_key_checked";
 
diff --git a/src/ui/main_window/MainWindowSlotUI.cpp b/src/ui/main_window/MainWindowSlotUI.cpp
index 9d81b11c..9061349e 100644
--- a/src/ui/main_window/MainWindowSlotUI.cpp
+++ b/src/ui/main_window/MainWindowSlotUI.cpp
@@ -105,17 +105,17 @@ void MainWindow::slot_open_settings_dialog() {
   connect(dialog, &SettingsDialog::finished, this, [&]() -> void {
     LOG(INFO) << "Setting Dialog Finished";
 
-    SettingsObject main_windows_state("main_windows_state");
+    SettingsObject general_settings_state("general_settings_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);
     LOG(INFO) << "icon_size" << width << height;
 
-    main_windows_state.Check("info_font_size", 10);
+    general_settings_state.Check("info_font_size", 10);
 
     // 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);
     this->setToolButtonStyle(icon_style);
     import_button_->setToolButtonStyle(icon_style);