From 1ecc369d344c5a91ab82e1d88cc24cfb54fd4fd9 Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Tue, 12 Dec 2023 20:39:36 +0100
Subject: [PATCH 1/3] partly fix wifi options

---
 src/components/input/source_entry_impl.rs |  2 -
 src/components/wifi/wifi_address_entry.rs | 13 ++--
 src/components/wifi/wifi_options.rs       | 83 ++++++++++++-----------
 src/components/wifi/wifi_options_impl.rs  |  6 +-
 src/components/wifi/wifi_route_entry.rs   | 10 +--
 src/resources/resetUI.cmb                 | 29 ++++++--
 src/resources/resetWifiOptions.ui         | 44 ++++++++++--
 7 files changed, 121 insertions(+), 66 deletions(-)

diff --git a/src/components/input/source_entry_impl.rs b/src/components/input/source_entry_impl.rs
index 6d46697..ca144e7 100644
--- a/src/components/input/source_entry_impl.rs
+++ b/src/components/input/source_entry_impl.rs
@@ -23,8 +23,6 @@ pub struct SourceEntry {
     pub reset_volume_slider: TemplateChild<Scale>,
     #[template_child]
     pub reset_volume_percentage: TemplateChild<Label>,
-    #[template_child]
-    pub reset_volume_meter: TemplateChild<ProgressBar>,
     pub source: Arc<RefCell<Source>>,
     pub volume_time_stamp: RefCell<Option<SystemTime>>,
 }
diff --git a/src/components/wifi/wifi_address_entry.rs b/src/components/wifi/wifi_address_entry.rs
index 92da84e..b3416d3 100644
--- a/src/components/wifi/wifi_address_entry.rs
+++ b/src/components/wifi/wifi_address_entry.rs
@@ -1,3 +1,4 @@
+use re_set_lib::network::connection::Address;
 use std::cell::RefCell;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 use std::rc::Rc;
@@ -9,7 +10,7 @@ use adw::prelude::PreferencesRowExt;
 use glib::clone;
 use glib::subclass::prelude::ObjectSubclassIsExt;
 use gtk::prelude::{ButtonExt, EditableExt, WidgetExt};
-use re_set_lib::network::connection::{Address, Connection};
+use re_set_lib::network::connection::{Connection};
 
 use crate::components::wifi::utils::IpProtocol;
 use crate::components::wifi::wifi_address_entry_impl;
@@ -37,10 +38,10 @@ impl WifiAddressEntry {
             entry_imp.reset_address_address.set_text(&address.address);
             entry_imp
                 .reset_address_prefix
-                .set_text(&address.prefix_length.to_string());
+                .set_text(&address.prefix.to_string());
             entry_imp
                 .reset_address_row
-                .set_title(&format!("{}/{}", &*address.address, address.prefix_length));
+                .set_title(&format!("{}/{}", &*address.address, address.prefix));
         }
         entry_imp.protocol.set(protocol);
         entry.setup_callbacks(conn);
@@ -71,7 +72,7 @@ impl WifiAddressEntry {
                         IpProtocol::IPv4 => &mut conn.ipv4.address_data,
                         IpProtocol::IPv6 => &mut conn.ipv6.address_data,
                     };
-                    address_data.push(Address::new_no_options(ip_addr.to_string(), self_imp.prefix.get().1 as u32));
+                    address_data.push(Address::new_no_options(ip_addr.to_string(), self_imp.prefix.get().1));
                     *self_imp.address.borrow_mut() = (true, ip_addr.to_string());
                 }
                 Err(_) => {
@@ -111,7 +112,7 @@ impl WifiAddressEntry {
                     if let Ok(address2) = Ipv4Addr::from_str(self_imp.reset_address_address.text().as_str()) {
                         if let Some(addr) = conn.ipv4.address_data.iter_mut()
                         .find(|conn_addr| *conn_addr.address == address2.to_string()) {
-                            addr.prefix_length = prefix as u32;
+                            addr.prefix = prefix as u32;
                         }
                     }
                 }
@@ -121,7 +122,7 @@ impl WifiAddressEntry {
                     if let Ok(address2) = Ipv6Addr::from_str(self_imp.reset_address_address.text().as_str()) {
                         if let Some(addr) = conn.ipv6.address_data.iter_mut()
                         .find(|conn_addr| *conn_addr.address == address2.to_string()) {
-                            addr.prefix_length = prefix as u32;
+                            addr.prefix = prefix as u32;
                         }
                     }
                 }
diff --git a/src/components/wifi/wifi_options.rs b/src/components/wifi/wifi_options.rs
index 0da08f8..f71cb5d 100644
--- a/src/components/wifi/wifi_options.rs
+++ b/src/components/wifi/wifi_options.rs
@@ -4,15 +4,16 @@ use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
 
+use adw::{gio, glib};
 use adw::glib::Object;
 use adw::prelude::{ActionRowExt, ComboRowExt, PreferencesGroupExt};
 use adw::subclass::prelude::ObjectSubclassIsExt;
-use adw::{gio, glib};
-use dbus::arg::PropMap;
 use dbus::{Error, Path};
+use dbus::arg::PropMap;
 use glib::{clone, PropertySet};
-use gtk::prelude::{ButtonExt, EditableExt, WidgetExt};
+use gtk::prelude::{ActionableExt, ButtonExt, EditableExt, ListBoxRowExt, WidgetExt};
 use re_set_lib::network::connection::{Connection, DNSMethod4, DNSMethod6, Enum, KeyManagement, TypeSettings};
+
 use IpProtocol::{IPv4, IPv6};
 
 use crate::components::wifi::utils::IpProtocol;
@@ -50,7 +51,7 @@ impl WifiOptions {
             ip4_route_length = conn.ipv4.route_data.len();
             ip6_address_length = conn.ipv4.address_data.len();
             ip6_route_length = conn.ipv4.route_data.len();
-
+            // dbg!(&conn);
             // General
             self_imp
                 .reset_wifi_auto_connect
@@ -59,7 +60,7 @@ impl WifiOptions {
                 .reset_wifi_metered
                 .set_active(conn.settings.metered != -1);
             match &conn.device {
-                TypeSettings::WIFI(wifi, _) => {
+                TypeSettings::WIFI(wifi) => {
                     self_imp.reset_wifi_link_speed.set_visible(false);
                     self_imp.reset_wifi_ip4_addr.set_visible(false);
                     self_imp.reset_wifi_ip6_addr.set_visible(false);
@@ -130,24 +131,24 @@ impl WifiOptions {
             self_imp.reset_ip6_gateway.set_text(&conn.ipv6.gateway);
 
             // Security
-            if let TypeSettings::WIFI(_, wifi_security) = &conn.device {
-                match wifi_security.key_management {
-                    KeyManagement::NONE => {
-                        self_imp.reset_wifi_security_dropdown.set_selected(0);
-                        self_imp.reset_wifi_password.set_visible(false);
-                        self_imp.reset_wifi_password.set_text("");
-                    }
-                    KeyManagement::WPAPSK => {
-                        self_imp.reset_wifi_security_dropdown.set_selected(1);
-                        self_imp.reset_wifi_password.set_visible(true);
-                        self_imp
-                            .reset_wifi_password
-                            .set_text(&wifi_security.psk);
-                    }
-                    _ => {}
+
+            match  &conn.security.key_management {
+                KeyManagement::NONE => {
+                    self_imp.reset_wifi_security_dropdown.set_selected(0);
+                    self_imp.reset_wifi_password.set_visible(false);
+                    self_imp.reset_wifi_password.set_text("");
                 }
+                KeyManagement::WPAPSK => {
+                    self_imp.reset_wifi_security_dropdown.set_selected(1);
+                    self_imp.reset_wifi_password.set_visible(true);
+                    self_imp
+                        .reset_wifi_password
+                        .set_text(&conn.security.psk);
+                }
+                _ => {}
             }
         }
+
         // IPv4
         for i in 0..ip4_address_length {
             let address = &WifiAddressEntry::new(Some(i), self_imp.connection.clone(), IPv4);
@@ -177,7 +178,6 @@ impl WifiOptions {
         }
         let route = &WifiRouteEntry::new(None, self_imp.connection.clone(), IPv6);
         self_imp.reset_ip6_routes_group.add(route);
-        // Security
     }
 
     pub fn set_ip4_visibility(&self, method: u32) {
@@ -352,29 +352,35 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
             let selected = dropdown.selected();
             let mut conn = imp.connection.borrow_mut();
 
-            match (selected, &mut conn.device) {
-                (0 , TypeSettings::WIFI(_, wifi_security)) => { // None
+            match selected {
+                0 => { // None
                     imp.reset_wifi_password.set_visible(false);
-                    wifi_security.key_management = KeyManagement::NONE;
-                    wifi_security.authentication_algorithm = String::from("none");
+                    conn.security.key_management = KeyManagement::NONE;
+                    conn.security.authentication_algorithm = String::from("none");
                 },
-                (1 , TypeSettings::WIFI(_, wifi_security)) => { // WPA/WPA2 Personal
+                1 => { // WPA/WPA2 Personal
                     imp.reset_wifi_password.set_visible(true);
-                    wifi_security.key_management = KeyManagement::WPAPSK;
-                    wifi_security.authentication_algorithm = String::from("none");
+                    conn.security.key_management = KeyManagement::WPAPSK;
+                    conn.security.authentication_algorithm = String::from("none");
                 },
-                (_, _) => {}
+                _ => {}
             }
         }));
 
-    imp.reset_wifi_password
-        .connect_changed(clone!(@weak imp => move |entry| {
-            let password_input = entry.text();
-            let mut conn = imp.connection.borrow_mut();
-            if let TypeSettings::WIFI(_, wifi_security) = &mut conn.device {
-                wifi_security.psk = password_input.to_string();
-            }
-        }));
+    imp.reset_wifi_password.connect_changed(clone!(@weak imp => move |entry| {
+        let password_input = entry.text();
+        if password_input.len() < 8 && !password_input.is_empty() {
+            entry.add_css_class("error");
+        } else {
+            entry.remove_css_class("error");
+        }
+        let mut conn = imp.connection.borrow_mut();
+        conn.security.psk = password_input.to_string();
+    }));
+
+    imp.reset_available_networks.set_activatable(true);
+    imp.reset_available_networks
+        .set_action_name(Some("navigation.pop"));
 }
 
 fn set_connection_settings(path: Path<'static>, prop: HashMap<String, PropMap>) {
@@ -385,10 +391,11 @@ fn set_connection_settings(path: Path<'static>, prop: HashMap<String, PropMap>)
             "/org/Xetibo/ReSetDaemon",
             Duration::from_millis(1000),
         );
-        let _: Result<(bool,), Error> = proxy.method_call(
+        let asdf: Result<(bool,), Error> = proxy.method_call(
             "org.Xetibo.ReSetWireless",
             "SetConnectionSettings",
             (path, prop),
         );
+        dbg!(asdf);
     });
 }
diff --git a/src/components/wifi/wifi_options_impl.rs b/src/components/wifi/wifi_options_impl.rs
index bc69ca0..44dd5a9 100644
--- a/src/components/wifi/wifi_options_impl.rs
+++ b/src/components/wifi/wifi_options_impl.rs
@@ -4,7 +4,7 @@ use adw::{
     ActionRow, ComboRow, EntryRow, NavigationPage, PasswordEntryRow, PreferencesGroup, SwitchRow,
 };
 use gtk::subclass::prelude::*;
-use gtk::{glib, Button, CompositeTemplate};
+use gtk::{glib, Button, CompositeTemplate, Label};
 use re_set_lib::network::connection::Connection;
 use std::cell::RefCell;
 use std::rc::Rc;
@@ -70,7 +70,11 @@ pub struct WifiOptions {
     pub reset_wifi_password: TemplateChild<PasswordEntryRow>,
     // Misc
     #[template_child]
+    pub reset_available_networks: TemplateChild<ActionRow>,
+    #[template_child]
     pub wifi_options_apply_button: TemplateChild<Button>,
+    #[template_child]
+    pub wifi_options_error_msg: TemplateChild<Label>,
     pub connection: Rc<RefCell<Connection>>,
 }
 
diff --git a/src/components/wifi/wifi_route_entry.rs b/src/components/wifi/wifi_route_entry.rs
index 59fe860..da86b6f 100644
--- a/src/components/wifi/wifi_route_entry.rs
+++ b/src/components/wifi/wifi_route_entry.rs
@@ -36,7 +36,7 @@ impl WifiRouteEntry {
             entry_imp.reset_route_address.set_text(&address.address);
             entry_imp
                 .reset_route_prefix
-                .set_text(&address.prefix_length.to_string());
+                .set_text(&address.prefix.to_string());
             if let Some(gateway) = &address.gateway {
                 entry_imp.reset_route_gateway.set_text(gateway);
             }
@@ -45,7 +45,7 @@ impl WifiRouteEntry {
             }
             entry_imp
                 .reset_route_row
-                .set_title(&format!("{}/{}", &*address.address, address.prefix_length));
+                .set_title(&format!("{}/{}", &*address.address, address.prefix));
         }
         entry_imp.protocol.set(protocol);
         entry.setup_callbacks(conn);
@@ -54,8 +54,8 @@ impl WifiRouteEntry {
 
     fn setup_callbacks(&self, connection: Rc<RefCell<Connection>>) {
         let self_imp = self.imp();
-
         let conn = connection.clone();
+        dbg!(conn.borrow());
         self_imp.reset_route_address.connect_changed(clone!(@weak self_imp => move |entry| {
             let address_input = entry.text();
             let mut conn = conn.borrow_mut();
@@ -116,7 +116,7 @@ impl WifiRouteEntry {
                     if let Ok(address2) = Ipv4Addr::from_str(self_imp.reset_route_address.text().as_str()) {
                         if let Some(addr) = conn.ipv4.route_data.iter_mut()
                         .find(|conn_addr| *conn_addr.address == address2.to_string()) {
-                            addr.prefix_length = prefix as u32;
+                            addr.prefix = prefix as u32;
                         }
                     }
                 }
@@ -126,7 +126,7 @@ impl WifiRouteEntry {
                     if let Ok(address2) = Ipv6Addr::from_str(self_imp.reset_route_address.text().as_str()) {
                         if let Some(addr) = conn.ipv6.route_data.iter_mut()
                         .find(|conn_addr| *conn_addr.address == address2.to_string()) {
-                            addr.prefix_length = prefix as u32;
+                            addr.prefix = prefix as u32;
                         }
                     }
                 }
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 1466ff8..18aed91 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -221,7 +221,7 @@
 	(20,2,"AdwComboRow","reset_card_entry",None,None,None,None,None,None),
 	(21,1,"AdwNavigationPage","resetWifiOptions",None,None,None,None,-1,None),
 	(21,52,"GtkBox",None,1,None,None,None,-1,None),
-	(21,53,"GtkNotebook",None,52,None,None,None,None,None),
+	(21,53,"GtkNotebook",None,52,None,None,None,1,None),
 	(21,54,"GtkBox",None,53,None,None,None,None,None),
 	(21,55,"AdwPreferencesGroup",None,54,None,None,None,None,None),
 	(21,56,"AdwActionRow","reset_wifi_name",55,None,None,None,None,None),
@@ -240,7 +240,6 @@
 	(21,69,"AdwComboRow","reset_ip4_method",68,None,None,None,None,None),
 	(21,70,"GtkStringList",None,69,None,None,None,None,None),
 	(21,71,"AdwEntryRow","reset_ip4_dns",68,None,None,None,1,None),
-	(21,72,"AdwEntryRow","reset_ip4_gateway",68,None,None,None,2,None),
 	(21,73,"AdwPreferencesGroup","reset_ip4_address_group",67,None,None,None,1,None),
 	(21,74,"AdwPreferencesGroup","reset_ip4_routes_group",67,None,None,None,2,None),
 	(21,75,"GtkBox",None,74,None,None,None,None,None),
@@ -264,12 +263,18 @@
 	(21,93,"AdwComboRow","reset_wifi_security_dropdown",92,None,None,None,None,None),
 	(21,96,"AdwPasswordEntryRow","reset_wifi_password",92,None,None,None,1,None),
 	(21,97,"GtkLabel",None,53,None,"tab",None,7,None),
-	(21,98,"GtkButton","wifi_options_apply_button",52,None,None,None,1,None),
 	(21,99,"GtkButton","reset_ip4_address_add_button",73,None,None,None,-1,None),
 	(21,100,"GtkButton","reset_ip4_route_add_button",75,None,None,None,2,None),
 	(21,101,"GtkButton","reset_ip6_address_add_button",85,None,None,None,-1,None),
 	(21,102,"GtkButton","reset_ip6_route_add_button",87,None,None,None,2,None),
 	(21,103,"GtkStringList",None,93,None,None,None,-1,None),
+	(21,104,"GtkBox",None,52,None,None,None,2,None),
+	(21,105,"GtkButton","wifi_options_apply_button",104,None,None,None,1,None),
+	(21,106,"GtkLabel","wifi_options_error_msg",104,None,None,None,None,None),
+	(21,107,"AdwEntryRow","reset_ip4_gateway",73,None,None,None,None,None),
+	(21,108,"AdwPreferencesGroup",None,52,None,None,None,None,None),
+	(21,109,"AdwActionRow","reset_available_networks",108,None,None,None,None,None),
+	(21,110,"GtkImage",None,109,None,None,None,None,None),
 	(22,1,"GtkBox","resetWifiAddressEntry",None,None,None,None,-1,None),
 	(22,2,"AdwExpanderRow","reset_address_row",1,None,None,None,-1,None),
 	(22,5,"GtkButton","reset_address_remove",1,None,None,None,-1,None),
@@ -713,6 +718,7 @@
 	(21,52,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(21,53,"GtkNotebook","scrollable","True",None,None,None,None,None,None,None,None,None),
 	(21,53,"GtkNotebook","show-border","False",None,None,None,None,None,None,None,None,None),
+	(21,53,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(21,54,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(21,54,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(21,56,"AdwPreferencesRow","title","WiFi Name",None,None,None,None,None,None,None,None,None),
@@ -739,7 +745,6 @@
 	(21,69,"AdwComboRow","model",None,None,None,None,None,70,None,None,None,None),
 	(21,69,"AdwPreferencesRow","title","IPv4 Method",None,None,None,None,None,None,None,None,None),
 	(21,71,"AdwPreferencesRow","title","DNS (separate IP by comma, empty for automatic)",None,None,None,None,None,None,None,None,None),
-	(21,72,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
 	(21,73,"AdwPreferencesGroup","header-suffix",None,None,None,None,None,99,None,None,None,None),
 	(21,73,"AdwPreferencesGroup","title","Addresses",None,None,None,None,None,None,None,None,None),
 	(21,73,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
@@ -772,15 +777,25 @@
 	(21,93,"AdwPreferencesRow","title","Security",None,None,None,None,None,None,None,None,None),
 	(21,96,"AdwPreferencesRow","title","Password",None,None,None,None,None,None,None,None,None),
 	(21,97,"GtkLabel","label","Security",None,None,None,None,None,None,None,None,None),
-	(21,98,"GtkButton","label","Apply",None,None,None,None,None,None,None,None,None),
-	(21,98,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(21,98,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(21,99,"GtkButton","icon-name","list-add-symbolic",None,None,None,None,None,None,None,None,None),
 	(21,100,"GtkButton","icon-name","list-add-symbolic",None,None,None,None,None,None,None,None,None),
 	(21,100,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None),
 	(21,101,"GtkButton","icon-name","list-add-symbolic",None,None,None,None,None,None,None,None,None),
 	(21,102,"GtkButton","icon-name","list-add-symbolic",None,None,None,None,None,None,None,None,None),
 	(21,102,"GtkWidget","margin-start","10",None,None,None,None,None,None,None,None,None),
+	(21,104,"GtkBox","spacing","10",None,None,None,None,None,None,None,None,None),
+	(21,104,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(21,104,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
+	(21,105,"GtkButton","label","Apply",None,None,None,None,None,None,None,None,None),
+	(21,105,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(21,106,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None),
+	(21,106,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None),
+	(21,107,"AdwPreferencesRow","title","Gateway",None,None,None,None,None,None,None,None,None),
+	(21,109,"AdwPreferencesRow","title","Available Networks",None,None,None,None,None,None,None,None,None),
+	(21,110,"GtkImage","icon-name","go-previous-symbolic",None,None,None,None,None,None,None,None,None),
+	(21,110,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
+	(21,110,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
+	(21,110,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
 	(22,1,"GtkWidget","margin-bottom","2",None,None,None,None,None,None,None,None,None),
 	(22,1,"GtkWidget","margin-top","2",None,None,None,None,None,None,None,None,None),
 	(22,2,"AdwPreferencesRow","title","Add new Address",None,None,None,None,None,None,None,None,None),
diff --git a/src/resources/resetWifiOptions.ui b/src/resources/resetWifiOptions.ui
index 0060f11..439fabd 100644
--- a/src/resources/resetWifiOptions.ui
+++ b/src/resources/resetWifiOptions.ui
@@ -7,8 +7,26 @@
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
+        <child>
+          <object class="AdwPreferencesGroup">
+            <child>
+              <object class="AdwActionRow" id="reset_available_networks">
+                <property name="title">Available Networks</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="halign">end</property>
+                    <property name="hexpand">True</property>
+                    <property name="icon-name">go-previous-symbolic</property>
+                    <property name="margin-end">5</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
         <child>
           <object class="GtkNotebook">
+            <property name="margin-top">10</property>
             <property name="scrollable">True</property>
             <property name="show-border">False</property>
             <child>
@@ -111,11 +129,6 @@
                         <property name="title">DNS (separate IP by comma, empty for automatic)</property>
                       </object>
                     </child>
-                    <child>
-                      <object class="AdwEntryRow" id="reset_ip4_gateway">
-                        <property name="title">Gateway</property>
-                      </object>
-                    </child>
                   </object>
                 </child>
                 <child>
@@ -127,6 +140,11 @@
                     </property>
                     <property name="margin-top">10</property>
                     <property name="title">Addresses</property>
+                    <child>
+                      <object class="AdwEntryRow" id="reset_ip4_gateway">
+                        <property name="title">Gateway</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
@@ -279,10 +297,22 @@
           </object>
         </child>
         <child>
-          <object class="GtkButton" id="wifi_options_apply_button">
+          <object class="GtkBox">
             <property name="halign">end</property>
-            <property name="label">Apply</property>
             <property name="margin-top">10</property>
+            <property name="spacing">10</property>
+            <child>
+              <object class="GtkLabel" id="wifi_options_error_msg">
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="wifi_options_apply_button">
+                <property name="halign">end</property>
+                <property name="label">Apply</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>

From 5ec6de95c016752dfbd2fec254da737d4cdb7dac Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Tue, 12 Dec 2023 02:12:50 +0100
Subject: [PATCH 2/3] feat: Add proper popover menu and shortcuts

---
 src/components/input/source_entry_impl.rs  |   2 +-
 src/components/window/reset_window.rs      | 122 ++++++++++++++-------
 src/components/window/reset_window_impl.rs |  10 +-
 src/resources/resetMainWindow.ui           |  39 ++-----
 src/resources/resetMenu.ui                 |  15 +++
 src/resources/resetShortcuts.ui            |  39 +++++++
 src/resources/resetUI.cmb                  |  55 +++++++---
 src/resources/resources.gresource.xml      |   5 +-
 8 files changed, 192 insertions(+), 95 deletions(-)
 create mode 100644 src/resources/resetMenu.ui
 create mode 100644 src/resources/resetShortcuts.ui

diff --git a/src/components/input/source_entry_impl.rs b/src/components/input/source_entry_impl.rs
index ca144e7..142b8a5 100644
--- a/src/components/input/source_entry_impl.rs
+++ b/src/components/input/source_entry_impl.rs
@@ -6,7 +6,7 @@ use std::sync::Arc;
 use std::time::SystemTime;
 
 use gtk::subclass::prelude::*;
-use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, ProgressBar, Scale};
+use gtk::{glib, Button, CheckButton, CompositeTemplate, Label, Scale};
 
 use super::source_entry;
 
diff --git a/src/components/window/reset_window.rs b/src/components/window/reset_window.rs
index 5da09e5..cc342b8 100644
--- a/src/components/window/reset_window.rs
+++ b/src/components/window/reset_window.rs
@@ -2,8 +2,9 @@ use adw::glib::clone;
 use adw::subclass::prelude::ObjectSubclassIsExt;
 use adw::BreakpointCondition;
 use glib::Object;
-use gtk::prelude::*;
+use gtk::gio::ActionEntry;
 use gtk::{gio, glib, Application, ListBoxRow, Orientation};
+use gtk::{prelude::*, DirectionType};
 
 use crate::components::window::handle_sidebar_click::*;
 use crate::components::window::reset_window_impl;
@@ -23,9 +24,87 @@ unsafe impl Sync for ReSetWindow {}
 
 impl ReSetWindow {
     pub fn new(app: &Application) -> Self {
+        app.set_accels_for_action("win.search", &["<Ctrl>F"]);
+        app.set_accels_for_action("win.close", &["<Ctrl>Q"]);
+        app.set_accels_for_action("win.about", &["<Ctrl>A"]);
+        // implemented when a proper movement method is found
+        // app.set_accels_for_action("win.up", &["<Ctrl>K"]);
+        // app.set_accels_for_action("win.right", &["<Ctrl>L"]);
+        // app.set_accels_for_action("win.down", &["<Ctrl>J"]);
+        // app.set_accels_for_action("win.left", &["<Ctrl>H"]);
         Object::builder().property("application", app).build()
     }
 
+    pub fn setup_shortcuts(&self) {
+        let search_action = ActionEntry::builder("search")
+            .activate(move |window: &Self, _, _| {
+                window.imp().reset_search_entry.grab_focus();
+            })
+            .build();
+
+        let close_action = ActionEntry::builder("close")
+            .activate(move |window: &Self, _, _| {
+                window.close();
+            })
+            .build();
+
+        let vim_up = ActionEntry::builder("up")
+            .activate(move |window: &Self, _, _| {
+                window.child_focus(DirectionType::Up);
+            })
+            .build();
+
+        let vim_right = ActionEntry::builder("right")
+            .activate(move |window: &Self, _, _| {
+                window.child_focus(DirectionType::Right);
+            })
+            .build();
+
+        let vim_down = ActionEntry::builder("down")
+            .activate(move |window: &Self, _, _| {
+                window.child_focus(DirectionType::Down);
+            })
+            .build();
+
+        let vim_left = ActionEntry::builder("left")
+            .activate(move |window: &Self, _, _| {
+                window.child_focus(DirectionType::Left);
+            })
+            .build();
+
+        let about_action = ActionEntry::builder("about")
+            .activate(move |window: &ReSetWindow, _, _| {
+                let dialog = adw::AboutWindow::builder()
+                    .application_name("ReSet")
+                    .application_icon("ReSet")
+                    .developer_name("Xetibo")
+                    .license("GPL-3.0")
+                    .license_type(gtk::License::Gpl30)
+                    .website("https://github.com/Xetibo/ReSet")
+                    .issue_url("https://github.com/Xetibo/ReSet/issues")
+                    .version("0.0.1")
+                    .transient_for(window)
+                    .modal(true)
+                    .copyright("© 2022-2023 Xetibo")
+                    .developers(vec!["DashieTM".to_string(), "Takotori".to_string()])
+                    .designers(vec!["DashieTM".to_string(), "Takotori".to_string()])
+                    .build();
+                // window.imp().reset_popover_menu.popdown();
+                dialog.present();
+            })
+            .build();
+
+        self.add_action_entries([
+            search_action,
+            close_action,
+            about_action,
+            vim_up,
+            vim_right,
+            vim_down,
+            vim_left,
+        ]);
+    }
+
     pub fn setup_callback(&self) {
         let self_imp = self.imp();
 
@@ -248,46 +327,9 @@ impl ReSetWindow {
             separator_row.set_child(Some(&separator));
             separator_row.set_selectable(false);
             separator_row.set_activatable(false);
+            separator_row.set_can_target(false);
+            // TODO how to simply skip this ?
             self_imp.reset_sidebar_list.append(&separator_row);
         }
     }
-
-    pub fn setup_popover_buttons(&self) {
-        let self_imp = self.imp();
-        self_imp
-            .reset_about_button
-            .connect_clicked(clone!(@ weak self as window => move |_| {
-                    let dialog = adw::AboutWindow::builder()
-                        .application_name("ReSet")
-                        .application_icon("ReSet")
-                        .developer_name("Xetibo")
-                        .license("GPL-3.0")
-                        .license_type(gtk::License::Gpl30)
-                        .website("https://github.com/Xetibo/ReSet")
-                        .issue_url("https://github.com/Xetibo/ReSet/issues")
-                        .version("0.0.1")
-                        .transient_for(&window)
-                        .modal(true)
-                        .copyright("© 2022-2023 Xetibo")
-                        .developers(vec!["DashieTM".to_string(), "Takotori".to_string()])
-                        .designers(vec!["DashieTM".to_string(), "Takotori".to_string()])
-                        .build();
-                window.imp().reset_popover_menu.popdown();
-                dialog.present();
-            }));
-        self_imp
-            .reset_preference_button
-            .connect_clicked(clone!(@weak self as window => move |_| {
-                let preferences = adw::PreferencesWindow::builder().build();
-                window.imp().reset_popover_menu.popdown();
-                preferences.present();
-            }));
-        self_imp
-            .reset_shortcuts_button
-            .connect_clicked(clone!(@weak self as window => move |_| {
-                let shortcuts = gtk::ShortcutsWindow::builder().build();
-                window.imp().reset_popover_menu.popdown();
-                shortcuts.present();
-            }));
-    }
 }
diff --git a/src/components/window/reset_window_impl.rs b/src/components/window/reset_window_impl.rs
index d2df9ff..0fc4ae2 100644
--- a/src/components/window/reset_window_impl.rs
+++ b/src/components/window/reset_window_impl.rs
@@ -31,15 +31,7 @@ pub struct ReSetWindow {
     #[template_child]
     pub reset_sidebar_toggle: TemplateChild<Button>,
     #[template_child]
-    pub reset_popover_menu: TemplateChild<PopoverMenu>,
-    #[template_child]
     pub reset_close: TemplateChild<Button>,
-    #[template_child]
-    pub reset_about_button: TemplateChild<Button>,
-    #[template_child]
-    pub reset_preference_button: TemplateChild<Button>,
-    #[template_child]
-    pub reset_shortcuts_button: TemplateChild<Button>,
     pub sidebar_entries: RefCell<Vec<(SidebarEntry, Vec<SidebarEntry>)>>,
     pub listeners: Arc<Listeners>,
     pub position: Rc<RefCell<Position>>,
@@ -70,8 +62,8 @@ impl ObjectImpl for ReSetWindow {
         self.parent_constructed();
 
         let obj = self.obj();
+        obj.setup_shortcuts();
         obj.setup_callback();
-        obj.setup_popover_buttons();
         obj.handle_dynamic_sidebar();
         obj.setup_sidebar_entries();
     }
diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui
index edbd7d6..4dd03bb 100644
--- a/src/resources/resetMainWindow.ui
+++ b/src/resources/resetMainWindow.ui
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Created with Cambalache 0.17.0 -->
 <interface>
+  <requires lib="gio" version="2.0"/>
   <requires lib="gtk" version="4.12"/>
   <requires lib="libadwaita" version="1.4"/>
   <template class="resetUI" parent="AdwApplicationWindow">
@@ -38,33 +39,7 @@
                         <property name="hexpand">True</property>
                         <property name="hexpand-set">True</property>
                         <property name="icon-name">open-menu-symbolic</property>
-                        <property name="popover">
-                          <object class="GtkPopoverMenu" id="reset_popover_menu">
-                            <property name="child">
-                              <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkButton" id="reset_shortcuts_button">
-                                    <property name="has-frame">False</property>
-                                    <property name="label">Shortcuts</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="reset_preference_button">
-                                    <property name="has-frame">False</property>
-                                    <property name="label">Preferences</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="reset_about_button">
-                                    <property name="has-frame">False</property>
-                                    <property name="label">About</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </property>
-                          </object>
-                        </property>
+                        <property name="menu-model">main_menu</property>
                         <property name="valign">end</property>
                         <property name="vexpand">True</property>
                       </object>
@@ -152,4 +127,14 @@
     </object>
     </child>
   </template>
+  <menu id="main_menu">
+    <item>
+      <attribute name="action">win.about</attribute>
+      <attribute name="label">About</attribute>
+    </item>
+    <item>
+      <attribute name="action">win.show-help-overlay</attribute>
+      <attribute name="label">Shortcuts</attribute>
+    </item>
+  </menu>
 </interface>
diff --git a/src/resources/resetMenu.ui b/src/resources/resetMenu.ui
new file mode 100644
index 0000000..b264aa6
--- /dev/null
+++ b/src/resources/resetMenu.ui
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.17.0 -->
+<interface>
+  <requires lib="gio" version="2.0"/>
+  <menu id="menu">
+    <item>
+      <attribute name="action">win.about</attribute>
+      <attribute name="label">About</attribute>
+    </item>
+    <item>
+      <attribute name="action">win.show-help-overlay</attribute>
+      <attribute name="label">Shortcuts</attribute>
+    </item>
+  </menu>
+</interface>
diff --git a/src/resources/resetShortcuts.ui b/src/resources/resetShortcuts.ui
new file mode 100644
index 0000000..2c4943b
--- /dev/null
+++ b/src/resources/resetShortcuts.ui
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.17.0 -->
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkShortcutsWindow" id="help_overlay">
+    <child>
+      <object class="GtkShortcutsSection">
+        <child>
+          <object class="GtkShortcutsGroup">
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="accelerator">&lt;Ctrl&gt;F</property>
+                <property name="action-name">win.search</property>
+                <property name="icon-set">True</property>
+                <property name="title">Search for Setting</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="accelerator">&lt;Ctrl&gt;Q</property>
+                <property name="action-name">win.close</property>
+                <property name="icon-set">True</property>
+                <property name="title">Close ReSet</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="accelerator">&lt;Ctrl&gt;A</property>
+                <property name="action-name">win.about</property>
+                <property name="icon-set">True</property>
+                <property name="title">Show about window</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 18aed91..6060976 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -21,7 +21,8 @@
 	(20,None,None,"resetCardEntry.ui",None,None,None,None,None,None,None),
 	(21,1,None,"resetWifiOptions.ui",None,None,None,None,None,None,None),
 	(22,1,None,"resetWifiAddressEntry.ui",None,None,None,None,None,None,None),
-	(23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None)
+	(23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None),
+	(24,None,None,"resetShortcuts.ui",None,None,None,None,None,None,None)
   </ui>
   <ui_library>
 	(21,"gtk","4.12",None),
@@ -40,17 +41,23 @@
 	(3,26,"GtkButton","reset_sidebar_toggle",25,None,None,None,None,None),
 	(3,31,"GtkButton","reset_close",25,None,None,None,2,None),
 	(3,33,"GtkMenuButton",None,25,None,None,None,1,None),
-	(3,35,"GtkPopoverMenu","reset_popover_menu",33,None,None,None,-1,None),
-	(3,36,"GtkBox",None,35,None,None,None,-1,None),
-	(3,38,"GtkButton","reset_preference_button",36,None,None,None,1,None),
-	(3,39,"GtkButton","reset_about_button",36,None,None,None,2,None),
 	(3,40,"GtkScrolledWindow",None,18,None,None,None,1,None),
 	(3,41,"GtkViewport",None,40,None,None,None,None,None),
 	(3,42,"GtkListBox","reset_sidebar_list",41,None,None,None,None,None),
 	(3,43,"GtkScrolledWindow",None,3,None,None,None,1,None),
 	(3,44,"GtkViewport",None,43,None,None,None,None,None),
 	(3,45,"GtkFlowBox","reset_main",44,None,None,None,None,None),
-	(3,51,"GtkButton","reset_shortcuts_button",36,None,None,None,None,None),
+	(3,54,"(menu)","main_menu",None,None,None,None,None,None),
+	(3,59,"(external)","54",None,None,None,None,None,None),
+	(3,61,"(external)","59",None,None,None,None,None,None),
+	(3,63,"(external)","61",None,None,None,None,None,None),
+	(3,65,"(external)","63",None,None,None,None,None,None),
+	(3,69,"(external)","67",None,None,None,None,None,None),
+	(3,72,"(external)","71",None,None,None,None,None,None),
+	(3,73,"(item)",None,54,None,None,None,1,None),
+	(3,74,"(external)","72",None,None,None,None,None,None),
+	(3,75,"(item)",None,54,None,None,None,2,None),
+	(3,76,"(external)","74",None,None,None,None,None,None),
 	(4,7,"GtkBox","resetWifi",None,None,None,None,None,None),
 	(4,152,"AdwNavigationView","reset_wifi_navigation",7,None,None,None,1,None),
 	(4,153,"AdwNavigationPage",None,152,None,None,None,None,None),
@@ -289,7 +296,13 @@
 	(23,8,"AdwEntryRow","reset_route_metric",6,None,None,None,1,None),
 	(23,9,"GtkBox",None,2,None,None,None,None,None),
 	(23,10,"AdwEntryRow","reset_route_address",9,None,None,None,None,None),
-	(23,11,"AdwEntryRow","reset_route_prefix",9,None,None,None,1,None)
+	(23,11,"AdwEntryRow","reset_route_prefix",9,None,None,None,1,None),
+	(24,1,"GtkShortcutsWindow","help_overlay",None,None,None,None,-1,None),
+	(24,2,"GtkShortcutsSection",None,1,None,None,None,-1,None),
+	(24,3,"GtkShortcutsGroup",None,2,None,None,None,-1,None),
+	(24,4,"GtkShortcutsShortcut",None,3,None,None,None,-1,None),
+	(24,5,"GtkShortcutsShortcut",None,3,None,None,None,-1,None),
+	(24,6,"GtkShortcutsShortcut",None,3,None,None,None,2,None)
   </object>
   <object_property>
 	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@@ -321,18 +334,12 @@
 	(3,33,"GtkMenuButton","can-shrink","True",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkMenuButton","has-frame","False",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkMenuButton","icon-name","open-menu-symbolic",None,None,None,None,None,None,None,None,None),
-	(3,33,"GtkMenuButton","popover",None,None,None,None,None,35,None,None,None,None),
+	(3,33,"GtkMenuButton","menu-model","54",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkWidget","valign","end",None,None,None,None,None,None,None,None,None),
 	(3,33,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
-	(3,35,"GtkPopover","child",None,None,None,None,None,36,None,None,None,None),
-	(3,36,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
-	(3,38,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(3,38,"GtkButton","label","Preferences",None,None,None,None,None,None,None,None,None),
-	(3,39,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(3,39,"GtkButton","label","About",None,None,None,None,None,None,None,None,None),
 	(3,40,"GtkScrolledWindow","propagate-natural-height","True",None,None,None,None,None,None,None,None,None),
 	(3,40,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,42,"GtkWidget","css-name","resetList",None,None,None,None,None,None,None,None,None),
@@ -345,8 +352,10 @@
 	(3,45,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
 	(3,45,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(3,45,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
-	(3,51,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(3,51,"GtkButton","label","Shortcuts",None,None,None,None,None,None,None,None,None),
+	(3,73,"(item)","action","win.about",None,None,None,None,None,None,None,None,None),
+	(3,73,"(item)","label","About",None,None,None,None,None,None,None,None,None),
+	(3,75,"(item)","action","win.show-help-overlay",None,None,None,None,None,None,None,None,None),
+	(3,75,"(item)","label","Shortcuts",None,None,None,None,None,None,None,None,None),
 	(4,7,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(4,7,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(4,7,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),
@@ -819,7 +828,19 @@
 	(23,10,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None),
 	(23,10,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(23,11,"AdwPreferencesRow","title","Prefix",None,None,None,None,None,None,None,None,None),
-	(23,11,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None)
+	(23,11,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None),
+	(24,4,"GtkShortcutsShortcut","accelerator","&lt;Ctrl&gt;F",None,None,None,None,None,None,None,None,None),
+	(24,4,"GtkShortcutsShortcut","action-name","win.search",None,None,None,None,None,None,None,None,None),
+	(24,4,"GtkShortcutsShortcut","icon-set","True",None,None,None,None,None,None,None,None,None),
+	(24,4,"GtkShortcutsShortcut","title","Search for Setting",None,None,None,None,None,None,None,None,None),
+	(24,5,"GtkShortcutsShortcut","accelerator","&lt;Ctrl&gt;Q",None,None,None,None,None,None,None,None,None),
+	(24,5,"GtkShortcutsShortcut","action-name","win.close",None,None,None,None,None,None,None,None,None),
+	(24,5,"GtkShortcutsShortcut","icon-set","True",None,None,None,None,None,None,None,None,None),
+	(24,5,"GtkShortcutsShortcut","title","Close ReSet",None,None,None,None,None,None,None,None,None),
+	(24,6,"GtkShortcutsShortcut","accelerator","&lt;Ctrl&gt;A",None,None,None,None,None,None,None,None,None),
+	(24,6,"GtkShortcutsShortcut","action-name","win.about",None,None,None,None,None,None,None,None,None),
+	(24,6,"GtkShortcutsShortcut","icon-set","True",None,None,None,None,None,None,None,None,None),
+	(24,6,"GtkShortcutsShortcut","title","Show about window",None,None,None,None,None,None,None,None,None)
   </object_property>
   <object_data>
 	(3,42,"GtkWidget",1,1,None,None,None,None,None,None),
diff --git a/src/resources/resources.gresource.xml b/src/resources/resources.gresource.xml
index cf016e5..577d8b9 100644
--- a/src/resources/resources.gresource.xml
+++ b/src/resources/resources.gresource.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/Xetibo/ReSet/">
-    <!--Main window-->
+    <!--Main
+    window-->
     <file compressed="true" preprocess="xml-stripblanks">resetMainWindow.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetSidebarEntry.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetSettingBox.ui</file>
@@ -26,6 +27,8 @@
     <file compressed="true" preprocess="xml-stripblanks">resetSourceEntry.ui</file>
     <!--Misc-->
     <file compressed="true" preprocess="xml-stripblanks">resetPopup.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">resetShortcuts.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">resetMenu.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">resetCardEntry.ui</file>
   </gresource>
 </gresources>

From c9d1282e62af74345a17391ca8b4044f6c912248 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Tue, 12 Dec 2023 02:13:27 +0100
Subject: [PATCH 3/3] chore: Remove unused import

---
 src/components/window/reset_window_impl.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/window/reset_window_impl.rs b/src/components/window/reset_window_impl.rs
index 0fc4ae2..223009b 100644
--- a/src/components/window/reset_window_impl.rs
+++ b/src/components/window/reset_window_impl.rs
@@ -8,7 +8,7 @@ use adw::{Breakpoint, OverlaySplitView};
 use glib::subclass::InitializingObject;
 use gtk::prelude::WidgetExt;
 use gtk::subclass::prelude::*;
-use gtk::{glib, Button, CompositeTemplate, FlowBox, ListBox, PopoverMenu, SearchEntry};
+use gtk::{glib, Button, CompositeTemplate, FlowBox, ListBox, SearchEntry};
 
 use crate::components::base::utils::{Listeners, Position};
 use crate::components::wifi::wifi_box::WifiBox;