[Internal] Morphic 1.1

.gitignore

@@ -9,3 +9,4 @@ instrumented
 reports
 coverage
 package-lock.json
+/bin/

configs/app.base.json

@@ -22,6 +22,6 @@
         }
     },
     "mergeConfigs": [
-        "%gpii-universal/gpii/configs/gpii.config.untrusted.development.dynamicDR.all.local.json5"
+        "%gpii-universal/gpii/configs/gpii.config.untrusted.production.dynamicDR.json5"
     ]
 }

main.js

@@ -11,6 +11,17 @@ https://github.com/GPII/universal/blob/master/LICENSE.txt
 /* eslint-env node */
 "use strict";
 
+var app = require("electron").app;
+
+// Perform this check early, do avoid any delay.
+var singleInstance = app.requestSingleInstanceLock();
+if (!singleInstance) {
+    // The event handler of second-instance (below) will be called in the original instance.
+    console.log("Another instance of Morphic is running");
+    app.quit();
+    return;
+}
+
 var dns = require("dns");
 var lookupReal = dns.lookup;
 dns.lookup = function lookup(hostname, options, callback) {
@@ -21,7 +32,6 @@ dns.lookup = function lookup(hostname, options, callback) {
 };
 
 var fluid = require("infusion"),
-    app = require("electron").app,
     gpii = fluid.registerNamespace("gpii"),
     kettle = fluid.registerNamespace("kettle");
 
@@ -33,25 +43,21 @@ app.disableHardwareAcceleration();
 // The PSP will have a single instance. If an attempt to start a second instance is made,
 // the second one will be closed and the callback provided to `app.makeSingleInstance`
 // in the first instance will be triggered enabling it to show the PSP `BrowserWindow`.
-var appIsRunning = app.makeSingleInstance(function (commandLine) {
+app.on("second-instance", function (event, commandLine) {
     var qssWrapper = fluid.queryIoCSelector(fluid.rootComponent, "gpii.app.qssWrapper")[0];
     qssWrapper.qss.show();
-
     if (commandLine.indexOf("--reset") > -1) {
-        process.nextTick(function () {
-            // GPII-3455: Call this in the next tick, to allow electron to free some things.
+        setTimeout(function () {
+            // GPII-3455: Call this in another execution stack, to allow electron to free some things, otherwise an
+            // error of a COM object being accessed in the wrong thread is raised - but that doesn't appear to be
+            // the case. Originally, nextTick was used to escape this strange state. However, since upgrading to
+            // Electron 3 it stopped working but a zero timeout does.
             var gpiiApp = fluid.queryIoCSelector(fluid.rootComponent, "gpii.app")[0];
             gpiiApp.resetAllToStandard();
-        });
+        }, 0);
     }
 });
 
-if (appIsRunning) {
-    fluid.log("Another instance of gpii-app is running!");
-    app.quit();
-    return;
-}
-
 // this module is loaded relatively slow
 // it also loads gpii-universal
 require("gpii-windows/index.js");

messageBundles/gpii-app-messageBundle_bg.json

@@ -24,6 +24,9 @@
     "gpii_psp_signIn_signUpButton": "Създай акаунт",
     "gpii_psp_signIn_forgotPasswordButton": "Забравена парола?",
 
+    "gpii_psp_widgets_switch_on": "Вкл",
+    "gpii_psp_widgets_switch_off": "Изкл",
+
     "gpii_psp_header_autosaveText": "Автоматично запазване е включено",
     "gpii_psp_header_keyOut":"Отпиши се",
 

messageBundles/gpii-app-messageBundle_en.json

@@ -24,6 +24,9 @@
     "gpii_psp_signIn_signUpButton": "Create an Account",
     "gpii_psp_signIn_forgotPasswordButton": "Forgot Password?",
 
+    "gpii_psp_widgets_switch_on": "On",
+    "gpii_psp_widgets_switch_off": "Off",
+
     "gpii_psp_header_autosaveText": "Auto-save is on",
     "gpii_psp_header_keyOut":"Sign out",
 

messageBundles/gpii-app-qss-settings_bg.json

@@ -1,15 +1,15 @@
 {
     "gpii_app_qss_settings_close": {
-        "tooltip": "<p>Close Morphic QuickStrip</p><p>You can reopen it using the Morphic Icon (below) <img height=20 src='../../icons/TaskTrayIcon_outline.svg'></img></p>",
-        "title": "Затвори"
+        "tooltip": "<p>Close Morphic QuickStrip</p><p>You can reopen it using the Morphic Icon (below) <img height=12 src='../../icons/TaskTrayIcon_outline.svg'></img></p>",
+        "title": "×"
     },
     "gpii_app_qss_settings_undo": {
         "tooltip": "<p>Undo the last change you made in the Morphic QuickStrip.</p>",
         "title": "Undo"
     },
     "gpii_app_qss_settings_resetAll": {
         "tooltip": "<p>Resets computer to standard settings</p><p>(does not affect personal saved settings)</p>",
-        "title": "Reset All to Standard"
+        "title": "Reset to Standard"
     },
     "gpii_app_qss_settings_save": {
         "tooltip": "<p>Save your preferences so you can use them on other computers that have Morphic installed.</p>",
@@ -21,7 +21,7 @@
             "keyedOut": "<p>Opens Morphic Settings Panel</p><p>Where you can sign in to apply your saved personal settings.</p>"
         },
         "title": {
-            "keyedIn": "Morphic Settings Panel",
+            "keyedIn": "Settings Panel",
             "keyedOut": "Sign In"
         }
     },
@@ -31,7 +31,9 @@
     },
     "gpii_app_qss_settings_common-selfVoicing-enabled": {
         "tooltip": "<p>Turn “Select to Read Aloud” extension in Chrome browser on/off.</p>",
-        "title": "Read Aloud"
+        "title": "Read Aloud",
+        "tip": "<p>Turns on and adjusts Read Aloud  mode in Chrome <img height=12 src='../../icons/chrome.svg'></p>",
+        "extendedTip": "<p>To use Read Aloud</p><ol><li>Open web page in Chrome</li><li>Select / highlight text</li><li>Click Play button that pops up</li></ol>"
     },
     "gpii_app_qss_settings_common-highContrastTheme": {
         "tooltip": "<p>Change the contrast between the text and background color, so text is easier to read.</p><p>Contrast changes will affect Windows, Edge, Chrome, and some other applications.</p>",

messageBundles/gpii-app-qss-settings_en.json

@@ -1,15 +1,15 @@
 {
     "gpii_app_qss_settings_close": {
-        "tooltip": "<p>Close Morphic QuickStrip</p><p>You can reopen it using the Morphic Icon (below) <img height=20 src='../../icons/TaskTrayIcon_outline.svg'></img></p>",
-        "title": "Close"
+        "tooltip": "<p>Close Morphic QuickStrip</p><p>You can reopen it using the Morphic Icon (below) <img height=12 src='../../icons/TaskTrayIcon_outline.svg'></img></p>",
+        "title": "×"
     },
     "gpii_app_qss_settings_undo": {
         "tooltip": "<p>Undo the last change you made in the Morphic QuickStrip.</p>",
         "title": "Undo"
     },
     "gpii_app_qss_settings_resetAll": {
-        "tooltip": "<p>Resets computer to standard settings</p><p>(does not affect personal saved settings)</p>",
-        "title": "Reset All to Standard"
+        "tooltip": "<p>Reset to the standard settings for this computer</p><p>(does not affect personal saved settings)</p>",
+        "title": "Reset to Standard"
     },
     "gpii_app_qss_settings_save": {
         "tooltip": "<p>Save your preferences so you can use them on other computers that have Morphic installed.</p>",
@@ -21,7 +21,7 @@
             "keyedOut": "<p>Opens Morphic Settings Panel</p><p>Where you can sign in to apply your saved personal settings.</p>"
         },
         "title": {
-            "keyedIn": "Morphic Settings Panel",
+            "keyedIn": "Settings Panel",
             "keyedOut": "Sign In"
         }
     },
@@ -31,7 +31,9 @@
     },
     "gpii_app_qss_settings_common-selfVoicing-enabled": {
         "tooltip": "<p>Turn “Select to Read Aloud” extension in Chrome browser on/off.</p>",
-        "title": "Read Aloud"
+        "title": "Read Aloud",
+        "tip": "<p>Turns on and adjusts Read Aloud  mode in Chrome</p>",
+        "extendedTip": "<p>To use Read Aloud</p><ol><li>Open web page in Chrome <img height=12 src='../../icons/chrome.svg'></li><li>Select / highlight text</li><li>Click Play button that pops up</li></ol>"
     },
     "gpii_app_qss_settings_common-highContrastTheme": {
         "tooltip": "<p>Change the contrast between the text and background color, so text is easier to read.</p><p>Contrast changes will affect Windows, Edge, Chrome, and some other applications.</p>",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gpii-app",
-    "version": "0.3.0",
+    "version": "1.0.1",
     "description": "Electron application and libraries to run the GPII as a native user space application on the desktop",
     "main": "main.js",
     "repository": {
@@ -12,7 +12,7 @@
         "electron": "3.0.2",
         "electron-edge-js": "8.3.8",
         "electron-localshortcut": "3.1.0",
-        "gpii-windows": "0.3.0-dev.20181213T111654Z.3af6c04",
+        "gpii-windows": "0.3.0-dev.20190121T215628Z.21e7fbb",
         "infusion": "3.0.0-dev.20180222T160835Z.6e1311a",
         "nan": "2.10.0",
         "node-jqunit": "1.1.8",
@@ -36,7 +36,8 @@
     "scripts": {
         "start": "electron .",
         "dev": "electron . ./configs app.dev",
-        "build": "electron ./scripts/compileMessageBundles.js",
+        "build": "electron ./scripts/compileMessageBundles.js && .\\trayButton\\build.cmd",
+        "postinstall": "npm run build",
         "pretest": "npm run pretest:clean && npm run build && npm run pretest:instrument",
         "pretest:clean": "node node_modules/rimraf/bin.js coverage instrumented reports build && node ./node_modules/mkdirp/bin/cmd.js coverage instrumented reports",
         "pretest:instrument": "node tests/lib/instrumentSource.js",

provisioning/Installer.ps1

@@ -83,6 +83,7 @@ Invoke-Command "robocopy" "..\configs $(Join-Path $preStagingDir "configs") /job
 Invoke-Command "robocopy" "..\src $(Join-Path $preStagingDir "src") /job:gpii-app.rcj *.*" $provisioningDir -errorLevel 3
 Invoke-Command "robocopy" "..\testData $(Join-Path $preStagingDir "testData") /job:gpii-app.rcj *.*" $provisioningDir -errorLevel 3
 Invoke-Command "robocopy" "..\build $(Join-Path $preStagingDir "build") /job:gpii-app.rcj *.*" $provisioningDir -errorLevel 3
+Invoke-Command "robocopy" "..\bin $(Join-Path $preStagingDir "bin") /job:gpii-app.rcj *.*" $provisioningDir -errorLevel 3
 Invoke-Command "robocopy" "$projectDir $preStagingDir LICENSE.txt" $provisioningDir -errorLevel 3
 Invoke-Command "robocopy" "$projectDir $preStagingDir main.js" $provisioningDir -errorLevel 3
 Invoke-Command "robocopy" "$projectDir $preStagingDir siteconfig.json5" $provisioningDir -errorLevel 3

siteconfig.json5

@@ -5,8 +5,11 @@
 
     // Configuration options for the QSS window
     qss: {
+        // Defines the delay in milliseconds before the tooltip is shown after a QSS button is selected
+        tooltipDisplayDelay: 500, // ms
+
         // The scaling factor for the QSS
-        scaleFactor: 0.85,
+        scaleFactor: 1.5,
         urls: {
             account: "http://morphic.world/account"
         },
@@ -20,10 +23,12 @@
             currentLanguageGroup: "%native",
             genericLanguage: "%native · %local"
         },
-        // The code of the language that would always stay on top of the "Language" setting's menu list.
+        // The code of OS default language `gpii-app` (it might be the one with which the system was installed with).
+        // This language should always stay on top of the "Language" setting's menu list.
         // The code must be exactly matching one of the installed languages' code (with respect to the region).
         // In case the selected language code is missing, there simply won't be a special first setting.
-        defaultLanguage: "en-US"
+        // NOTE: this is not related to the default language value defined for the language setting
+        systemDefaultLanguage: "en-US"
     },
 
     // Configuration options for the PSP window
@@ -52,13 +57,13 @@
 
     // Configuration options for the QSS More panel
     qssMorePanel: {
-    	// These are default values. The actual dimensions of the QSS more panel
-    	// are qssScaleFactor * defaultWidth and qssScaleFactor * defaultHeight.
-    	defaultWidth: 600,
-    	defaultHeight: 450,
-    	movable: true,
-    	resizable: true,
-    	alwaysOnTop: true,
+        // These are default values. The actual dimensions of the QSS more panel
+        // are qssScaleFactor * defaultWidth and qssScaleFactor * defaultHeight.
+        defaultWidth: 400,
+        defaultHeight: 300,
+        movable: true,
+        resizable: true,
+        alwaysOnTop: true,
 
         urls: {
             moreInfo: "http://morphic.world/more"
@@ -74,5 +79,8 @@
     },
 
     // URL to the the place serving the survey triggers data. Note that it should return triggers in JSON format
-    surveyTriggersUrl: "http://survey.gpii.net/survey-triggers.json"
+    surveyTriggersUrl: "http://survey.gpii.net/survey-triggers.json",
+
+    // The type of widget to use in the task bar - "gpii.app.trayButton", "gpii.app.trayIcon", or both.
+    trayType: ["gpii.app.trayButton"]
 }