leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: import trait

Browse source
This commit is contained in:
Ashley Wulber 2022-06-09 15:51:58 -04:00
parent 02e240b6bb
commit 5661e0c045
8 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Cargo.lock generated
View file

@ -325,11 +325,13 @@ dependencies = [
"gtk4", "gtk4",
"libcosmic-widgets", "libcosmic-widgets",
"libpulse-binding", "libpulse-binding",
"mpris2-zbus",
"once_cell", "once_cell",
"pulsectl-rs", "pulsectl-rs",
"relm4-macros 0.4.4", "relm4-macros 0.4.4",
"tokio", "tokio",
"tracker", "tracker",
"zbus",
] ]
[[package]] [[package]]
@ -443,7 +445,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-panel-config" name = "cosmic-panel-config"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"gtk4", "gtk4",
@ -1650,6 +1652,18 @@ dependencies = [
"windows-sys", "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]] [[package]]
name = "nanorand" name = "nanorand"
version = "0.7.0" version = "0.7.0"

4
applets/cosmic-app-list/src/dock_item/mod.rs
View file

@ -5,7 +5,7 @@ use crate::dock_popover::DockPopover;
use crate::utils::BoxedWindowList; use crate::utils::BoxedWindowList;
use crate::utils::Event; use crate::utils::Event;
use cascade::cascade; use cascade::cascade;
use cosmic_panel_config::config::Anchor; use cosmic_panel_config::config::{Anchor, XdgWrapperConfig};
use gtk4::glib; use gtk4::glib;
use gtk4::prelude::*; use gtk4::prelude::*;
use gtk4::subclass::prelude::*; use gtk4::subclass::prelude::*;
@ -165,6 +165,7 @@ impl DockItem {
dots.set_margin_end(4); dots.set_margin_end(4);
item_box.reorder_child_after(&dots.clone(), Some(&image.clone())); item_box.reorder_child_after(&dots.clone(), Some(&image.clone()));
} }
Anchor::Center => unimplemented!(),
}; };
} }
let popover = imp.popover.borrow(); let popover = imp.popover.borrow();
@ -173,6 +174,7 @@ impl DockItem {
Anchor::Right => PositionType::Left, Anchor::Right => PositionType::Left,
Anchor::Top => PositionType::Bottom, Anchor::Top => PositionType::Bottom,
Anchor::Bottom => PositionType::Top, Anchor::Bottom => PositionType::Top,
Anchor::Center => unimplemented!(),
}); });
} }

2
applets/cosmic-app-list/src/dock_list/mod.rs
View file

@ -5,7 +5,7 @@ use crate::dock_object::DockObject;
use crate::utils::data_path; use crate::utils::data_path;
use crate::utils::{BoxedWindowList, Event, Item}; use crate::utils::{BoxedWindowList, Event, Item};
use cascade::cascade; use cascade::cascade;
use cosmic_panel_config::config::{Anchor, CosmicPanelConfig}; use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig, Anchor};
use gio::DesktopAppInfo; use gio::DesktopAppInfo;
use gio::Icon; use gio::Icon;
use glib::Object; use glib::Object;

2
applets/cosmic-applet-graphics/src/main.rs
View file

@ -20,7 +20,7 @@ use gtk4::{
}; };
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use cosmic_panel_config::config::CosmicPanelConfig; use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig};
static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime")); static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime"));

2
applets/cosmic-applet-network/src/main.rs
View file

@ -10,7 +10,7 @@ pub mod widgets;
use gtk4::{glib, gio::ApplicationFlags, prelude::*, Orientation, Separator}; use gtk4::{glib, gio::ApplicationFlags, prelude::*, Orientation, Separator};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use cosmic_panel_config::config::CosmicPanelConfig; use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig};
static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime")); static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime"));

2
applets/cosmic-applet-power/src/main.rs
View file

@ -9,7 +9,7 @@ pub mod ui;
use gtk4::{glib, gio::ApplicationFlags, prelude::*, Orientation, Separator}; use gtk4::{glib, gio::ApplicationFlags, prelude::*, Orientation, Separator};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use cosmic_panel_config::config::CosmicPanelConfig; use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig};
static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime")); static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime"));

2
applets/cosmic-applet-workspaces/src/workspace_list/mod.rs
View file

@ -4,7 +4,7 @@ use crate::utils::Activate;
use crate::workspace_button::WorkspaceButton; use crate::workspace_button::WorkspaceButton;
use crate::workspace_object::WorkspaceObject; use crate::workspace_object::WorkspaceObject;
use cascade::cascade; use cascade::cascade;
use cosmic_panel_config::config::CosmicPanelConfig; use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig};
use gtk4::ListView; use gtk4::ListView;
use gtk4::Orientation; use gtk4::Orientation;
use gtk4::SignalListItemFactory; use gtk4::SignalListItemFactory;

2
applets/cosmic-panel-button/src/apps_window/mod.rs
View file

@ -2,7 +2,7 @@
use crate::fl; use crate::fl;
use cascade::cascade; use cascade::cascade;
use cosmic_panel_config::config::CosmicPanelConfig; use cosmic_panel_config::config::{CosmicPanelConfig, XdgWrapperConfig};
use gtk4::{ use gtk4::{
gio::{self, DesktopAppInfo, Icon}, gio::{self, DesktopAppInfo, Icon},
glib::{self, Object}, glib::{self, Object},