Remove dbus by using zbus variant

jpochyla · Feb 19, 2024 · 544cdaa · 544cdaa
1 parent a039bb2
commit 544cdaa
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/psst-gui/Cargo.toml b/psst-gui/Cargo.toml
@@ -36,13 +36,23 @@ ureq = { version = "2.8.0", features = ["json", "socks-proxy"] }
 url = { version = "2.4.1" }
 
 # GUI
-druid = { git = "https://github.com/jpochyla/druid", branch = "psst", features = ["im", "image", "jpeg", "png", "serde"] }
+druid = { git = "https://github.com/jpochyla/druid", branch = "psst", features = [
+  "im",
+  "image",
+  "jpeg",
+  "png",
+  "serde",
+] }
 druid-enums = { git = "https://github.com/jpochyla/druid-enums" }
-druid-shell = { git = "https://github.com/jpochyla/druid", branch = "psst", features = ["raw-win-handle"] }
+druid-shell = { git = "https://github.com/jpochyla/druid", branch = "psst", features = [
+  "raw-win-handle",
+] }
 open = { version = "5.0.0" }
 raw-window-handle = { version = "0.5.2" } # Must stay compatible with Druid
-souvlaki = { version = "0.6.1" }
-webbrowser = {version = "0.8.11"}
+souvlaki = { version = "0.7.3", default-features = false, features = [
+  "use_zbus",
+] }
+webbrowser = { version = "0.8.11" }
 dark-light = "1.0.0"
 [target.'cfg(windows)'.build-dependencies]
 winres = { version = "0.1.12" }
@@ -52,11 +62,11 @@ image = { version = "0.24.7" }
 name = "Psst"
 identifier = "com.jpochyla.psst"
 icon = [
-    "assets/logo_32.png",
-    "assets/logo_64.png",
-    "assets/logo_128.png",
-    "assets/logo_256.png",
-    "assets/logo_512.png",
+  "assets/logo_32.png",
+  "assets/logo_64.png",
+  "assets/logo_128.png",
+  "assets/logo_256.png",
+  "assets/logo_512.png",
 ]
 version = "0.1.0"
 resources = []

diff --git a/psst-gui/src/cmd.rs b/psst-gui/src/cmd.rs
@@ -60,11 +60,13 @@ pub const PLAY_QUEUE_BEHAVIOR: Selector<QueueBehavior> = Selector::new("app.play
 pub const PLAY_SEEK: Selector<f64> = Selector::new("app.play-seek");
 
 // Sorting control
+
 pub const SORT_BY_DATE_ADDED: Selector = Selector::new("app.sort-by-date-added");
 pub const SORT_BY_TITLE: Selector = Selector::new("app.sort-by-title");
 pub const SORT_BY_ARTIST: Selector = Selector::new("app.sort-by-artist");
 pub const SORT_BY_ALBUM: Selector = Selector::new("app.sort-by-album");
 pub const SORT_BY_DURATION: Selector = Selector::new("app.sort-by-duration");
 
-//Sort direction control
+// Sort direction control
+
 pub const TOGGLE_SORT_ORDER: Selector = Selector::new("app.toggle-sort-order");
diff --git a/psst-gui/src/ui/preferences.rs b/psst-gui/src/ui/preferences.rs
@@ -157,8 +157,12 @@ fn general_tab_widget() -> impl Widget<AppState> {
         .with_child(Label::new("Theme").with_font(theme::UI_FONT_MEDIUM))
         .with_spacer(theme::grid(2.0))
         .with_child(
-            RadioGroup::column(vec![("Light", Theme::Light), ("Dark", Theme::Dark), ("System", Theme::System)])
-                .lens(AppState::config.then(Config::theme)),
+            RadioGroup::column(vec![
+                ("Light", Theme::Light),
+                ("Dark", Theme::Dark),
+                ("System", Theme::System),
+            ])
+            .lens(AppState::config.then(Config::theme)),
         );
 
     col = col.with_spacer(theme::grid(1.5));