X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=9f34b595bbe483025240e02f3c19b7516db45830;hp=081baa4499e343e7e86bccb24bc9d7de3b1618cf;hb=526eccc444029c5a0d80694487c3aec6707cbeda;hpb=aa5df1497a6fca61d6f59be49572799b5c9d93fe

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 081baa44..9f34b595 100644
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -25,7 +25,7 @@
 #include "buffersettings.h"
 
 GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Behaviour"), tr("General"), parent) {
+  : SettingsPage(tr("Misc"), QString(), parent) {
   ui.setupUi(this);
 
 #ifdef Q_WS_MAC
@@ -34,13 +34,8 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
   ui.macOnly->hide();
 #endif
 
-#ifdef Q_WS_WIN
-  ui.minimizeOnMinimize->hide();
-#endif
-
   connect(ui.useSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.showSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-  connect(ui.minimizeOnMinimize, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.minimizeOnClose, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
 
   connect(ui.userNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
@@ -67,7 +62,6 @@ bool GeneralSettingsPage::hasDefaults() const {
 void GeneralSettingsPage::defaults() {
   ui.useSystemTrayIcon->setChecked(true);
   ui.showSystemTrayIcon->setChecked(true);
-  ui.minimizeOnMinimize->setChecked(false);
   ui.minimizeOnClose->setChecked(false);
 
   ui.userNoticesInDefaultBuffer->setChecked(true);
@@ -98,9 +92,6 @@ void GeneralSettingsPage::load() {
   ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
   ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
 
-  settings["MinimizeOnMinimize"] = qtuiSettings.value("MinimizeOnMinimize", QVariant(false));
-  ui.minimizeOnMinimize->setChecked(settings["MinimizeOnMinimize"].toBool());
-
   settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false));
   ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
 
@@ -128,8 +119,9 @@ void GeneralSettingsPage::load() {
   settings["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false));
   ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool());
 
-  // inputline settings
-  settings["CompletionSuffix"] = uiSettings.value("CompletionSuffix", QString(": "));
+  // completion settings
+  TabCompletionSettings completionSettings;
+  settings["CompletionSuffix"] = completionSettings.completionSuffix();
   ui.completionSuffix->setText(settings["CompletionSuffix"].toString());
 
   setChangedState(false);
@@ -137,8 +129,11 @@ void GeneralSettingsPage::load() {
 
 void GeneralSettingsPage::save() {
   QtUiSettings qtuiSettings;
+#ifdef Q_WS_MAC
+  qtuiSettings.setValue("UseSystemTrayIcon", ui.showSystemTrayIcon->isChecked());
+#else
   qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
-  qtuiSettings.setValue("MinimizeOnMinimize",  ui.minimizeOnMinimize->isChecked());
+#endif
   qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
 
   UiSettings uiSettings;
@@ -174,7 +169,8 @@ void GeneralSettingsPage::save() {
 
   bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());
 
-  uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
+  TabCompletionSettings completionSettings;
+  completionSettings.setCompletionSuffix(ui.completionSuffix->text());
 
 
   load();
@@ -187,8 +183,11 @@ void GeneralSettingsPage::widgetHasChanged() {
 }
 
 bool GeneralSettingsPage::testHasChanged() {
+#ifdef Q_WS_MAC
+  if(settings["UseSystemTrayIcon"].toBool() != ui.showSystemTrayIcon->isChecked()) return true;
+#else
   if(settings["UseSystemTrayIcon"].toBool() != ui.useSystemTrayIcon->isChecked()) return true;
-  if(settings["MinimizeOnMinimize"].toBool() != ui.minimizeOnMinimize->isChecked()) return true;
+#endif
   if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true;
 
   if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true;