diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 012038ba5..4f43ed7cf 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -3,7 +3,6 @@ "panel": "Panel", "copyPath": "Copy Path", "workspaceList": "Workspaces", - "openWorkspace": "Open Workspace", "removeWorkspaceTip": "Remove from Workspaces", "new": "New", "share2LiandiConfirmTip": "Are you sure to share this document to Liandi?", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 271520151..b069930c7 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -3,7 +3,6 @@ "panel": "Panel", "copyPath": "Copiar ruta", "workspaceList": "Áreas de trabajo", - "openWorkspace": "Abrir espacio de trabajo", "removeWorkspaceTip": "Quitar de los espacios de trabajo", "new": "Nuevo", "share2LiandiConfirmTip": "¿Estás seguro de compartir este documento con Liandi?", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 613b94717..dd85e48d7 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -3,7 +3,6 @@ "panel": "Panneau", "copyPath": "Copier le chemin", "workspaceList": "Espaces de travail", - "openWorkspace": "Ouvrir l'espace de travail", "removeWorkspaceTip": "Supprimer des espaces de travail", "new": "Nouveau", "share2LiandiConfirmTip": "Êtes-vous sûr de partager ce document avec Liandi ?", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 2560084ea..61118c490 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -2,8 +2,7 @@ "pointExchangeSize": "積分兌換", "panel": "面板", "copyPath": "複製路徑", - "workspaceList": "工作空間列表", - "openWorkspace": "打開工作空間", + "workspaceList": "工作空間", "removeWorkspaceTip": "從工作空間列表中移除", "new": "新建", "share2LiandiConfirmTip": "確定將該文檔分享到鏈滴嗎?", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 7fc992b82..aaa6e979f 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -2,8 +2,7 @@ "pointExchangeSize": "积分兑换", "panel": "面板", "copyPath": "复制路径", - "workspaceList": "工作空间列表", - "openWorkspace": "打开工作空间", + "workspaceList": "工作空间", "removeWorkspaceTip": "从工作空间列表中移除", "new": "新建", "share2LiandiConfirmTip": "确定将该文档分享到链滴吗?", diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts index 1d8d18d94..a8ea6d649 100644 --- a/app/src/menus/workspace.ts +++ b/app/src/menus/workspace.ts @@ -54,7 +54,7 @@ export const workspaceMenu = (rect: DOMRect) => { }).element); /// #if !BROWSER const workspaceSubMenu: IMenu[] = [{ - label: window.siyuan.languages.openWorkspace, + label: window.siyuan.languages.openBy + "...", iconHTML: Constants.ZWSP, click: async () => { const localPath = await dialog.showOpenDialog({ @@ -73,19 +73,12 @@ export const workspaceMenu = (rect: DOMRect) => { }); window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.workspaceList, + icon: "iconFiles", type: "submenu", submenu: workspaceSubMenu, }).element); /// #endif window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); - window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.dataHistory, - icon: "iconHistory", - accelerator: window.siyuan.config.keymap.general.dataHistory.custom, - click: () => { - openHistory(); - } - }).element); if (!window.siyuan.config.readonly) { if (getOpenNotebookCount() < 2) { window.siyuan.menus.menu.append(new MenuItem({ @@ -138,6 +131,14 @@ export const workspaceMenu = (rect: DOMRect) => { lockScreen(); } }).element); + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.dataHistory, + icon: "iconHistory", + accelerator: window.siyuan.config.keymap.general.dataHistory.custom, + click: () => { + openHistory(); + } + }).element); window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.help, @@ -192,6 +193,7 @@ const workspaceItem = (item: IWorkspace) => { label: `
${originalPath().basename(item.path)}
`, + current: !item.closed, iconHTML: Constants.ZWSP, type: "submenu", submenu: [{