Make compile on top of the current master branch

[quassel.git] / src / qtui / settingspages / generalsettingspage.cpp

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index a0c0228..db21c39 100644 (file)
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -24,12 +24,9 @@
 #include "uisettings.h"
 #include "buffersettings.h"
 
-#include <QStyleFactory>
-
 GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
   : SettingsPage(tr("Behaviour"), tr("General"), parent) {
   ui.setupUi(this);
-  initStyleComboBox();
 
 #ifdef Q_WS_MAC
   ui.useSystemTrayIcon->hide();
@@ -47,7 +44,11 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
   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.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()));
@@ -55,16 +56,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget *parent)
 
   connect(ui.displayTopicInTooltip, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.mouseWheelChangesBuffers, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-
-  connect(ui.styleComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged())); 
-}
-
-void GeneralSettingsPage::initStyleComboBox() {
-  QStringList styleList = QStyleFactory::keys();
-  ui.styleComboBox->addItem("<default>");
-  foreach(QString style, styleList) {
-    ui.styleComboBox->addItem(style);
-  }
+  connect(ui.completionSuffix, SIGNAL(textEdited(const QString&)), this, SLOT(widgetHasChanged()));
 }
 
 bool GeneralSettingsPage::hasDefaults() const {
@@ -78,7 +70,11 @@ void GeneralSettingsPage::defaults() {
   ui.minimizeOnClose->setChecked(false);
 
   ui.animateTrayIcon->setChecked(true);
-  ui.displayPopupMessages->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);
@@ -87,7 +83,7 @@ void GeneralSettingsPage::defaults() {
   ui.displayTopicInTooltip->setChecked(false);
   ui.mouseWheelChangesBuffers->setChecked(true);
 
-  ui.styleComboBox->setCurrentIndex(0);
+  ui.completionSuffix->setText(": ");
 
   widgetHasChanged();
 }
@@ -111,16 +107,17 @@ void GeneralSettingsPage::load() {
   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());
+  settings["NotificationBubble"] = uiSettings.value("NotificationBubble", QVariant(true));
+  ui.bubbleBox->setChecked(settings["NotificationBubble"].toBool());
 
-  settings["Style"] = uiSettings.value("Style", QString(""));
-  if(settings["Style"].toString() == "") {
-    ui.styleComboBox->setCurrentIndex(0);
-  } else {
-    ui.styleComboBox->setCurrentIndex(ui.styleComboBox->findText(settings["Style"].toString(), Qt::MatchExactly));
-    QApplication::setStyle(settings["Style"].toString());
-  }
+  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;
@@ -136,6 +133,10 @@ 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);
 }
 
@@ -147,14 +148,18 @@ void GeneralSettingsPage::save() {
   uiSettings.setValue("MouseWheelChangesBuffers", ui.mouseWheelChangesBuffers->isChecked());
 
   uiSettings.setValue("AnimateTrayIcon", ui.animateTrayIcon->isChecked());
-  uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked());
-
-  if(ui.styleComboBox->currentIndex() < 1) {
-    uiSettings.setValue("Style", QString(""));
-  } else {
-    uiSettings.setValue("Style", ui.styleComboBox->currentText());
-  }
-
+//<<< 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());
@@ -177,7 +182,11 @@ bool GeneralSettingsPage::testHasChanged() {
   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["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;
@@ -186,7 +195,7 @@ bool GeneralSettingsPage::testHasChanged() {
   if(settings["DisplayTopicInTooltip"].toBool() != ui.displayTopicInTooltip->isChecked()) return true;
   if(settings["MouseWheelChangesBuffers"].toBool() != ui.mouseWheelChangesBuffers->isChecked()) return true;
 
-  if(settings["Style"].toString() != ui.styleComboBox->currentText()) return true;
+  if(settings["CompletionSuffix"].toString() != ui.completionSuffix->text()) return true;
 
   return false;
 }