From 2bce347cd5fb0e455433d8c35a045edade381431 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Sun, 30 Jul 2023 13:32:35 -0700 Subject: [PATCH] Replace NetworkSpeedWidget with new AllNetworkSpeedWidget. --- src/bin/home.rs | 11 ++++------- src/bin/work.rs | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/bin/home.rs b/src/bin/home.rs index 2518c3e..e13c79b 100644 --- a/src/bin/home.rs +++ b/src/bin/home.rs @@ -3,28 +3,25 @@ use i3monkit::{ColorRGB, Header, I3Protocol, WidgetCollection}; use i3xs::widgets::{ cpu::CpuWidget, datetime::{DateTimeWidget, TimeColor}, - network::NetworkSpeedWidget, + network::AllNetworkSpeedWidget, power::PowerSupply, }; use structopt::StructOpt; #[derive(Debug, StructOpt)] #[structopt(name = "i3xs", about = "Custom i3 status bar program.")] -struct Opt { - #[structopt(short, long)] - nic: String, -} +struct Opt {} fn main() { let mut bar = WidgetCollection::new(); - let opts = Opt::from_args(); + let _opts = Opt::from_args(); bar.push(PowerSupply::default()); bar.push(CpuWidget::default()); // Realtime upload/download rate for a interface - bar.push(NetworkSpeedWidget::new(&opts.nic, 6)); + bar.push(AllNetworkSpeedWidget::new(6)); let mut dt = DateTimeWidget::new("%m/%d %H:%M"); dt.set_colors(vec![ diff --git a/src/bin/work.rs b/src/bin/work.rs index fdb8330..f179bca 100644 --- a/src/bin/work.rs +++ b/src/bin/work.rs @@ -3,28 +3,25 @@ use i3monkit::{ColorRGB, Header, I3Protocol, WidgetCollection}; use i3xs::widgets::{ cpu::CpuWidget, datetime::{DateTimeWidget, TimeColor}, - network::NetworkSpeedWidget, + network::AllNetworkSpeedWidget, power::PowerSupply, }; use structopt::StructOpt; #[derive(Debug, StructOpt)] #[structopt(name = "i3xs", about = "Custom i3 status bar program.")] -struct Opt { - #[structopt(short, long)] - nic: String, -} +struct Opt {} fn main() { let mut bar = WidgetCollection::new(); - let opts = Opt::from_args(); + let _opts = Opt::from_args(); bar.push(PowerSupply::default()); bar.push(CpuWidget::default()); // Realtime upload/download rate for a interface - bar.push(NetworkSpeedWidget::new(&opts.nic, 6)); + bar.push(AllNetworkSpeedWidget::new(6)); let mut dt = DateTimeWidget::tz("%H:%M %Z", chrono_tz::Europe::London); dt.set_colors(vec![