diff --git a/Cargo.lock b/Cargo.lock index ed85b549..b320e7c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -325,11 +325,13 @@ dependencies = [ "gtk4", "libcosmic-widgets", "libpulse-binding", + "mpris2-zbus", "once_cell", "pulsectl-rs", "relm4-macros 0.4.4", "tokio", "tracker", + "zbus", ] [[package]] @@ -443,7 +445,7 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#d53d6a4d24347dd50068ac174861b1ee37395b10" +source = "git+https://github.com/pop-os/cosmic-panel#8787823d807ea9a9d7b96ecacf017d695ba7b58a" dependencies = [ "anyhow", "gtk4", @@ -1650,6 +1652,18 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "mpris2-zbus" +version = "0.1.0" +source = "git+https://github.com/pop-os/mpris2-zbus#bcc8481ea7ccfc08aa870f28272d9093db3b1ba9" +dependencies = [ + "serde", + "thiserror", + "time 0.3.9", + "zbus", + "zvariant", +] + [[package]] name = "nanorand" version = "0.7.0" diff --git a/applets/cosmic-app-list/src/dock_item/mod.rs b/applets/cosmic-app-list/src/dock_item/mod.rs index 768ec365..1a129a9f 100644 --- a/applets/cosmic-app-list/src/dock_item/mod.rs +++ b/applets/cosmic-app-list/src/dock_item/mod.rs @@ -5,7 +5,7 @@ use crate::dock_popover::DockPopover; use crate::utils::BoxedWindowList; use crate::utils::Event; use cascade::cascade; -use cosmic_panel_config::config::Anchor; +use cosmic_panel_config::config::{Anchor, XdgWrapperConfig}; use gtk4::glib; use gtk4::prelude::*; use gtk4::subclass::prelude::*; @@ -165,6 +165,7 @@ impl DockItem { dots.set_margin_end(4); item_box.reorder_child_after(&dots.clone(), Some(&image.clone())); } + Anchor::Center => unimplemented!(), }; } let popover = imp.popover.borrow(); @@ -173,6 +174,7 @@ impl DockItem { Anchor::Right => PositionType::Left, Anchor::Top => PositionType::Bottom, Anchor::Bottom => PositionType::Top, + Anchor::Center => unimplemented!(), }); } diff --git a/applets/cosmic-app-list/src/dock_list/mod.rs b/applets/cosmic-app-list/src/dock_list/mod.rs index a6d86a52..5cc9f1bc 100644 --- a/applets/cosmic-app-list/src/dock_list/mod.rs +++ b/applets/cosmic-app-list/src/dock_list/mod.rs @@ -5,7 +5,7 @@ use crate::dock_object::DockObject; use crate::utils::data_path; use crate::utils::{BoxedWindowList, Event, Item}; use cascade::cascade; -use cosmic_panel_config::config::{Anchor, CosmicPanelConfig}; +use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig, Anchor}; use gio::DesktopAppInfo; use gio::Icon; use glib::Object; diff --git a/applets/cosmic-applet-graphics/src/main.rs b/applets/cosmic-applet-graphics/src/main.rs index 30059487..6200700b 100644 --- a/applets/cosmic-applet-graphics/src/main.rs +++ b/applets/cosmic-applet-graphics/src/main.rs @@ -20,7 +20,7 @@ use gtk4::{ }; use once_cell::sync::Lazy; use tokio::runtime::Runtime; -use cosmic_panel_config::config::CosmicPanelConfig; +use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig}; static RT: Lazy = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime")); diff --git a/applets/cosmic-applet-network/src/main.rs b/applets/cosmic-applet-network/src/main.rs index 06543433..2d0a5319 100644 --- a/applets/cosmic-applet-network/src/main.rs +++ b/applets/cosmic-applet-network/src/main.rs @@ -10,7 +10,7 @@ pub mod widgets; use gtk4::{glib, gio::ApplicationFlags, prelude::*, Orientation, Separator}; use once_cell::sync::Lazy; use tokio::runtime::Runtime; -use cosmic_panel_config::config::CosmicPanelConfig; +use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig}; static RT: Lazy = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime")); diff --git a/applets/cosmic-applet-power/src/main.rs b/applets/cosmic-applet-power/src/main.rs index 9bc4337b..2a405e3e 100644 --- a/applets/cosmic-applet-power/src/main.rs +++ b/applets/cosmic-applet-power/src/main.rs @@ -9,7 +9,7 @@ pub mod ui; use gtk4::{glib, gio::ApplicationFlags, prelude::*, Orientation, Separator}; use once_cell::sync::Lazy; use tokio::runtime::Runtime; -use cosmic_panel_config::config::CosmicPanelConfig; +use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig}; static RT: Lazy = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime")); diff --git a/applets/cosmic-applet-workspaces/src/workspace_list/mod.rs b/applets/cosmic-applet-workspaces/src/workspace_list/mod.rs index e7c031ef..e018c561 100644 --- a/applets/cosmic-applet-workspaces/src/workspace_list/mod.rs +++ b/applets/cosmic-applet-workspaces/src/workspace_list/mod.rs @@ -4,7 +4,7 @@ use crate::utils::Activate; use crate::workspace_button::WorkspaceButton; use crate::workspace_object::WorkspaceObject; use cascade::cascade; -use cosmic_panel_config::config::CosmicPanelConfig; +use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig}; use gtk4::ListView; use gtk4::Orientation; use gtk4::SignalListItemFactory; diff --git a/applets/cosmic-panel-button/src/apps_window/mod.rs b/applets/cosmic-panel-button/src/apps_window/mod.rs index 53aeacf1..c8d35329 100644 --- a/applets/cosmic-panel-button/src/apps_window/mod.rs +++ b/applets/cosmic-panel-button/src/apps_window/mod.rs @@ -2,7 +2,7 @@ use crate::fl; use cascade::cascade; -use cosmic_panel_config::config::CosmicPanelConfig; +use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig}; use gtk4::{ gio::{self, DesktopAppInfo, Icon}, glib::{self, Object},