From d7f369bf557b1a910f49d14ee21b6cc71f78dd8c Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 5 Mar 2026 15:04:08 +1300 Subject: [PATCH 1/3] New version. --- package.json | 2 +- src/renderer/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e7e4f346..1e45549f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "url": "git+https://github.com/opencor/webapp.git" }, "type": "module", - "version": "0.20260305.0", + "version": "0.20260305.1", "engines": { "bun": ">=1.2.0" }, diff --git a/src/renderer/package.json b/src/renderer/package.json index eb33204c..75458e67 100644 --- a/src/renderer/package.json +++ b/src/renderer/package.json @@ -42,7 +42,7 @@ }, "./style.css": "./dist/opencor.css" }, - "version": "0.20260305.0", + "version": "0.20260305.1", "scripts": { "build": "vite build && bun scripts/generate.version.js", "build:lib": "vite build --config vite.lib.config.ts && bun scripts/copy.indexdts.js", From 8ac0b58a6b8d52dc02c89bc2e2d580ec1764f227 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 5 Mar 2026 15:04:55 +1300 Subject: [PATCH 2/3] Updated our dependencies. --- bun.lock | 2 +- src/renderer/bun.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bun.lock b/bun.lock index 587b11fb..356059bf 100644 --- a/bun.lock +++ b/bun.lock @@ -937,7 +937,7 @@ "mkdirp": ["mkdirp@0.5.6", "", { "dependencies": { "minimist": "^1.2.6" }, "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="], - "mlly": ["mlly@1.8.0", "", { "dependencies": { "acorn": "^8.15.0", "pathe": "^2.0.3", "pkg-types": "^1.3.1", "ufo": "^1.6.1" } }, "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g=="], + "mlly": ["mlly@1.8.1", "", { "dependencies": { "acorn": "^8.16.0", "pathe": "^2.0.3", "pkg-types": "^1.3.1", "ufo": "^1.6.3" } }, "sha512-SnL6sNutTwRWWR/vcmCYHSADjiEesp5TGQQ0pXyLhW5IoeibRlF/CbSLailbB3CNqJUk9cVJ9dUDnbD7GrcHBQ=="], "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], diff --git a/src/renderer/bun.lock b/src/renderer/bun.lock index c9fde4fb..f563e3f4 100644 --- a/src/renderer/bun.lock +++ b/src/renderer/bun.lock @@ -517,7 +517,7 @@ "micromatch": ["micromatch@4.0.8", "", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="], - "mlly": ["mlly@1.8.0", "", { "dependencies": { "acorn": "^8.15.0", "pathe": "^2.0.3", "pkg-types": "^1.3.1", "ufo": "^1.6.1" } }, "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g=="], + "mlly": ["mlly@1.8.1", "", { "dependencies": { "acorn": "^8.16.0", "pathe": "^2.0.3", "pkg-types": "^1.3.1", "ufo": "^1.6.3" } }, "sha512-SnL6sNutTwRWWR/vcmCYHSADjiEesp5TGQQ0pXyLhW5IoeibRlF/CbSLailbB3CNqJUk9cVJ9dUDnbD7GrcHBQ=="], "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], From ea0b54a3b0e76ae0c8c8fdc6e7dcbc03aaf50605 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 5 Mar 2026 14:54:33 +1300 Subject: [PATCH 3/3] Main menu: some minor cleaning up. --- src/renderer/src/components/MainMenu.vue | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/renderer/src/components/MainMenu.vue b/src/renderer/src/components/MainMenu.vue index 8640a76f..50ab2d4a 100644 --- a/src/renderer/src/components/MainMenu.vue +++ b/src/renderer/src/components/MainMenu.vue @@ -62,7 +62,7 @@ const isWindowsOrLinux = common.isWindows() || common.isLinux(); const isMacOs = common.isMacOs(); const updateAvailable = version.updateAvailable; -const items = [ +const items = vue.computed(() => [ { label: 'File', items: [ @@ -117,7 +117,7 @@ const items = [ label: 'Settings...', shortcut: isWindowsOrLinux ? 'Ctrl+Alt+,' : isMacOs ? '⌘⌥,' : undefined, command: () => { - emit('settings') + emit('settings'); } } ] @@ -148,7 +148,7 @@ const items = [ } ] } -]; +]); // A few things that can only be done when the component is mounted. @@ -201,22 +201,30 @@ if (common.isDesktop()) { return; } - if (common.isCtrlOrCmd(event) && !event.shiftKey && event.code === 'KeyO') { + if (common.isCtrlOrCmd(event) && !event.shiftKey && event.altKey && event.code === 'KeyO') { event.preventDefault(); emit('open'); - } else if (common.isCtrlOrCmd(event) && event.shiftKey && event.code === 'KeyO') { + } else if (common.isCtrlOrCmd(event) && event.shiftKey && event.altKey && event.code === 'KeyO') { event.preventDefault(); emit('openRemote'); - } else if (props.hasFiles && common.isCtrlOrCmd(event) && !event.shiftKey && event.code === 'KeyW') { + } else if ( + props.hasFiles && + common.isCtrlOrCmd(event) && + !event.shiftKey && + event.altKey && + event.code === 'KeyW' + ) { event.preventDefault(); emit('close'); - } else if (common.isCtrlOrCmd(event) && !event.shiftKey && event.code === 'Comma') { + /* TODO: enable the settings menu once we have settings for OpenCOR's Web app. + } else if (common.isCtrlOrCmd(event) && !event.shiftKey && event.altKey && event.code === 'Comma') { event.preventDefault(); emit('settings'); + */ } }); }