X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=9f34b595bbe483025240e02f3c19b7516db45830;hp=b329e6396fa80f035744f20d0dabcc288e64d5b9;hb=e04d897d69a62d0b6062d788812ca12d6d85b75d;hpb=754a784dda6fe5235c59a7ce3829599ccf62eeda diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp index b329e639..9f34b595 100644 --- a/src/qtui/settingspages/generalsettingspage.cpp +++ b/src/qtui/settingspages/generalsettingspage.cpp @@ -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()); @@ -143,7 +134,6 @@ void GeneralSettingsPage::save() { #else qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked()); #endif - qtuiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked()); qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked()); UiSettings uiSettings; @@ -198,7 +188,6 @@ bool GeneralSettingsPage::testHasChanged() { #else if(settings["UseSystemTrayIcon"].toBool() != ui.useSystemTrayIcon->isChecked()) return true; #endif - if(settings["MinimizeOnMinimize"].toBool() != ui.minimizeOnMinimize->isChecked()) return true; if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true; if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true;