Merge pull request #283 from caorushizi/feature

feat: ✨ 添加关闭窗口选项
caorushizi · Sep 25, 2024 · 8764a19 · 8764a19
2 parents e5a5642 + be2944d
commit 8764a19
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/packages/main/src/main.d.ts b/packages/main/src/main.d.ts
@@ -60,6 +60,8 @@ declare interface AppStore {
   autoUpgrade: boolean;
   // 允许使用beta版本
   allowBeta: boolean;
+  // 关闭主窗口
+  closeMainWindow: boolean;
 }
 
 declare interface BrowserStore {

diff --git a/packages/main/src/vendor/ElectronStore.ts b/packages/main/src/vendor/ElectronStore.ts
@@ -32,6 +32,7 @@ export default class StoreService extends Store<AppStore> implements Vendor {
         downloadProxySwitch: false,
         autoUpgrade: true,
         allowBeta: false,
+        closeMainWindow: false,
       },
     });
   }

diff --git a/packages/main/src/windows/MainWindow.ts b/packages/main/src/windows/MainWindow.ts
@@ -49,6 +49,13 @@ export default class MainWindow extends Window {
     app.on("second-instance", this.secondInstance);
   }
 
+  closeMainWindow = () => {
+    const { closeMainWindow } = this.store.store;
+    if (closeMainWindow) {
+      app.quit();
+    }
+  };
+
   onDownloadReadyStart = async ({ id, isLive }: DownloadProgress) => {
     if (isLive) {
       await this.videoRepository.changeVideoIsLive(id);
@@ -74,6 +81,7 @@ export default class MainWindow extends Window {
 
     // 处理当前窗口改变大小
     this.window.on("resized", this.handleResize);
+    this.window.on("close", this.closeMainWindow);
   }
 
   handleResize = () => {

diff --git a/packages/renderer/src/i18n/index.ts b/packages/renderer/src/i18n/index.ts
@@ -163,6 +163,11 @@ Referer: http://www.example.com`,
           updateModal: "Update",
           update: "Update",
           install: "Install",
+          checkingForUpdates: "Checking for updates",
+          updateAvailable: "Update available",
+          updateNotAvailable: "Update not available",
+          closeMainWindow: "Close Main Window",
+          minimizeToTray: "Minimize to tray",
         },
       },
       zh: {
@@ -312,6 +317,11 @@ Referer: http://www.example.com`,
           updateModal: "更新",
           update: "更新",
           install: "安装",
+          checkingForUpdates: "正在检查更新",
+          updateAvailable: "发现新版本",
+          updateNotAvailable: "当前已是最新版本",
+          closeMainWindow: "关闭主窗口",
+          minimizeToTray: "最小化到托盘",
         },
       },
     },

diff --git a/packages/renderer/src/pages/SettingPage/index.tsx b/packages/renderer/src/pages/SettingPage/index.tsx
@@ -12,6 +12,7 @@ import {
   message,
   Modal,
   Progress,
+  Radio,
   Select,
   Space,
   Switch,
@@ -265,6 +266,12 @@ const SettingPage: React.FC = () => {
           >
             <Switch />
           </Form.Item>
+          <Form.Item label={t("closeMainWindow")} name="closeMainWindow">
+            <Radio.Group>
+              <Radio value={true}>{t("close")}</Radio>
+              <Radio value={false}>{t("minimizeToTray")}</Radio>
+            </Radio.Group>
+          </Form.Item>
         </GroupWrapper>
         <GroupWrapper title={t("browserSetting")}>
           <Form.Item name="proxy" label={t("proxySetting")}>
@@ -423,10 +430,10 @@ const SettingPage: React.FC = () => {
       >
         <div className="flex min-h-28 flex-col justify-center">
           {updateChecking
-            ? "正在检查更新"
+            ? t("checkingForUpdates")
             : updateAvailable
-              ? "有新版本"
-              : "当前已是最新版本"}
+              ? t("updateAvailable")
+              : t("updateNotAvailable")}
           {!updateChecking && updateAvailable && (
             <Progress percent={updateDownloaded ? 100 : downloadProgress} />
           )}