Changeset 87342 in vbox

Timestamp:

Jan 21, 2021 9:28:42 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9871: Missed bits related to renaming Host Network Manager to just Network Manager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (9 diffs)
• globals/UIActionPoolManager.h (modified) (1 diff)
• manager/UIToolPaneGlobal.cpp (modified) (1 diff)
• manager/UIToolPaneGlobal.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (6 diffs)
• manager/UIVirtualBoxManager.h (modified) (2 diffs)
• medium/UIMediumManager.h (modified) (1 diff)
• networkmanager/UINetworkManager.h (modified) (2 diffs)
• networkmanager/UINetworkManagerUtils.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

@@ -96 +96 @@
 };
 
-/** Simple action extension, used as 'Show Host Network Manager' action class. */
+/** Simple action extension, used as 'Show Network Manager' action class. */
 class UIActionSimpleManagerFileShowHostNetworkManager : public UIActionSimple
 {
@@ -125 +125 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "&Host Network Manager..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the Host Network Manager window"));
+        setName(QApplication::translate("UIActionPool", "&Network Manager..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Display the Network Manager window"));
     }
 };
@@ -1813 +1813 @@
 };
 
-/** Simple action extension, used as 'Show Host Network Manager' action class. */
+/** Simple action extension, used as 'Show Network Manager' action class. */
 class UIActionSimpleManagerToolsGlobalShowHostNetworkManager : public UIActionSimple
 {
@@ -1838 +1838 @@
     virtual void retranslateUi() /* override */
     {
-        setName(QApplication::translate("UIActionPool", "&Host Network Manager"));
-        setStatusTip(QApplication::translate("UIActionPool", "Open the Host Network Manager"));
+        setName(QApplication::translate("UIActionPool", "&Network Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open the Network Manager"));
     }
 };
@@ -3507 +3507 @@
     m_pool[UIActionIndexMN_M_Medium_S_Refresh] = new UIActionMenuManagerMediumPerformRefresh(this);
 
-    /* Host Network Manager actions: */
+    /* Network Manager actions: */
     m_pool[UIActionIndexMN_M_NetworkWindow] = new UIActionMenuManagerNetwork(this);
     m_pool[UIActionIndexMN_M_Network] = new UIActionMenuManagerNetwork(this);
@@ -3645 +3645 @@
     updateMenuMediumWindow();
     updateMenuMedium();
-    /* 'Host Network Manager' menu: */
+    /* 'Network Manager' menu: */
     addMenu(m_mainMenus, action(UIActionIndexMN_M_Network));
     updateMenuNetworkWindow();
@@ -3653 +3653 @@
     updateMenuCloudWindow();
     updateMenuCloud();
-
     /* 'VM Resource Monitor' menu: */
     addMenu(m_mainMenus, action(UIActionIndexMN_M_VMResourceMonitor));
@@ -3823 +3822 @@
     /* 'Show Virtual Medium Manager' action goes to 'File' menu: */
     pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager));
-    /* 'Show Host Network Manager' action goes to 'File' menu: */
+    /* 'Show Network Manager' action goes to 'File' menu: */
     pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
     /* 'Show Cloud Profile Manager' action goes to 'File' menu: */
@@ -3846 +3845 @@
     /* 'Show Virtual Medium Manager' action goes to 'File' menu: */
     pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager));
-    /* 'Show Host Network Manager' action goes to 'File' menu: */
+    /* 'Show Network Manager' action goes to 'File' menu: */
     pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
     /* 'Show Cloud Profile Manager' action goes to 'File' menu: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h

@@ -160 +160 @@
     UIActionIndexMN_M_Medium_S_Refresh,
 
-    /* Host Network Manager actions: */
+    /* Network Manager actions: */
     UIActionIndexMN_M_NetworkWindow,
     UIActionIndexMN_M_Network,

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp

@@ -143 +143 @@
             case UIToolType_Network:
             {
-                /* Create Host Network Manager: */
+                /* Create Network Manager: */
                 m_pPaneNetwork = new UINetworkManagerWidget(EmbedTo_Stack, m_pActionPool, false /* show toolbar */);
                 AssertPtrReturnVoid(m_pPaneNetwork);

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.h

@@ -96 +96 @@
     /** Holds the Virtual Media Manager instance. */
     UIMediumManagerWidget       *m_pPaneMedia;
-    /** Holds the Host Network Manager instance. */
+    /** Holds the Network Manager instance. */
     UINetworkManagerWidget      *m_pPaneNetwork;
     /** Holds the Cloud Profile Manager instance. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -704 +704 @@
     {
         case UIToolType_Media:       sltCloseVirtualMediumManagerWindow(); break;
-        case UIToolType_Network:     sltCloseHostNetworkManagerWindow(); break;
+        case UIToolType_Network:     sltCloseNetworkManagerWindow(); break;
         case UIToolType_Cloud:       sltCloseCloudProfileManagerWindow(); break;
         case UIToolType_Logs:        sltCloseLogViewerWindow(); break;
@@ -764 +764 @@
 }
 
-void UIVirtualBoxManager::sltOpenHostNetworkManagerWindow()
+void UIVirtualBoxManager::sltOpenNetworkManagerWindow()
 {
     /* First check if instance of widget opened the embedded way: */
@@ -778 +778 @@
         UINetworkManagerFactory(m_pActionPool).prepare(m_pManagerHostNetwork, this);
         connect(m_pManagerHostNetwork, &QIManagerDialog::sigClose,
-                this, &UIVirtualBoxManager::sltCloseHostNetworkManagerWindow);
+                this, &UIVirtualBoxManager::sltCloseNetworkManagerWindow);
     }
 
@@ -787 +787 @@
 }
 
-void UIVirtualBoxManager::sltCloseHostNetworkManagerWindow()
+void UIVirtualBoxManager::sltCloseNetworkManagerWindow()
 {
     /* Destroy instance if still exists: */
@@ -2316 +2316 @@
             this, &UIVirtualBoxManager::sltOpenVirtualMediumManagerWindow);
     connect(actionPool()->action(UIActionIndexMN_M_File_S_ShowHostNetworkManager), &UIAction::triggered,
-            this, &UIVirtualBoxManager::sltOpenHostNetworkManagerWindow);
+            this, &UIVirtualBoxManager::sltOpenNetworkManagerWindow);
     connect(actionPool()->action(UIActionIndexMN_M_File_S_ShowCloudProfileManager), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenCloudProfileManagerWindow);
@@ -2542 +2542 @@
     /* Close the sub-dialogs first: */
     sltCloseVirtualMediumManagerWindow();
-    sltCloseHostNetworkManagerWindow();
+    sltCloseNetworkManagerWindow();
     sltCloseCloudProfileManagerWindow();
     sltCloseCloudConsoleManagerWindow();

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -160 +160 @@
         void sltCloseVirtualMediumManagerWindow();
 
-        /** Handles call to open Host Network Manager window. */
-        void sltOpenHostNetworkManagerWindow();
-        /** Handles call to close Host Network Manager window. */
-        void sltCloseHostNetworkManagerWindow();
+        /** Handles call to open Network Manager window. */
+        void sltOpenNetworkManagerWindow();
+        /** Handles call to close Network Manager window. */
+        void sltCloseNetworkManagerWindow();
 
         /** Handles call to open Cloud Profile Manager window. */
@@ -466 +466 @@
     /** Holds the Virtual Media Manager window instance. */
     QIManagerDialog *m_pManagerVirtualMedia;
-    /** Holds the Host Network Manager window instance. */
+    /** Holds the Network Manager window instance. */
     QIManagerDialog *m_pManagerHostNetwork;
     /** Holds the Cloud Profile Manager window instance. */

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -424 +424 @@
 private:
 
-    /** Constructs Host Network Manager dialog.
+    /** Constructs Medium Manager dialog.
       * @param  pCenterWidget  Brings the widget reference to center according to.
       * @param  pActionPool    Brings the action-pool reference. */

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.h

@@ -255 +255 @@
 
 
-/** QIManagerDialogFactory extension used as a factory for Host Network Manager dialog. */
+/** QIManagerDialogFactory extension used as a factory for Network Manager dialog. */
 class UINetworkManagerFactory : public QIManagerDialogFactory
 {
@@ -297 +297 @@
 private:
 
-    /** Constructs Host Network Manager dialog.
+    /** Constructs Network Manager dialog.
       * @param  pCenterWidget  Brings the widget reference to center according to.
       * @param  pActionPool    Brings the action-pool reference. */

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManagerUtils.h

@@ -26 +26 @@
 
 
-/** Host Network Manager: Host network utilities. */
+/** Network Manager: Host network utilities. */
 namespace UINetworkManagerUtils
 {