apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-05-04 13:22:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Register General Assist and Screenshot Assist as two independent global shortcuts.

Browse source
This commit is contained in:
CREDO23 2026-04-27 18:49:30 +02:00
parent 24a5a06f21
commit f489fee2e8
1 changed files with 53 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

70
surfsense_desktop/src/modules/tray.ts
View file

@ -1,12 +1,14 @@
import { app, globalShortcut, Menu, nativeImage, Tray, type NativeImage } from 'electron'; import { app, globalShortcut, Menu, nativeImage, Tray, type NativeImage } from 'electron';
import path from 'path'; import path from 'path';
import { runGeneralAssistShortcut } from './general-assist'; import { runGeneralAssistShortcut } from './general-assist';
import { runScreenshotAssistShortcut } from './screenshot-assist';
import { showMainWindow } from './window'; import { showMainWindow } from './window';
import { getShortcuts } from './shortcuts'; import { getShortcuts } from './shortcuts';
import { trackEvent } from './analytics'; import { trackEvent } from './analytics';
let tray: Tray | null = null; let tray: Tray | null = null;
let currentShortcut: string | null = null; let registeredGeneralAssist: string | null = null;
let registeredScreenshotAssist: string | null = null;
function getTrayIcon(): NativeImage { function getTrayIcon(): NativeImage {
const iconName = process.platform === 'win32' ? 'icon.ico' : 'icon.png'; const iconName = process.platform === 'win32' ? 'icon.ico' : 'icon.png';
@ -17,25 +19,29 @@ function getTrayIcon(): NativeImage {
return img.resize({ width: 16, height: 16 }); return img.resize({ width: 16, height: 16 });
} }
function registerShortcut(accelerator: string): void { function registerOne(
if (currentShortcut) { previous: string | null,
globalShortcut.unregister(currentShortcut); accelerator: string,
currentShortcut = null; onFire: () => void | Promise<void>,
label: string
): string | null {
if (previous) {
globalShortcut.unregister(previous);
} }
if (!accelerator) return; if (!accelerator) return null;
try { try {
const ok = globalShortcut.register(accelerator, () => { const ok = globalShortcut.register(accelerator, () => {
void runGeneralAssistShortcut(); void Promise.resolve(onFire());
}); });
if (ok) { if (ok) {
currentShortcut = accelerator; console.log(`[hotkeys] Register ${label} ${accelerator}: OK`);
console.log(`[general-assist] Register ${accelerator}: OK`); return accelerator;
} else {
console.warn(`[general-assist] Register ${accelerator}: FAILED (OS or another app may own this chord)`);
} }
console.warn(`[hotkeys] Register ${label} ${accelerator}: FAILED (OS or another app may own this chord)`);
} catch (err) { } catch (err) {
console.error(`[tray] Error registering General Assist shortcut:`, err); console.error(`[tray] Error registering ${label} shortcut:`, err);
} }
return null;
} }
export async function createTray(): Promise<void> { export async function createTray(): Promise<void> {
@ -60,18 +66,48 @@ export async function createTray(): Promise<void> {
tray.on('double-click', () => showMainWindow('tray_click')); tray.on('double-click', () => showMainWindow('tray_click'));
const shortcuts = await getShortcuts(); const shortcuts = await getShortcuts();
registerShortcut(shortcuts.generalAssist); registeredGeneralAssist = registerOne(
null,
shortcuts.generalAssist,
runGeneralAssistShortcut,
'General Assist'
);
registeredScreenshotAssist = registerOne(
null,
shortcuts.screenshotAssist,
runScreenshotAssistShortcut,
'Screenshot Assist'
);
} }
export async function reregisterGeneralAssist(): Promise<void> { export async function reregisterGeneralAssist(): Promise<void> {
const shortcuts = await getShortcuts(); const shortcuts = await getShortcuts();
registerShortcut(shortcuts.generalAssist); registeredGeneralAssist = registerOne(
registeredGeneralAssist,
shortcuts.generalAssist,
runGeneralAssistShortcut,
'General Assist'
);
}
export async function reregisterScreenshotAssist(): Promise<void> {
const shortcuts = await getShortcuts();
registeredScreenshotAssist = registerOne(
registeredScreenshotAssist,
shortcuts.screenshotAssist,
runScreenshotAssistShortcut,
'Screenshot Assist'
);
} }
export function destroyTray(): void { export function destroyTray(): void {
if (currentShortcut) { if (registeredGeneralAssist) {
globalShortcut.unregister(currentShortcut); globalShortcut.unregister(registeredGeneralAssist);
currentShortcut = null; registeredGeneralAssist = null;
}
if (registeredScreenshotAssist) {
globalShortcut.unregister(registeredScreenshotAssist);
registeredScreenshotAssist = null;
} }
tray?.destroy(); tray?.destroy();
tray = null; tray = null;