fixed the electron-settings bug in windows.

diff --git a/main-process/i18n.js b/main-process/i18n.js
index ec76f88..9f0a8d4 100644 (file)
--- a/main-process/i18n.js
+++ b/main-process/i18n.js
@@ -5,6 +5,15 @@ The i18n module, loads the language files and initializes i18next
 */
 const fs = require('fs')
 const i18n = require('i18next')
+// const path = require('path')
+// const settings = require('electron-settings')
+// const { app } = require('electron')
+//
+// fs.stat(`${path.join(app.getPath('userData'), '/Settings')}`, function(err) {
+//   if(err == null) {
+//     global.language = settings.get('browserSetting.core.lang')
+//   }
+// })
 
 let i18nConf = fs.readFileSync(`${__dirname}/interface/project-tap.i18n`)
 i18nConf = JSON.parse(i18nConf)

diff --git a/main-process/menus/application-menu.js b/main-process/menus/application-menu.js
index f7355da..6be0a54 100755 (executable)
--- a/main-process/menus/application-menu.js
+++ b/main-process/menus/application-menu.js
@@ -1,6 +1,8 @@
 const {Menu, app, shell} = require('electron')
 const settings = require('electron-settings')
-const i18n = global.i18n
+global.language = settings.get('browserSetting.core.lang') || app.getLocale()
+const i18n = require('../i18n.js')
+global.i18n = i18n
 const path = require('path')
 const logger = require('../logger')
 const log = logger.create('menu')
@@ -236,23 +238,23 @@ let menuTempl = function () {
 
   return menu
 }
-
-function findReopenMenuItem () {
-  const menu = Menu.getApplicationMenu()
-  if (!menu) return
-
-  let reopenMenuItem
-  menu.items.forEach(item => {
-    if (item.submenu) {
-      item.submenu.items.forEach(item => {
-        if (item.key === 'reopenMenuItem') {
-          reopenMenuItem = item
-        }
-      })
-    }
-  })
-  return reopenMenuItem
-}
+//
+// function findReopenMenuItem () {
+//   const menu = Menu.getApplicationMenu()
+//   if (!menu) return
+//
+//   let reopenMenuItem
+//   menu.items.forEach(item => {
+//     if (item.submenu) {
+//       item.submenu.items.forEach(item => {
+//         if (item.key === 'reopenMenuItem') {
+//           reopenMenuItem = item
+//         }
+//       })
+//     }
+//   })
+//   return reopenMenuItem
+// }
 
 
 const createMenu = function () {
@@ -261,36 +263,59 @@ const createMenu = function () {
   Menu.setApplicationMenu(menu)
 }
 
-app.on('ready', () => {
-  createMenu()
 
-  settings.watch('browserSetting.app.navAdvancedState', newValue => {
-    advNav = newValue
-    menu.items[2].submenu.items[1].checked = ( advNav === 'advance' )
-  })
+settings.watch('browserSetting.app.navAdvancedState', newValue => {
+  advNav = newValue
+  menu.items[2].submenu.items[1].checked = ( advNav === 'advance' )
+})
 
-  settings.watch('browserSetting.core.btmAmountUnit', newValue => {
-    btmAmountUnit = newValue
-    menu.items[2].submenu.items[0].submenu.items[0].checked = ( btmAmountUnit === 'BTM' )
-    menu.items[2].submenu.items[0].submenu.items[1].checked = ( btmAmountUnit === 'mBTM' )
-    menu.items[2].submenu.items[0].submenu.items[2].checked = ( btmAmountUnit === 'NEU' )
-  })
+settings.watch('browserSetting.core.btmAmountUnit', newValue => {
+  btmAmountUnit = newValue
+  menu.items[2].submenu.items[0].submenu.items[0].checked = ( btmAmountUnit === 'BTM' )
+  menu.items[2].submenu.items[0].submenu.items[1].checked = ( btmAmountUnit === 'mBTM' )
+  menu.items[2].submenu.items[0].submenu.items[2].checked = ( btmAmountUnit === 'NEU' )
+})
 
-  settings.watch('browserSetting.core.lang', newValue => {
-    i18n.changeLanguage(newValue, (err, t) => {
-      if (err) return log.error('i18n: something went wrong loading', err)
-      createMenu()
-    })
+settings.watch('browserSetting.core.lang', newValue => {
+  i18n.changeLanguage(newValue, (err, t) => {
+    if (err) return log.error('i18n: something went wrong loading', err)
+    createMenu()
   })
-
 })
 
-app.on('browser-window-created', () => {
-  let reopenMenuItem = findReopenMenuItem()
-  if (reopenMenuItem) reopenMenuItem.enabled = false
-})
+module.exports = createMenu()
 
-app.on('window-all-closed', () => {
-  let reopenMenuItem = findReopenMenuItem()
-  if (reopenMenuItem) reopenMenuItem.enabled = true
-})
+
+// app.on('ready', () => {
+//   // createMenu()
+//
+//   settings.watch('browserSetting.app.navAdvancedState', newValue => {
+//     advNav = newValue
+//     menu.items[2].submenu.items[1].checked = ( advNav === 'advance' )
+//   })
+//
+//   settings.watch('browserSetting.core.btmAmountUnit', newValue => {
+//     btmAmountUnit = newValue
+//     menu.items[2].submenu.items[0].submenu.items[0].checked = ( btmAmountUnit === 'BTM' )
+//     menu.items[2].submenu.items[0].submenu.items[1].checked = ( btmAmountUnit === 'mBTM' )
+//     menu.items[2].submenu.items[0].submenu.items[2].checked = ( btmAmountUnit === 'NEU' )
+//   })
+//
+//   settings.watch('browserSetting.core.lang', newValue => {
+//     i18n.changeLanguage(newValue, (err, t) => {
+//       if (err) return log.error('i18n: something went wrong loading', err)
+//       createMenu()
+//     })
+//   })
+//
+// })
+//
+// app.on('browser-window-created', () => {
+//   let reopenMenuItem = findReopenMenuItem()
+//   if (reopenMenuItem) reopenMenuItem.enabled = false
+// })
+
+// app.on('window-all-closed', () => {
+//   let reopenMenuItem = findReopenMenuItem()
+//   if (reopenMenuItem) reopenMenuItem.enabled = true
+// })

diff --git a/main.js b/main.js
index 56295c9..f014dad 100644 (file)
--- a/main.js
+++ b/main.js
@@ -2,9 +2,7 @@ const {app, BrowserWindow, ipcMain} = require('electron')
 const exec = require('child_process').exec
 const glob = require('glob')
 const settings = require('electron-settings')
-global.language = settings.get('browserSetting.core.lang')
 
-const i18n = require('./main-process/i18n.js')
 const url = require('url')
 const path = require('path')
 const fs = require('fs')
@@ -15,13 +13,10 @@ let win, bytomdInit, bytomdMining
 
 
 global.fileExist = false
-global.i18n = i18n
 
 
 function initialize () {
 
-  loadMenu()
-
   function createWindow() {
     // Create browser Window
     win = new BrowserWindow({
@@ -46,7 +41,9 @@ function initialize () {
       })
     win.loadURL(startUrl)
 
-    win.webContents.openDevTools()
+    if(process.env.DEV){
+      win.webContents.openDevTools()
+    }
 
     win.on('closed', () => {
       win = null
@@ -55,14 +52,10 @@ function initialize () {
   }
 
   app.on('ready', () => {
-    // init i18n
-    if(!settings.get('browserSetting.core.lang')){
-      i18n.init({lng: app.getLocale()})
-    }
 
-    const logFolder = {logFolder: path.join(app.getPath('userData'), 'logs')}
-    const loggerOptions = Object.assign(logFolder)
-    logger.setup(loggerOptions)
+    loadMenu()
+
+    setupConfigure()
 
     fs.stat(`${path.join(app.getPath('userData'), '/.bytomd/genesis.json')}`, function(err) {
       if(err == null) {
@@ -96,10 +89,13 @@ function initialize () {
 
   })
 }
+const bytomdPath = process.env.DEV?
+  path.join(__dirname, '/bytomd/bytomd-darwin_amd64'):
+  glob.sync( path.join(__dirname, '/bytomd/bytomd*').replace('app.asar', 'app.asar.unpacked'))
 
+const bytomdDataPath = path.join(app.getPath('userData'), '/.bytomd')
 function setBytomMining(event) {
-  bytomdMining = exec( `cd "${app.getPath('userData')}" \
-    && ${path.join(__dirname, '/bytomd/bytomd').replace('app.asar', 'app.asar.unpacked')} node --mining` ,
+  bytomdMining = exec( `${bytomdPath} node --mining --home "${bytomdDataPath}" --web.closed` ,
     (error, stdout, stderr) => {
       if (error) {
         log.error(`bytomd mining exec error: ${error}`)
@@ -126,8 +122,7 @@ function setBytomMining(event) {
 
 function setBytomInit(event, bytomNetwork) {
   // Init bytomd
-  bytomdInit = exec(`cd "${app.getPath('userData')}" \
-    && ${path.join(__dirname, '/bytomd/bytomd').replace('app.asar', 'app.asar.unpacked')} init --chain_id  ${bytomNetwork}` ,
+  bytomdInit = exec(`${bytomdPath} init --chain_id  ${bytomNetwork} --home "${bytomdDataPath}"` ,
     (error, stdout, stderr) => {
       if (error) {
         log.error(`bytomd init exec error: ${error}`)
@@ -154,6 +149,12 @@ function loadMenu () {
   files.forEach((file) => { require(file) })
 }
 
+function setupConfigure(){
+  const logFolder = {logFolder: path.join(app.getPath('userData'), 'logs')}
+  const loggerOptions = Object.assign(logFolder)
+  logger.setup(loggerOptions)
+}
+
 // Handle Squirrel on Windows startup events
 switch (process.argv[1]) {
   case '--squirrel-install':