X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=cac26c09d1e7d7b0b47fd03c13d02d1f2ee3ee44;hp=db21c39703818b175903504801f829c1fb03b0f8;hb=e1f500a5f5b510d16e9eaf76a24a9aea98fac86c;hpb=535f934ed8d2d991a83ad10f34669dbc909f1c84

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index db21c397..cac26c09 100644
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -21,7 +21,7 @@
 #include "generalsettingspage.h"
 
 #include "qtui.h"
-#include "uisettings.h"
+#include "qtuisettings.h"
 #include "buffersettings.h"
 
 GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
@@ -43,13 +43,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()));
@@ -69,13 +62,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 +76,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));
@@ -141,25 +113,14 @@ void GeneralSettingsPage::load() {
 }
 
 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 +128,8 @@ void GeneralSettingsPage::save() {
 
   bufferSettings.setValue("DisplayTopicInTooltip", ui.displayTopicInTooltip->isChecked());
 
+  uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
+
   load();
   setChangedState(false);
 }
@@ -181,13 +144,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;
@@ -199,7 +155,3 @@ bool GeneralSettingsPage::testHasChanged() {
 
   return false;
 }
-
-
-
-