From d97c00f962757210d7ef617c40d4c4e3da37efb1 Mon Sep 17 00:00:00 2001
From: Mahadevan Sreenivasan <mahadevan_sv@yahoo.com>
Date: Thu, 15 Oct 2020 03:29:53 +0530
Subject: Flash TaskBar (Windows) / Bounce Dock (Mac) on New Message (#1020)

- Add a new Toggle Field for Win32 and MacOS for NotifyTaskBarOnMessage in EditSettingsForm.js
- Add notifyTaskbarOnMessage under messages Array in EditSettingsScreen.js
- Update appIndicator.js to flash Windows TaskBar or Bounce the Dock on MacOS when a new message arrives
- Update en-US.json to include settings.app.form.notifyTaskBarOnMessage string
---
 src/components/settings/settings/EditSettingsForm.js |  2 ++
 src/config.js                                        |  1 +
 src/containers/settings/EditSettingsScreen.js        | 10 ++++++++++
 src/electron/ipc-api/appIndicator.js                 | 13 +++++++++++++
 src/i18n/locales/en-US.json                          |  1 +
 5 files changed, 27 insertions(+)

(limited to 'src')

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index b1e9a878d..476c4f045 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -306,6 +306,8 @@ export default @observer class EditSettingsForm extends Component {
                   <Toggle field={form.$('minimizeToSystemTray')} />
                 )}
                 <Toggle field={form.$('privateNotifications')} />
+                {(process.platform === 'win32' || process.platform === 'darwin') && (
+                  <Toggle field={form.$('notifyTaskBarOnMessage')} />)}
                 <Select field={form.$('navigationBarBehaviour')} />
 
                 <Hr />
diff --git a/src/config.js b/src/config.js
index 8a46d8083..32996a03c 100644
--- a/src/config.js
+++ b/src/config.js
@@ -94,6 +94,7 @@ export const DEFAULT_APP_SETTINGS = {
   startMinimized: false,
   minimizeToSystemTray: false,
   privateNotifications: false,
+  notifyTaskBarOnMessage: false,
   showDisabledServices: true,
   showMessageBadgeWhenMuted: true,
   showDragArea: false,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 7078546f9..d87b2512e 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -59,6 +59,10 @@ const messages = defineMessages({
     id: 'settings.app.form.privateNotifications',
     defaultMessage: '!!!Don\'t show message content in notifications',
   },
+  notifyTaskBarOnMessage: {
+    id: 'settings.app.form.notifyTaskBarOnMessage',
+    defaultMessage: '!!!Notify TaskBar/Dock on new message',
+  },
   navigationBarBehaviour: {
     id: 'settings.app.form.navigationBarBehaviour',
     defaultMessage: '!!!Navigation bar behaviour',
@@ -230,6 +234,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         startMinimized: settingsData.startMinimized,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
         privateNotifications: settingsData.privateNotifications,
+        notifyTaskBarOnMessage: settingsData.notifyTaskBarOnMessage,
         navigationBarBehaviour: settingsData.navigationBarBehaviour,
         sentry: settingsData.sentry,
         hibernate: settingsData.hibernate,
@@ -374,6 +379,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.privateNotifications,
           default: DEFAULT_APP_SETTINGS.privateNotifications,
         },
+        notifyTaskBarOnMessage: {
+          label: intl.formatMessage(messages.notifyTaskBarOnMessage),
+          value: settings.all.app.notifyTaskBarOnMessage,
+          default: DEFAULT_APP_SETTINGS.notifyTaskBarOnMessage,
+        },
         navigationBarBehaviour: {
           label: intl.formatMessage(messages.navigationBarBehaviour),
           value: settings.all.app.navigationBarBehaviour,
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index 9957ef5fc..bea8e7751 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -25,6 +25,19 @@ export default (params) => {
   });
 
   ipcMain.on('updateAppIndicator', (event, args) => {
+
+    // Flash TaskBar for windows, bounce Dock on Mac
+    if (!app.mainWindow.isFocused()) {
+      if (params.settings.app.get('notifyTaskBarOnMessage')) {
+        if (process.platform === 'win32') {
+          app.mainWindow.flashFrame(true);
+          app.mainWindow.once('focus', () => app.mainWindow.flashFrame(false));
+        } else if (process.platform === 'darwin') {
+          app.dock.bounce('informational');
+        }
+      }
+    }
+
     // Update badge
     if (process.platform === 'darwin'
       && typeof (args.indicator) === 'string') {
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 9bf4fcc15..a08dd9bb0 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -311,6 +311,7 @@
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
+  "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message",
   "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb",
-- 
cgit v1.2.3-70-g09d2