From 60a17376fbadddc033d313379ebd507ba7141652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20de=20la=20Martini=C3=A8re?= Date: Tue, 23 Apr 2024 02:11:20 +0200 Subject: [PATCH] Update window + help menus, enable zoom shortcuts --- src-tauri/capabilities/main.json | 1 + src-tauri/src/plugins/app_menu.rs | 20 +++++++++++++++----- src-tauri/tauri.conf.json | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src-tauri/capabilities/main.json b/src-tauri/capabilities/main.json index 6e6a1d86..dcee767f 100644 --- a/src-tauri/capabilities/main.json +++ b/src-tauri/capabilities/main.json @@ -19,6 +19,7 @@ "app:allow-tauri-version", "log:allow-log", "webview:deny-print", + "webview:allow-set-webview-zoom", "menu:allow-new", "menu:allow-popup", "notification:default", diff --git a/src-tauri/src/plugins/app_menu.rs b/src-tauri/src/plugins/app_menu.rs index 8f6f92ae..f281d74b 100644 --- a/src-tauri/src/plugins/app_menu.rs +++ b/src-tauri/src/plugins/app_menu.rs @@ -5,6 +5,7 @@ use tauri::{ plugin::{Builder, TauriPlugin}, Manager, Runtime, }; +use tauri_plugin_shell::ShellExt; use crate::libs::error::AnyResult; use crate::libs::events::IPCEvent; @@ -92,7 +93,6 @@ pub fn init() -> TauriPlugin { // ----------------------------------------------------------------- // View sub-menu // ----------------------------------------------------------------- - // TODO: create events listeners and shortcuts let view_menu = SubmenuBuilder::new(app_handle, "View") .item( &MenuItemBuilder::new("Jump to playing track") @@ -123,6 +123,7 @@ pub fn init() -> TauriPlugin { .build(app_handle) .unwrap(), ) + .separator() .build() .unwrap(); @@ -131,8 +132,9 @@ pub fn init() -> TauriPlugin { // ----------------------------------------------------------------- let window_menu: tauri::menu::Submenu = SubmenuBuilder::new(app_handle, "Window") .item( - &MenuItemBuilder::new("-") - .enabled(false) + &MenuItemBuilder::new("Minimize") + .id("minimize") + .accelerator("CmdOrCtrl+M") .build(app_handle) .unwrap(), ) @@ -144,8 +146,8 @@ pub fn init() -> TauriPlugin { // ----------------------------------------------------------------- let help_menu = SubmenuBuilder::new(app_handle, "Help") .item( - &MenuItemBuilder::new("-") - .enabled(false) + &MenuItemBuilder::new("Report an issue") + .id("report_an_issue") .build(app_handle) .unwrap(), ) @@ -194,6 +196,14 @@ pub fn init() -> TauriPlugin { "go_to_settings" => { win.emit(IPCEvent::GoToSettings.as_ref(), ()).unwrap(); } + "minimize" => { + win.minimize().unwrap(); + } + "report_an_issue" => { + win.shell() + .open("https://github.com/martpie/museeks", None) + .unwrap(); + } _ => {} }); }) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 2ec57f7b..01a42f0f 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -22,7 +22,8 @@ "minWidth": 900, "fullscreen": false, "resizable": true, - "dragDropEnabled": false + "dragDropEnabled": false, + "zoomHotkeysEnabled": true } ], "security": {