X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=ce7bacc9451a8e565b06acae8edaab369a2241e0;hp=5111b4ec52ca57927a2ff8d69bc2eb72444c5286;hb=60c6384aae4035545cd02f6032dd810e98ddba37;hpb=22fea756df3d68f8bc433d2540ac6e7400853d7b

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 5111b4ec..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,15 +44,15 @@ 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.displayPopupMessages, 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.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 {
@@ -64,9 +65,6 @@ void GeneralSettingsPage::defaults() {
   ui.minimizeOnMinimize->setChecked(false);
   ui.minimizeOnClose->setChecked(false);
 
-  ui.animateTrayIcon->setChecked(true);
-  ui.displayPopupMessages->setChecked(true);
-
   ui.userMessagesInStatusBuffer->setChecked(true);
   ui.userMessagesInQueryBuffer->setChecked(false);
   ui.userMessagesInCurrentBuffer->setChecked(false);
@@ -74,31 +72,28 @@ void GeneralSettingsPage::defaults() {
   ui.displayTopicInTooltip->setChecked(false);
   ui.mouseWheelChangesBuffers->setChecked(true);
 
+  ui.completionSuffix->setText(": ");
+
   widgetHasChanged();
 }
 
 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["DisplayPopupMessages"] = uiSettings.value("DisplayPopupMessages", QVariant(true));
-  ui.displayPopupMessages->setChecked(settings["DisplayPopupMessages"].toBool());
-
   // bufferSettings:
   BufferSettings bufferSettings;
   settings["UserMessagesInStatusBuffer"] = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true));
@@ -113,19 +108,30 @@ void GeneralSettingsPage::load() {
   settings["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false));
   ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool());
 
+  // inputline settings
+  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());
-  uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked());
-
   BufferSettings bufferSettings;
   bufferSettings.setValue("UserMessagesInStatusBuffer", ui.userMessagesInStatusBuffer->isChecked());
   bufferSettings.setValue("UserMessagesInQueryBuffer", ui.userMessagesInQueryBuffer->isChecked());
@@ -133,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);
 }
@@ -147,9 +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["DisplayPopupMessages"].toBool() != ui.displayPopupMessages->isChecked()) 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;
@@ -157,9 +167,10 @@ bool GeneralSettingsPage::testHasChanged() {
   if(settings["DisplayTopicInTooltip"].toBool() != ui.displayTopicInTooltip->isChecked()) return true;
   if(settings["MouseWheelChangesBuffers"].toBool() != ui.mouseWheelChangesBuffers->isChecked()) return true;
 
-  return false;
-}
-
-
+  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;
+}