Feature: add config item to hide dock, only for macos

This commit is contained in:
萌萌哒赫萝
2023-04-09 17:12:21 +08:00
parent 28caf56331
commit 0466fa78a4
10 changed files with 44 additions and 9 deletions

View File

@@ -30,7 +30,8 @@ import {
RELOAD_APP,
SHOW_PLUGIN_PAGE_MENU,
SET_MINI_WINDOW_POS,
GET_PICBEDS
GET_PICBEDS,
HIDE_DOCK
} from '#/events/constants'
import {
uploadClipboardFiles,
@@ -270,6 +271,13 @@ export default {
const window = BrowserWindow.getFocusedWindow()
window?.setBounds(pos)
})
ipcMain.on(HIDE_DOCK, (_evt: IpcMainEvent, val: boolean) => {
if (val) {
app.dock.hide()
} else {
app.dock.show()
}
})
},
dispose () {}
}

View File

@@ -175,7 +175,8 @@ class LifeCycle {
}
await remoteNoticeHandler.init()
remoteNoticeHandler.triggerHook(IRemoteNoticeTriggerHook.APP_START)
if (db.get('settings.startMode') === 'mini') {
const startMode = db.get('settings.startMode') || 'quiet'
if (startMode === 'mini') {
windowManager.create(IWindowList.MINI_WINDOW)
const miniWindow = windowManager.get(IWindowList.MINI_WINDOW)!
if (db.get('settings.miniWindowOntop')) {
@@ -198,11 +199,15 @@ class LifeCycle {
})
miniWindow.show()
miniWindow.focus()
} else if (db.get('settings.startMode') === 'main') {
} else if (startMode === 'main') {
const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW)!
settingWindow.show()
settingWindow.focus()
}
const isHideDock = db.get('settings.isHideDock') || false
if (isHideDock) {
app.dock.hide()
}
}
app.whenReady().then(readyFunction)
}

View File

@@ -70,6 +70,16 @@
/>
</el-select>
</el-form-item>
<el-form-item
:label="$T('SETTINGS_ISHIDEDOCK')"
>
<el-switch
v-model="form.isHideDock"
:active-text="$T('SETTINGS_OPEN')"
:inactive-text="$T('SETTINGS_CLOSE')"
@change="handleHideDockChange"
/>
</el-form-item>
<el-form-item
:label="$T('SETTINGS_MIGRATE_FROM_PICGO')"
>
@@ -897,7 +907,7 @@
import { ElForm, ElMessage as $message, ElMessage, ElMessageBox, FormRules } from 'element-plus'
import { Reading, QuestionFilled } from '@element-plus/icons-vue'
import pkg from 'root/package.json'
import { PICGO_OPEN_FILE, OPEN_URL, GET_PICBEDS } from '#/events/constants'
import { PICGO_OPEN_FILE, OPEN_URL, GET_PICBEDS, HIDE_DOCK } from '#/events/constants'
import {
ipcRenderer
} from 'electron'
@@ -1022,7 +1032,8 @@ const form = reactive<ISettingForm>({
logFileSizeLimit: 10,
deleteCloudFile: false,
isCustomMiniIcon: false,
customMiniIcon: ''
customMiniIcon: '',
isHideDock: false
})
const languageList = i18nManager.languageList.map(item => ({
@@ -1117,6 +1128,7 @@ async function initData () {
form.deleteCloudFile = settings.deleteCloudFile || false
form.isCustomMiniIcon = settings.isCustomMiniIcon || false
form.customMiniIcon = settings.customMiniIcon || ''
form.isHideDock = settings.isHideDock || false
currentLanguage.value = settings.language ?? 'zh-CN'
currentStartMode.value = settings.startMode || 'quiet'
customLink.value = settings.customLink || '$url'
@@ -1166,7 +1178,7 @@ function openLogSetting () {
async function cancelCustomLink () {
customLinkVisible.value = false
customLink.value = await getConfig<string>('settings.customLink') || '$url'
customLink.value = await getConfig<string>('settings.customLink') || '![$fileName]($url)'
}
function confirmCustomLink () {
@@ -1222,6 +1234,11 @@ function updateHelperChange (val: ICheckBoxValueType) {
saveConfig('settings.showUpdateTip', val)
}
function handleHideDockChange (val: ICheckBoxValueType) {
saveConfig('settings.isHideDock', val)
sendToMain(HIDE_DOCK, val)
}
function useBuiltinClipboardChange (val: ICheckBoxValueType) {
saveConfig('settings.useBuiltinClipboard', val)
}

View File

@@ -22,6 +22,7 @@ export const MINIMIZE_WINDOW = 'MINIMIZE_WINDOW'
export const CLOSE_WINDOW = 'CLOSE_WINDOW'
export const OPEN_USER_STORE_FILE = 'OPEN_USER_STORE_FILE'
export const OPEN_URL = 'OPEN_URL'
export const HIDE_DOCK = 'HIDE_DOCK'
export const RELOAD_APP = 'RELOAD_APP'
export const PICGO_CONFIG_PLUGIN = 'PICGO_CONFIG_PLUGIN'
export const PICGO_HANDLE_PLUGIN_ING = 'PICGO_HANDLE_PLUGIN_ING'

View File

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

View File

@@ -14,7 +14,8 @@ interface ISettingForm {
logFileSizeLimit: number,
deleteCloudFile: boolean,
isCustomMiniIcon: boolean,
customMiniIcon: string
customMiniIcon: string,
isHideDock: boolean
}
interface IShortKeyMap {