Merge pull request #7 from theIYD/development

Release: 0.2.1
theIYD · Nov 24, 2017 · 03e5621 · 03e5621
2 parents 03fa0fd + 2340d36
commit 03e5621
Show file tree

Hide file tree

Showing 9 changed files with 495 additions and 162 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ node_modules/
 dist/
 builds/
 .env
+release-builds/
diff --git a/main.js b/main.js
@@ -20,25 +20,13 @@ function createWindow() {
   let config = {
     width: 1024,
     height: 840,
-    frame: false,
     backgroundColor: '#7E57C2',
-    icon: 'src/assets/icons/win/iconWin.ico',
+    autoHideMenuBar: true,
+    icon: path.join(__dirname, 'src/assets/icons/linux/iconLinux.png'),
     resizable: false,
-    alwaysOnTop: true,
     maximizable: false,
     show: false
   }
-
-  if(/^win/.test(process.platform)) {
-    config = {
-      width: 1024,
-      height: 840,
-      backgroundColor: '#7E57C2',
-      autoHideMenuBar: true,
-      icon: 'src/assets/icons/win/iconWin.ico',
-      show: false
-    }
-  }
   mainWindow = new BrowserWindow(config);
 
   // and load the index.html of the app.
@@ -58,6 +46,8 @@ function createWindow() {
     });
   }
 
+
+
   mainWindow.loadURL( indexPath );
 
   // Don't show until we are ready and loaded