v1.8.1 - 支持在设置中禁用最小化时的通知 - #10

Xmader · Dec 27, 2018 · 777278f · 777278f
1 parent 434f21a
commit 777278f
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 33 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ariang-gui",
-    "version": "1.8.0",
+    "version": "1.8.1",
     "private": true,
     "description": "AriaNg GUI",
     "main": "app.js",

diff --git a/app/pages/index.html b/app/pages/index.html
diff --git a/app/pages/index.manifest b/app/pages/index.manifest
@@ -5,7 +5,7 @@ css/aria-ng-c609d5bccb.min.css
 css/bootstrap-3.3.7.min.css
 css/plugins-acd93e5a25.min.css
 js/angular-packages-1.6.10.min.js
-js/aria-ng-814f68cfc6.min.js
+js/aria-ng-8b623983c4.min.js
 js/bootstrap-3.3.7.min.js
 js/echarts-common-3.8.5.min.js
 js/jquery-3.3.1.min.js
@@ -20,4 +20,4 @@ NETWORK:
 SETTINGS:
 prefer-online
 
-# hash: 85adcb0d0c00d9bed58b821aac704f6a0b7ef760d8a6bf98ad4a3bca7837a8ae
+# hash: fed9bf8a3f19fbeeb950349036c904ac0ebfc3bbd6beb3ed08ecc881f1bc5ecf
diff --git a/app/pages/js/aria-ng-814f68cfc6.min.js b/app/pages/js/aria-ng-814f68cfc6.min.js
diff --git a/app/pages/js/aria-ng-8b623983c4.min.js b/app/pages/js/aria-ng-8b623983c4.min.js
diff --git a/app/pages/langs/zh_Hans.txt b/app/pages/langs/zh_Hans.txt
@@ -137,6 +137,7 @@ Example: ${downspeed:noprefix:nosuffix:scale\=1}=示例: ${downspeed:noprefix:no
 Page Title Refresh Interval=页面标题刷新间隔
 Enable Browser Notification=启用浏览器通知
 Enable Desktop Notification=启用桌面通知
+Enable Minimize Notification=启用最小化通知
 Aria2 RPC Alias=Aria2 RPC 别名
 Aria2 RPC Address=Aria2 RPC 地址
 Aria2 RPC Protocol=Aria2 RPC 协议

diff --git a/app/pages/langs/zh_Hant.txt b/app/pages/langs/zh_Hant.txt
@@ -137,6 +137,7 @@ Example: ${downspeed:noprefix:nosuffix:scale\=1}=示例: ${downspeed:noprefix:no
 Page Title Refresh Interval=頁面標題重新整理間隔
 Enable Browser Notification=啟用瀏覽器通知
 Enable Desktop Notification=啟用桌面通知
+Enable Minimize Notification=啟用最小化通知
 Aria2 RPC Alias=Aria2 RPC 別名
 Aria2 RPC Address=Aria2 RPC 位址
 Aria2 RPC Protocol=Aria2 RPC 協定

diff --git a/app/pre.js b/app/pre.js
@@ -86,6 +86,15 @@ const saveLocalConfig = (options) => {
 window.saveLocalConfig = saveLocalConfig
 
 
+// 获取是否禁用了最小化时的通知
+ipcRenderer.on("isMinimizeNotificationDisabled", () => {
+    const options = localStorage.getItem("AriaNg.Options")
+    const disabled = options && JSON.parse(options).minimizeNotification == false
+
+    ipcRenderer.send("minimizeNotificationDisabled", disabled)
+})
+
+
 window.onload = () => {
     // 显示AriaNg GUI的版本号
     const version = app.getVersion()

diff --git a/app/tray.js b/app/tray.js
@@ -8,7 +8,7 @@
  * 
 */
 
-const { app, Tray, BrowserWindow } = require("electron")
+const { app, Tray, BrowserWindow, ipcMain } = require("electron")
 const { dialog } = require("electron")
 
 let tray = null
@@ -21,27 +21,40 @@ const getTrayMenu = () => {
     return _trayMenu
 }
 
-const displayTray = (icon) => {
+const displayTray = async (icon) => {
     tray = new Tray(icon)
     tray.setToolTip("AriaNg GUI v" + app.getVersion())
     tray.setContextMenu(trayMenu || getTrayMenu())
 
-    const title = "AriaNg GUI 已最小化到托盘"
-    const content = "可以右键单击托盘图标完全退出"
-    if (process.platform == "win32") {
-        tray.displayBalloon({
-            icon,
-            title,
-            content
-        })
-    } else {
-        dialog.showMessageBox({
-            type: "info",
-            icon,
-            title: "AriaNg GUI",
-            message: title,
-            detail: content
+    const minimizeNotificationDisabled = await new Promise((resolve) => {
+        const mainWindow = BrowserWindow.getAllWindows()[0]
+
+        ipcMain.once("minimizeNotificationDisabled", (e, value) => {
+            resolve(value)
         })
+
+        mainWindow.webContents.send("isMinimizeNotificationDisabled")
+    })
+
+
+    if (!minimizeNotificationDisabled) {
+        const title = "AriaNg GUI 已最小化到托盘"
+        const content = "可以右键单击托盘图标完全退出"
+        if (process.platform == "win32") {
+            tray.displayBalloon({
+                icon,
+                title,
+                content
+            })
+        } else {
+            dialog.showMessageBox({
+                type: "info",
+                icon,
+                title: "AriaNg GUI",
+                message: title,
+                detail: content
+            })
+        }
     }
 }