A WiFi security auditing software
ui: use themed symbolic icons for deauth, stop and capture buttons (#207)
Martin Olivierf9e1a4402f2f
diff --git a/crates/gui/icons/capture.png b/crates/gui/icons/capture.pngdeleted file mode 100644index 235a594..0000000Binary files a/crates/gui/icons/capture.png and /dev/null differdiff --git a/crates/gui/icons/deauth.png b/crates/gui/icons/deauth.pngdeleted file mode 100644index d86f8eb..0000000Binary files a/crates/gui/icons/deauth.png and /dev/null differdiff --git a/crates/gui/icons/stop.png b/crates/gui/icons/stop.pngdeleted file mode 100644index 4cfb160..0000000Binary files a/crates/gui/icons/stop.png and /dev/null differdiff --git a/crates/gui/src/frontend/connections/app.rs b/crates/gui/src/frontend/connections/app.rsindex 793ccb1..a479a46 100755--- a/crates/gui/src/frontend/connections/app.rs+++ b/crates/gui/src/frontend/connections/app.rs@@ -724,10 +724,16 @@ fn start_app_refresh(app_data: Rc<AppData>) {match attack_pool.contains_key(&bssid) {true => {- app_data.app_gui.deauth_but.set_icon(globals::STOP_ICON);+ app_data+ .app_gui+ .deauth_but+ .set_icon_name("process-stop-symbolic");}false => {- app_data.app_gui.deauth_but.set_icon(globals::DEAUTH_ICON);+ app_data+ .app_gui+ .deauth_but+ .set_icon_name("network-wireless-offline-symbolic");}}@@ -737,7 +743,10 @@ fn start_app_refresh(app_data: Rc<AppData>) {}}None => {- app_data.app_gui.deauth_but.set_icon(globals::DEAUTH_ICON);+ app_data+ .app_gui+ .deauth_but+ .set_icon_name("network-wireless-offline-symbolic");}};diff --git a/crates/gui/src/frontend/interfaces/app.rs b/crates/gui/src/frontend/interfaces/app.rsindex efaf01a..8d925c5 100755--- a/crates/gui/src/frontend/interfaces/app.rs+++ b/crates/gui/src/frontend/interfaces/app.rs@@ -1,6 +1,4 @@use crate::backend;-use crate::frontend::widgets::*;-use crate::globals;use gtk4::prelude::*;use gtk4::*;@@ -120,6 +118,22 @@ fn build_bottom_but() -> Button {.build()}+fn build_deauth_button() -> Button {+ Button::builder()+ .icon_name("network-wireless-offline-symbolic")+ .tooltip_text("Perform (or stop) a deauth attack on the selected access point")+ .sensitive(false)+ .build()+}++fn build_capture_button() -> Button {+ Button::builder()+ .icon_name("dialog-password-symbolic")+ .tooltip_text("Decrypt a handshake captured on the selected access point")+ .sensitive(false)+ .build()+}+fn build_window(app: &Application) -> ApplicationWindow {let window = ApplicationWindow::builder().application(app)@@ -336,8 +350,8 @@ pub struct AppGui {pub hopping_but: Button,pub focus_but: Button,pub add_but: Button,- pub deauth_but: IconButton,- pub capture_but: IconButton,+ pub deauth_but: Button,+ pub capture_but: Button,pub client_status_bar: Statusbar,pub channel_status_bar: Statusbar,pub iface_status_bar: Statusbar,@@ -364,6 +378,9 @@ impl AppGui {let top_but = build_top_but();let bottom_but = build_bottom_but();+ let deauth_but = build_deauth_button();+ let capture_but = build_capture_button();+let about_button = build_about_button();let decrypt_button = build_decrypt_button();let settings_button = build_settings_button();@@ -408,20 +425,6 @@ impl AppGui {let style_context = channel_filter_entry.style_context();style_context.add_provider(&css_provider, gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION);- // Actions-- let deauth_but = IconButton::new(globals::DEAUTH_ICON);- deauth_but.set_tooltip_text(Some(- "Perform (or stop) a deauth attack on the selected access point",- ));- deauth_but.set_sensitive(false);-- let capture_but = IconButton::new(globals::CAPTURE_ICON);- capture_but.set_tooltip_text(Some(- "Decrypt a handshake captured on the selected access point",- ));- capture_but.set_sensitive(false);-// Header Barheader_bar.pack_start(&scan_but);@@ -438,8 +441,8 @@ impl AppGui {header_bar.pack_start(&Separator::new(Orientation::Vertical));- header_bar.pack_start(&deauth_but.handle);- header_bar.pack_start(&capture_but.handle);+ header_bar.pack_start(&deauth_but);+ header_bar.pack_start(&capture_but);header_bar.pack_start(&Separator::new(Orientation::Vertical));diff --git a/crates/gui/src/frontend/widgets/icon_button.rs b/crates/gui/src/frontend/widgets/icon_button.rsdeleted file mode 100644index 9fca153..0000000--- a/crates/gui/src/frontend/widgets/icon_button.rs+++ /dev/null@@ -1,54 +0,0 @@-#![allow(unused)]--use gtk4::gdk_pixbuf::Pixbuf;-use gtk4::prelude::*;-use gtk4::*;-use std::io::BufReader;--pub struct IconButton {- pub handle: Button,- image: Image,-}--impl IconButton {- pub fn new(icon: &'static [u8]) -> Self {- let pixbuf = Pixbuf::from_read(BufReader::new(icon)).unwrap();- let image = Image::from_pixbuf(Some(&pixbuf));- let handle = Button::builder().child(&image).build();-- Self { handle, image }- }-- pub fn set_tooltip_text(&self, text: Option<&str>) {- self.handle.set_tooltip_text(text)- }-- pub fn set_sensitive(&self, sensitive: bool) {- self.handle.set_sensitive(sensitive)- }-- pub fn set_icon(&self, icon: &'static [u8]) {- let pixbuf = Pixbuf::from_read(BufReader::new(icon)).unwrap();- self.image.set_from_pixbuf(Some(&pixbuf))- }-- pub fn connect_clicked<F: Fn(&Button) + 'static>(&self, f: F) -> glib::SignalHandlerId {- self.handle.connect_clicked(f)- }-- pub fn set_margin_bottom(&self, margin_bottom: i32) {- self.handle.set_margin_bottom(margin_bottom)- }-- pub fn set_margin_end(&self, margin_end: i32) {- self.handle.set_margin_end(margin_end)- }-- pub fn set_margin_start(&self, margin_start: i32) {- self.handle.set_margin_start(margin_start)- }-- pub fn set_margin_top(&self, margin_top: i32) {- self.handle.set_margin_top(margin_top)- }-}diff --git a/crates/gui/src/frontend/widgets/mod.rs b/crates/gui/src/frontend/widgets/mod.rsindex a3fb728..7bf18a9 100644--- a/crates/gui/src/frontend/widgets/mod.rs+++ b/crates/gui/src/frontend/widgets/mod.rs@@ -1,5 +1,3 @@mod dialog;-mod icon_button;pub use dialog::*;-pub use icon_button::IconButton;diff --git a/crates/gui/src/globals.rs b/crates/gui/src/globals.rsindex 73848e3..ffebf6f 100644--- a/crates/gui/src/globals.rs+++ b/crates/gui/src/globals.rs@@ -11,12 +11,6 @@ pub use airgorah_common::VERSION;pub static APP_ICON: &[u8] =include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/icons/app_icon.png"));-pub static DEAUTH_ICON: &[u8] =- include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/icons/deauth.png"));-pub static STOP_ICON: &[u8] =- include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/icons/stop.png"));-pub static CAPTURE_ICON: &[u8] =- include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/icons/capture.png"));lazy_static! {pub static ref IFACE: Mutex<Option<String>> = Mutex::new(None);