Fix electron downgrade

package.json

@@ -61,7 +61,7 @@
     "@types/sha1": "^1.1.1",
     "axios": "^0.18.0",
     "chai": "^4.2.0",
-    "electron": "^5.0.0-beta.4",
+    "electron": "^4.0.6",
     "electron-builder": "^20.38.5",
     "fs-extra": "^7.0.1",
     "mime": "^2.4.0",

scripts/prepareVideo.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-DIMENSIONS="1280x720"
+DIMENSIONS="1024x720"
+GIF_SCALE="1024"
 
 ffmpeg -s:v $DIMENSIONS -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv app2.mp4
 
@@ -14,10 +15,10 @@ END_OF_BLACK=`awk "BEGIN {print $END_OF_BLACK+0.8; exit}"`
 ffmpeg -s:v $DIMENSIONS -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv -ss $END_OF_BLACK  app.mp4
 
 # Generate gif palette
-ffmpeg -y -s:v $DIMENSIONS -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv -vf fps=10,scale=1280:-1:flags=lanczos,palettegen palette1024.png
+ffmpeg -y -s:v $DIMENSIONS -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv -vf "fps=10,scale=$GIF_SCALE:-1:flags=lanczos,palettegen" palette1024.png
 
 # Create gif
-ffmpeg -s:v $DIMENSIONS -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv -i palette1024.png -ss $END_OF_BLACK -filter_complex "fps=10,scale=1280:-1:flags=lanczos[x];[x][1:v]paletteuse" app720.gif
+ffmpeg -s:v $DIMENSIONS -r 20 -f rawvideo -pix_fmt yuv420p -i qrawvideorgb24.yuv -i palette1024.png -ss $END_OF_BLACK -filter_complex "fps=10,scale=$GIF_SCALE:-1:flags=lanczos[x];[x][1:v]paletteuse" app720.gif
 
 # Clean up
 rm ffmpeg_info palette*.png qrawvideorgb24.yuv

scripts/uiTests.sh

@@ -9,7 +9,7 @@ function finish {
 
 trap finish EXIT
 
-DIMENSIONS="1280x720"
+DIMENSIONS="1024x720"
 SCR=99
 # Start new window manager
 Xvfb :$SCR -screen 0 "$DIMENSIONS"x24 -ac &

src/MenuTemplate.ts

@@ -74,7 +74,7 @@ const editMenu: MenuItemConstructorOptions = {
   ],
 }
 
-const viewMenu = {
+const viewMenu: MenuItemConstructorOptions = {
   label: 'View',
   submenu: [
     {
@@ -93,8 +93,9 @@ const viewMenu = {
       click: () => {
         const window = BrowserWindow.getFocusedWindow()
         if (window) {
-          const zoom = window.webContents.getZoomFactor()
-          window.webContents.setZoomFactor(Math.min(zoom + 0.1, 2.0))
+          window.webContents.getZoomFactor((zoom) => {
+            window.webContents.setZoomFactor(Math.min(zoom + 0.1, 2.0))
+          })
         }
       },
     },
@@ -104,15 +105,16 @@ const viewMenu = {
       click: () => {
         const window = BrowserWindow.getFocusedWindow()
         if (window) {
-          const zoom = window.webContents.getZoomFactor()
-          window.webContents.setZoomFactor(Math.max(zoom - 0.1, 0.5))
+          window.webContents.getZoomFactor((zoom) => {
+            window.webContents.setZoomFactor(Math.max(zoom - 0.1, 0.5))
+          })
         }
       },
     },
   ],
 }
 
-const template: Array<(MenuItemConstructorOptions) | (MenuItem)> = [
+const template: any = [
   applicationMenu,
   editMenu,
   viewMenu,

src/electron.ts

@@ -33,8 +33,8 @@ function createWindow() {
   const iconPath = path.join(__dirname, 'icon.png')
   // Create the browser window.
   mainWindow = new BrowserWindow({
-    width: runningUiTestOnCi ? 1280 : 1024,
-    height: runningUiTestOnCi ? 720 : 700,
+    width: 1024,
+    height: 720,
     show: false,
     webPreferences: {
       nodeIntegration: true,

yarn.lock

@@ -1168,10 +1168,10 @@ electron-updater@^4.0.6:
     semver "^5.6.0"
     source-map-support "^0.5.9"
 
-electron@^5.0.0-beta.4:
-  version "5.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-5.0.0-beta.4.tgz#436af638c20c7563e749d9d7599c4267b665759b"
-  integrity sha512-8rBHuR04zcyJP1MfnhbbqExeIywxrbzR9FyKyrLc8O/ho4tEpKbxgGWoRStFDrv9YYL9BEjsaaExPseI7Rwu5A==
+electron@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.6.tgz#f936772ddb5eaa026591ea14ef806e1385fbbda9"
+  integrity sha512-r2ow/EmDibjoCNJp35mB1CcPs2xBF9fp2eoWuUOJmpVQyzdba6EnqsSD1BxwXzF9vQ5WkQ2UbfXBIvpomrdioQ==
   dependencies:
     "@types/node" "^10.12.18"
     electron-download "^4.1.0"