chore: cleanup and update deps
This commit is contained in:
parent
1472f82061
commit
69d358ec34
4 changed files with 328 additions and 437 deletions
735
Cargo.lock
generated
735
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
12
Cargo.toml
12
Cargo.toml
|
|
@ -70,20 +70,20 @@ lto = "thin"
|
||||||
[workspace.metadata.cargo-machete]
|
[workspace.metadata.cargo-machete]
|
||||||
ignored = ["libcosmic"]
|
ignored = ["libcosmic"]
|
||||||
|
|
||||||
[patch."https://github.com/pop-os/libcosmic"]
|
# [patch."https://github.com/pop-os/libcosmic"]
|
||||||
# cosmic-config = { path = "../libcosmic/cosmic-config" }
|
# cosmic-config = { path = "../libcosmic/cosmic-config" }
|
||||||
# libcosmic = { path = "../libcosmic" }
|
# libcosmic = { path = "../libcosmic" }
|
||||||
# iced_futures = { path = "../libcosmic/iced/futures" }
|
# iced_futures = { path = "../libcosmic/iced/futures" }
|
||||||
cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
|
# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
|
||||||
libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
|
# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
|
||||||
iced_futures = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
|
# iced_futures = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
|
||||||
|
|
||||||
[patch."https://github.com/smithay/client-toolkit.git"]
|
[patch."https://github.com/smithay/client-toolkit.git"]
|
||||||
sctk = { package = "smithay-client-toolkit", version = "0.20.0" }
|
sctk = { package = "smithay-client-toolkit", version = "0.20.0" }
|
||||||
|
|
||||||
[patch."https://github.com/pop-os/cosmic-protocols"]
|
[patch."https://github.com/pop-os/cosmic-protocols"]
|
||||||
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "a7d2d7a" }
|
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "32283d7" }
|
||||||
cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "a7d2d7a" }
|
cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "32283d7" }
|
||||||
|
|
||||||
# [patch.'https://github.com/pop-os/dbus-settings-bindings']
|
# [patch.'https://github.com/pop-os/dbus-settings-bindings']
|
||||||
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
|
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
|
||||||
|
|
|
||||||
|
|
@ -313,7 +313,7 @@ impl cosmic::Application for Audio {
|
||||||
(100, &[][..])
|
(100, &[][..])
|
||||||
};
|
};
|
||||||
|
|
||||||
let popup_settings = app.core.applet.get_popup_settings(
|
let mut popup_settings = app.core.applet.get_popup_settings(
|
||||||
app.core.main_window_id().unwrap(),
|
app.core.main_window_id().unwrap(),
|
||||||
new_id,
|
new_id,
|
||||||
None,
|
None,
|
||||||
|
|
|
||||||
|
|
@ -1761,7 +1761,7 @@ impl cosmic::Application for CosmicNetworkApplet {
|
||||||
.icon_size(16)
|
.icon_size(16)
|
||||||
.on_press(Message::ResetFailedKnownSsid(
|
.on_press(Message::ResetFailedKnownSsid(
|
||||||
known.ssid.to_string(),
|
known.ssid.to_string(),
|
||||||
known.hw_address,
|
known.hw_address.clone(),
|
||||||
))
|
))
|
||||||
.into(),
|
.into(),
|
||||||
);
|
);
|
||||||
|
|
@ -1777,12 +1777,14 @@ impl cosmic::Application for CosmicNetworkApplet {
|
||||||
| DeviceState::Unknown
|
| DeviceState::Unknown
|
||||||
| DeviceState::Unmanaged
|
| DeviceState::Unmanaged
|
||||||
| DeviceState::Disconnected
|
| DeviceState::Disconnected
|
||||||
| DeviceState::NeedAuth => {
|
| DeviceState::NeedAuth => btn.on_press(Message::Connect(
|
||||||
btn.on_press(Message::Connect(known.ssid.clone(), known.hw_address))
|
known.ssid.clone(),
|
||||||
}
|
known.hw_address.clone(),
|
||||||
DeviceState::Activated => {
|
)),
|
||||||
btn.on_press(Message::Disconnect(known.ssid.clone(), known.hw_address))
|
DeviceState::Activated => btn.on_press(Message::Disconnect(
|
||||||
}
|
known.ssid.clone(),
|
||||||
|
known.hw_address.clone(),
|
||||||
|
)),
|
||||||
_ => btn,
|
_ => btn,
|
||||||
};
|
};
|
||||||
known_wifi.push(Element::from(
|
known_wifi.push(Element::from(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue