X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=4d517964589bc32a7ed9d070a86cc1bea6a42a6d;hp=6139ad5b60bb5c58017edd9ebcd69d171a351e6e;hb=e7eb2e3561d0f184e15f8dc9d587ef93ba209973;hpb=65d88a7f8c37e549a259aba85c52b7916b89a17d diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp index 6139ad5b..4d517964 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 * @@ -21,7 +21,7 @@ #include "generalsettingspage.h" #include "qtui.h" -#include "uisettings.h" +#include "qtuisettings.h" #include "buffersettings.h" GeneralSettingsPage::GeneralSettingsPage(QWidget *parent) @@ -43,16 +43,17 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent) connect(ui.minimizeOnMinimize, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.minimizeOnClose, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.animateTrayIcon, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); - connect(ui.bubbleBox, SIGNAL(toggled(bool)), this, SLOT(widgetHasChanged())); - connect(ui.desktopBox, SIGNAL(toggled(bool)), this, SLOT(widgetHasChanged())); - connect(ui.timeout_value, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged())); - connect(ui.x_value, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged())); - connect(ui.y_value, SIGNAL(valueChanged(int)), 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.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.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.displayTopicInTooltip, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); connect(ui.mouseWheelChangesBuffers, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged())); @@ -69,19 +70,20 @@ void GeneralSettingsPage::defaults() { ui.minimizeOnMinimize->setChecked(false); ui.minimizeOnClose->setChecked(false); - ui.animateTrayIcon->setChecked(true); - ui.bubbleBox->setChecked(true); - ui.desktopBox->setChecked(true); - ui.timeout_value->setValue(5000); - ui.x_value->setValue(0); - ui.y_value->setValue(0); + 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.userMessagesInStatusBuffer->setChecked(true); - ui.userMessagesInQueryBuffer->setChecked(false); - ui.userMessagesInCurrentBuffer->setChecked(false); + ui.errorMsgsInDefaultBuffer->setChecked(true); + ui.errorMsgsInStatusBuffer->setChecked(false); + ui.errorMsgsInCurrentBuffer->setChecked(false); ui.displayTopicInTooltip->setChecked(false); - ui.mouseWheelChangesBuffers->setChecked(true); + ui.mouseWheelChangesBuffers->setChecked(false); ui.completionSuffix->setText(": "); @@ -90,45 +92,38 @@ void GeneralSettingsPage::defaults() { void GeneralSettingsPage::load() { // uiSettings: + QtUiSettings qtuiSettings; UiSettings uiSettings; - settings["UseSystemTrayIcon"] = uiSettings.value("UseSystemTrayIcon", QVariant(true)); + settings["UseSystemTrayIcon"] = qtuiSettings.value("UseSystemTrayIcon", QVariant(true)); ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool()); ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool()); - settings["MinimizeOnMinimize"] = uiSettings.value("MinimizeOnMinimize", QVariant(false)); + settings["MinimizeOnMinimize"] = qtuiSettings.value("MinimizeOnMinimize", QVariant(false)); ui.minimizeOnMinimize->setChecked(settings["MinimizeOnMinimize"].toBool()); - settings["MinimizeOnClose"] = uiSettings.value("MinimizeOnClose", QVariant(false)); + 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()); - settings["AnimateTrayIcon"] = uiSettings.value("AnimateTrayIcon", QVariant(true)); - ui.animateTrayIcon->setChecked(settings["AnimateTrayIcon"].toBool()); - - settings["NotificationBubble"] = uiSettings.value("NotificationBubble", QVariant(true)); - ui.bubbleBox->setChecked(settings["NotificationBubble"].toBool()); - - settings["NotificationDesktop"] = uiSettings.value("NotificationDesktop", QVariant(true)); - ui.desktopBox->setChecked(settings["NotificationDesktop"].toBool()); - settings["NotificationDesktopTimeout"] = uiSettings.value("NotificationDesktopTimeout", QVariant(5000)); - ui.timeout_value->setValue(settings["NotificationDesktopTimeout"].toInt()); - settings["NotificationDesktopHintX"] = uiSettings.value("NotificationDesktopHintX", QVariant(0)); - ui.x_value->setValue(settings["NotificationDesktopHintX"].toInt()); - settings["NotificationDesktopHintY"] = uiSettings.value("NotificationDesktopHintY", QVariant(0)); - ui.y_value->setValue(settings["NotificationDesktopHintY"].toInt()); - // bufferSettings: BufferSettings bufferSettings; - settings["UserMessagesInStatusBuffer"] = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true)); - ui.userMessagesInStatusBuffer->setChecked(settings["UserMessagesInStatusBuffer"].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); - settings["UserMessagesInQueryBuffer"] = bufferSettings.value("UserMessagesInQueryBuffer", QVariant(false)); - ui.userMessagesInQueryBuffer->setChecked(settings["UserMessagesInQueryBuffer"].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); - settings["UserMessagesInCurrentBuffer"] = bufferSettings.value("UserMessagesInCurrentBuffer", QVariant(false)); - ui.userMessagesInCurrentBuffer->setChecked(settings["UserMessagesInCurrentBuffer"].toBool()); settings["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false)); ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool()); @@ -141,32 +136,51 @@ 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()); +#endif + qtuiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked()); + qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked()); + UiSettings uiSettings; - uiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked()); - uiSettings.setValue("MinimizeOnMinimize", ui.minimizeOnMinimize->isChecked()); - uiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked()); uiSettings.setValue("MouseWheelChangesBuffers", ui.mouseWheelChangesBuffers->isChecked()); - uiSettings.setValue("AnimateTrayIcon", ui.animateTrayIcon->isChecked()); -//<<< HEAD:src/qtui/settingspages/generalsettingspage.cpp - uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked()); - uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text()); - -//======= - uiSettings.setValue("NotificationBubble", ui.bubbleBox->isChecked()); - uiSettings.setValue("NotificationDesktop", ui.desktopBox->isChecked()); - uiSettings.setValue("NotificationDesktopTimeout", ui.timeout_value->value()); - uiSettings.setValue("NotificationDesktopHintX", ui.x_value->value()); - uiSettings.setValue("NotificationDesktopHintY", ui.y_value->value()); - -//>>> Configuration support for desktop notifications.:src/qtui/settingspages/generalsettingspage.cpp BufferSettings bufferSettings; - bufferSettings.setValue("UserMessagesInStatusBuffer", ui.userMessagesInStatusBuffer->isChecked()); - bufferSettings.setValue("UserMessagesInQueryBuffer", ui.userMessagesInQueryBuffer->isChecked()); - bufferSettings.setValue("UserMessagesInCurrentBuffer", ui.userMessagesInCurrentBuffer->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()); + + load(); setChangedState(false); } @@ -177,20 +191,25 @@ 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; - if(settings["AnimateTrayIcon"].toBool() != ui.animateTrayIcon->isChecked()) return true; - if(settings["NotificationBubble"].toBool() != ui.bubbleBox->isChecked()) return true; - if(settings["NotificationDesktop"].toBool() != ui.desktopBox->isChecked()) return true; - if(settings["NotificationDesktopTimeout"].toInt() != ui.timeout_value->value()) return true; - if(settings["NotificationDesktopHintX"].toInt() != ui.x_value->value()) return true; - if(settings["NotificationDesktopHintY"].toInt() != ui.y_value->value()) return true; + if(SettingsPage::hasChanged(ui.userNoticesInStatusBuffer)) return true; + if(SettingsPage::hasChanged(ui.userNoticesInDefaultBuffer)) return true; + if(SettingsPage::hasChanged(ui.userNoticesInCurrentBuffer)) return true; - if(settings["UserMessagesInStatusBuffer"].toBool() != ui.userMessagesInStatusBuffer->isChecked()) return true; - if(settings["UserMessagesInQueryBuffer"].toBool() != ui.userMessagesInQueryBuffer->isChecked()) return true; - if(settings["UserMessagesInCurrentBuffer"].toBool() != ui.userMessagesInCurrentBuffer->isChecked()) 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["DisplayTopicInTooltip"].toBool() != ui.displayTopicInTooltip->isChecked()) return true; if(settings["MouseWheelChangesBuffers"].toBool() != ui.mouseWheelChangesBuffers->isChecked()) return true; @@ -199,7 +218,3 @@ bool GeneralSettingsPage::testHasChanged() { return false; } - - - -