Merge pull request #9 from Doka-NT/ubuntu-fixes

More comfortable user experience on linux desktops

Author: Doka-NT

.gitignore

@@ -88,5 +88,4 @@ typings/
 # Electron-Forge
 out/
 
-.vscode/
 .idea/

.vscode/launch.json

@@ -0,0 +1,34 @@
+{
+    // Используйте IntelliSense, чтобы узнать о возможных атрибутах.
+    // Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.
+    // Для получения дополнительной информации посетите: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "cwd": "${workspaceRoot}",
+            "runtimeExecutable": "yarn",
+            "runtimeArgs": [
+                "start",
+            ],
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Make",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "cwd": "${workspaceRoot}",
+            "runtimeExecutable": "yarn",
+            "runtimeArgs": [
+                "make",
+            ],
+        },
+    ]
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "worklog-reminder",
   "productName": "worklog-reminder",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "Tool for easily search and add worklog to JIRA issues",
   "repository": {
     "type": "git",

src/UI/AppTray.js

@@ -12,34 +12,63 @@ class AppTray
     constructor(windowManager) {
         this.windowManager = windowManager
         this.tray = new Tray(this._resolveIcon())
+        this.tray.setContextMenu(this._createContextMenu())
+        this.tray.closeContextMenu()
     }
 
     setHandlers()
     {
         this.tray.on('double-click', this._toggleWindow.bind(this))
         this.tray.on('click', event => {
-            this.tray.setContextMenu(null)
-
-            const mainWindow = this.windowManager.getMainWindow()
-
-            this._toggleWindow()
-
-            if (mainWindow.isVisible() && process.defaultApp && event.metaKey) {
-                mainWindow.openDevTools({mode: 'detach'})
+            if (process.platform === 'darwin') {
+                this.tray.setContextMenu(null)
             }
+
+            this._showMainWindow(event)
         })
+        
         this.tray.on('right-click', () => {
-            const contextMenu = Menu.buildFromTemplate([
-                {
-                    label: 'Help', click: () => {
-                        new OpenInShellHandler().handle({payload: 'https://github.com/Doka-NT/worklog-reminder'})
-                    }
-                },
-                {label: 'Quit', click: () => app.quit()},
-            ])
-
-            this.tray.setContextMenu(contextMenu)
+            if (process.platform === 'darwin') {
+                this.tray.setContextMenu(this._createContextMenu())
+            }
+            this.tray.popUpContextMenu()
         })
+    
+    }
+
+    _showMainWindow(event)
+    {
+        const mainWindow = this.windowManager.getMainWindow()
+
+        this._toggleWindow()
+
+        if (mainWindow.isVisible() && process.defaultApp && event.metaKey) {
+            mainWindow.openDevTools({mode: 'detach'})
+        }
+    }
+
+    _createContextMenu()
+    {
+        const menuItems = [
+            {
+                label: 'Help',
+                click: () => {
+                    new OpenInShellHandler().handle({payload: 'https://github.com/Doka-NT/worklog-reminder'})
+                }
+            },
+            {label: 'Quit', click: () => app.quit()},
+        ]
+
+        if (process.platform === 'linux') {
+            menuItems.unshift({
+                label: 'Toggle Window',
+                click: (event) => {
+                    this._showMainWindow(event)
+                }
+            })
+        }
+        
+        return Menu.buildFromTemplate(menuItems)
     }
 
     _resolveIcon()

src/UI/WindowManager.js

@@ -1,5 +1,7 @@
 import AppTray from "./AppTray";
 import MainWindow from "./MainWindow";
+import config from '../app.config.main';
+import path from 'path';
 
 class WindowManager {
     /**
@@ -48,7 +50,8 @@ class WindowManager {
             fullscreenable: false,
             resizable: false,
             transparent: false,
-            skipTaskbar: true,
+            skipTaskbar: process.platform !== 'linux',
+            icon: path.join(config.assetsDir, process.platform !== 'win32' ? 'appIconColored.png' : 'appIconColored.ico'),
             webPreferences: {
                 // Prevents renderer process code from not running when window is
                 // hidden