X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=ce7bacc9451a8e565b06acae8edaab369a2241e0;hp=6139ad5b60bb5c58017edd9ebcd69d171a351e6e;hb=60c6384aae4035545cd02f6032dd810e98ddba37;hpb=65d88a7f8c37e549a259aba85c52b7916b89a17d diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp index 6139ad5b..ce7bacc9 100644 --- a/src/qtui/settingspages/generalsettingspage.cpp +++ b/src/qtui/settingspages/generalsettingspage.cpp @@ -21,7 +21,8 @@ #include "generalsettingspage.h" #include "qtui.h" -#include "uisettings.h" +#include "qtuisettings.h" +#include "backlogsettings.h" #include "buffersettings.h" GeneralSettingsPage::GeneralSettingsPage(QWidget *parent) @@ -43,13 +44,6 @@ 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.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())); @@ -57,6 +51,8 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent) 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 { @@ -69,13 +65,6 @@ 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.userMessagesInStatusBuffer->setChecked(true); ui.userMessagesInQueryBuffer->setChecked(false); ui.userMessagesInCurrentBuffer->setChecked(false); @@ -90,35 +79,21 @@ 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)); 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)); @@ -137,29 +112,26 @@ 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; + qtuiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked()); + 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()); @@ -167,6 +139,13 @@ void GeneralSettingsPage::save() { 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); } @@ -181,13 +160,6 @@ bool GeneralSettingsPage::testHasChanged() { 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(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; @@ -197,9 +169,8 @@ 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; } - - - -