X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=acd8c62f3ed1f468a0e6b81a9a1a3379c8e5f58d;hp=9b232bddcdc7afd8be0be99c8510ef803caff0c3;hb=dcac65fc4beeb1167de8ebec5cc54608fc314fd3;hpb=af456476e906a564d9faf3381b8bc3111fdb2bbd diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp index 9b232bdd..acd8c62f 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,11 +22,10 @@ #include "qtui.h" #include "qtuisettings.h" -#include "backlogsettings.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 @@ -55,12 +54,10 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent) 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.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())); - connect(ui.fixedBacklogAmount, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged())); - connect(ui.dynamicBacklogAmount, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged())); } bool GeneralSettingsPage::hasDefaults() const { @@ -86,7 +83,7 @@ void GeneralSettingsPage::defaults() { ui.errorMsgsInCurrentBuffer->setChecked(false); ui.displayTopicInTooltip->setChecked(false); - ui.mouseWheelChangesBuffers->setChecked(true); + ui.mouseWheelChangesBuffers->setChecked(false); ui.completionSuffix->setText(": "); @@ -107,24 +104,27 @@ void GeneralSettingsPage::load() { settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false)); ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool()); - settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(true)); + 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()); + 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); - 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()); + redirectTarget = bufferSettings.errorMsgsTarget(); + SettingsPage::load(ui.errorMsgsInDefaultBuffer, redirectTarget & BufferSettings::DefaultBuffer); + SettingsPage::load(ui.errorMsgsInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer); + SettingsPage::load(ui.errorMsgsInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer); - 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()); @@ -132,20 +132,16 @@ void GeneralSettingsPage::load() { settings["CompletionSuffix"] = uiSettings.value("CompletionSuffix", QString(": ")); ui.completionSuffix->setText(settings["CompletionSuffix"].toString()); - // backlogSettings: - BacklogSettings backlogSettings; - settings["FixedBacklogAmount"] = backlogSettings.fixedBacklogAmount(); - ui.fixedBacklogAmount->setValue(backlogSettings.fixedBacklogAmount()); - - settings["DynamicBacklogAmount"] = backlogSettings.dynamicBacklogAmount(); - ui.dynamicBacklogAmount->setValue(backlogSettings.dynamicBacklogAmount()); - setChangedState(false); } void GeneralSettingsPage::save() { QtUiSettings qtuiSettings; +#ifdef Q_WS_MAC + qtuiSettings.setValue("UseSystemTrayIcon", ui.showSystemTrayIcon->isChecked()); +#else qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked()); +#endif qtuiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked()); qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked()); @@ -153,27 +149,38 @@ void GeneralSettingsPage::save() { 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()); + 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); bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked()); uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text()); - BacklogSettings backlogSettings; - backlogSettings.setFixedBacklogAmount(ui.fixedBacklogAmount->value()); - backlogSettings.setDynamicBacklogAmount(ui.dynamicBacklogAmount->value()); - load(); setChangedState(false); } @@ -184,7 +191,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; +#endif if(settings["MinimizeOnMinimize"].toBool() != ui.minimizeOnMinimize->isChecked()) return true; if(settings["MinimizeOnClose"].toBool() != ui.minimizeOnClose->isChecked()) return true; @@ -205,8 +216,5 @@ bool GeneralSettingsPage::testHasChanged() { if(settings["CompletionSuffix"].toString() != ui.completionSuffix->text()) return true; - if(settings["FixedBacklogAmount"].toInt() != ui.fixedBacklogAmount->value()) return true; - if(settings["DynamicBacklogAmount"].toInt() != ui.dynamicBacklogAmount->value()) return true; - return false; }