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

Update sctk, libcosmic, cosmic-client-toolkit

Browse source
This commit is contained in:
Ian Douglas Scott 2023-03-01 10:06:14 -08:00 • committed by Ashley Wulber
parent 4ce5a8b8ac
commit 6d7727a5d0
15 changed files with 58 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bi
# cosmic-dbus-networkmanager = { path = "../../../dbus-settings-bindings/networkmanager" }
futures-util = "0.3.21"
libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet", "tokio"] }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "3776d4a" }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "69bffe5" }
futures = "0.3"
zbus = { version = "3.7", default-features = false }
log = "0.4"

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

@ -15,7 +15,7 @@ use cosmic::{
renderer::BorderRadius,
window,
},
iced_style::{application, button::StyleSheet, svg},
iced_style::{application, button::StyleSheet},
theme::{Button, Svg},
widget::{button, divider, icon, toggler},
Element, Theme,
@ -415,9 +415,7 @@ impl Application for CosmicNetworkApplet {
}
let mut btn_content = vec![
icon("network-wireless-symbolic", 24)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(24))
.height(Length::Units(24))
.into(),
@ -430,9 +428,7 @@ impl Application for CosmicNetworkApplet {
| ActiveConnectionState::Deactivating => {
btn_content.push(
icon("process-working-symbolic", 24)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(24))
.height(Length::Units(24))
.into(),
@ -461,9 +457,7 @@ impl Application for CosmicNetworkApplet {
for known in &self.nm_state.known_access_points {
let mut btn_content = vec![
icon("network-wireless-symbolic", 24)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(24))
.height(Length::Units(24))
.into(),
@ -473,9 +467,7 @@ impl Application for CosmicNetworkApplet {
if known.working {
btn_content.push(
icon("process-working-symbolic", 24)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(24))
.height(Length::Units(24))
.into(),
@ -542,9 +534,7 @@ impl Application for CosmicNetworkApplet {
.into(),
container(
icon(dropdown_icon, 14)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(14))
.height(Length::Units(14)),
)
@ -569,9 +559,7 @@ impl Application for CosmicNetworkApplet {
} => {
let id = row![
icon("network-wireless-symbolic", 24)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(24))
.height(Length::Units(24)),
text(&access_point.ssid).size(14),
@ -609,9 +597,7 @@ impl Application for CosmicNetworkApplet {
NewConnectionState::Waiting(access_point) => {
let id = row![
icon("network-wireless-symbolic", 24)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(24))
.height(Length::Units(24)),
text(&access_point.ssid).size(14),
@ -622,9 +608,7 @@ impl Application for CosmicNetworkApplet {
let connecting = row![
id,
icon("process-working-symbolic", 24)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(24))
.height(Length::Units(24)),
]
@ -635,9 +619,7 @@ impl Application for CosmicNetworkApplet {
NewConnectionState::Failure(access_point) => {
let id = row![
icon("network-wireless-symbolic", 24)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(24))
.height(Length::Units(24)),
text(&access_point.ssid).size(14),
@ -687,9 +669,7 @@ impl Application for CosmicNetworkApplet {
let button = button(button_style)
.custom(vec![row![
icon("network-wireless-symbolic", 16)
.style(Svg::Custom(|theme| svg::Appearance {
color: Some(theme.palette().text),
}))
.style(Svg::Symbolic)
.width(Length::Units(16))
.height(Length::Units(16)),
text(&ap.ssid)