Bunch of fixes.

Thorium-Sim · May 2, 2019 · 7ee5ee8 · 7ee5ee8
1 parent ea1d78d
commit 7ee5ee8
Show file tree

Hide file tree

Showing 12 changed files with 230 additions and 264 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,14 +1,15 @@
 {
   "name": "thorium-kiosk",
-  "version": "2.0.1",
+  "version": "2.0.6",
   "description": "A client application for Thorium",
   "main": "src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "electron .",
     "pack": "electron-builder -mwl",
     "dist": "electron-builder -mwl -p always",
-    "postinstall": "electron-builder install-app-deps"
+    "postinstall": "electron-builder install-app-deps && npm run rebuild",
+    "rebuild": "npm rebuild --runtime=electron --target=4.1.4 --disturl=https://atom.io/download/atom-shell --abi=69"
   },
   "repository": {
     "type": "git",
@@ -24,8 +25,8 @@
   },
   "homepage": "https://github.com/Thorium-Sim/thorium-kiosk#readme",
   "devDependencies": {
-    "electron": "^3.0.10",
-    "electron-builder": "^20.39.0"
+    "electron": "^4.1.4",
+    "electron-builder": "^20.40.2"
   },
   "build": {
     "appId": "us.fyreworks.thorium",
@@ -52,7 +53,7 @@
   "dependencies": {
     "bonjour": "^3.5.0",
     "electron-settings": "^3.2.0",
-    "electron-updater": "^4.0.4",
+    "electron-updater": "^4.0.6",
     "power-off": "^1.1.2",
     "sleep-mode": "^1.1.0",
     "uuid": "^3.3.2"

diff --git a/src/helpers/freakout.js b/src/helpers/freakout.js
@@ -1,15 +1,14 @@
 // var robot = require("robotjs");
 // //console.log(process.version);
 // module.exports = function() {
-//   // Speed up the mouse.
-//   robot.setMouseDelay(2);
-
-//   var twoPI = Math.PI * 2.0;
 //   var screenSize = robot.getScreenSize();
 //   var height = screenSize.height;
 //   var width = screenSize.width;
 //   var counter = 0;
 
+//   // Speed up the mouse.
+//   robot.setMouseDelay(2);
+
 //   moveMouse();
 //   function moveMouse() {
 //     counter++;

diff --git a/src/helpers/hotkeys.js b/src/helpers/hotkeys.js
@@ -1,5 +1,6 @@
 const { app, globalShortcut, BrowserWindow } = require("electron");
 const { windows } = require("./multiWindow");
+const { clearMenubar, setMenubar } = require("./setMenubar");
 
 module.exports = () => {
   // Create the browser window.
@@ -8,15 +9,15 @@ module.exports = () => {
     mainWindow.webContents.openDevTools();
   });
 
-  globalShortcut.register("CommandOrControl+Q", function() {
-    // Do nothing.
-  });
+  // globalShortcut.register("CommandOrControl+Q", function() {
+  //   // Do nothing.
+  // });
 
-  globalShortcut.register("CommandOrControl+W", function() {
-    // Do nothing.
-  });
+  // globalShortcut.register("CommandOrControl+W", function() {
+  //   // Do nothing.
+  // });
 
-  globalShortcut.register("CommandOrControl+R", function() {
+  globalShortcut.register("CommandOrControl+Alt+R", function() {
     windows.forEach(mainWindow => {
       mainWindow && mainWindow.reload();
     });
@@ -31,9 +32,11 @@ module.exports = () => {
       windows.forEach(mainWindow => {
         mainWindow.setKiosk(false);
       });
+      setMenubar();
     } else {
       windows.forEach(mainWindow => {
         mainWindow.setKiosk(true);
+        clearMenubar();
       });
     }
   });

diff --git a/src/helpers/loadPage.js b/src/helpers/loadPage.js
@@ -4,25 +4,26 @@ const { clearMenubar, setMenubar } = require("./setMenubar");
 const { windows } = require("./multiWindow");
 const { setLoadedUrl } = require("./loadedUrl");
 
-module.exports = function loadPage(uri) {
+module.exports = function loadPage(uri, kiosk) {
   return new Promise((resolve, reject) => {
     const url = uri
       .replace("https://", "")
       .replace("http://", "")
       .replace("/client", "");
     http
       .get(`http://${url}/client`, res => {
-        if (res.statusCode !== 200) {
-          setMenubar();
-          return reject();
-        }
+        // if (res.statusCode !== 200) {
+        //   setMenubar();
+        //   return reject();
+        // }
         setLoadedUrl(`http://${url}/client`);
         windows.forEach(mainWindow => {
           mainWindow && mainWindow.loadURL(`http://${url}/client`);
-          triggerWindow(mainWindow);
+          triggerWindow(mainWindow, kiosk);
         });
-
-        clearMenubar();
+        if (kiosk) {
+          clearMenubar();
+        }
         return resolve();
       })
       .on("error", e => {

diff --git a/src/helpers/menuTemplate.js b/src/helpers/menuTemplate.js
@@ -1,6 +1,7 @@
 const { BrowserWindow, app } = require("electron");
 const { windows, addWindow } = require("./multiWindow");
 const { getLoadedUrl } = require("./loadedUrl");
+const { clearMenubar, setMenubar } = require("./setMenubar");
 
 module.exports = function() {
   var template = [
@@ -11,6 +12,18 @@ module.exports = function() {
           label: "About Application",
           selector: "orderFrontStandardAboutPanel:"
         },
+        {
+          label: "Quit",
+          accelerator: "CmdOrCtrl+Alt+Q",
+          click: function() {
+            app.quit();
+          }
+        }
+      ]
+    },
+    {
+      label: "File",
+      submenu: [
         {
           label: "New Window",
           accelerator: "CmdOrCtrl+N",
@@ -35,10 +48,12 @@ module.exports = function() {
             if (windows[0] && windows[0].isKiosk()) {
               windows.forEach(mainWindow => {
                 mainWindow.setKiosk(false);
+                setMenubar();
               });
             } else {
               windows.forEach(mainWindow => {
                 mainWindow.setKiosk(true);
+                clearMenubar();
               });
             }
           }
@@ -50,13 +65,6 @@ module.exports = function() {
             const focused = BrowserWindow.getFocusedWindow();
             focused && focused.webContents.openDevTools();
           }
-        },
-        {
-          label: "Quit",
-          accelerator: "CmdOrCtrl+Alt+Q",
-          click: function() {
-            app.quit();
-          }
         }
       ]
     },

diff --git a/src/helpers/multiWindow.js b/src/helpers/multiWindow.js
@@ -28,7 +28,7 @@ function addWindow({ main, x, y, loadedUrl }) {
   const config = {
     backgroundColor: "#2e2c29",
     width: 800,
-    height: 600,
+    height: 700,
     x,
     y,
     kiosk: false,

diff --git a/src/helpers/preload.js b/src/helpers/preload.js
@@ -42,10 +42,20 @@ function getClientList() {
   return clientList;
 }
 
+document.addEventListener("DOMContentLoaded", function() {
+  if (localStorage.getItem("thorium_startKiosked") !== "false") {
+    if (document.getElementById("start-kiosked")) {
+      document.getElementById("start-kiosked").checked = true;
+    }
+  }
+});
+
 window.loadPage = function loadPage(url) {
   let auto = false;
   if (document.getElementById("remember-client").checked) auto = true;
-  ipcRenderer.send("loadPage", { url, auto });
+  let kiosk = document.getElementById("start-kiosked").checked;
+  localStorage.setItem("thorium_startKiosked", kiosk);
+  ipcRenderer.send("loadPage", { url, auto, kiosk });
   return;
 };
 window.openBrowser = function openBrowser() {

diff --git a/src/helpers/setMenubar.js b/src/helpers/setMenubar.js
@@ -1,9 +1,14 @@
 const { Menu } = require("electron");
 const templateFunc = require("./menuTemplate");
+const { windows } = require("./multiWindow");
 
 module.exports.setMenubar = function setMenubar() {
   const template = templateFunc();
   Menu.setApplicationMenu(Menu.buildFromTemplate(template));
+  windows.forEach(w => {
+    w.setMenuBarVisibility(true);
+    w.setAutoHideMenuBar(false);
+  });
 };
 
 module.exports.clearMenubar = function clearMenubar() {

diff --git a/src/helpers/startApp.js b/src/helpers/startApp.js
@@ -22,11 +22,11 @@ module.exports = () => {
       }).length;
     });
     ipcMain.on("loadPage", function(evt, data) {
-      const { url: loadUrl, auto } = data;
+      const { url: loadUrl, auto, kiosk } = data;
       if (auto) {
         settings.set("autostart", loadUrl);
       }
-      loadPage(loadUrl).catch(() => {
+      loadPage(loadUrl, kiosk).catch(() => {
         settings.set("autostart", null);
         bonjour.start();
       });
@@ -35,7 +35,7 @@ module.exports = () => {
       // Check to see if the page will work.
       const loadUrl = settings.get("autostart");
       // Do a fetch
-      loadPage(loadUrl).catch(() => {
+      loadPage(loadUrl, true).catch(() => {
         settings.set("autostart", null);
         bonjour.start();
       });

diff --git a/src/helpers/triggerWindow.js b/src/helpers/triggerWindow.js
@@ -2,9 +2,11 @@ const initHotkeys = require("./hotkeys");
 const initRemote = require("./remote");
 const { app } = require("electron");
 
-module.exports = function triggerWindow(mainWindow) {
-  mainWindow.setKiosk(true);
-  initHotkeys();
+module.exports = function triggerWindow(mainWindow, kiosk) {
+  if (kiosk) {
+    mainWindow.setKiosk(true);
+    initHotkeys();
+  }
   initRemote();
 
   mainWindow.on("closed", function() {

diff --git a/src/index.html b/src/index.html
@@ -79,6 +79,11 @@
         padding: 5px 10px;
         width: 100%;
       }
+      input[type="checkbox"] {
+        float: left;
+        width: auto;
+        margin: 3px 0.5ex;
+      }
     </style>
   </head>
 
@@ -354,8 +359,8 @@ <h4>Select a server:</h4>
           <div id="serverList"></div>
           <label>
             <input type="checkbox" id="remember-client" /> Auto-connect to
-            server on Open</label
-          >
+            server on Open
+          </label>
           <div>
             <small
               >Make sure your server is on before starting the client.</small
@@ -371,6 +376,10 @@ <h4>Select a server:</h4>
             Connect to Server
           </button>
         </p>
+        <label>
+          <input type="checkbox" id="start-kiosked" /> Start the client in
+          kiosk-mode.
+        </label>
       </div>
     </div>
     <script>