X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=2e45e51024191aa64250566150dbd830c38ac346;hp=53ed0514a4729d7f05f4fab703b1d51fee963406;hb=9d32e4eb35cecd82d936d2de7da7e7e7dc606667;hpb=e9189ebd5af607385629d3aa74dc9fc15bb642f4

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 53ed0514..2e45e510 100644
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -49,10 +49,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
 
   connect(ui.displayTopicInTooltip, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.mouseWheelChangesBuffers, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-
-//   ui.userMessagesInStatusBuffer->setEnabled(false);
-//   ui.userMessagesInQueryBuffer->setEnabled(false);
-//   ui.userMessagesInCurrentBuffer->setEnabled(false);
+  connect(ui.completionSuffix, SIGNAL(textEdited(const QString&)), this, SLOT(widgetHasChanged()));
 }
 
 bool GeneralSettingsPage::hasDefaults() const {
@@ -60,7 +57,6 @@ bool GeneralSettingsPage::hasDefaults() const {
 }
 
 void GeneralSettingsPage::defaults() {
-  qDebug() << "defaults in generalsettingspage";
   ui.useSystemTrayIcon->setChecked(true);
   ui.showSystemTrayIcon->setChecked(true);
   ui.minimizeOnMinimize->setChecked(false);
@@ -73,12 +69,14 @@ void GeneralSettingsPage::defaults() {
   ui.displayTopicInTooltip->setChecked(false);
   ui.mouseWheelChangesBuffers->setChecked(true);
 
+  ui.completionSuffix->setText(": ");
+
   widgetHasChanged();
 }
 
 void GeneralSettingsPage::load() {
   // uiSettings:
-  UiSettings uiSettings("Ui");
+  UiSettings uiSettings;
   settings["UseSystemTrayIcon"] = uiSettings.value("UseSystemTrayIcon", QVariant(true));
   ui.useSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
   ui.showSystemTrayIcon->setChecked(settings["UseSystemTrayIcon"].toBool());
@@ -89,7 +87,7 @@ void GeneralSettingsPage::load() {
   settings["MinimizeOnClose"] = uiSettings.value("MinimizeOnClose", QVariant(false));
   ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
 
-  settings["MouseWheelChangesBuffers"] = uiSettings.value("mouseWheelChangesBuffers", QVariant(true));
+  settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(true));
   ui.mouseWheelChangesBuffers->setChecked(settings["MouseWheelChangesBuffers"].toBool());
 
   // bufferSettings:
@@ -106,11 +104,15 @@ 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());
+
   setChangedState(false);
 }
 
 void GeneralSettingsPage::save() {
-  UiSettings uiSettings("Ui");
+  UiSettings uiSettings;
   uiSettings.setValue("UseSystemTrayIcon", ui.useSystemTrayIcon->isChecked());
   uiSettings.setValue("MinimizeOnMinimize",  ui.minimizeOnMinimize->isChecked());
   uiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
@@ -123,6 +125,8 @@ void GeneralSettingsPage::save() {
 
   bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());
 
+  uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
+
   load();
   setChangedState(false);
 }
@@ -144,9 +148,7 @@ bool GeneralSettingsPage::testHasChanged() {
   if(settings["DisplayTopicInTooltip"].toBool() != ui.displayTopicInTooltip->isChecked()) return true;
   if(settings["MouseWheelChangesBuffers"].toBool() != ui.mouseWheelChangesBuffers->isChecked()) return true;
 
+  if(settings["CompletionSuffix"].toString() != ui.completionSuffix->text()) return true;
+
   return false;
 }
-
-
-
-