Changeset 97376 in vbox

Timestamp:

Nov 2, 2022 10:41:56 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154376

Message:

FE/Qt: bugref:6669: Runtime UI / Machine logic: A bit of cleanup for settings dialog related code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (8 diffs)
• UIMachineLogic.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1051 +1051 @@
     /* 'Machine' actions connections: */
     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Settings), &UIAction::triggered,
-            this, &UIMachineLogic::sltOpenVMSettingsDialogDefault);
+            this, &UIMachineLogic::sltOpenSettingsDialogDefault);
     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_TakeSnapshot), &UIAction::triggered,
             this, &UIMachineLogic::sltTakeSnapshot);
@@ -1118 +1118 @@
     connect(actionPool(), &UIActionPool::sigNotifyAboutMenuPrepare, this, &UIMachineLogic::sltHandleMenuPrepare);
     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_HardDrives_S_Settings), &UIAction::triggered,
-            this, &UIMachineLogic::sltOpenStorageSettingsDialog);
+            this, &UIMachineLogic::sltOpenSettingsDialogStorage);
     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_Audio_T_Output), &UIAction::toggled,
             this, &UIMachineLogic::sltToggleAudioOutput);
@@ -1124 +1124 @@
             this, &UIMachineLogic::sltToggleAudioInput);
     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_Network_S_Settings), &UIAction::triggered,
-            this, &UIMachineLogic::sltOpenNetworkSettingsDialog);
+            this, &UIMachineLogic::sltOpenSettingsDialogNetwork);
     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_USBDevices_S_Settings), &UIAction::triggered,
-            this, &UIMachineLogic::sltOpenUSBDevicesSettingsDialog);
+            this, &UIMachineLogic::sltOpenSettingsDialogUSBDevices);
     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings), &UIAction::triggered,
-            this, &UIMachineLogic::sltOpenSharedFoldersSettingsDialog);
+            this, &UIMachineLogic::sltOpenSettingsDialogSharedFolders);
     connect(actionPool()->action(UIActionIndexRT_M_Devices_S_InstallGuestTools), &UIAction::triggered,
             this, &UIMachineLogic::sltInstallGuestAdditions);
@@ -2075 +2075 @@
 {
     /* Open VM settings : Display page : Recording tab: */
-    sltOpenVMSettingsDialog("#display", "m_pCheckboxVideoCapture");
+    sltOpenSettingsDialog("#display", "m_pCheckboxVideoCapture");
 }
 
@@ -2146 +2146 @@
 }
 
-void UIMachineLogic::sltOpenVMSettingsDialogDefault()
-{
-    sltOpenVMSettingsDialog();
-}
-
-void UIMachineLogic::sltOpenVMSettingsDialog(const QString &strCategory /* = QString() */,
-                                             const QString &strControl /* = QString()*/)
+void UIMachineLogic::sltOpenSettingsDialog(const QString &strCategory /* = QString() */,
+                                           const QString &strControl /* = QString()*/)
 {
     /* Do not process if window(s) missed! */
@@ -2180 +2175 @@
 }
 
-void UIMachineLogic::sltOpenStorageSettingsDialog()
+void UIMachineLogic::sltOpenSettingsDialogStorage()
 {
     /* Machine settings: Storage page: */
-    sltOpenVMSettingsDialog("#storage");
+    sltOpenSettingsDialog("#storage");
 }
 
@@ -2260 +2255 @@
 }
 
-void UIMachineLogic::sltOpenNetworkSettingsDialog()
+void UIMachineLogic::sltOpenSettingsDialogNetwork()
 {
     /* Open VM settings : Network page: */
-    sltOpenVMSettingsDialog("#network");
-}
-
-void UIMachineLogic::sltOpenUSBDevicesSettingsDialog()
+    sltOpenSettingsDialog("#network");
+}
+
+void UIMachineLogic::sltOpenSettingsDialogUSBDevices()
 {
     /* Machine settings: Storage page: */
-    sltOpenVMSettingsDialog("#usb");
-}
-
-void UIMachineLogic::sltOpenSharedFoldersSettingsDialog()
+    sltOpenSettingsDialog("#usb");
+}
+
+void UIMachineLogic::sltOpenSettingsDialogSharedFolders()
 {
     /* Do not process if additions are not loaded! */
@@ -2279 +2274 @@
 
     /* Open VM settings : Shared folders page: */
-    sltOpenVMSettingsDialog("#sharedFolders");
+    sltOpenSettingsDialog("#sharedFolders");
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -144 +144 @@
 
     /* Wrapper to open Machine settings / Network page: */
-    void openNetworkSettingsDialog() { sltOpenNetworkSettingsDialog(); }
+    void openNetworkSettingsDialog() { sltOpenSettingsDialogNetwork(); }
 
 #ifdef VBOX_WS_MAC
@@ -303 +303 @@
 
     /* "Device" menu functionality: */
-    void sltOpenVMSettingsDialogDefault();
-    void sltOpenVMSettingsDialog(const QString &strCategory = QString(), const QString &strControl = QString());
-    void sltOpenStorageSettingsDialog();
+    void sltOpenSettingsDialog(const QString &strCategory = QString(), const QString &strControl = QString());
+    void sltOpenSettingsDialogDefault() { sltOpenSettingsDialog(); }
+    void sltOpenSettingsDialogStorage();
     void sltToggleAudioOutput(bool fEnabled);
     void sltToggleAudioInput(bool fEnabled);
-    void sltOpenNetworkSettingsDialog();
-    void sltOpenUSBDevicesSettingsDialog();
-    void sltOpenSharedFoldersSettingsDialog();
+    void sltOpenSettingsDialogNetwork();
+    void sltOpenSettingsDialogUSBDevices();
+    void sltOpenSettingsDialogSharedFolders();
     void sltMountStorageMedium();
     void sltAttachUSBDevice();