Add setting to turn system notifications on/off.

Author: Mike Limansky

src/settings.cpp

@@ -27,6 +27,10 @@ static const char* ITEM_FORMAT = "ItemFormat";
 static const char* NOTIFICATIONS = "Notifications";
 static const char* NTF_DEVICES = "Devices";
 static const char* NTF_MOUNT = "Mount";
+#ifdef WITH_LIBNOTIFY
+static const char* USE_LIBNOTIFY = "UseLibNotify";
+#endif
+
 
 static const char* DEFAULT_ITEM_FORMAT = "%name% (%fs%) %size%";
 
@@ -51,6 +55,9 @@ void SettingsManager::readSettings()
     s.beginGroup(NOTIFICATIONS);
     settings.deviceNotifications = s.value(NTF_DEVICES, true).toBool();
     settings.mountNotifications= s.value(NTF_MOUNT, true).toBool();
+#ifdef WITH_LIBNOTIFY
+    settings.useLibnotify = s.value(USE_LIBNOTIFY, true).toBool();
+#endif
 }
 
 void SettingsManager::save(const Settings& newSettings)
@@ -64,6 +71,9 @@ void SettingsManager::save(const Settings& newSettings)
     s.beginGroup(NOTIFICATIONS);
     s.setValue(NTF_DEVICES, settings.deviceNotifications);
     s.setValue(NTF_MOUNT, settings.mountNotifications);
+#ifdef WITH_LIBNOTIFY
+    s.setValue(USE_LIBNOTIFY, settings.useLibnotify);
+#endif
 }
 
 QString SettingsManager::defaultItemFormat()

src/settings.h

@@ -28,6 +28,9 @@ struct Settings
     bool deviceNotifications;
     bool mountNotifications;
     bool mountAutomaticaly;
+#ifdef WITH_LIBNOTIFY
+    bool useLibnotify;
+#endif
     QString itemFormat;
 };
 

src/settingsdialog.cpp

@@ -14,6 +14,11 @@ SettingsDialog::SettingsDialog(const Settings& settings, QWidget *parent) :
     ui->mountNotify->setChecked(settings.mountNotifications);
 
     ui->itemFormat->setText(settings.itemFormat);
+#ifdef WITH_LIBNOTIFY
+    useLibNotify = new QCheckBox(tr("Use system notifications"));
+    useLibNotify->setChecked(settings.useLibnotify);
+    ui->notifyGroupBox->layout()->addWidget(useLibNotify);
+#endif
 }
 
 SettingsDialog::~SettingsDialog()
@@ -30,6 +35,10 @@ Settings SettingsDialog::getSettings()
     settings.deviceNotifications = ui->deviceNotify->isChecked();
     settings.mountNotifications = ui->deviceNotify->isChecked();
 
+#ifdef WITH_LIBNOTIFY
+    settings.useLibnotify = useLibNotify->isChecked();
+#endif
+
     settings.itemFormat = ui->itemFormat->text();
     return settings;
 }

src/settingsdialog.h

@@ -8,6 +8,9 @@ namespace Ui {
 }
 
 class Settings;
+#ifdef WITH_LIBNOTIFY
+class QCheckBox;
+#endif
 
 class SettingsDialog : public QDialog
 {
@@ -26,6 +29,9 @@ private slots:
 
 private:
     Ui::SettingsDialog *ui;
+#ifdef WITH_LIBNOTIFY
+    QCheckBox* useLibNotify;
+#endif
 };
 
 #endif // SETTINGSDIALOG_H

src/tinymounttray.cpp

@@ -283,7 +283,14 @@ void TinyMountTray::showSettings()
 void TinyMountTray::showNotification(const QString& title, const QString &message)
 {
 #ifdef WITH_LIBNOTIFY
-    notifier->showNotification(title, message);
+    if (SettingsManager::instance().getSettings().useLibnotify)
+    {
+        notifier->showNotification(title, message);
+    }
+    else
+    {
+        tray->showMessage(title, message);
+    }
 #else
     tray->showMessage(title, message);
 #endif