Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-30 19:27:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(touch_bar): run button for scripts

Browse Source
This commit is contained in:
Elian Doran 2025-03-09 15:31:03 +02:00
parent 615a5f7222
commit 975e641286
No known key found for this signature in database
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/public/app/widgets/touch_bar.ts
View File

@ -4,6 +4,8 @@ import appContext from "../components/app_context.js";
import NoteContextAwareWidget from "./note_context_aware_widget.js"; import NoteContextAwareWidget from "./note_context_aware_widget.js";
import type { TouchBarButton, TouchBarGroup, TouchBarSegmentedControl, TouchBarSpacer } from "@electron/remote"; import type { TouchBarButton, TouchBarGroup, TouchBarSegmentedControl, TouchBarSpacer } from "@electron/remote";
export type TouchBarItem = (TouchBarButton | TouchBarSpacer | TouchBarGroup | TouchBarSegmentedControl);
export function buildSelectedBackgroundColor(isSelected: boolean) { export function buildSelectedBackgroundColor(isSelected: boolean) {
return isSelected ? "#757575" : undefined; return isSelected ? "#757575" : undefined;
} }
@ -58,13 +60,13 @@ export default class TouchBarWidget extends NoteContextAwareWidget {
let result = parentComponent.triggerCommand("buildTouchBar", { let result = parentComponent.triggerCommand("buildTouchBar", {
TouchBar, TouchBar,
buildIcon: this.buildIcon.bind(this) buildIcon: this.buildIcon.bind(this)
}); }) as unknown as TouchBarItem[];
const touchBar = this.#buildTouchBar(result); const touchBar = this.#buildTouchBar(result);
this.remote.getCurrentWindow().setTouchBar(touchBar); this.remote.getCurrentWindow().setTouchBar(touchBar);
} }
#buildTouchBar(componentSpecificItems?: (TouchBarButton | TouchBarSpacer | TouchBarGroup | TouchBarSegmentedControl)[]) { #buildTouchBar(componentSpecificItems?: TouchBarItem[]) {
const { TouchBar } = this.remote; const { TouchBar } = this.remote;
const { TouchBarButton, TouchBarSpacer, TouchBarGroup, TouchBarSegmentedControl, TouchBarOtherItemsProxy } = this.remote.TouchBar; const { TouchBarButton, TouchBarSpacer, TouchBarGroup, TouchBarSegmentedControl, TouchBarOtherItemsProxy } = this.remote.TouchBar;
@ -81,7 +83,6 @@ export default class TouchBarWidget extends NoteContextAwareWidget {
new TouchBarSpacer({ size: "large" }), new TouchBarSpacer({ size: "large" }),
...componentSpecificItems, ...componentSpecificItems,
new TouchBarOtherItemsProxy(), new TouchBarOtherItemsProxy(),
new TouchBarSpacer({ size: "flexible" }),
new TouchBarButton({ new TouchBarButton({
icon: this.buildIcon("NSTouchBarAddDetailTemplate"), icon: this.buildIcon("NSTouchBarAddDetailTemplate"),
click: () => this.triggerCommand("jumpToNote") click: () => this.triggerCommand("jumpToNote")

24
src/public/app/widgets/type_widgets/editable_code.ts
View File

@ -1,9 +1,12 @@
import type { EventData } from "../../components/app_context.js"; import { app } from "electron";
import type { CommandListenerData, EventData } from "../../components/app_context.js";
import type FNote from "../../entities/fnote.js"; import type FNote from "../../entities/fnote.js";
import { t } from "../../services/i18n.js"; import { t } from "../../services/i18n.js";
import keyboardActionService from "../../services/keyboard_actions.js"; import keyboardActionService from "../../services/keyboard_actions.js";
import options from "../../services/options.js"; import options from "../../services/options.js";
import AbstractCodeTypeWidget from "./abstract_code_type_widget.js"; import AbstractCodeTypeWidget from "./abstract_code_type_widget.js";
import appContext from "../../components/app_context.js";
import type { TouchBarItem } from "../touch_bar.js";
const TPL = ` const TPL = `
<div class="note-detail-code note-detail-printable"> <div class="note-detail-code note-detail-printable">
@ -63,6 +66,8 @@ export default class EditableCodeTypeWidget extends AbstractCodeTypeWidget {
}); });
this.show(); this.show();
this.triggerCommand("refreshTouchBar");
} }
getData() { getData() {
@ -80,4 +85,21 @@ export default class EditableCodeTypeWidget extends AbstractCodeTypeWidget {
resolve(this.codeEditor); resolve(this.codeEditor);
} }
buildTouchBarCommand({ TouchBar, buildIcon }: CommandListenerData<"buildTouchBar">) {
const items: TouchBarItem[] = [
new TouchBar.TouchBarSpacer({ size: "flexible" }),
];
const note = this.note;
if (note?.mime.startsWith("application/javascript") || note?.mime === "text/x-sqlite;schema=trilium") {
items.push(new TouchBar.TouchBarButton({
icon: buildIcon("NSImageNameTouchBarPlayTemplate"),
click: () => appContext.triggerCommand("runActiveNote")
}));
}
return items;
}
} }