tcjlj/PicList
1
0
Fork 0
mirror of https://github.com/Kuingsmile/PicList.git synced 2025-03-13 08:28:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ Feature: add check to avoid hide dock and tray at the same time

Browse Source
This commit is contained in:
萌萌哒赫萝 2023-04-09 18:21:32 +08:00
parent 4043dbfb25
commit 8421925f9d
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/i18n/en.yml
View File

@ -190,6 +190,7 @@ SETTINGS_CUSTOM_MINI_ICON: Custom Mini Window Icon
SETTINGS_COMPRESS_AND_WATERMARK: Compress and Watermark SETTINGS_COMPRESS_AND_WATERMARK: Compress and Watermark
SETTINGS_SYNC_DELETE_CLOUD: Sync delete from cloud storage of gallery SETTINGS_SYNC_DELETE_CLOUD: Sync delete from cloud storage of gallery
SETTINGS_ISHIDEDOCK: Hide Dock Icon SETTINGS_ISHIDEDOCK: Hide Dock Icon
SETTINGS_ISHIDEDOCK_TIPS: Not support hide dock and tray at the same time
# shortcut-page # shortcut-page
BUILTIN_CLIPBOARD_TIPS: Use builtin clipboard function to upload instead of using scripts BUILTIN_CLIPBOARD_TIPS: Use builtin clipboard function to upload instead of using scripts

1
public/i18n/zh-CN.yml
View File

@ -191,6 +191,7 @@ SETTINGS_CUSTOM_MINI_ICON: 是否自定义Mini窗口图标
SETTINGS_COMPRESS_AND_WATERMARK: 设置图片水印和压缩-格式转换等参数 SETTINGS_COMPRESS_AND_WATERMARK: 设置图片水印和压缩-格式转换等参数
SETTINGS_SYNC_DELETE_CLOUD: 相册内删除时同步删除云端文件 SETTINGS_SYNC_DELETE_CLOUD: 相册内删除时同步删除云端文件
SETTINGS_ISHIDEDOCK: 是否隐藏dock图标 SETTINGS_ISHIDEDOCK: 是否隐藏dock图标
SETTINGS_ISHIDEDOCK_TIPS: 不支持同时隐藏dock和托盘
# shortcut-page # shortcut-page

1
public/i18n/zh-TW.yml
View File

@ -191,6 +191,7 @@ SETTINGS_CUSTOM_MINI_ICON: 自訂Mini視窗圖示
SETTINGS_COMPRESS_AND_WATERMARK: 設置圖片浮水印和壓縮-格式轉換等參數 SETTINGS_COMPRESS_AND_WATERMARK: 設置圖片浮水印和壓縮-格式轉換等參數
SETTINGS_SYNC_DELETE_CLOUD: 從相簿中刪除並同步從雲端刪除 SETTINGS_SYNC_DELETE_CLOUD: 從相簿中刪除並同步從雲端刪除
SETTINGS_ISHIDEDOCK: 是否隱藏dock圖示 SETTINGS_ISHIDEDOCK: 是否隱藏dock圖示
SETTINGS_ISHIDEDOCK_TIPS: 不支持同時隱藏dock和托盘
# shortcut-page # shortcut-page
SHORTCUT_NAME: 快捷鍵名稱 SHORTCUT_NAME: 快捷鍵名稱

15
src/renderer/pages/PicGoSetting.vue
View File

@ -1242,6 +1242,10 @@ function updateHelperChange (val: ICheckBoxValueType) {
} }
function handleHideDockChange (val: ICheckBoxValueType) { function handleHideDockChange (val: ICheckBoxValueType) {
if (val && currentStartMode.value === 'no-tray') {
ElMessage.warning($T('SETTINGS_ISHIDEDOCK_TIPS'))
return
}
saveConfig('settings.isHideDock', val) saveConfig('settings.isHideDock', val)
sendToMain(HIDE_DOCK, val) sendToMain(HIDE_DOCK, val)
} }
@ -1457,12 +1461,17 @@ function handleLanguageChange (val: string) {
} }
function handleStartModeChange (val: 'quiet' | 'mini' | 'main' | 'no-tray') { function handleStartModeChange (val: 'quiet' | 'mini' | 'main' | 'no-tray') {
if (val === 'no-tray') {
if (form.isHideDock) {
ElMessage.warning($T('SETTINGS_ISHIDEDOCK_TIPS'))
currentStartMode.value = 'quiet'
return
}
$message.info($T('TIPS_NEED_RELOAD'))
}
saveConfig({ saveConfig({
'settings.startMode': val 'settings.startMode': val
}) })
if (val === 'no-tray') {
$message.info($T('TIPS_NEED_RELOAD'))
}
} }
function goConfigPage () { function goConfigPage () {

1
src/universal/types/i18n.d.ts vendored
View File

@ -185,6 +185,7 @@ interface ILocales {
SETTINGS_COMPRESS_AND_WATERMARK: string SETTINGS_COMPRESS_AND_WATERMARK: string
SETTINGS_SYNC_DELETE_CLOUD: string SETTINGS_SYNC_DELETE_CLOUD: string
SETTINGS_ISHIDEDOCK: string SETTINGS_ISHIDEDOCK: string
SETTINGS_ISHIDEDOCK_TIPS: string
SHORTCUT_NAME: string SHORTCUT_NAME: string
SHORTCUT_BIND: string SHORTCUT_BIND: string
SHORTCUT_STATUS: string SHORTCUT_STATUS: string