From f1504d99acbccc61ee6e7967a7a9ceda2d3dc743 Mon Sep 17 00:00:00 2001 From: reya Date: Wed, 13 Mar 2024 09:19:25 +0700 Subject: [PATCH] feat: add mock tray menu --- src-tauri/src/nostr/keys.rs | 4 ++++ src-tauri/src/tray.rs | 36 +++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src-tauri/src/nostr/keys.rs b/src-tauri/src/nostr/keys.rs index 7bf6e960..62336941 100644 --- a/src-tauri/src/nostr/keys.rs +++ b/src-tauri/src/nostr/keys.rs @@ -132,6 +132,7 @@ pub async fn load_selected_account(npub: &str, state: State<'_, Nostr>) -> Resul if let Some(event) = events.first() { let list = nip65::extract_relay_list(&event); for item in list.into_iter() { + println!("connecting to relay: {}", item.0.to_string()); client .connect_relay(item.0.to_string()) .await @@ -140,6 +141,9 @@ pub async fn load_selected_account(npub: &str, state: State<'_, Nostr>) -> Resul } } + // #TODO + // Subscribe new event for activity and local newsfeed + Ok(true) } else { Err("nsec not found".into()) diff --git a/src-tauri/src/tray.rs b/src-tauri/src/tray.rs index 9dbca7c7..3209c30b 100644 --- a/src-tauri/src/tray.rs +++ b/src-tauri/src/tray.rs @@ -1,8 +1,32 @@ -use tauri::{tray::ClickType, Manager, Runtime}; +use tauri::{Manager, Runtime}; pub fn create_tray(app: &tauri::AppHandle) -> tauri::Result<()> { + let version = app.package_info().version.to_string(); let tray = app.tray().unwrap(); let menu = tauri::menu::MenuBuilder::new(app) + .item( + &tauri::menu::MenuItem::with_id(app, "open_lume", "Open Lume", true, None::<&str>).unwrap(), + ) + .item(&tauri::menu::MenuItem::with_id(app, "editor", "New Post", true, None::<&str>).unwrap()) + .separator() + .item( + &tauri::menu::MenuItem::with_id( + app, + "version", + format!("Version {}", version), + false, + None::<&str>, + ) + .unwrap(), + ) + .item(&tauri::menu::MenuItem::with_id(app, "about", "About Lume", true, None::<&str>).unwrap()) + .item( + &tauri::menu::MenuItem::with_id(app, "update", "Check for Updates", true, None::<&str>) + .unwrap(), + ) + .item( + &tauri::menu::MenuItem::with_id(app, "settings", "Settings...", true, None::<&str>).unwrap(), + ) .item(&tauri::menu::MenuItem::with_id(app, "quit", "Quit", true, None::<&str>).unwrap()) .build() .unwrap(); @@ -16,15 +40,5 @@ pub fn create_tray(app: &tauri::AppHandle) -> tauri::Result<()> { _ => {} }); - tray.on_tray_icon_event(|tray, event| { - if event.click_type == ClickType::Left { - let app = tray.app_handle(); - if let Some(window) = app.get_webview_window("main") { - let _ = window.show(); - let _ = window.set_focus(); - } - } - }); - Ok(()) }