Browse Source

Prevent to flash taskbar when Dont Disturb is ON

Fixes #922
Fixes #948
pull/1121/head
Ramiro Saenz 8 years ago
parent
commit
d459e46be3
  1. 1
      app/Application.js
  2. 2
      app/view/main/MainController.js
  3. 7
      electron/main.js

1
app/Application.js

@ -198,6 +198,7 @@ Ext.define('Rambox.Application', {
// Define default value
if ( localStorage.getItem('dontDisturb') === null ) localStorage.setItem('dontDisturb', false);
ipc.send('setDontDisturb', localStorage.getItem('dontDisturb')); // We store it in config
if ( localStorage.getItem('locked') ) {
console.info('Lock Rambox:', 'Enabled');

2
app/view/main/MainController.js

@ -237,6 +237,8 @@ Ext.define('Rambox.view.main.MainController', {
localStorage.setItem('dontDisturb', btn.pressed);
ipc.send('setDontDisturb', btn.pressed);
btn.setText(locale['app.main[16]']+': ' + ( btn.pressed ? locale['app.window[20]'] : locale['app.window[21]'] ));
// If this method is called from Lock method, prevent showing toast

7
electron/main.js

@ -26,6 +26,7 @@ const config = new Config({
,start_minimized: false
,systemtray_indicator: true
,master_password: false
,dont_disturb: false
,disable_gpu: process.platform === 'linux'
,proxy: false
,proxyHost: ''
@ -275,7 +276,7 @@ function updateBadge(title) {
app.setBadgeCount(messageCount);
}
if ( messageCount > 0 && !mainWindow.isFocused() ) mainWindow.flashFrame(true);
if ( messageCount > 0 && !mainWindow.isFocused() && !config.get('dont_disturb') ) mainWindow.flashFrame(true);
}
ipcMain.on('setBadge', function(event, messageCount, value) {
@ -335,6 +336,10 @@ ipcMain.on('setServiceNotifications', function(event, partition, op) {
});
});
ipcMain.on('setDontDisturb', function(event, arg) {
config.set('dont_disturb', arg);
})
// Reload app
ipcMain.on('reloadApp', function(event) {
mainWindow.reload();

Loading…
Cancel
Save