X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=9888235d947689c64b8f33b79d9a7abc852a52b4;hp=5b44914a44743e6f7501e6ee59ed1af5d494983a;hb=983164018267de71e92c025ff81e4f10b8ddc5b0;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp index 5b44914a..9888235d 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())); @@ -55,8 +50,6 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent) connect(ui.errorMsgsInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.errorMsgsInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.displayTopicInTooltip, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.mouseWheelChangesBuffers, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.completionSuffix, SIGNAL(textEdited(const QString&)), this, SLOT(widgetHasChanged())); } @@ -67,7 +60,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); @@ -82,9 +74,6 @@ void GeneralSettingsPage::defaults() { ui.errorMsgsInStatusBuffer->setChecked(false); ui.errorMsgsInCurrentBuffer->setChecked(false); - ui.displayTopicInTooltip->setChecked(false); - ui.mouseWheelChangesBuffers->setChecked(false); - ui.completionSuffix->setText(": "); widgetHasChanged(); @@ -98,35 +87,29 @@ 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()); - settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(false)); - ui.mouseWheelChangesBuffers->setChecked(settings["MouseWheelChangesBuffers"].toBool()); - // bufferSettings: BufferSettings bufferSettings; - SettingsPage::load(ui.userNoticesInDefaultBuffer, bufferSettings.value("UserNoticesInDefaultBuffer", QVariant(true)).toBool()); - SettingsPage::load(ui.userNoticesInStatusBuffer, bufferSettings.value("UserNoticesInStatusBuffer", QVariant(false)).toBool()); - SettingsPage::load(ui.userNoticesInCurrentBuffer, bufferSettings.value("UserNoticesInCurrentBuffer", QVariant(false)).toBool()); - - SettingsPage::load(ui.serverNoticesInDefaultBuffer, bufferSettings.value("ServerNoticesInDefaultBuffer", QVariant(false)).toBool()); - SettingsPage::load(ui.serverNoticesInStatusBuffer, bufferSettings.value("ServerNoticesInStatusBuffer", QVariant(true)).toBool()); - SettingsPage::load(ui.serverNoticesInCurrentBuffer, bufferSettings.value("ServerNoticesInCurrentBuffer", QVariant(false)).toBool()); - - SettingsPage::load(ui.errorMsgsInDefaultBuffer, bufferSettings.value("ErrorMsgsInDefaultBuffer", QVariant(true)).toBool()); - SettingsPage::load(ui.errorMsgsInStatusBuffer, bufferSettings.value("ErrorMsgsInStatusBuffer", QVariant(false)).toBool()); - SettingsPage::load(ui.errorMsgsInCurrentBuffer, bufferSettings.value("ErrorMsgsInCurrentBuffer", QVariant(false)).toBool()); - - - settings["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false)); - ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool()); - - // inputline settings - settings["CompletionSuffix"] = uiSettings.value("CompletionSuffix", QString(": ")); + int redirectTarget = bufferSettings.userNoticesTarget(); + SettingsPage::load(ui.userNoticesInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer); + SettingsPage::load(ui.userNoticesInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer); + SettingsPage::load(ui.userNoticesInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer); + + redirectTarget = bufferSettings.serverNoticesTarget(); + SettingsPage::load(ui.serverNoticesInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer); + SettingsPage::load(ui.serverNoticesInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer); + SettingsPage::load(ui.serverNoticesInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer); + + redirectTarget = bufferSettings.errorMsgsTarget(); + SettingsPage::load(ui.errorMsgsInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer); + SettingsPage::load(ui.errorMsgsInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer); + SettingsPage::load(ui.errorMsgsInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer); + + // completion settings + TabCompletionSettings completionSettings; + settings["CompletionSuffix"] = completionSettings.completionSuffix(); ui.completionSuffix->setText(settings["CompletionSuffix"].toString()); setChangedState(false); @@ -134,29 +117,43 @@ 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; - uiSettings.setValue("MouseWheelChangesBuffers", ui.mouseWheelChangesBuffers->isChecked()); - BufferSettings bufferSettings; - bufferSettings.setValue("UserNoticesInDefaultBuffer", ui.userNoticesInDefaultBuffer->isChecked()); - bufferSettings.setValue("UserNoticesInStatusBuffer", ui.userNoticesInStatusBuffer->isChecked()); - bufferSettings.setValue("UserNoticesInCurrentBuffer", ui.userNoticesInCurrentBuffer->isChecked()); - - bufferSettings.setValue("ServerNoticesInDefaultBuffer", ui.serverNoticesInDefaultBuffer->isChecked()); - bufferSettings.setValue("ServerNoticesInStatusBuffer", ui.serverNoticesInStatusBuffer->isChecked()); - bufferSettings.setValue("ServerNoticesInCurrentBuffer", ui.serverNoticesInCurrentBuffer->isChecked()); - - bufferSettings.setValue("ErrorMsgsInDefaultBuffer", ui.errorMsgsInDefaultBuffer->isChecked()); - bufferSettings.setValue("ErrorMsgsInStatusBuffer", ui.errorMsgsInStatusBuffer->isChecked()); - bufferSettings.setValue("ErrorMsgsInCurrentBuffer", ui.errorMsgsInCurrentBuffer->isChecked()); - - bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked()); - - uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text()); + int redirectTarget = 0; + if(ui.userNoticesInDefaultBuffer->isChecked()) + redirectTarget |= BufferSettings::DefaultBuffer; + if(ui.userNoticesInStatusBuffer->isChecked()) + redirectTarget |= BufferSettings::StatusBuffer; + if(ui.userNoticesInCurrentBuffer->isChecked()) + redirectTarget |= BufferSettings::CurrentBuffer; + bufferSettings.setUserNoticesTarget(redirectTarget); + + redirectTarget = 0; + if(ui.serverNoticesInDefaultBuffer->isChecked()) + redirectTarget |= BufferSettings::DefaultBuffer; + if(ui.serverNoticesInStatusBuffer->isChecked()) + redirectTarget |= BufferSettings::StatusBuffer; + if(ui.serverNoticesInCurrentBuffer->isChecked()) + redirectTarget |= BufferSettings::CurrentBuffer; + bufferSettings.setServerNoticesTarget(redirectTarget); + + redirectTarget = 0; + if(ui.errorMsgsInDefaultBuffer->isChecked()) + redirectTarget |= BufferSettings::DefaultBuffer; + if(ui.errorMsgsInStatusBuffer->isChecked()) + redirectTarget |= BufferSettings::StatusBuffer; + if(ui.errorMsgsInCurrentBuffer->isChecked()) + redirectTarget |= BufferSettings::CurrentBuffer; + bufferSettings.setErrorMsgsTarget(redirectTarget); + + TabCompletionSettings completionSettings; + completionSettings.setCompletionSuffix(ui.completionSuffix->text()); load(); @@ -169,8 +166,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; @@ -185,9 +185,6 @@ bool GeneralSettingsPage::testHasChanged() { if(SettingsPage::hasChanged(ui.errorMsgsInDefaultBuffer)) return true; if(SettingsPage::hasChanged(ui.errorMsgsInCurrentBuffer)) return true; - if(settings["DisplayTopicInTooltip"].toBool() != ui.displayTopicInTooltip->isChecked()) return true; - if(settings["MouseWheelChangesBuffers"].toBool() != ui.mouseWheelChangesBuffers->isChecked()) return true; - if(settings["CompletionSuffix"].toString() != ui.completionSuffix->text()) return true; return false;