diff options
| -rw-r--r-- | .DS_Store | bin | 12292 -> 12292 bytes | |||
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | electron_js/main.js | 7 | ||||
| -rwxr-xr-x | make_desktop.sh | 9 | ||||
| -rw-r--r-- | package-lock.json | 13 | ||||
| -rwxr-xr-x | prepare_desktop.sh | 4 |
6 files changed, 25 insertions, 10 deletions
| Binary files differ @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.501" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.502" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client diff --git a/electron_js/main.js b/electron_js/main.js index 84c2cb70..3f56b332 100644 --- a/electron_js/main.js +++ b/electron_js/main.js @@ -6,8 +6,9 @@ const {dialog} = require('electron') // Module to create native browser window. const {BrowserWindow} = electron; var isFs = false; -var argv = require('minimist')(process.argv.slice(2)); +var argv = require('minimist')(process.argv.slice(1)); +console.log ("ARGV="+JSON.stringify(argv)); if (argv.path) { console.log ("PATH SET TO "+argv.path); @@ -39,8 +40,10 @@ if (shouldQuit) { function createWindow() { + const mx = globalShortcut.register('CommandOrControl+Alt+F', () => { - console.log('CommandOrControl+F is pressed'); + + console.log('Command Or Control+F is pressed'); isFs = !isFs; win.setFullScreen(isFs); }) diff --git a/make_desktop.sh b/make_desktop.sh index 7f12b941..85ef83c4 100755 --- a/make_desktop.sh +++ b/make_desktop.sh @@ -16,7 +16,7 @@ APPVER=`cat config.xml | grep "widget " | sed 's/.* version=\"\([^\"]*\)\" xmlns APPVER+="D" echo "Application version:$APPVER" -declare -a app_ports=("desktop/zmNinja-mac.app/Contents/Resources" "desktop/zmNinja-linux32bit/resources" "desktop/zmNinja-linux64bit/resources" "desktop/zmNinja-win32-x64bit/resources" "desktop/zmNinja-win32-ia32bit/resources" "desktop/zmNinja-linuxarm/resources") +declare -a app_ports=("desktop/zmNinja-mac.app/Contents/Resources" "desktop/zmNinja-linux32bit/resources" "desktop/zmNinja-linux64bit/resources" "desktop/zmNinja-win-x64bit/resources" "desktop/zmNinja-win-ia32bit/resources" "desktop/zmNinja-linuxarm/resources") for i in "${app_ports[@]}" do @@ -53,7 +53,12 @@ if [ -d "$i" ]; then rm -fr app.asar - exe asar pack app app.asar + + # No idea why but asar is causing problems in windows + # main.js changes are not showig up. wuh? - Sep 29, 2017 + + #exe asar pack app app.asar + #read -p "Press a key to remove app dir for $i..." #exe rm -fr app exe cd - #OSX ditto does a better job than zip! diff --git a/package-lock.json b/package-lock.json index 4e736e48..ee5f51bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -761,9 +761,9 @@ } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "mkdirp": { "version": "0.5.1", @@ -771,6 +771,13 @@ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + } } }, "phonegap-plugin-mobile-accessibility": { diff --git a/prepare_desktop.sh b/prepare_desktop.sh index 52040c12..0c37bb34 100755 --- a/prepare_desktop.sh +++ b/prepare_desktop.sh @@ -28,8 +28,8 @@ mkdir -p desktop 2>/dev/null cd desktop -declare -a release_names=("darwin-x64" "win32-x64" "linux-arm" "linux-x64" "linux-ia32") -declare -a release_renames=("zmNinja-mac.app" "zmNinja-win32-64bit" "zmNinja-linuxarm" "zmNinja-linux64bit" "zmNinja-linux32bit") +declare -a release_names=("darwin-x64" "win32-x64" "win32-ia32" "linux-arm" "linux-x64" "linux-ia32") +declare -a release_renames=("zmNinja-mac.app" "zmNinja-x64bit" "zmNinja-ia32bit" "zmNinja-linuxarm" "zmNinja-linux64bit" "zmNinja-linux32bit") for i in "${!release_names[@]}" do |