From ae05d819eb7f8538c05822bdaaf5700a2b7e51fc Mon Sep 17 00:00:00 2001 From: Krishan <33421343+kfiven@users.noreply.github.com> Date: Tue, 20 Jan 2026 11:41:19 +0000 Subject: [PATCH] update action and disable menu --- .github/workflows/tauri.yml | 14 +++---- src-tauri/src/lib.rs | 38 +++--------------- src-tauri/src/menu.rs | 79 ++++++++++++++++++++----------------- 3 files changed, 55 insertions(+), 76 deletions(-) diff --git a/.github/workflows/tauri.yml b/.github/workflows/tauri.yml index 1099557..453bb3a 100644 --- a/.github/workflows/tauri.yml +++ b/.github/workflows/tauri.yml @@ -27,8 +27,8 @@ jobs: uses: tauri-apps/tauri-action@v0.5.14 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} + TAURI_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }} NODE_OPTIONS: "--max_old_space_size=4096" with: releaseId: ${{ github.event.release.upload_url }} @@ -75,7 +75,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf + sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf - name: Install cinny dependencies run: cd cinny && npm ci - name: Install tauri dependencies @@ -84,8 +84,8 @@ jobs: uses: tauri-apps/tauri-action@v0.5.14 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} + TAURI_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }} NODE_OPTIONS: "--max_old_space_size=4096" with: releaseId: ${{ github.event.release.upload_url }} @@ -134,8 +134,8 @@ jobs: uses: tauri-apps/tauri-action@v0.5.14 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} + TAURI_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }} NODE_OPTIONS: "--max_old_space_size=4096" with: releaseId: ${{ github.event.release.upload_url }} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 5bd1bba..7162e5b 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -3,44 +3,19 @@ windows_subsystem = "windows" )] -// #[cfg(target_os = "macos")] // mod menu; -// use tauri::{webview::WebviewWindowBuilder, WebviewUrl}; - -// fn main() { -// let port: u16 = 44548; - -// let mut context = tauri::generate_context!(); -// let url = format!("http://localhost:{}", port).parse().unwrap(); -// let window_url = WebviewUrl::External(url); -// // context.config_mut().build.frontend_dist = WebviewWindowBuilder::Url(window_url.clone()); -// // context.config_mut().build.dev_url = WebviewWindowBuilder::Url(window_url.clone()); - -// context.config_mut().build.frontend_dist = WebviewWindowBuilder::new(app, "Cinny", window_url.clone()); -// context.config_mut().build.dev_url = WebviewWindowBuilder::new(app, "Cinny", window_url.clone()); -// let builder = tauri::Builder::default(); - -// #[cfg(target_os = "macos")] -// let builder = builder.menu(menu::menu()); - -// builder -// .plugin(tauri_plugin_localhost::Builder::new(port).build()) -// .plugin(tauri_plugin_window_state::Builder::default().build()) -// .run(context) -// .expect("error while building tauri application") -// } - use tauri::{webview::WebviewWindowBuilder, WebviewUrl}; pub fn run() { let port: u16 = 44548; let context = tauri::generate_context!(); - let builder = tauri::Builder::default(); - #[cfg(target_os = "macos")] - let builder = builder.menu(menu::menu()); + // #[cfg(target_os = "macos")] + // { + // builder = builder.menu(menu::menu()); + // } builder .plugin(tauri_plugin_localhost::Builder::new(port).build()) @@ -48,14 +23,11 @@ pub fn run() { .setup(move |app| { let url = format!("http://localhost:{}", port).parse().unwrap(); let window_url = WebviewUrl::External(url); - WebviewWindowBuilder::new(app, "main".to_string(), window_url) .title("Cinny") .build()?; - Ok(()) }) .run(context) - .expect("error while running tauri application"); + .expect("error while building tauri application"); } - diff --git a/src-tauri/src/menu.rs b/src-tauri/src/menu.rs index eb4bce6..010a2cf 100644 --- a/src-tauri/src/menu.rs +++ b/src-tauri/src/menu.rs @@ -1,37 +1,44 @@ -use tauri::{AboutMetadata, Menu, MenuItem, Submenu}; -//for macOS -pub(crate) fn menu() -> Menu { - Menu::new() - .add_submenu(Submenu::new( - "Cinny", - Menu::new() - .add_native_item(MenuItem::About("Cinny".to_string(), AboutMetadata::new())) - .add_native_item(MenuItem::Separator) - .add_native_item(MenuItem::Hide) - .add_native_item(MenuItem::HideOthers) - .add_native_item(MenuItem::ShowAll) - .add_native_item(MenuItem::Separator) - .add_native_item(MenuItem::Quit), - )) - .add_submenu(Submenu::new( - "Edit", - Menu::new() - .add_native_item(MenuItem::Undo) - .add_native_item(MenuItem::Redo) - .add_native_item(MenuItem::Separator) - .add_native_item(MenuItem::Cut) - .add_native_item(MenuItem::Copy) - .add_native_item(MenuItem::Paste) - .add_native_item(MenuItem::SelectAll), - )) - .add_submenu(Submenu::new( - "View", - Menu::new().add_native_item(MenuItem::EnterFullScreen), - )) - .add_submenu(Submenu::new( - "Window", - Menu::new() - .add_native_item(MenuItem::Minimize) - .add_native_item(MenuItem::Zoom), - )) +use tauri::menu::{MenuBuilder, SubmenuBuilder}; +use tauri::AppHandle; + +pub fn menu() -> tauri::menu::Menu { + let app_menu = SubmenuBuilder::new(app, "Cinny") + .about(Some(Default::default())) + .separator() + .hide() + .hide_others() + .show_all() + .separator() + .quit() + .build() + .unwrap(); + + let edit_menu = SubmenuBuilder::new(app, "Edit") + .undo() + .redo() + .separator() + .cut() + .copy() + .paste() + .select_all() + .build() + .unwrap(); + + let view_menu = SubmenuBuilder::new(app, "View") + .fullscreen() // `.fullscreen()` works instead of `.enter_fullscreen()` + .build() + .unwrap(); + + let window_menu = SubmenuBuilder::new(app, "Window") + .minimize() + .build() // no `.zoom()` method directly available + .unwrap(); + + MenuBuilder::new(app) + .item(&app_menu) + .item(&edit_menu) + .item(&view_menu) + .item(&window_menu) + .build() + .unwrap() }