Minor code cleanup

- Removed leftover files
- Fixed formatting
- Fixed struct member visibility
- Added a missing comment
- Renamed some methods to be more generic

Author: nickbeth

src/gui/connected_tab/mod.rs

@@ -12,8 +12,10 @@ use windows_sys::Win32::UI::Controls::LVSCW_AUTOSIZE_USEHEADER;
 use windows_sys::Win32::UI::Shell::SIID_SHIELD;
 
 use self::device_info::DeviceInfo;
-use crate::gui::nwg_ext::{BitmapEx, MenuItemEx};
-use crate::gui::usbipd_gui::GuiTab;
+use crate::gui::{
+    nwg_ext::{BitmapEx, MenuItemEx},
+    usbipd_gui::GuiTab,
+};
 use crate::usbipd::{self, UsbDevice};
 
 const PADDING_LEFT: Rect<D> = Rect {
@@ -77,12 +79,12 @@ pub struct ConnectedTab {
     #[nwg_control(parent: buttons_frame, text: "Attach")]
     #[nwg_layout_item(layout: buttons_layout, flex_grow: 0.33)]
     #[nwg_events(OnButtonClick: [ConnectedTab::attach_detach_device])]
-    pub attach_detach_button: nwg::Button,
+    attach_detach_button: nwg::Button,
 
     #[nwg_control(parent: buttons_frame, text: "Bind")]
     #[nwg_layout_item(layout: buttons_layout, flex_grow: 0.33)]
     #[nwg_events(OnButtonClick: [ConnectedTab::bind_unbind_device])]
-    pub bind_unbind_button: nwg::Button,
+    bind_unbind_button: nwg::Button,
 
     // Device context menu
     #[nwg_control(text: "Device", popup: true)]
@@ -113,7 +115,7 @@ pub struct ConnectedTab {
 }
 
 impl ConnectedTab {
-    fn init_device_list(&self) {
+    fn init_list(&self) {
         let dv = &self.list_view;
         dv.clear();
         dv.insert_column("Bus ID");
@@ -127,7 +129,7 @@ impl ConnectedTab {
     }
 
     /// Clears the device list and reloads it with the currently connected devices.
-    fn refresh_device_list(&self) {
+    fn refresh_list(&self) {
         self.update_devices();
 
         self.list_view.clear();
@@ -354,12 +356,12 @@ impl GuiTab for ConnectedTab {
 
         self.shield_bitmap.set(shield_bitmap);
 
-        self.init_device_list();
+        self.init_list();
         self.refresh();
     }
 
     fn refresh(&self) {
-        self.refresh_device_list();
+        self.refresh_list();
         self.update_device_details();
     }
 }

src/gui/device_info.rs

@@ -11,12 +11,12 @@ use nwg::stretch::{
 use windows_sys::Win32::UI::{Controls::LVSCW_AUTOSIZE_USEHEADER, Shell::SIID_SHIELD};
 
 use self::profile_info::ProfileInfo;
-use crate::gui::nwg_ext::BitmapEx;
-use crate::gui::usbipd_gui::GuiTab;
+use crate::gui::{
+    nwg_ext::{BitmapEx, MenuItemEx},
+    usbipd_gui::GuiTab,
+};
 use crate::usbipd::{self, UsbDevice};
 
-use super::nwg_ext::MenuItemEx;
-
 const PADDING_LEFT: Rect<D> = Rect {
     start: D::Points(8.0),
     end: D::Points(0.0),
@@ -78,7 +78,7 @@ pub struct PersistedTab {
     #[nwg_control(parent: buttons_frame, text: "Delete")]
     #[nwg_layout_item(layout: buttons_layout, flex_grow: 0.33)]
     #[nwg_events(OnButtonClick: [PersistedTab::delete])]
-    pub delete_button: nwg::Button,
+    delete_button: nwg::Button,
 
     // Device context menu
     #[nwg_control(text: "Device", popup: true)]
@@ -90,7 +90,7 @@ pub struct PersistedTab {
 }
 
 impl PersistedTab {
-    fn init_device_list(&self) {
+    fn init_list(&self) {
         let dv = &self.list_view;
         dv.clear();
         dv.insert_column("Profile");
@@ -101,7 +101,7 @@ impl PersistedTab {
     }
 
     /// Clears the device list and reloads it with the currently persisted devices.
-    fn refresh_device_list(&self) {
+    fn refresh_list(&self) {
         self.update_devices();
 
         self.list_view.clear();
@@ -212,12 +212,12 @@ impl GuiTab for PersistedTab {
 
         self.shield_bitmap.set(shield_bitmap);
 
-        self.init_device_list();
+        self.init_list();
         self.refresh();
     }
 
     fn refresh(&self) {
-        self.refresh_device_list();
+        self.refresh_list();
         self.update_profile_details();
     }
 }

src/gui/persisted_tab/mod.rs

@@ -51,16 +51,22 @@ impl Display for UsbipState {
 pub struct UsbDevice {
     #[serde(rename = "BusId")]
     pub bus_id: Option<String>,
+
     #[serde(rename = "ClientIPAddress")]
     pub client_ip_address: Option<String>,
+
     #[serde(rename = "Description")]
     pub description: Option<String>,
+
     #[serde(rename = "InstanceId")]
     pub instance_id: Option<String>,
+
     #[serde(rename = "IsForced")]
     pub is_forced: bool,
+
     #[serde(rename = "PersistedGuid")]
     pub persisted_guid: Option<String>,
+
     #[serde(rename = "StubInstanceGuid")]
     pub stub_instance_id: Option<String>,
 }

src/usbipd.rs

@@ -63,6 +63,7 @@ pub fn get_last_error_string() -> String {
 pub fn register_usb_device_notifications(
     callback: impl Fn() + 'static,
 ) -> Result<DeviceNotification, u32> {
+    // The callback function that will be called by the system, which will then call the user's closure
     extern "system" fn callback_impl(
         _hnotify: HCMNOTIFICATION,
         context: *const std::ffi::c_void,