mirror of
https://github.com/Zedfrigg/ironbar.git
synced 2025-04-19 19:34:24 +02:00
fix: post-merge fixes
This commit is contained in:
parent
b860f5b603
commit
8d0560e9ce
3 changed files with 7 additions and 7 deletions
|
@ -157,7 +157,7 @@ swayipc-async = { version = "2.0.1", optional = true }
|
||||||
hyprland = { version = "0.3.13", default_features = false, features = ["listener", "tokio", "silent"], optional = true }
|
hyprland = { version = "0.3.13", default_features = false, features = ["listener", "tokio", "silent"], optional = true }
|
||||||
|
|
||||||
# shared
|
# shared
|
||||||
futures-lite = { version = "2.3.0", optional = true } # workspaces, upower
|
futures-lite = { version = "2.3.0", optional = true } # networkmanager, upower, workspaces
|
||||||
regex = { version = "1.10.4", default-features = false, features = [
|
regex = { version = "1.10.4", default-features = false, features = [
|
||||||
"std",
|
"std",
|
||||||
], optional = true } # music, sys_info
|
], optional = true } # music, sys_info
|
||||||
|
|
|
@ -103,6 +103,8 @@ impl ModuleConfig {
|
||||||
Self::Launcher(module) => create!(module),
|
Self::Launcher(module) => create!(module),
|
||||||
#[cfg(feature = "music")]
|
#[cfg(feature = "music")]
|
||||||
Self::Music(module) => create!(module),
|
Self::Music(module) => create!(module),
|
||||||
|
#[cfg(feature = "networkmanager")]
|
||||||
|
Self::NetworkManager(module) => create!(module),
|
||||||
#[cfg(feature = "notifications")]
|
#[cfg(feature = "notifications")]
|
||||||
Self::Notifications(module) => create!(module),
|
Self::Notifications(module) => create!(module),
|
||||||
Self::Script(module) => create!(module),
|
Self::Script(module) => create!(module),
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use color_eyre::Result;
|
use color_eyre::Result;
|
||||||
|
use futures_lite::StreamExt;
|
||||||
use futures_signals::signal::SignalExt;
|
use futures_signals::signal::SignalExt;
|
||||||
use futures_util::StreamExt;
|
|
||||||
use gtk::prelude::ContainerExt;
|
use gtk::prelude::ContainerExt;
|
||||||
use gtk::{Image, Orientation};
|
use gtk::{Image, Orientation};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
@ -11,7 +11,7 @@ use crate::config::CommonConfig;
|
||||||
use crate::gtk_helpers::IronbarGtkExt;
|
use crate::gtk_helpers::IronbarGtkExt;
|
||||||
use crate::image::ImageProvider;
|
use crate::image::ImageProvider;
|
||||||
use crate::modules::{Module, ModuleInfo, ModuleParts, ModuleUpdateEvent, WidgetContext};
|
use crate::modules::{Module, ModuleInfo, ModuleParts, ModuleUpdateEvent, WidgetContext};
|
||||||
use crate::{glib_recv, send_async, spawn};
|
use crate::{glib_recv, module_impl, send_async, spawn};
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Clone)]
|
#[derive(Debug, Deserialize, Clone)]
|
||||||
pub struct NetworkManagerModule {
|
pub struct NetworkManagerModule {
|
||||||
|
@ -30,10 +30,6 @@ impl Module<gtk::Box> for NetworkManagerModule {
|
||||||
type SendMessage = ClientState;
|
type SendMessage = ClientState;
|
||||||
type ReceiveMessage = ();
|
type ReceiveMessage = ();
|
||||||
|
|
||||||
fn name() -> &'static str {
|
|
||||||
"networkmanager"
|
|
||||||
}
|
|
||||||
|
|
||||||
fn spawn_controller(
|
fn spawn_controller(
|
||||||
&self,
|
&self,
|
||||||
_: &ModuleInfo,
|
_: &ModuleInfo,
|
||||||
|
@ -87,4 +83,6 @@ impl Module<gtk::Box> for NetworkManagerModule {
|
||||||
|
|
||||||
Ok(ModuleParts::new(container, None))
|
Ok(ModuleParts::new(container, None))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
module_impl!("networkmanager");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue