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

refactor: move projects into a workspace

Browse source
This commit is contained in:
Ashley Wulber 2022-12-23 15:14:15 -05:00 • committed by Ashley Wulber
parent 2a417a9156
commit a1aa87f5bd
29 changed files with 1105 additions and 28224 deletions
Download patch file Download diff file Expand all files Collapse all files

3986
cosmic-applet-network/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

15
cosmic-applet-network/Cargo.toml
View file

@ -6,14 +6,12 @@ license = "GPL-3.0-or-later"
[dependencies]
once_cell = "1.16.0"
cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings" }
cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", branch = "deps" }
futures-util = "0.3.21"
libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet"] }
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", default-features = false }
iced_sctk = { git = "https://github.com/pop-os/iced-sctk" }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", version = "0.16" }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "73346019952f82ec7e4d4d15f5d66841b54e8b61" }
futures = "0.3"
zbus = { version = "3.5", no-default-features = true }
zbus = { version = "3.6.2", no-default-features = true }
log = "0.4"
pretty_env_logger = "0.4"
# Application i18n
@ -23,10 +21,3 @@ rust-embed = "6.3.0"
itertools = "0.10.3"
slotmap = "1.0.6"
tokio = { version = "1.15.0", features = ["full"] }
[dependencies.iced]
git = "https://github.com/pop-os/iced.git"
branch = "sctk-cosmic"
# path = "../iced"
default-features = false
features = ["image", "svg", "tokio"]

12
cosmic-applet-network/src/app.rs
View file

@ -3,7 +3,7 @@ use cosmic::{
iced::{
executor,
widget::{column, container, row, scrollable, text},
Alignment, Application, Color, Command, Length, Subscription,
Alignment, Application, Color, Command, Length, Subscription, wayland::{popup::{destroy_popup, get_popup}, SurfaceIdWrapper},
},
iced_native::window,
iced_style::{application, svg},
@ -12,10 +12,6 @@ use cosmic::{
Element, Theme,
};
use futures::channel::mpsc::UnboundedSender;
use iced_sctk::{
application::SurfaceIdWrapper,
commands::popup::{destroy_popup, get_popup},
};
use crate::{
config, fl,
@ -187,9 +183,9 @@ impl Application for CosmicNetworkApplet {
.into(),
SurfaceIdWrapper::Popup(_) => {
let name = text(fl!("network")).size(18);
let icon = icon(&self.icon_name, 24)
let icon = icon(&*self.icon_name, 24)
.style(Svg::Custom(|theme| svg::Appearance {
fill: Some(theme.palette().text),
color: Some(theme.palette().text),
}))
.width(Length::Units(24))
.height(Length::Units(24));
@ -331,7 +327,7 @@ impl Application for CosmicNetworkApplet {
self.theme
}
fn close_requested(&self, _id: iced_sctk::application::SurfaceIdWrapper) -> Self::Message {
fn close_requested(&self, _id: SurfaceIdWrapper) -> Self::Message {
Message::Ignore
}