X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=9888235d947689c64b8f33b79d9a7abc852a52b4;hp=5341511b52aef7e23663b8895da639120a3addfc;hb=983164018267de71e92c025ff81e4f10b8ddc5b0;hpb=b6745556187013f9ddb84abd26498c77a7db5999 diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp index 5341511b..9888235d 100644 --- a/src/qtui/settingspages/generalsettingspage.cpp +++ b/src/qtui/settingspages/generalsettingspage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel IRC Team * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -22,18 +22,35 @@ #include "qtui.h" #include "qtuisettings.h" +#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 + ui.useSystemTrayIcon->hide(); +#else + ui.macOnly->hide(); +#endif + connect(ui.useSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.minimizeOnMinimize, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.showSystemTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.minimizeOnClose, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.userMessagesInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.userMessagesInQueryBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.userMessagesInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.userNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.userNoticesInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.userNoticesInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + + connect(ui.serverNoticesInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.serverNoticesInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.serverNoticesInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + + connect(ui.errorMsgsInDefaultBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.errorMsgsInStatusBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + connect(ui.errorMsgsInCurrentBuffer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); + + connect(ui.completionSuffix, SIGNAL(textEdited(const QString&)), this, SLOT(widgetHasChanged())); } bool GeneralSettingsPage::hasDefaults() const { @@ -41,51 +58,105 @@ bool GeneralSettingsPage::hasDefaults() const { } void GeneralSettingsPage::defaults() { - qDebug() << "defaults in generalsettingspage"; ui.useSystemTrayIcon->setChecked(true); - ui.minimizeOnMinimize->setChecked(false); + ui.showSystemTrayIcon->setChecked(true); ui.minimizeOnClose->setChecked(false); - ui.userMessagesInStatusBuffer->setChecked(true); - ui.userMessagesInQueryBuffer->setChecked(false); - ui.userMessagesInCurrentBuffer->setChecked(false); + ui.userNoticesInDefaultBuffer->setChecked(true); + ui.userNoticesInStatusBuffer->setChecked(false); + ui.userNoticesInCurrentBuffer->setChecked(false); + + ui.serverNoticesInDefaultBuffer->setChecked(false); + ui.serverNoticesInStatusBuffer->setChecked(true); + ui.serverNoticesInCurrentBuffer->setChecked(false); + + ui.errorMsgsInDefaultBuffer->setChecked(true); + ui.errorMsgsInStatusBuffer->setChecked(false); + ui.errorMsgsInCurrentBuffer->setChecked(false); + + ui.completionSuffix->setText(": "); widgetHasChanged(); } void GeneralSettingsPage::load() { - QtUiSettings s; - settings["UseSystemTrayIcon"] = s.value("UseSystemTrayIcon"); + // uiSettings: + QtUiSettings qtuiSettings; + UiSettings uiSettings; + settings["UseSystemTrayIcon"] = qtuiSettings.value("UseSystemTrayIcon", QVariant(true)); ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool()); + ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool()); - settings["MinimizeOnMinimize"] = s.value("MinimizeOnMinimize"); - ui.minimizeOnMinimize->setChecked(settings["MinimizeOnMinimize"].toBool()); - - settings["MinimizeOnClose"] = s.value("MinimizeOnClose"); + settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false)); ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool()); - settings["UserMessagesInStatusBuffer"] = s.value("UserMessagesInStatusBuffer"); - ui.userMessagesInStatusBuffer->setChecked(settings["UserMessagesInStatusBuffer"].toBool()); + // bufferSettings: + BufferSettings bufferSettings; + 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); - settings["UserMessagesInQueryBuffer"] = s.value("UserMessagesInQueryBuffer"); - ui.userMessagesInQueryBuffer->setChecked(settings["UserMessagesInQueryBuffer"].toBool()); + redirectTarget = bufferSettings.serverNoticesTarget(); + SettingsPage::load(ui.serverNoticesInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer); + SettingsPage::load(ui.serverNoticesInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer); + SettingsPage::load(ui.serverNoticesInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer); - settings["UserMessagesInCurrentBuffer"] = s.value("UserMessagesInCurrentBuffer"); - ui.userMessagesInCurrentBuffer->setChecked(settings["UserMessagesInCurrentBuffer"].toBool()); + 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); } void GeneralSettingsPage::save() { - QtUiSettings s; - s.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked()); - s.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked()); - s.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked()); - - s.setValue("UserMessagesInStatusBuffer", ui.userMessagesInStatusBuffer->isChecked()); - s.setValue("UserMessagesInQueryBuffer", ui.userMessagesInQueryBuffer->isChecked()); - s.setValue("UserMessagesInCurrentBuffer", ui.userMessagesInCurrentBuffer->isChecked()); - + QtUiSettings qtuiSettings; +#ifdef Q_WS_MAC + qtuiSettings.setValue("UseSystemTrayIcon", ui.showSystemTrayIcon->isChecked()); +#else + qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked()); +#endif + qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked()); + + BufferSettings bufferSettings; + 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(); setChangedState(false); } @@ -95,16 +166,26 @@ void GeneralSettingsPage::widgetHasChanged() { } bool GeneralSettingsPage::testHasChanged() { - if(settings["UseSystemTrayIcon"] != ui.useSystemTrayIcon->isChecked()) return true; - if(settings["MinimizeOnMinimize"] != ui.minimizeOnMinimize->isChecked()) return true; - if(settings["MinimizeOnClose"] != ui.minimizeOnClose->isChecked()) return true; - if(settings["UserMessagesInStatusBuffer"] != ui.userMessagesInStatusBuffer->isChecked()) return true; - if(settings["UserMessagesInQueryBuffer"] != ui.userMessagesInQueryBuffer->isChecked()) return true; - if(settings["UserMessagesInCurrentBuffer"] != ui.userMessagesInCurrentBuffer->isChecked()) return true; +#ifdef Q_WS_MAC + if(settings["UseSystemTrayIcon"].toBool() != ui.showSystemTrayIcon->isChecked()) return true; +#else + if(settings["UseSystemTrayIcon"].toBool() != ui.useSystemTrayIcon->isChecked()) return true; +#endif + if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true; - return false; -} + if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true; + if(SettingsPage::hasChanged(ui.userNoticesInDefaultBuffer)) return true; + if(SettingsPage::hasChanged(ui.userNoticesInCurrentBuffer)) return true; + if(SettingsPage::hasChanged(ui.serverNoticesInStatusBuffer)) return true; + if(SettingsPage::hasChanged(ui.serverNoticesInDefaultBuffer)) return true; + if(SettingsPage::hasChanged(ui.serverNoticesInCurrentBuffer)) return true; + if(SettingsPage::hasChanged(ui.errorMsgsInStatusBuffer)) return true; + if(SettingsPage::hasChanged(ui.errorMsgsInDefaultBuffer)) return true; + if(SettingsPage::hasChanged(ui.errorMsgsInCurrentBuffer)) return true; + if(settings["CompletionSuffix"].toString() != ui.completionSuffix->text()) return true; + return false; +}