Adds option to toggle display of Sync and Activity notifications.

Signed-off-by: Camila San <hello@camila.codes>

src/gui/activitywidget.cpp

@@ -37,6 +37,7 @@
 #include "servernotificationhandler.h"
 #include "theme.h"
 #include "ocsjob.h"
+#include "configfile.h"
 
 #include "ui_activitywidget.h"
 
@@ -308,8 +309,11 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList &list)
         }
 
         // Assemble a tray notification
-        QString log = tr("Notification for %1.").arg(activity._accName);
-        emit guiLog(log, activity._subject);
+        ConfigFile cfg;
+        if(cfg.optionalDesktopNotifications()){
+            QString log = tr("Notification for %1.").arg(activity._accName);
+            emit guiLog(log, activity._subject);
+         }
     }
 
     // check if there are widgets that have no corresponding activity from
@@ -599,7 +603,10 @@ void ActivitySettings::slotCopyToClipboard()
     }
 
     QApplication::clipboard()->setText(text);
-    emit guiLog(tr("Copied to clipboard"), message);
+
+    ConfigFile cfg;
+    if(cfg.optionalActivityNotifications())
+        emit guiLog(tr("Copied to clipboard"), message);
 }
 
 void ActivitySettings::slotRemoveAccount(AccountState *ptr)

src/gui/generalsettings.cpp

@@ -44,6 +44,10 @@ GeneralSettings::GeneralSettings(QWidget *parent)
 
     connect(_ui->desktopNotificationsCheckBox, &QAbstractButton::toggled,
         this, &GeneralSettings::slotToggleOptionalDesktopNotifications);
+    connect(_ui->syncNotificationsCheckBox, &QAbstractButton::toggled,
+        this, &GeneralSettings::slotToggleOptionalSyncNotifications);
+    connect(_ui->activityNotificationsCheckBox, &QAbstractButton::toggled,
+        this, &GeneralSettings::slotToggleOptionalActivityNotifications);
     connect(_ui->showInExplorerNavigationPaneCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::slotShowInExplorerNavigationPane);
 
     _ui->autostartCheckBox->setChecked(Utility::hasLaunchOnStartup(Theme::instance()->appName()));
@@ -115,6 +119,8 @@ void GeneralSettings::loadMiscSettings()
     ConfigFile cfgFile;
     _ui->monoIconsCheckBox->setChecked(cfgFile.monoIcons());
     _ui->desktopNotificationsCheckBox->setChecked(cfgFile.optionalDesktopNotifications());
+    _ui->syncNotificationsCheckBox->setChecked(cfgFile.optionalSyncNotifications());
+    _ui->activityNotificationsCheckBox->setChecked(cfgFile.optionalActivityNotifications());
     _ui->showInExplorerNavigationPaneCheckBox->setChecked(cfgFile.showInExplorerNavigationPane());
     _ui->crashreporterCheckBox->setChecked(cfgFile.crashReporter());
     auto newFolderLimit = cfgFile.newBigFolderSizeLimit();
@@ -171,6 +177,20 @@ void GeneralSettings::slotToggleOptionalDesktopNotifications(bool enable)
     cfgFile.setOptionalDesktopNotifications(enable);
 }
 
+void GeneralSettings::slotToggleOptionalSyncNotifications(bool enable)
+{
+    ConfigFile cfgFile;
+    cfgFile.setOptionalSyncNotifications(enable);
+}
+
+
+void GeneralSettings::slotToggleOptionalActivityNotifications(bool enable)
+{
+    ConfigFile cfgFile;
+    cfgFile.setOptionalActivityNotifications(enable);
+}
+
+
 void GeneralSettings::slotShowInExplorerNavigationPane(bool checked)
 {
     ConfigFile cfgFile;

src/gui/generalsettings.h

@@ -43,6 +43,8 @@ private slots:
     void saveMiscSettings();
     void slotToggleLaunchOnStartup(bool);
     void slotToggleOptionalDesktopNotifications(bool);
+    void slotToggleOptionalSyncNotifications(bool);
+    void slotToggleOptionalActivityNotifications(bool);
     void slotShowInExplorerNavigationPane(bool);
     void slotUpdateInfo();
     void slotIgnoreFilesEditor();

src/gui/generalsettings.ui

@@ -20,6 +20,13 @@
       <string>General Settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="syncNotificationsCheckBox">
+        <property name="text">
+         <string>Show Sync Notifications</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="0">
        <widget class="QCheckBox" name="autostartCheckBox">
         <property name="text">
@@ -44,6 +51,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="activityNotificationsCheckBox">
+        <property name="text">
+         <string>Show Activity Notifications</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

src/libsync/configfile.cpp

@@ -53,7 +53,9 @@ static const char notificationRefreshIntervalC[] = "notificationRefreshInterval"
 static const char monoIconsC[] = "monoIcons";
 static const char promptDeleteC[] = "promptDeleteAllFiles";
 static const char crashReporterC[] = "crashReporter";
-static const char optionalDesktopNoficationsC[] = "optionalDesktopNotifications";
+static const char optionalDesktopNotificationsC[] = "optionalDesktopNotifications";
+static const char optionalSyncNotificationsC[] = "optionalSyncNotifications";
+static const char optionalActivityNotificationsC[] = "optionalActivityNotifications";
 static const char showInExplorerNavigationPaneC[] = "showInExplorerNavigationPane";
 static const char skipUpdateCheckC[] = "skipUpdateCheck";
 static const char updateCheckIntervalC[] = "updateCheckInterval";
@@ -124,7 +126,19 @@ bool ConfigFile::setConfDir(const QString &value)
 bool ConfigFile::optionalDesktopNotifications() const
 {
     QSettings settings(configFile(), QSettings::IniFormat);
-    return settings.value(QLatin1String(optionalDesktopNoficationsC), true).toBool();
+    return settings.value(QLatin1String(optionalDesktopNotificationsC), true).toBool();
+}
+
+bool ConfigFile::optionalSyncNotifications() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(optionalSyncNotificationsC), false).toBool();
+}
+
+bool ConfigFile::optionalActivityNotifications() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(optionalActivityNotificationsC), false).toBool();
 }
 
 bool ConfigFile::showInExplorerNavigationPane() const
@@ -180,7 +194,21 @@ quint64 ConfigFile::targetChunkUploadDuration() const
 void ConfigFile::setOptionalDesktopNotifications(bool show)
 {
     QSettings settings(configFile(), QSettings::IniFormat);
-    settings.setValue(QLatin1String(optionalDesktopNoficationsC), show);
+    settings.setValue(QLatin1String(optionalDesktopNotificationsC), show);
+    settings.sync();
+}
+
+void ConfigFile::setOptionalSyncNotifications(bool show)
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    settings.setValue(QLatin1String(optionalSyncNotificationsC), show);
+    settings.sync();
+}
+
+void ConfigFile::setOptionalActivityNotifications(bool show)
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    settings.setValue(QLatin1String(optionalActivityNotificationsC), show);
     settings.sync();
 }
 

src/libsync/configfile.h

@@ -123,6 +123,12 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
     bool optionalDesktopNotifications() const;
     void setOptionalDesktopNotifications(bool show);
 
+    bool optionalSyncNotifications() const;
+    void setOptionalSyncNotifications(bool show);
+
+    bool optionalActivityNotifications() const;
+    void setOptionalActivityNotifications(bool show);
+
     bool showInExplorerNavigationPane() const;
     void setShowInExplorerNavigationPane(bool show);