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

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 53ed0514..5111b4ec 100644
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -43,16 +43,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()));
-
-//   ui.userMessagesInStatusBuffer->setEnabled(false);
-//   ui.userMessagesInQueryBuffer->setEnabled(false);
-//   ui.userMessagesInCurrentBuffer->setEnabled(false);
 }
 
 bool GeneralSettingsPage::hasDefaults() const {
@@ -60,12 +59,14 @@ bool GeneralSettingsPage::hasDefaults() const {
 }
 
 void GeneralSettingsPage::defaults() {
-  qDebug() << "defaults in generalsettingspage";
   ui.useSystemTrayIcon->setChecked(true);
   ui.showSystemTrayIcon->setChecked(true);
   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);
@@ -78,7 +79,7 @@ void GeneralSettingsPage::defaults() {
 
 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,9 +90,15 @@ 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());
 
+  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));
@@ -110,12 +117,15 @@ void GeneralSettingsPage::load() {
 }
 
 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());
   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());
@@ -137,6 +147,9 @@ 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;