Accept selected changes from PR #175

app/.gitaattributes

@@ -0,0 +1 @@
+app/Cargo.lock merge=ours

app/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ab_glyph"
@@ -118,6 +118,7 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
+<<<<<<< HEAD
 version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
@@ -127,6 +128,11 @@ name = "arbitrary"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+=======
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+>>>>>>> sawixy/master
 
 [[package]]
 name = "arc-swap"
@@ -681,15 +687,18 @@ dependencies = [
 
 [[package]]
 name = "cocoa-foundation"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
 dependencies = [
  "bitflags 1.3.2",
  "block",
  "core-foundation",
  "core-graphics-types",
+<<<<<<< HEAD
  "foreign-types 0.3.2",
+=======
+>>>>>>> sawixy/master
  "libc",
  "objc",
 ]
@@ -1124,7 +1133,11 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
+<<<<<<< HEAD
  "syn 2.0.53",
+=======
+ "syn 2.0.106",
+>>>>>>> sawixy/master
 ]
 
 [[package]]
@@ -1601,6 +1614,7 @@ name = "jarvis-app"
 version = "0.0.3"
 dependencies = [
  "atomic_enum",
+ "gtk",
  "hound",
  "image",
  "kira",
@@ -2456,7 +2470,11 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
+<<<<<<< HEAD
  "syn 2.0.53",
+=======
+ "syn 2.0.106",
+>>>>>>> sawixy/master
 ]
 
 [[package]]
@@ -2586,9 +2604,15 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
+<<<<<<< HEAD
 version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+=======
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+>>>>>>> sawixy/master
 dependencies = [
  "unicode-ident",
 ]
@@ -2648,6 +2672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
+<<<<<<< HEAD
 name = "quick-error"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2667,6 +2692,12 @@ name = "quote"
 version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+=======
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+>>>>>>> sawixy/master
 dependencies = [
  "proc-macro2",
 ]
@@ -3117,7 +3148,11 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
+<<<<<<< HEAD
  "syn 2.0.53",
+=======
+ "syn 2.0.106",
+>>>>>>> sawixy/master
 ]
 
 [[package]]
@@ -3404,9 +3439,15 @@ dependencies = [
 
 [[package]]
 name = "syn"
+<<<<<<< HEAD
 version = "2.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+=======
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+>>>>>>> sawixy/master
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3449,7 +3490,11 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
+<<<<<<< HEAD
  "syn 2.0.53",
+=======
+ "syn 2.0.106",
+>>>>>>> sawixy/master
 ]
 
 [[package]]
@@ -3598,9 +3643,15 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
+<<<<<<< HEAD
 version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "454035ff34b8430638c894e6197748578d6b4d449c6edaf8ea854d94e2dd862b"
+=======
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55fbbc14ea5f192218597f3cc252c4ea787c8493bae4115fd42ccbaab5704131"
+>>>>>>> sawixy/master
 dependencies = [
  "cocoa",
  "core-graphics",
@@ -3722,7 +3773,11 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
+<<<<<<< HEAD
  "syn 2.0.53",
+=======
+ "syn 2.0.106",
+>>>>>>> sawixy/master
  "wasm-bindgen-shared",
 ]
 
@@ -3756,7 +3811,11 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
+<<<<<<< HEAD
  "syn 2.0.53",
+=======
+ "syn 2.0.106",
+>>>>>>> sawixy/master
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

app/src/tray.rs

@@ -6,6 +6,12 @@ use tray_icon::{
     TrayIconBuilder, TrayIconEvent,
 };
 use winit::event_loop::{ControlFlow, EventLoopBuilder};
+<<<<<<< HEAD
+=======
+use image;
+
+#[cfg(target_os="windows")]
+>>>>>>> sawixy/master
 use winit::platform::windows::EventLoopBuilderExtWindows;
 
 use crate::config;
@@ -42,8 +48,9 @@ pub fn init() {
         #[cfg(target_os = "linux")]
         {
             use tray_icon::menu::Menu;
-
+            
             gtk::init().unwrap();
+
             let _tray_icon = TrayIconBuilder::new()
                 .with_menu(Box::new(tray_menu))
                 .with_tooltip(config::TRAY_TOOLTIP)
@@ -56,7 +63,7 @@ pub fn init() {
 
         // run the event loop
         let event_loop = EventLoopBuilder::new()
-            .with_any_thread(true)
+            // .with_any_thread(true)
             .build()
             .unwrap();