X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=a16e1b69225c1e8581e1b4cc8def5925a2664f35;hp=9f34b595bbe483025240e02f3c19b7516db45830;hb=d7832127ff8412b09d9fa4e56570d8a890abcbbe;hpb=e04d897d69a62d0b6062d788812ca12d6d85b75d

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 9f34b595..a16e1b69 100644
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -49,10 +49,6 @@ 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()));
 }
 
 bool GeneralSettingsPage::hasDefaults() const {
@@ -76,11 +72,6 @@ void GeneralSettingsPage::defaults() {
   ui.errorMsgsInStatusBuffer->setChecked(false);
   ui.errorMsgsInCurrentBuffer->setChecked(false);
 
-  ui.displayTopicInTooltip->setChecked(false);
-  ui.mouseWheelChangesBuffers->setChecked(false);
-
-  ui.completionSuffix->setText(": ");
-
   widgetHasChanged();
 }
 
@@ -95,9 +86,6 @@ void GeneralSettingsPage::load() {
   settings["MinimizeOnClose"] = qtuiSettings.value("MinimizeOnClose", QVariant(false));
   ui.minimizeOnClose->setChecked(settings["MinimizeOnClose"].toBool());
 
-  settings["MouseWheelChangesBuffers"] = uiSettings.value("MouseWheelChangesBuffers", QVariant(false));
-  ui.mouseWheelChangesBuffers->setChecked(settings["MouseWheelChangesBuffers"].toBool());
-
   // bufferSettings:
   BufferSettings bufferSettings;
   int redirectTarget = bufferSettings.userNoticesTarget();
@@ -115,15 +103,6 @@ void GeneralSettingsPage::load() {
   SettingsPage::load(ui.errorMsgsInStatusBuffer, redirectTarget & BufferSettings::StatusBuffer);
   SettingsPage::load(ui.errorMsgsInCurrentBuffer, redirectTarget & BufferSettings::CurrentBuffer);
 
-
-  settings["DisplayTopicInTooltip"] = bufferSettings.value("DisplayTopicInTooltip", QVariant(false));
-  ui.displayTopicInTooltip->setChecked(settings["DisplayTopicInTooltip"].toBool());
-
-  // completion settings
-  TabCompletionSettings completionSettings;
-  settings["CompletionSuffix"] = completionSettings.completionSuffix();
-  ui.completionSuffix->setText(settings["CompletionSuffix"].toString());
-
   setChangedState(false);
 }
 
@@ -136,9 +115,6 @@ void GeneralSettingsPage::save() {
 #endif
   qtuiSettings.setValue("MinimizeOnClose", ui.minimizeOnClose->isChecked());
 
-  UiSettings uiSettings;
-  uiSettings.setValue("MouseWheelChangesBuffers", ui.mouseWheelChangesBuffers->isChecked());
-
   BufferSettings bufferSettings;
   int redirectTarget = 0;
   if(ui.userNoticesInDefaultBuffer->isChecked())
@@ -167,12 +143,6 @@ void GeneralSettingsPage::save() {
     redirectTarget |= BufferSettings::CurrentBuffer;
   bufferSettings.setErrorMsgsTarget(redirectTarget);
 
-  bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());
-
-  TabCompletionSettings completionSettings;
-  completionSettings.setCompletionSuffix(ui.completionSuffix->text());
-
-
   load();
   setChangedState(false);
 }
@@ -202,10 +172,5 @@ bool GeneralSettingsPage::testHasChanged() {
   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;
-
-  if(settings["CompletionSuffix"].toString() != ui.completionSuffix->text()) return true;
-
   return false;
 }