From fd317367ce221b83137e6198b30159caf4b129ce Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 9 Sep 2018 10:47:55 -0400
Subject: #701 moved to electron-build

---
 electron_js/icons/icon.icns  | Bin 0 -> 111298 bytes
 electron_js/icons/icon.ico   | Bin 0 -> 370070 bytes
 electron_js/main.js          |   4 +++-
 electron_js/sync_versions.sh |  16 ++++++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 electron_js/icons/icon.icns
 create mode 100644 electron_js/icons/icon.ico
 create mode 100755 electron_js/sync_versions.sh

(limited to 'electron_js')

diff --git a/electron_js/icons/icon.icns b/electron_js/icons/icon.icns
new file mode 100644
index 00000000..55c2c9af
Binary files /dev/null and b/electron_js/icons/icon.icns differ
diff --git a/electron_js/icons/icon.ico b/electron_js/icons/icon.ico
new file mode 100644
index 00000000..36a0e09d
Binary files /dev/null and b/electron_js/icons/icon.ico differ
diff --git a/electron_js/main.js b/electron_js/main.js
index efac0235..9e2a9028 100644
--- a/electron_js/main.js
+++ b/electron_js/main.js
@@ -71,8 +71,10 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => {
         y: mainWindowState.y,
         width: mainWindowState.width,
         height: mainWindowState.height,
+        icon: path.join(__dirname, '/../icon.png'),
         webPreferences:{nodeIntegration:false}});
 //
+    console.log (__dirname+'/../icon.png');
 
      
 
@@ -149,7 +151,7 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => {
       role: 'window',
       submenu: [
         {role: 'minimize'},
-        {role: 'close'}
+        {role: 'quit'}
       ]
     },
     {
diff --git a/electron_js/sync_versions.sh b/electron_js/sync_versions.sh
new file mode 100755
index 00000000..6a02f924
--- /dev/null
+++ b/electron_js/sync_versions.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+APPVER=`cat config.xml | grep "widget " | sed 's/.* version=\"\([^\"]*\)\" xmlns.*/\1/'`
+
+echo "Config.xml: App version: ${APPVER}"
+echo "Syncing package.json and DataModel.js with this version..."
+
+cat www/js/DataModel.js | sed s/"var zmAppVersion =.*"/"var zmAppVersion = \"${APPVER}\";"/g > www/js/DataModel.js.tmp
+
+cat ./package.json | sed  s/"\"version\":.*"/"\"version\":\"${APPVER}\","/g > package.json.tmp
+
+rm package.json
+mv package.json.tmp package.json
+
+rm  www/js/DataModel.js
+mv  www/js/DataModel.js.tmp www/js/DataModel.js
+echo "Done!"
-- 
cgit v1.2.3