MCorange/cinny-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update action and disable menu

Browse Source
This commit is contained in:
Krishan
2026-01-20 11:41:19 +00:00
parent 943e569193
commit ae05d819eb
3 changed files with 55 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/tauri.yml vendored
View File

@@ -27,8 +27,8 @@ jobs:
uses: tauri-apps/tauri-action@v0.5.14 uses: tauri-apps/tauri-action@v0.5.14
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
NODE_OPTIONS: "--max_old_space_size=4096" NODE_OPTIONS: "--max_old_space_size=4096"
with: with:
releaseId: ${{ github.event.release.upload_url }} releaseId: ${{ github.event.release.upload_url }}
@@ -75,7 +75,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update 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 - name: Install cinny dependencies
run: cd cinny && npm ci run: cd cinny && npm ci
- name: Install tauri dependencies - name: Install tauri dependencies
@@ -84,8 +84,8 @@ jobs:
uses: tauri-apps/tauri-action@v0.5.14 uses: tauri-apps/tauri-action@v0.5.14
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
NODE_OPTIONS: "--max_old_space_size=4096" NODE_OPTIONS: "--max_old_space_size=4096"
with: with:
releaseId: ${{ github.event.release.upload_url }} releaseId: ${{ github.event.release.upload_url }}
@@ -134,8 +134,8 @@ jobs:
uses: tauri-apps/tauri-action@v0.5.14 uses: tauri-apps/tauri-action@v0.5.14
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
NODE_OPTIONS: "--max_old_space_size=4096" NODE_OPTIONS: "--max_old_space_size=4096"
with: with:
releaseId: ${{ github.event.release.upload_url }} releaseId: ${{ github.event.release.upload_url }}

38
src-tauri/src/lib.rs
View File

@@ -3,44 +3,19 @@
windows_subsystem = "windows" windows_subsystem = "windows"
)] )]
// #[cfg(target_os = "macos")]
// mod menu; // 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}; use tauri::{webview::WebviewWindowBuilder, WebviewUrl};
pub fn run() { pub fn run() {
let port: u16 = 44548; let port: u16 = 44548;
let context = tauri::generate_context!(); let context = tauri::generate_context!();
let builder = tauri::Builder::default(); let builder = tauri::Builder::default();
#[cfg(target_os = "macos")] // #[cfg(target_os = "macos")]
let builder = builder.menu(menu::menu()); // {
// builder = builder.menu(menu::menu());
// }
builder builder
.plugin(tauri_plugin_localhost::Builder::new(port).build()) .plugin(tauri_plugin_localhost::Builder::new(port).build())
@@ -48,14 +23,11 @@ pub fn run() {
.setup(move |app| { .setup(move |app| {
let url = format!("http://localhost:{}", port).parse().unwrap(); let url = format!("http://localhost:{}", port).parse().unwrap();
let window_url = WebviewUrl::External(url); let window_url = WebviewUrl::External(url);
WebviewWindowBuilder::new(app, "main".to_string(), window_url) WebviewWindowBuilder::new(app, "main".to_string(), window_url)
.title("Cinny") .title("Cinny")
.build()?; .build()?;
Ok(()) Ok(())
}) })
.run(context) .run(context)
.expect("error while running tauri application"); .expect("error while building tauri application");
} }

79
src-tauri/src/menu.rs
View File

@@ -1,37 +1,44 @@
use tauri::{AboutMetadata, Menu, MenuItem, Submenu}; use tauri::menu::{MenuBuilder, SubmenuBuilder};
//for macOS use tauri::AppHandle;
pub(crate) fn menu() -> Menu {
Menu::new() pub fn menu() -> tauri::menu::Menu {
.add_submenu(Submenu::new( let app_menu = SubmenuBuilder::new(app, "Cinny")
"Cinny", .about(Some(Default::default()))
Menu::new() .separator()
.add_native_item(MenuItem::About("Cinny".to_string(), AboutMetadata::new())) .hide()
.add_native_item(MenuItem::Separator) .hide_others()
.add_native_item(MenuItem::Hide) .show_all()
.add_native_item(MenuItem::HideOthers) .separator()
.add_native_item(MenuItem::ShowAll) .quit()
.add_native_item(MenuItem::Separator) .build()
.add_native_item(MenuItem::Quit), .unwrap();
))
.add_submenu(Submenu::new( let edit_menu = SubmenuBuilder::new(app, "Edit")
"Edit", .undo()
Menu::new() .redo()
.add_native_item(MenuItem::Undo) .separator()
.add_native_item(MenuItem::Redo) .cut()
.add_native_item(MenuItem::Separator) .copy()
.add_native_item(MenuItem::Cut) .paste()
.add_native_item(MenuItem::Copy) .select_all()
.add_native_item(MenuItem::Paste) .build()
.add_native_item(MenuItem::SelectAll), .unwrap();
))
.add_submenu(Submenu::new( let view_menu = SubmenuBuilder::new(app, "View")
"View", .fullscreen() // `.fullscreen()` works instead of `.enter_fullscreen()`
Menu::new().add_native_item(MenuItem::EnterFullScreen), .build()
)) .unwrap();
.add_submenu(Submenu::new(
"Window", let window_menu = SubmenuBuilder::new(app, "Window")
Menu::new() .minimize()
.add_native_item(MenuItem::Minimize) .build() // no `.zoom()` method directly available
.add_native_item(MenuItem::Zoom), .unwrap();
))
MenuBuilder::new(app)
.item(&app_menu)
.item(&edit_menu)
.item(&view_menu)
.item(&window_menu)
.build()
.unwrap()
} }