persisted_tab: replace usages of the "profile" word with "persisted"

Avoids confusion with auto-attach profiles, since persisted devices are not really profiles.

Author: nickbeth

src/gui/persisted_tab/mod.rs

@@ -1,4 +1,4 @@
-mod profile_info;
+mod persisted_info;
 
 use std::cell::{Cell, RefCell};
 
@@ -10,7 +10,7 @@ use nwg::stretch::{
 };
 use windows_sys::Win32::UI::{Controls::LVSCW_AUTOSIZE_USEHEADER, Shell::SIID_SHIELD};
 
-use self::profile_info::ProfileInfo;
+use self::persisted_info::PersistedInfo;
 use crate::gui::{
     nwg_ext::{BitmapEx, MenuItemEx},
     usbipd_gui::GuiTab,
@@ -42,12 +42,12 @@ pub struct PersistedTab {
         ex_flags: nwg::ListViewExFlags::FULL_ROW_SELECT,
     )]
     #[nwg_events(OnListViewRightClick: [PersistedTab::show_menu],
-        OnListViewItemChanged: [PersistedTab::update_profile_details]
+        OnListViewItemChanged: [PersistedTab::update_persisted_details]
     )]
     #[nwg_layout_item(layout: persisted_tab_layout, flex_grow: 1.0)]
     list_view: nwg::ListView,
 
-    // Profile info
+    // Persisted info
     #[nwg_control]
     #[nwg_layout_item(layout: persisted_tab_layout, margin: PADDING_LEFT,
         size: Size { width: D::Points(DETAILS_PANEL_WIDTH), height: D::Auto },
@@ -62,10 +62,10 @@ pub struct PersistedTab {
     #[nwg_layout_item(layout: details_layout, flex_grow: 1.0)]
     // Multi-line RichLabels send a WM_CLOSE message when the ESC key is pressed
     #[nwg_events(OnWindowClose: [PersistedTab::inhibit_close(EVT_DATA)])]
-    profile_info_frame: nwg::Frame,
+    persisted_info_frame: nwg::Frame,
 
-    #[nwg_partial(parent: profile_info_frame)]
-    profile_info: ProfileInfo,
+    #[nwg_partial(parent: persisted_info_frame)]
+    persisted_info: PersistedInfo,
 
     // Buttons
     #[nwg_control(parent: details_frame, flags: "VISIBLE")]
@@ -93,7 +93,7 @@ impl PersistedTab {
     fn init_list(&self) {
         let dv = &self.list_view;
         dv.clear();
-        dv.insert_column("Profile");
+        dv.insert_column("Device");
         dv.set_headers_enabled(true);
 
         // Auto-size before adding items to ensure we don't overflow the list view
@@ -113,8 +113,8 @@ impl PersistedTab {
         }
     }
 
-    /// Updates the profile details panel with the currently selected device.
-    fn update_profile_details(&self) {
+    /// Updates the details panel with the currently selected device.
+    fn update_persisted_details(&self) {
         let devices = self.persisted_devices.borrow();
         let device = self.list_view.selected_item().and_then(|i| devices.get(i));
 
@@ -124,7 +124,7 @@ impl PersistedTab {
             self.delete_button.set_enabled(false);
         }
 
-        self.profile_info.update(device);
+        self.persisted_info.update(device);
     }
 
     fn show_menu(&self) {
@@ -218,6 +218,6 @@ impl GuiTab for PersistedTab {
 
     fn refresh(&self) {
         self.refresh_list();
-        self.update_profile_details();
+        self.update_persisted_details();
     }
 }

src/gui/persisted_tab/profile_info.rs renamed to src/gui/persisted_tab/persisted_info.rs

@@ -9,7 +9,7 @@ use nwg::stretch::{
 use crate::usbipd::UsbDevice;
 
 /// The persisted device info tab.
-/// It displays detailed information about a persistent device profile.
+/// It displays detailed information about a persisted device.
 ///
 /// Call the `update` method to update the information displayed.
 ///
@@ -20,62 +20,62 @@ use crate::usbipd::UsbDevice;
 /// has focus. It is suggested to inhibit the `OnWindowClose` event on the
 /// parent window (e.g. the parent `nwg::Frame`) to prevent it from closing.
 #[derive(Default, NwgPartial)]
-pub struct ProfileInfo {
+pub struct PersistedInfo {
     #[nwg_resource(family: "Segoe UI Semibold", size: 16, weight: 400)]
     font_bold: nwg::Font,
 
     #[nwg_resource(family: "Segoe UI Semibold", size: 20, weight: 400)]
     font_bold_big: nwg::Font,
 
     #[nwg_layout(flex_direction: FlexDirection::Column, auto_spacing: None)]
-    device_info_layout: nwg::FlexboxLayout,
+    info_layout: nwg::FlexboxLayout,
 
-    #[nwg_control(text: "Profile Info", font: Some(&data.font_bold_big))]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
-    profile_info: nwg::Label,
+    #[nwg_control(text: "Persisted Info", font: Some(&data.font_bold_big))]
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
+    persisted_info: nwg::Label,
 
     #[nwg_control]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: Pt(1.0) },
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: Pt(1.0) },
         margin: Rect { start: Pt(0.0), end: Pt(0.0), top: Pt(5.0), bottom: Pt(0.0)}
     )]
     separator: nwg::Frame,
 
     #[nwg_control(text: "VID:PID:", font: Some(&data.font_bold), v_align: nwg::VTextAlign::Bottom)]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: Pt(20.0)},
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: Pt(20.0)},
         margin: Rect { start: Pt(0.0), end: Pt(0.0), top: Pt(6.0), bottom: Pt(0.0)}
     )]
     vid_pid: nwg::Label,
 
     #[nwg_control]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
     vid_pid_content: nwg::RichLabel,
 
     #[nwg_control(text: "Serial number:", font: Some(&data.font_bold), v_align: nwg::VTextAlign::Bottom)]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
     serial: nwg::Label,
 
     #[nwg_control]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
     serial_content: nwg::RichLabel,
 
     #[nwg_control(text: "Persisted ID:", font: Some(&data.font_bold), v_align: nwg::VTextAlign::Bottom)]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
     persisted: nwg::Label,
 
     #[nwg_control]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
     persisted_content: nwg::RichLabel,
 
     #[nwg_control(text: "Description:", font: Some(&data.font_bold), v_align: nwg::VTextAlign::Bottom)]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: Pt(20.0) })]
     description: nwg::Label,
 
     #[nwg_control(flags: "VISIBLE|MULTI_LINE")]
-    #[nwg_layout_item(layout: device_info_layout, size: Size { width: D::Auto, height: D::Auto }, flex_grow: 1.0)]
+    #[nwg_layout_item(layout: info_layout, size: Size { width: D::Auto, height: D::Auto }, flex_grow: 1.0)]
     description_content: nwg::RichLabel,
 }
 
-impl ProfileInfo {
+impl PersistedInfo {
     pub fn update(&self, device: Option<&UsbDevice>) {
         if let Some(device) = device {
             self.vid_pid_content
@@ -94,7 +94,7 @@ impl ProfileInfo {
             self.vid_pid_content.set_text("-");
             self.serial_content.set_text("-");
             self.persisted_content.set_text("-");
-            self.description_content.set_text("No profile selected");
+            self.description_content.set_text("No device selected");
         }
     }
 }