Merge pull request #55 from KilleenCode/add-version-to-menu

feat: show version in system tray menu
KilleenCode · Mar 21, 2022 · 3addb00 · 3addb00
2 parents f481cc8 + 42ed014
commit 3addb00
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "brancato",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "private": true,
   "dependencies": {
     "@algolia/autocomplete-js": "^1.5.3",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "brancato"
-version = "0.5.0"
+version = "0.6.0"
 description = "A tool for stage-managing your life"
 authors = ["Ryan Killeen"]
 license = ""

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -157,29 +157,14 @@ fn main() {
   let app_config = app_config::get_or_create_app_config();
   let user_config = user_config::get_user_config(app_config.user_config_path.clone());
 
-  let quit = CustomMenuItem::new("quit", "Quit");
-  let hide = CustomMenuItem::new("hide", "Hide");
-  let settings = CustomMenuItem::new("settings", "Settings");
-  let tray_menu = SystemTrayMenu::new()
-    .add_item(quit)
-    .add_native_item(SystemTrayMenuItem::Separator)
-    .add_item(settings)
-    .add_native_item(SystemTrayMenuItem::Separator)
-    .add_item(hide);
-  let system_tray = SystemTray::new().with_menu(tray_menu);
   let app = tauri::Builder::default()
-    .system_tray(system_tray)
+    .system_tray(SystemTray::new())
     .on_system_tray_event(|app, event| match event {
       SystemTrayEvent::LeftClick {
         position: _,
         size: _,
         ..
       } => {
-        // tauri::window::WindowBuilder::new(
-        //   app,
-        //   "settings",
-        //   tauri::WindowUrl::App("/settings".into()),
-        // );
         focus_window(app, "settings".to_owned()).ok();
       }
 
@@ -219,6 +204,28 @@ fn main() {
       set_shortcut,
       set_user_config_path
     ])
+    .setup(|app_handle| {
+      let tray_menu = SystemTrayMenu::new()
+        .add_item(CustomMenuItem::new("quit", "Quit"))
+        .add_item(CustomMenuItem::new("settings", "Settings"))
+        .add_item(CustomMenuItem::new("hide", "Hide"))
+        .add_native_item(SystemTrayMenuItem::Separator)
+        .add_item(
+          CustomMenuItem::new(
+            "version",
+            format!(
+              "Version {version}",
+              version = &app_handle.package_info().version
+            ),
+          )
+          .disabled(),
+        );
+      app_handle
+        .tray_handle()
+        .set_menu(tray_menu)
+        .expect("Set the tray damn it");
+      Ok(())
+    })
     .build(tauri::generate_context!())
     .expect("error while running tauri application");
 

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "brancato",
-    "version": "0.5.0"
+    "version": "0.6.0"
   },
   "build": {
     "distDir": "../build",