0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve floating window triggering method https://github.com/siyuan-note/siyuan/issues/10317

Browse source
This commit is contained in:
Daniel 2024-02-09 12:05:29 +08:00
parent c4d96894dd
commit c6a32b1712
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
7 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/appearance/langs/en_US.json
View file

@ -369,8 +369,11 @@
"backmentionExpandTip": "If configured as <code class='fn__code'>0</code>, it will not be expanded",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "After enabling, it will use <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> to count the opening status of the application and will not collect users data and operations",
"floatWindowMode": "Hover to display a floating window",
"floatWindowModeTip": "After enabling, a floating window will appear when the mouse hovers over the block reference, breadcrumb block icon, etc. After disabling, you need to hold down the <code class='fn__code'>${hotkey}</code> key to appear the floating window",
"floatWindowMode": "Floating window trigger method",
"floatWindowModeTip": "Choose how to trigger the floating window when the mouse hovers over the block icon, breadcrumb icon, etc.",
"floatWindowMode0": "Hover",
"floatWindowMode1": "Press and hold <code class='fn__code'>${hotkey}</code>+Hover",
"floatWindowMode2": "Do not trigger",
"codeSnippet": "Code Snippet",
"expandDown": "Expand Down",
"expandUp": "Expand Up",

7
app/appearance/langs/es_ES.json
View file

@ -369,8 +369,11 @@
"backmentionExpandTip": "Si se configura como <code class='fn__code'>0</code>, no se expandirá",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "Después de habilitarlo, usará <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> para contar el estado de apertura del aplicación y no recopilará datos y operaciones de los usuarios",
"floatWindowMode": "Pase el cursor para mostrar una ventana flotante",
"floatWindowModeTip": "Después de habilitar, aparecerá una ventana flotante cuando el mouse se desplace sobre la referencia del bloque, el ícono del bloque de navegación, etc. Después de deshabilitar, debe mantener presionada la tecla <code class='fn__code'>${hotkey}</code> para aparece la ventana flotante",
"floatWindowMode": "Método de activación de ventana flotante",
"floatWindowModeTip": "Elija cómo activar la ventana flotante cuando el mouse pasa sobre el ícono de bloque, el ícono de ruta de navegación, etc.",
"floatWindowMode0": "Flotar",
"floatWindowMode1": "Presione y mantenga presionado <code class='fn__code'>${hotkey}</code>+Flotar",
"floatWindowMode2": "No activar",
"codeSnippet": "Fragmento de código",
"expandDown": "Expandir hacia abajo",
"expandUp": "Expandir hacia arriba",

7
app/appearance/langs/fr_FR.json
View file

@ -369,8 +369,11 @@
"backmentionExpandTip": "Si configuré comme <code class='fn__code'>0</code>, il ne sera pas développé",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "Après l'activation, il utilisera <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> pour compter le statut d'ouverture du l'application et ne collectera pas les Données et Opérations des utilisateurs",
"floatWindowMode": "Survolez pour afficher une fenêtre flottante",
"floatWindowModeTip": "Après l'activation, une fenêtre flottante apparaît lorsque la souris survole la référence du bloc, l'icône du fil d'Ariane, etc. Après la désactivation, vous devez maintenir enfoncée la touche <code class='fn__code'>${hotkey}</code> pour apparaît la fenêtre flottante",
"floatWindowMode": "Méthode de déclenchement de fenêtre flottante",
"floatWindowModeTip": "Choisissez comment déclencher la fenêtre flottante lorsque la souris survole l'icône de bloc, l'icône de fil d'Ariane, etc.",
"floatWindowMode0": "Flotter",
"floatWindowMode1": "Appuyez et maintenez <code class='fn__code'>${hotkey}</code>+Flotter",
"floatWindowMode2": "Ne pas déclencher",
"codeSnippet": "Extrait de code",
"expandDown": "Développer vers le bas",
"expandUp": "Développer vers le haut",

7
app/appearance/langs/zh_CHT.json
View file

@ -369,8 +369,11 @@
"backmentionExpandTip": "配置為 <code class='fn__code'>0</code> 則不展開",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "啟用後會通過 <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> 統計應用打開狀態，不會收集用戶資料和操作",
"floatWindowMode": "懸停出現浮窗",
"floatWindowModeTip": "啟用後鼠標懸停塊引、導覽路徑塊標等位置會出現浮窗，關閉後需按住 <code class='fn__code'>${hotkey}</code> 鍵才會出現浮窗",
"floatWindowMode": "浮窗觸發方式",
"floatWindowModeTip": "選擇滑鼠懸停塊引、麵包屑塊標等位置觸發浮窗的方式",
"floatWindowMode0": "懸停",
"floatWindowMode1": "按住 <code class='fn__code'>${hotkey}</code>+懸停",
"floatWindowMode2": "不觸發浮窗",
"codeSnippet": "代碼片段",
"expandDown": "向下擴選",
"expandUp": "向上擴選",

7
app/appearance/langs/zh_CN.json
View file

@ -369,8 +369,11 @@
"backmentionExpandTip": "配置为 <code class='fn__code'>0</code> 则不展开",
"googleAnalytics": "Google Analytics",
"googleAnalyticsTip": "启用后会通过 <a href=\"https://analytics.google.com/\" target=\"_blank\">Google Analytics</a> 统计应用打开状态，不会收集用户数据和操作",
"floatWindowMode": "悬停出现浮窗",
"floatWindowModeTip": "启用后鼠标悬停块引、面包屑块标等位置会出现浮窗，关闭后需按住 <code class='fn__code'>${hotkey}</code> 键才会出现浮窗",
"floatWindowMode": "浮窗触发方式",
"floatWindowModeTip": "选择鼠标悬停块引、面包屑块标等位置触发浮窗的方式",
"floatWindowMode0": "悬停",
"floatWindowMode1": "按住 <code class='fn__code'>${hotkey}</code>+悬停",
"floatWindowMode2": "不触发浮窗",
"codeSnippet": "代码片段",
"expandDown": "向下扩选",
"expandUp": "向上扩选",

8
app/src/config/editor.ts
View file

@ -79,7 +79,11 @@ export const editor = {
<div class="b3-label__text">${window.siyuan.languages.floatWindowModeTip.replace("${hotkey}", updateHotkeyTip("⌘"))}</div>
</div>
<span class="fn__space"></span>
<input class="b3-switch fn__flex-center" id="floatWindowMode" type="checkbox"${window.siyuan.config.editor.floatWindowMode === 0 ? " checked" : ""}/>
<select class="b3-select fn__flex-center fn__size200" id="floatWindowMode">
<option value="0" ${window.siyuan.config.editor.floatWindowMode === 0 ? "selected" : ""}>${window.siyuan.languages.floatWindowMode0}</option>
<option value="1" ${window.siyuan.config.editor.floatWindowMode === 1 ? "selected" : ""}>${window.siyuan.languages.floatWindowMode1}</option>
<option value="2" ${window.siyuan.config.editor.floatWindowMode === 2 ? "selected" : ""}>${window.siyuan.languages.floatWindowMode2}</option>
</select>
</label>
<label class="fn__flex b3-label">
<div class="fn__flex-1">
@ -296,7 +300,7 @@ export const editor = {
listLogicalOutdent: (editor.element.querySelector("#listLogicalOutdent") as HTMLInputElement).checked,
spellcheck: (editor.element.querySelector("#spellcheck") as HTMLInputElement).checked,
onlySearchForDoc: (editor.element.querySelector("#onlySearchForDoc") as HTMLInputElement).checked,
floatWindowMode: (editor.element.querySelector("#floatWindowMode") as HTMLInputElement).checked ? 0 : 1,
floatWindowMode: parseInt((editor.element.querySelector("#floatWindowMode") as HTMLSelectElement).value),
plantUMLServePath: (editor.element.querySelector("#plantUMLServePath") as HTMLInputElement).value,
katexMacros: (editor.element.querySelector("#katexMacros") as HTMLTextAreaElement).value,
codeLineWrap: (editor.element.querySelector("#codeLineWrap") as HTMLInputElement).checked,

2
kernel/conf/editor.go
View file

@ -39,7 +39,7 @@ type Editor struct {
ReadOnly bool `json:"readOnly"` // 只读模式
EmbedBlockBreadcrumb bool `json:"embedBlockBreadcrumb"` // 嵌入块是否显示面包屑
ListLogicalOutdent bool `json:"listLogicalOutdent"` // 列表逻辑反向缩进
FloatWindowMode int `json:"floatWindowMode"` // 浮窗触发模式，0：光标悬停，1：按住 Ctrl 悬停
FloatWindowMode int `json:"floatWindowMode"` // 浮窗触发模式，0：光标悬停，1：按住 Ctrl 悬停，2：不触发浮窗
DynamicLoadBlocks int `json:"dynamicLoadBlocks"` // 块动态数，可配置区间 [48, 1024]
Justify bool `json:"justify"` // 是否两端对齐
RTL bool `json:"rtl"` // 是否从右到左显示