gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-21 15:49:00 +02:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

feat(settings/keyboard_actions): display friendly name

Browse Source
This commit is contained in:
Elian Doran 2025-07-27 17:04:29 +03:00
parent c4ec27bb1e
commit d10bbdd7a7
No known key found for this signature in database
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/client/src/widgets/type_widgets/options/shortcuts.ts
View File

@ -3,7 +3,7 @@ import utils from "../../../services/utils.js";
import dialogService from "../../../services/dialog.js"; import dialogService from "../../../services/dialog.js";
import OptionsWidget from "./options_widget.js"; import OptionsWidget from "./options_widget.js";
import { t } from "../../../services/i18n.js"; import { t } from "../../../services/i18n.js";
import type { OptionNames, KeyboardShortcut } from "@triliumnext/commons"; import type { OptionNames, KeyboardShortcut, KeyboardShortcutWithRequiredActionName } from "@triliumnext/commons";
const TPL = /*html*/` const TPL = /*html*/`
<div class="options-section shortcuts-options-section tn-no-card"> <div class="options-section shortcuts-options-section tn-no-card">
@ -75,10 +75,10 @@ export default class KeyboardShortcutsOptions extends OptionsWidget {
for (const action of actions) { for (const action of actions) {
const $tr = $("<tr>"); const $tr = $("<tr>");
if (action.separator) { if ("separator" in action) {
$tr.append($('<td class="separator" colspan="4">').attr("style", "background-color: var(--accented-background-color); font-weight: bold;").text(action.separator)); $tr.append($('<td class="separator" colspan="4">').attr("style", "background-color: var(--accented-background-color); font-weight: bold;").text(action.separator));
} else if (action.defaultShortcuts && action.actionName) { } else if (action.defaultShortcuts && action.actionName) {
$tr.append($("<td>").text(action.actionName)) $tr.append($("<td>").text(action.friendlyName))
.append( .append(
$("<td>").append( $("<td>").append(
$(`<input type="text" class="form-control">`) $(`<input type="text" class="form-control">`)
@ -145,9 +145,9 @@ export default class KeyboardShortcutsOptions extends OptionsWidget {
return; return;
} }
const action = globActions.find((act) => act.actionName === actionName); const action = globActions.find((act) => "actionName" in act && act.actionName === actionName) as KeyboardShortcutWithRequiredActionName;
if (!action || !action.actionName) { if (!action) {
this.$widget.find(el).hide(); this.$widget.find(el).hide();
return; return;
} }
@ -157,6 +157,7 @@ export default class KeyboardShortcutsOptions extends OptionsWidget {
.toggle( .toggle(
!!( !!(
action.actionName.toLowerCase().includes(filter) || action.actionName.toLowerCase().includes(filter) ||
(action.friendlyName && action.friendlyName.toLowerCase().includes(filter)) ||
(action.defaultShortcuts ?? []).some((shortcut) => shortcut.toLowerCase().includes(filter)) || (action.defaultShortcuts ?? []).some((shortcut) => shortcut.toLowerCase().includes(filter)) ||
(action.effectiveShortcuts ?? []).some((shortcut) => shortcut.toLowerCase().includes(filter)) || (action.effectiveShortcuts ?? []).some((shortcut) => shortcut.toLowerCase().includes(filter)) ||
(action.description && action.description.toLowerCase().includes(filter)) (action.description && action.description.toLowerCase().includes(filter))