From 73608d17e1681985e7fd2b2ae6dd629108efea9e Mon Sep 17 00:00:00 2001
From: Damillora <duniapengetahuan.12345@gmail.com>
Date: Fri, 7 Jul 2017 14:53:35 +0700
Subject: [PATCH] tweak menu behavior on non-Mac

---
 main.js              | 4 +++-
 menu.js              | 2 ++
 preferencemanager.js | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/main.js b/main.js
index cd297d8..ad46e14 100644
--- a/main.js
+++ b/main.js
@@ -15,7 +15,9 @@ function createWindow () {
   // Create the browser window.
   win = new BrowserWindow({width: 480, height: 600,icon: path.join(__dirname, 'ic_launcher.png')})
   setdock.setdock(win)
-  Menu.setApplicationMenu(themenu(win));
+  if(process.platform == 'darwin') { Menu.setApplicationMenu(themenu(win)); }
+  else { win.setMenu(themenu(win));
+  }
   // and load the index.html of the app.
   win.loadURL('http://pf.gree.net/58737',options);
   // Open the DevTools.
diff --git a/menu.js b/menu.js
index b2b9339..8be2dfe 100644
--- a/menu.js
+++ b/menu.js
@@ -113,6 +113,8 @@ module.exports = function(win){
       label: "File",
       submenu: [
         {label: 'Preferences',click(){prefman.showPreferences()}},
+        {type: 'separator'},
+        {label: 'Exit', click(){ app.quit() }},
       ],
       visible: process.platform !== 'darwin'
     })
diff --git a/preferencemanager.js b/preferencemanager.js
index 99d7663..d0e1de8 100644
--- a/preferencemanager.js
+++ b/preferencemanager.js
@@ -10,6 +10,7 @@ require('electron-debug')();
 function showPreferences_int(){
   if(!preferencesWindow){
     preferencesWindow = new BrowserWindow({width: 800, height: 600})
+    if (process.platform !== 'darwin') preferencesWindow.setMenu(null);
     preferencesWindow.loadURL(url.format({
         pathname: path.join(__dirname, 'preferences.html'),
         protocol: 'file:',