Changeset 103551 in vbox for trunk/src/VBox

Timestamp:

Feb 23, 2024 4:09:47 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: Moving UIType from UICommon to UIDefs for reuse purposes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• globals/UICommon.cpp (modified) (5 diffs)
• globals/UICommon.h (modified) (1 diff)
• globals/UIDefs.h (modified) (2 diffs)
• globals/UIDesktopWidgetWatchdog.cpp (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerWidget.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)
• networking/UIUpdateManager.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.cpp (modified) (5 diffs)
• settings/editors/UIShortcutConfigurationEditor.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -4892 +4892 @@
     {
         /* Current VM only: */
-        if (   uiCommon().uiType() == UICommon::UIType_RuntimeUI
+        if (   uiCommon().uiType() == UIType_RuntimeUI
             && uMachineID == uiCommon().managedVMUuid())
         {

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

@@ -633 +633 @@
     }
 
-    if (m_enmType == UIType_RuntimeUI && startVM)
+    if (uiType() == UIType_RuntimeUI && startVM)
     {
         /* m_fSeparateProcess makes sense only if a VM is started. */
@@ -677 +677 @@
 
     /* For Selector UI: */
-    if (uiType() == UIType_SelectorUI)
+    if (uiType() == UIType_ManagerUI)
     {
         /* We should create separate logging file for VM selector: */
@@ -1404 +1404 @@
         {
             /* For Selector UI: */
-            case UIType_SelectorUI:
+            case UIType_ManagerUI:
             {
                 /* Just switch to existing VM window: */
@@ -1585 +1585 @@
     }
     /* Is this a Selector UI call? */
-    else if (uiType() == UIType_SelectorUI)
+    else if (uiType() == UIType_ManagerUI)
     {
         /* Open existing 'shared' session: */
@@ -3085 +3085 @@
 
             /* For Selector UI: */
-            if (uiType() == UIType_SelectorUI)
+            if (uiType() == UIType_ManagerUI)
             {
                 /* Recreate Main event listeners: */

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

@@ -145 +145 @@
 public:
 
-    /** UI types. */
-    enum UIType
-    {
-        UIType_SelectorUI,
-        UIType_RuntimeUI
-    };
-
     /** VM launch running options. */
     enum LaunchRunning

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

@@ -33 +33 @@
 
 /* Qt includes: */
-#include <QEvent>
 #include <QStringList>
 
@@ -84 +83 @@
 
 
+/** UI types. */
+enum UIType
+{
+    UIType_ManagerUI,
+    UIType_RuntimeUI
+};
+
+
 /** VM launch modes. */
 enum UILaunchMode

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

@@ -1070 +1070 @@
     return    m_enmSynthTestPolicy == DesktopWatchdogPolicy_SynthTest_Disabled
            || (   m_enmSynthTestPolicy == DesktopWatchdogPolicy_SynthTest_ManagerOnly
-               && uiCommon().uiType() == UICommon::UIType_RuntimeUI)
+               && uiCommon().uiType() == UIType_RuntimeUI)
            || (   m_enmSynthTestPolicy == DesktopWatchdogPolicy_SynthTest_MachineOnly
-               && uiCommon().uiType() == UICommon::UIType_SelectorUI);
+               && uiCommon().uiType() == UIType_ManagerUI);
 }
 

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

@@ -2190 +2190 @@
     if (!strAutoConfirmId.isEmpty())
     {
-        const QUuid uID = uiCommon().uiType() == UICommon::UIType_RuntimeUI
+        const QUuid uID = uiCommon().uiType() == UIType_RuntimeUI
                         ? uiCommon().managedVMUuid()
                         : UIExtraDataManager::GlobalID;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -997 +997 @@
 
         /* Add a label tab with machine name on it. Used only in manager UI: */
-        if (uiCommon().uiType() == UICommon::UIType_SelectorUI)
+        if (uiCommon().uiType() == UIType_ManagerUI)
             m_pTabWidget->addTab(new UILabelTab(this, uMachineId, strMachineName), strMachineName);
 

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -542 +542 @@
 #ifndef VBOX_RUNTIME_UI
         /* Create global app instance for Selector UI: */
-        UICommon::create(UICommon::UIType_SelectorUI);
+        UICommon::create(UIType_ManagerUI);
 #else
         /* Create global app instance for Runtime UI: */
-        UICommon::create(UICommon::UIType_RuntimeUI);
+        UICommon::create(UIType_RuntimeUI);
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateManager.cpp

@@ -272 +272 @@
 #ifdef VBOX_WITH_UPDATE_REQUEST
     /* Ask updater to check for the first time, for Selector UI only: */
-    if (gEDataManager->applicationUpdateEnabled() && uiCommon().uiType() == UICommon::UIType_SelectorUI)
+    if (gEDataManager->applicationUpdateEnabled() && uiCommon().uiType() == UIType_ManagerUI)
         QTimer::singleShot(0, this, SLOT(sltCheckIfUpdateIsNecessary()));
 #endif /* VBOX_WITH_UPDATE_REQUEST */

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -2391 +2391 @@
     switch (uiCommon().uiType())
     {
-        case UICommon::UIType_SelectorUI:
+        case UIType_ManagerUI:
         {
             /* Open a session thru which we will modify the machine: */
@@ -2498 +2498 @@
     switch (uiCommon().uiType())
     {
-        case UICommon::UIType_SelectorUI:
+        case UIType_ManagerUI:
         {
             /* Acquire VM id: */
@@ -2543 +2543 @@
     switch (uiCommon().uiType())
     {
-        case UICommon::UIType_RuntimeUI:
+        case UIType_RuntimeUI:
         {
             /* Check the console state, it might be already gone: */
@@ -3720 +3720 @@
     switch (uiCommon().uiType())
     {
-        case UICommon::UIType_SelectorUI:
+        case UIType_ManagerUI:
         {
             /* Acquire session state: */
@@ -3749 +3749 @@
             break;
         }
-        case UICommon::UIType_RuntimeUI:
+        case UIType_RuntimeUI:
         {
             /* Get passed machine: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.cpp

@@ -978 +978 @@
 
         /* In the VM process we start by displaying the Runtime UI tab: */
-        if (uiCommon().uiType() == UICommon::UIType_RuntimeUI)
+        if (uiCommon().uiType() == UIType_RuntimeUI)
             m_pTabWidget->setCurrentWidget(pTabMachine);
     }