Some tweaking of NotificationsSettingsPage

diff --git a/src/qtui/settingspages/notificationssettingspage.cpp b/src/qtui/settingspages/notificationssettingspage.cpp
index 9fbe715..def42d9 100644 (file)
--- a/src/qtui/settingspages/notificationssettingspage.cpp
+++ b/src/qtui/settingspages/notificationssettingspage.cpp
@@ -35,6 +35,9 @@ NotificationsSettingsPage::NotificationsSettingsPage(QWidget *parent)
   connect(ui.x_value, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
   connect(ui.y_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()));
 

+#ifndef HAVE_DBUS
+  ui.desktopBox->setEnabled(false);
+#endif

 }
 
 bool NotificationsSettingsPage::hasDefaults() const {
 }
 
 bool NotificationsSettingsPage::hasDefaults() const {


@@ -44,7 +47,7 @@ bool NotificationsSettingsPage::hasDefaults() const {
 void NotificationsSettingsPage::defaults() {
   ui.animateTrayIcon->setChecked(true);
   ui.showBubble->setChecked(true);
 void NotificationsSettingsPage::defaults() {
   ui.animateTrayIcon->setChecked(true);
   ui.showBubble->setChecked(true);

-  ui.desktopBox->setChecked(true);
+  ui.desktopBox->setChecked(false);

   ui.timeout_value->setValue(5000);
   ui.x_value->setValue(0);
   ui.y_value->setValue(0);
   ui.timeout_value->setValue(5000);
   ui.x_value->setValue(0);
   ui.y_value->setValue(0);


@@ -62,7 +65,7 @@ void NotificationsSettingsPage::load() {
   settings["NotificationBubble"] = uiSettings.value("NotificationBubble", QVariant(true));
   ui.showBubble->setChecked(settings["NotificationBubble"].toBool());
 
   settings["NotificationBubble"] = uiSettings.value("NotificationBubble", QVariant(true));
   ui.showBubble->setChecked(settings["NotificationBubble"].toBool());
 

-  settings["NotificationDesktop"] = uiSettings.value("NotificationDesktop", QVariant(true));
+  settings["NotificationDesktop"] = uiSettings.value("NotificationDesktop", QVariant(false));

   ui.desktopBox->setChecked(settings["NotificationDesktop"].toBool());
   settings["NotificationDesktopTimeout"] = uiSettings.value("NotificationDesktopTimeout", QVariant(5000));
   ui.timeout_value->setValue(settings["NotificationDesktopTimeout"].toInt());
   ui.desktopBox->setChecked(settings["NotificationDesktop"].toBool());
   settings["NotificationDesktopTimeout"] = uiSettings.value("NotificationDesktopTimeout", QVariant(5000));
   ui.timeout_value->setValue(settings["NotificationDesktopTimeout"].toInt());

diff --git a/src/qtui/settingspages/notificationssettingspage.ui b/src/qtui/settingspages/notificationssettingspage.ui
index c7ffda5..17cb7f5 100644 (file)
--- a/src/qtui/settingspages/notificationssettingspage.ui
+++ b/src/qtui/settingspages/notificationssettingspage.ui
@@ -41,6 +41,9 @@
    </item>
    <item>
     <widget class="QGroupBox" name="desktopBox" >
    </item>
    <item>
     <widget class="QGroupBox" name="desktopBox" >

+     <property name="toolTip" >
+      <string>Sends Quassel's notifications to a notification daemon compliant to Freedesktop's Notification specification (org.freedesktop.Notification).</string>
+     </property>

      <property name="title" >
       <string>Desktop Notification (via DBus)</string>
      </property>
      <property name="title" >
       <string>Desktop Notification (via DBus)</string>
      </property>