From 651175b812f5d4f3fec7ce345057cf5a1adb2682 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Wed, 12 Oct 2022 09:40:12 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E6=94=B9=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B6=E6=A0=8F=E6=95=B0=E6=8D=AE=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=92=8C=E5=9B=BE=E6=A0=87=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/6158?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/util/onGetConfig.ts | 39 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts
index 388daab41..7d152dea1 100644
--- a/app/src/util/onGetConfig.ts
+++ b/app/src/util/onGetConfig.ts
@@ -2,9 +2,8 @@ import {openSearch} from "../search/spread";
 import {exportLayout, JSONToLayout, resizeDrag, resizeTabs} from "../layout/util";
 import {hotKey2Electron, updateHotkeyTip} from "../protyle/util/compatibility";
 /// #if !BROWSER
-import {getCurrentWindow} from "@electron/remote";
+import {dialog, getCurrentWindow} from "@electron/remote";
 import {ipcRenderer, OpenDialogReturnValue} from "electron";
-import {dialog} from "@electron/remote";
 import * as fs from "fs";
 import * as path from "path";
 import {afterExport} from "../protyle/export/util";
@@ -163,41 +162,29 @@ export const onGetConfig = (isStart: boolean) => {
 
 const initBar = () => {
     document.querySelector(".toolbar").innerHTML = `<div id="toolbarVIP" class="fn__flex"></div>
-<div id="barDailyNote" data-menu="true" aria-label="${window.siyuan.languages.dailyNote} ${updateHotkeyTip(window.siyuan.config.keymap.general.dailyNote.custom)}" class="toolbar__item b3-tooltips b3-tooltips__se${window.siyuan.config.readonly ? " fn__none" : ""}">
-    <svg>
-        <use xlink:href="#iconCalendar"></use>
-    </svg>
-</div>
-<div id="barSearch" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.globalSearch} ${updateHotkeyTip(window.siyuan.config.keymap.general.globalSearch.custom)}">
-    <svg>
-        <use xlink:href="#iconSearch"></use>
-    </svg>
-</div>
-<div id="barHistory" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.dataHistory} ${updateHotkeyTip(window.siyuan.config.keymap.general.dataHistory.custom)}">
-    <svg>
-        <use xlink:href="#iconTrashcan"></use>
-    </svg>
-</div>
 <div id="barSetting" class="toolbar__item b3-tooltips b3-tooltips__se${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.config} ${updateHotkeyTip(window.siyuan.config.keymap.general.config.custom)}">
-    <svg>
-        <use xlink:href="#iconSettings"></use>
-    </svg>
+    <svg><use xlink:href="#iconSettings"></use></svg>
 </div>
 <div id="barSync" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.config.sync.stat || (window.siyuan.languages.syncNow + " " + updateHotkeyTip(window.siyuan.config.keymap.general.syncNow.custom))}">
     <svg><use xlink:href="#iconCloud"></use></svg>
 </div>
+<div id="barSearch" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.globalSearch} ${updateHotkeyTip(window.siyuan.config.keymap.general.globalSearch.custom)}">
+    <svg><use xlink:href="#iconSearch"></use></svg>
+</div>
+<div id="barHistory" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.dataHistory} ${updateHotkeyTip(window.siyuan.config.keymap.general.dataHistory.custom)}">
+    <svg><use xlink:href="#iconTrashcan"></use></svg>
+</div>
+<div id="barDailyNote" data-menu="true" aria-label="${window.siyuan.languages.dailyNote} ${updateHotkeyTip(window.siyuan.config.keymap.general.dailyNote.custom)}" class="toolbar__item b3-tooltips b3-tooltips__se${window.siyuan.config.readonly ? " fn__none" : ""}">
+    <svg><use xlink:href="#iconCalendar"></use></svg>
+</div>
 <div id="barReadonly" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.use} ${window.siyuan.config.editor.readOnly ? window.siyuan.languages.editMode : window.siyuan.languages.editReadonly}">
     <svg><use xlink:href="#icon${window.siyuan.config.editor.readOnly ? "Preview" : "Edit"}"></use></svg>
 </div>
 <button id="barBack" data-menu="true" class="toolbar__item toolbar__item--disabled b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.goBack} ${updateHotkeyTip(window.siyuan.config.keymap.general.goBack.custom)}">
-    <svg>
-        <use xlink:href="#iconLeft"></use>
-    </svg>
+    <svg><use xlink:href="#iconLeft"></use></svg>
 </button>
 <button id="barForward" data-menu="true" class="toolbar__item toolbar__item--disabled b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.goForward} ${updateHotkeyTip(window.siyuan.config.keymap.general.goForward.custom)}">
-    <svg>
-        <use xlink:href="#iconRight"></use>
-    </svg>
+    <svg><use xlink:href="#iconRight"></use></svg>
 </button>
 <div class="fn__flex-1 fn__ellipsis" id="drag"><span class="fn__none">开发版，使用前请进行备份 Development version, please backup before use</span></div>
 <div class="fn__flex" id="windowControls"></div>`;