From 6b2ec1ef1ae8d149913143fc6cb5573dc05dc43d Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Fri, 20 Sep 2024 13:16:57 +0800
Subject: [PATCH] feat(settings): link opening behavior

---
 src/_locales/cmn-CN.yml                       |  1 +
 src/_locales/cmn-TW.yml                       |  1 +
 src/_locales/en.yml                           |  1 +
 src/_locales/jyut.yml                         |  1 +
 .../DesktopAndDock/DesktopAndDock.vue         | 20 -----------
 src/components/Settings/General/General.vue   | 35 +++++++++++++++----
 6 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/_locales/cmn-CN.yml b/src/_locales/cmn-CN.yml
index cc65b678..e704d6e2 100644
--- a/src/_locales/cmn-CN.yml
+++ b/src/_locales/cmn-CN.yml
@@ -65,6 +65,7 @@ settings:
 
   # Settings group
   group_common: 通用
+  group_link_opening_behavior: 链接打开行为
   group_video_card: 视频卡片
   group_performance: 毛玻璃和性能
   group_topbar: 顶栏
diff --git a/src/_locales/cmn-TW.yml b/src/_locales/cmn-TW.yml
index 15fc09e4..0ee47506 100644
--- a/src/_locales/cmn-TW.yml
+++ b/src/_locales/cmn-TW.yml
@@ -65,6 +65,7 @@ settings:
 
   # Settings group
   group_common: 常用
+  group_link_opening_behavior: 連結開啟行為
   group_video_card: 影片卡片
   group_performance: 毛玻璃與效能
   group_topbar: 頂欄
diff --git a/src/_locales/en.yml b/src/_locales/en.yml
index 33fe2ff4..b33227c9 100644
--- a/src/_locales/en.yml
+++ b/src/_locales/en.yml
@@ -65,6 +65,7 @@ settings:
 
   # Settings group
   group_common: Common
+  group_link_opening_behavior: Link opening behavior
   group_video_card: Video Card
   group_performance: Frosted Glass & Performance
   group_topbar: Top Bar
diff --git a/src/_locales/jyut.yml b/src/_locales/jyut.yml
index 88ad5c6a..7f36f4eb 100644
--- a/src/_locales/jyut.yml
+++ b/src/_locales/jyut.yml
@@ -65,6 +65,7 @@ settings:
 
   # Settings group
   group_common: 通用
+  group_link_opening_behavior: 連結開啓行爲
   group_video_card: 影片卡片
   group_performance: 毛玻璃同效能
   group_topbar: 頂部欄
diff --git a/src/components/Settings/DesktopAndDock/DesktopAndDock.vue b/src/components/Settings/DesktopAndDock/DesktopAndDock.vue
index 3007f0bf..26d1f67c 100644
--- a/src/components/Settings/DesktopAndDock/DesktopAndDock.vue
+++ b/src/components/Settings/DesktopAndDock/DesktopAndDock.vue
@@ -45,23 +45,6 @@ const dockPositions = computed(() => {
   ]
 })
 
-const topBarLinkOpenModeOptions = computed(() => {
-  return [
-    {
-      label: t('settings.top_bar_link_opening_behavior_opt.current_tab'),
-      value: 'currentTab',
-    },
-    {
-      label: t('settings.top_bar_link_opening_behavior_opt.current_tab_if_not_homepage'),
-      value: 'currentTabIfNotHomepage',
-    },
-    {
-      label: t('settings.top_bar_link_opening_behavior_opt.new_tab'),
-      value: 'newTab',
-    },
-  ]
-})
-
 const pageOptions = computed((): { label: string, icon: string, value: string }[] => {
   return mainStore.dockItems.map((e: any) => {
     return {
@@ -109,9 +92,6 @@ function handleToggleDockItem(dockItem: any) {
       <SettingsItem :title="$t('settings.use_old_top_bar')">
         <Radio v-model="settings.useOldTopBar" />
       </SettingsItem>
-      <SettingsItem :title="$t('settings.top_bar_link_opening_behavior')">
-        <Select v-model="settings.topBarLinkOpenMode" :options="topBarLinkOpenModeOptions" w="full" />
-      </SettingsItem>
       <SettingsItem :title="$t('settings.auto_hide_top_bar')">
         <Radio v-model="settings.autoHideTopBar" />
       </SettingsItem>
diff --git a/src/components/Settings/General/General.vue b/src/components/Settings/General/General.vue
index 40f115d1..d0964eb9 100644
--- a/src/components/Settings/General/General.vue
+++ b/src/components/Settings/General/General.vue
@@ -29,6 +29,23 @@ const langOptions = computed(() => {
   ]
 })
 
+const topBarLinkOpenModeOptions = computed(() => {
+  return [
+    {
+      label: t('settings.top_bar_link_opening_behavior_opt.current_tab'),
+      value: 'currentTab',
+    },
+    {
+      label: t('settings.top_bar_link_opening_behavior_opt.current_tab_if_not_homepage'),
+      value: 'currentTabIfNotHomepage',
+    },
+    {
+      label: t('settings.top_bar_link_opening_behavior_opt.new_tab'),
+      value: 'newTab',
+    },
+  ]
+})
+
 const videoCardOpenModeOptions = computed(() => {
   return [
     {
@@ -83,13 +100,10 @@ watch(() => settings.value.language, (newValue) => {
       </SettingsItem>
     </SettingsItemGroup>
 
-    <SettingsItemGroup>
-      <SettingsItem :title="$t('settings.block_ads')">
-        <Radio v-model="settings.blockAds" />
+    <SettingsItemGroup :title="$t('settings.group_link_opening_behavior')">
+      <SettingsItem :title="$t('settings.top_bar_link_opening_behavior')">
+        <Select v-model="settings.topBarLinkOpenMode" :options="topBarLinkOpenModeOptions" w="full" />
       </SettingsItem>
-    </SettingsItemGroup>
-
-    <SettingsItemGroup :title="$t('settings.group_video_card')">
       <SettingsItem :title="$t('settings.video_card_link_opening_behavior')">
         <Select
           v-model="settings.videoCardLinkOpenMode"
@@ -97,6 +111,15 @@ watch(() => settings.value.language, (newValue) => {
           w="full"
         />
       </SettingsItem>
+    </SettingsItemGroup>
+
+    <SettingsItemGroup>
+      <SettingsItem :title="$t('settings.block_ads')">
+        <Radio v-model="settings.blockAds" />
+      </SettingsItem>
+    </SettingsItemGroup>
+
+    <SettingsItemGroup :title="$t('settings.group_video_card')">
       <SettingsItem :title="$t('settings.enable_video_preview')">
         <Radio v-model="settings.enableVideoPreview" />
       </SettingsItem>