1 files changed, 51 insertions, 21 deletions

diff --git a/src/index.js b/src/index.js
index ae75865c6..1f3510361 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 /* eslint-disable import/first */
 
-import { app, BrowserWindow, ipcMain, session } from 'electron';
+import { app, BrowserWindow, ipcMain, session, dialog } from 'electron';
 
 import { emptyDirSync, ensureFileSync } from 'fs-extra';
 import { join } from 'path';
@@ -10,6 +10,7 @@ import ms from 'ms';
 
 require('@electron/remote/main').initialize();
 
+import osName from 'os-name';
 import { DEFAULT_WINDOW_OPTIONS } from './config';
 
 import {
@@ -18,10 +19,14 @@ import {
   isMac,
   isWindows,
   isLinux,
-  aboutAppDetails,
   userDataRecipesPath,
   userDataPath,
+  ferdiVersion,
+  electronVersion,
+  chromeVersion,
+  nodeVersion,
 } from './environment';
+import { ifUndefinedBoolean } from './jsUtils';
 
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
 import ipcApi from './electron/ipc-api';
@@ -36,6 +41,7 @@ import './electron/exception';
 import { asarPath } from './helpers/asar-helpers';
 import { openExternalUrl } from './helpers/url-helpers';
 import userAgent from './helpers/userAgent-helpers';
+import * as buildInfo from './buildInfo.json'; // eslint-disable-line import/no-unresolved
 
 const debug = require('debug')('Ferdi:App');
 
@@ -77,13 +83,14 @@ if (isWindows) {
 const settings = new Settings('app', DEFAULT_APP_SETTINGS);
 const proxySettings = new Settings('proxy');
 
-if (settings.get('sentry')) {
+const retrieveSettingValue = (key, defaultValue = true) => ifUndefinedBoolean(settings.get(key), defaultValue);
+
+if (retrieveSettingValue('sentry')) {
   // eslint-disable-next-line global-require
   require('./sentry');
 }
 
-// add `liftSingleInstanceLock` to settings.json to override the single instance lock
-const liftSingleInstanceLock = settings.get('liftSingleInstanceLock') || false;
+const liftSingleInstanceLock = retrieveSettingValue('liftSingleInstanceLock', false);
 
 // Force single window
 const gotTheLock = liftSingleInstanceLock
@@ -147,13 +154,23 @@ if (
 }
 
 // Disable GPU acceleration
-if (!settings.get('enableGPUAcceleration')) {
+if (!retrieveSettingValue('enableGPUAcceleration', false)) {
   debug('Disable GPU Acceleration');
   app.disableHardwareAcceleration();
 }
 
 app.setAboutPanelOptions({
-  applicationVersion: aboutAppDetails(),
+  applicationVersion: [
+    `Version: ${ferdiVersion}`,
+    `Electron: ${electronVersion}`,
+    `Chrome: ${chromeVersion}`,
+    `Node.js: ${nodeVersion}`,
+    `Platform: ${osName()}`,
+    `Arch: ${process.arch}`,
+    `Build date: ${new Date(Number(buildInfo.timestamp))}`,
+    `Git SHA: ${buildInfo.gitHashShort}`,
+    `Git branch: ${buildInfo.gitBranch}`,
+  ].join('\n'),
   version: '',
 });
 
@@ -176,7 +193,7 @@ const createWindow = () => {
   }
 
   // Create the browser window.
-  const backgroundColor = settings.get('darkMode')
+  const backgroundColor = retrieveSettingValue('darkMode', false)
     ? '#1E1E1E'
     : settings.get('accentColor');
 
@@ -190,7 +207,7 @@ const createWindow = () => {
     show: false,
     titleBarStyle: isMac ? 'hidden' : '',
     frame: isLinux,
-    spellcheck: settings.get('enableSpellchecking'),
+    spellcheck: retrieveSettingValue('enableSpellchecking'),
     backgroundColor,
     webPreferences: {
       nodeIntegration: true,
@@ -268,15 +285,14 @@ const createWindow = () => {
     // when you should delete the corresponding element.
     if (
       !willQuitApp &&
-      (settings.get('runInBackground') === undefined ||
-        settings.get('runInBackground'))
+      retrieveSettingValue('runInBackground')
     ) {
       e.preventDefault();
       if (isWindows) {
         debug('Window: minimize');
         mainWindow.minimize();
 
-        if (settings.get('closeToSystemTray')) {
+        if (retrieveSettingValue('closeToSystemTray')) {
           debug('Skip taskbar: true');
           mainWindow.setSkipTaskbar(true);
         }
@@ -300,7 +316,7 @@ const createWindow = () => {
   mainWindow.on('minimize', () => {
     app.wasMaximized = app.isMaximized;
 
-    if (settings.get('minimizeToSystemTray')) {
+    if (retrieveSettingValue('minimizeToSystemTray')) {
       debug('Skip taskbar: true');
       mainWindow.setSkipTaskbar(true);
       trayIcon.show();
@@ -326,7 +342,7 @@ const createWindow = () => {
       mainWindow.maximize();
     }
 
-    if (!settings.get('enableSystemTray')) {
+    if (!retrieveSettingValue('enableSystemTray')) {
       debug('Tray: hiding tray icon');
       trayIcon.hide();
     }
@@ -351,7 +367,7 @@ const createWindow = () => {
     openExternalUrl(url);
   });
 
-  if (settings.get('startMinimized')) {
+  if (retrieveSettingValue('startMinimized', false)) {
     mainWindow.hide();
   } else {
     mainWindow.show();
@@ -551,10 +567,7 @@ ipcMain.on('stop-find-in-page', (e, action) => {
 app.on('window-all-closed', () => {
   // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
-  if (
-    settings.get('runInBackground') === undefined ||
-    settings.get('runInBackground')
-  ) {
+  if (retrieveSettingValue('runInBackground')) {
     debug('Window: all windows closed, quit app');
     app.quit();
   } else {
@@ -562,8 +575,25 @@ app.on('window-all-closed', () => {
   }
 });
 
-app.on('before-quit', () => {
-  willQuitApp = true;
+app.on('before-quit', (event) => {
+  const yesButtonIndex = 0;
+  let selection = yesButtonIndex;
+  if (retrieveSettingValue('confirmOnQuit')) {
+    selection = dialog.showMessageBoxSync(app.mainWindow, {
+      type: 'question',
+      message: 'Quit',
+      detail: 'Do you really want to quit Ferdi?',
+      buttons: [
+        'Yes',
+        'No',
+      ],
+    });
+  }
+  if (selection === yesButtonIndex) {
+    willQuitApp = true;
+  } else {
+    event.preventDefault();
+  }
 });
 
 app.on('activate', () => {