0.5.11

0.5.11

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');
@@ -281,9 +282,17 @@ Ext.define('Rambox.Application', {
 	,updateTotalNotifications: function( newValue, oldValue ) {
 		newValue = parseInt(newValue);
 		if ( newValue > 0 )	{
-			document.title = 'Rambox (' + Rambox.util.Format.formatNumber(newValue) + ')';
+			if ( Ext.cq1('app-main').getActiveTab().record ) {
+				document.title = 'Rambox (' + Rambox.util.Format.formatNumber(newValue) + ') - '+Ext.cq1('app-main').getActiveTab().record.get('name');
+			} else {
+				document.title = 'Rambox (' + Rambox.util.Format.formatNumber(newValue) + ')';
+			}
 		} else {
-			document.title = 'Rambox';
+			if ( Ext.cq1('app-main') && Ext.cq1('app-main').getActiveTab().record ) {
+				document.title = 'Rambox - '+Ext.cq1('app-main').getActiveTab().record.get('name');
+			} else {
+				document.title = 'Rambox';
+			}
 		}
 	}
 

app/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rambox",
 	"productName": "Rambox",
-	"version": "0.5.10",
+	"version": "0.5.11",
 	"description": "Rambox",
 	"main": "electron/main.js",
 	"private": true,
@@ -29,12 +29,12 @@
 	"author": "Ramiro Saenz <saenzramiro@gmail.com>",
 	"license": "GPL-3.0",
 	"dependencies": {
+		"@exponent/electron-cookies": "2.0.0",
 		"auto-launch-patched": "5.0.2",
-		"tmp": "0.0.28",
-		"rimraf": "2.6.1",
-		"mime": "^1.3.4",
-		"electron-is-dev": "^0.1.1",
 		"electron-config": "0.2.1",
-		"@exponent/electron-cookies": "2.0.0"
+		"electron-is-dev": "^0.1.2",
+		"mime": "^1.4.0",
+		"rimraf": "2.6.1",
+		"tmp": "0.0.28"
 	}
 }

app/store/ServicesList.js

@@ -217,6 +217,7 @@ Ext.define('Rambox.store.ServicesList', {
 			,url: 'https://mail.yahoo.com/'
 			,type: 'email'
 			,note: 'To enable desktop notifications, you have to go to Options inside Yahoo! Mail.'
+			,userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36'
 		},
 		{
 			 id: 'protonmail'

app/view/main/MainController.js

@@ -11,7 +11,11 @@ Ext.define('Rambox.view.main.MainController', {
 		ga_storage._trackPageview('/index.html', 'main');
 
 		if ( newTab.id === 'ramboxTab' ) {
-			document.title = 'Rambox';
+			if ( Rambox.app.getTotalNotifications() > 0 ) {
+				document.title = 'Rambox ('+ Rambox.app.getTotalNotifications() +')';
+			} else {
+				document.title = 'Rambox';
+			}
 			return;
 		}
 
@@ -23,7 +27,11 @@ Ext.define('Rambox.view.main.MainController', {
 		if ( webview ) webview.focus();
 
 		// Update the main window so it includes the active tab title.
-		document.title = 'Rambox - ' + newTab.title;
+		if ( Rambox.app.getTotalNotifications() > 0 ) {
+			document.title = 'Rambox ('+ Rambox.app.getTotalNotifications() +') - ' + newTab.record.get('name');
+		} else {
+			document.title = 'Rambox - ' + newTab.record.get('name');
+		}
 	}
 
 	,updatePositions: function(tabPanel, tab) {
@@ -237,6 +245,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

app/view/preferences/Preferences.js

@@ -101,12 +101,6 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,boxLabel: locale['preferences[5]']
 						,value: config.auto_launch
 					}
-					,{
-						 xtype: 'checkbox'
-						,name: 'flash_frame'
-						,boxLabel: locale['preferences[flash_frame]']
-						,value: config.flash_frame
-					}
 					,{
 						 xtype: 'checkbox'
 						,name: 'start_minimized'
@@ -175,6 +169,12 @@ Ext.define('Rambox.view.preferences.Preferences',{
 						,value: config.systemtray_indicator
 						,hidden: process.platform === 'darwin'
 					}
+					,{
+						 xtype: 'checkbox'
+						,name: 'flash_frame'
+						,boxLabel: process.platform === 'darwin' ? locale['preferences[10]'] : locale['preferences[9]']
+						,value: config.flash_frame
+					}
 					,{
 						 xtype: 'checkbox'
 						,name: 'disable_gpu'

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.5.10
+version: 0.5.11
 pull_requests:
   do_not_increment_build_number: true
 branches:

electron/main.js

@@ -27,6 +27,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: ''
@@ -44,10 +45,14 @@ const config = new Config({
 
 // Fix issues with HiDPI scaling on Windows platform
 if (config.get('enable_hidpi_support') && (process.platform === 'win32')) {
-  app.commandLine.appendSwitch('high-dpi-support', 'true')
+	app.commandLine.appendSwitch('high-dpi-support', 'true')
-  app.commandLine.appendSwitch('force-device-scale-factor', '1')
+	app.commandLine.appendSwitch('force-device-scale-factor', '1')
 }
 
+// Because we build it using Squirrel, it will assign UserModelId automatically, so we match it here to display notifications correctly.
+// https://github.com/electron-userland/electron-builder/issues/362
+app.setAppUserModelId('com.squirrel.Rambox.Rambox');
+
 // Menu
 const appMenu = require('./menu')(config);
 
@@ -113,7 +118,7 @@ function handleSquirrelEvent() {
 		spawnUpdate(['--removeShortcut', exeName]);
 		// Remove user app data
 		require('rimraf').sync(require('electron').app.getPath('userData'));
-		
+
 		setTimeout(app.quit, 1000);
 		return true;
 
@@ -272,9 +277,7 @@ function updateBadge(title) {
 		app.setBadgeCount(messageCount);
 	}
 
-	if ( messageCount > 0 && !mainWindow.isFocused() && config.get('flash_frame') ) {
+	if ( messageCount > 0 && !mainWindow.isFocused() && !config.get('dont_disturb') && config.get('flash_frame') ) mainWindow.flashFrame(true);
-		mainWindow.flashFrame(true);
-	}
 }
 
 ipcMain.on('setBadge', function(event, messageCount, value) {
@@ -334,6 +337,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();
@@ -350,6 +357,9 @@ const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => {
 	if (mainWindow) {
 		if (mainWindow.isMinimized()) mainWindow.restore();
 		mainWindow.focus();
+		mainWindow.show();
+		mainWindow.setSkipTaskbar(false);
+		if (app.dock && app.dock.show) app.dock.show();
 	}
 });
 

electron/tray.js

@@ -40,7 +40,7 @@ exports.create = function(win, config) {
 };
 
 exports.destroy = function() {
-	appIcon.destroy();
+	if (appIcon) appIcon.destroy();
 	appIcon = null;
 };
 

package.json

@@ -88,24 +88,24 @@
 		}
 	},
 	"devDependencies": {
-		"asar": "^0.12.1",
+		"asar": "^0.12.4",
 		"chai": "3.5.0",
 		"crowdin": "1.0.0",
 		"csvjson": "4.3.3",
-		"electron": "1.7.4",
+		"electron": "1.7.5",
-		"electron-builder": "^17.8.0",
+		"electron-builder": "^17.10.0",
 		"electron-builder-squirrel-windows": "15.0.0",
 		"electron-squirrel-startup": "^1.0.0",
 		"mocha": "3.2.0",
 		"spectron": "3.4.0"
 	},
 	"dependencies": {
+		"@exponent/electron-cookies": "2.0.0",
 		"auto-launch-patched": "5.0.2",
-		"tmp": "0.0.28",
-		"rimraf": "2.6.1",
-		"mime": "^1.3.4",
-		"electron-is-dev": "^0.1.1",
 		"electron-config": "0.2.1",
-		"@exponent/electron-cookies": "2.0.0"
+		"electron-is-dev": "^0.1.2",
+		"mime": "^1.4.0",
+		"rimraf": "2.6.1",
+		"tmp": "0.0.28"
 	}
 }

resources/languages/README.md

@@ -0,0 +1,5 @@
+## PLEASE DO NOT EDIT ANY FILES HERE
+
+WE GENERATE THIS FILES FROM CROWDIN, SO PLEASE VISIT https://crowdin.com/project/rambox/invite AND TRANSLATE FROM THERE.
+
+If you are making a pull request with a new feature, just do it in English and then we add the strings in Crowdin to translate it to all languages.