Merge from main

Author: sheepzh

src/popup/components/chart/option.ts

@@ -19,6 +19,9 @@ import { t } from "@popup/locale"
 import { getPrimaryTextColor, getSecondaryTextColor } from "@util/style"
 import { generateSiteLabel } from "@util/site"
 import { IS_SAFARI } from "@util/constant/environment"
+import { OPTION_ROUTE } from "@app/router/constants"
+import { getAppPageUrl } from "@util/constant/url"
+import { optionIcon } from "./toolbox-icon"
 
 type EcOption = ComposeOption<
     | PieSeriesOption
@@ -118,6 +121,15 @@ const staticOptions: EcOption = {
                 }),
                 excludeComponents: ['toolbox'],
                 pixelRatio: 1
+            },
+            // Customized tool's name must start with 'my'
+            myOptions: {
+                show: true,
+                title: t(msg => msg.options),
+                icon: optionIcon,
+                onclick() {
+                    chrome.tabs.create({ url: getAppPageUrl(false, OPTION_ROUTE, { i: 'popup' }) })
+                }
             }
         }
     }

src/popup/components/chart/toolbox-icon.ts

@@ -0,0 +1,2 @@
+export const optionIcon = 'path://' +
+    'M499.612903 68.789677L134.35871 279.667613a24.774194 24.774194 0 0 0-12.387097 21.470968v421.739354a24.774194 24.774194 0 0 0 12.387097 21.454452L499.612903 955.210323a24.774194 24.774194 0 0 0 24.774194 0l365.254193-210.877936a24.774194 24.774194 0 0 0 12.387097-21.470968V301.138581a24.774194 24.774194 0 0 0-12.387097-21.454452L524.387097 68.789677a24.774194 24.774194 0 0 0-24.774194 0z m414.802581 167.969033a74.322581 74.322581 0 0 1 37.16129 64.363355v421.75587a74.322581 74.322581 0 0 1-37.16129 64.363355L549.16129 998.119226a74.322581 74.322581 0 0 1-74.32258 0L109.584516 787.24129a74.322581 74.322581 0 0 1-37.16129-64.363355V301.122065a74.322581 74.322581 0 0 1 37.16129-64.363355L474.83871 25.880774a74.322581 74.322581 0 0 1 74.32258 0l365.254194 210.877936zM512 685.419355c-95.777032 0-173.419355-77.642323-173.419355-173.419355S416.222968 338.580645 512 338.580645 685.419355 416.222968 685.419355 512 607.777032 685.419355 512 685.419355z m0-49.548387a123.870968 123.870968 0 1 0 0-247.741936 123.870968 123.870968 0 0 0 0 247.741936z'

src/popup/locale/messages.ts

@@ -17,6 +17,7 @@ export type PopupMessage = {
     fileName: string
     saveAsImageTitle: string
     restoreTitle: string
+    options: string
     totalTime: string
     totalCount: string
     averageTime: string
@@ -43,6 +44,7 @@ const _default: Messages<PopupMessage> = {
         fileName: '上网时长清单_{today}_by_{app}',
         saveAsImageTitle: '保存',
         restoreTitle: '刷新',
+        options: '设置',
         totalTime: '共 {totalTime}',
         totalCount: '共 {totalCount} 次',
         averageTime: '平均每天 {value}',
@@ -67,6 +69,7 @@ const _default: Messages<PopupMessage> = {
         fileName: '上網時長清單_{today}_by_{app}',
         saveAsImageTitle: '保存',
         restoreTitle: '刷新',
+        options: '設置',
         totalTime: '共 {totalTime}',
         totalCount: '共 {totalCount} 次',
         averageCount: '平均每天 {value} 次',
@@ -91,6 +94,7 @@ const _default: Messages<PopupMessage> = {
         fileName: 'Web_Time_List_{today}_By_{app}',
         saveAsImageTitle: 'Snapshot',
         restoreTitle: 'Restore',
+        options: 'Options',
         totalTime: 'Total {totalTime}',
         totalCount: 'Total {totalCount} times',
         averageCount: '{value} times per day on average',
@@ -115,6 +119,7 @@ const _default: Messages<PopupMessage> = {
         fileName: 'オンライン時間_{today}_by_{app}',
         saveAsImageTitle: 'ダウンロード',
         restoreTitle: '刷新',
+        options: '設定',
         totalTime: '合計 {totalTime}',
         totalCount: '合計 {totalCount} 回',
         averageTime: '1日平均 {value}',