Changeset 99012 in vbox for trunk

Timestamp:

Mar 17, 2023 2:19:31 PM (23 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Window name for the case when COM init failed.

Location:

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

Files:

• UIMachineWindow.cpp (modified) (1 diff)
• UIMachineWindow.h (modified) (1 diff)

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

@@ -255 +255 @@
         const KMachineState enmState = uimachine()->machineState();
         if (enmState == KMachineState_Null)
-            return;
-
-        /* Prepare full name: */
-        QString strMachineName = machineName();
-
-        /* Append snapshot name: */
-        ulong uSnapshotCount = 0;
-        uimachine()->acquireSnapshotCount(uSnapshotCount);
-        if (uSnapshotCount > 0)
-        {
-            QString strCurrentSnapshotName;
-            uimachine()->acquireCurrentSnapshotName(strCurrentSnapshotName);
-            strMachineName += " (" + strCurrentSnapshotName + ")";
-        }
-
-        /* Append state name: */
-        strMachineName += " [" + gpConverter->toString(enmState) + "]";
+        {
+            /* Assign default window title: */
+            setWindowTitle(defaultWindowTitle());
+        }
+        else
+        {
+            /* Prepare full name: */
+            QString strMachineName = machineName();
+
+            /* Append snapshot name: */
+            ulong uSnapshotCount = 0;
+            uimachine()->acquireSnapshotCount(uSnapshotCount);
+            if (uSnapshotCount > 0)
+            {
+                QString strCurrentSnapshotName;
+                uimachine()->acquireCurrentSnapshotName(strCurrentSnapshotName);
+                strMachineName += " (" + strCurrentSnapshotName + ")";
+            }
+
+            /* Append state name: */
+            strMachineName += " [" + gpConverter->toString(enmState) + "]";
 
 #ifndef VBOX_WS_MAC
-        /* Append user product name (besides macOS): */
-        const QString strUserProductName = uimachine()->machineWindowNamePostfix();
-        strMachineName += " - " + (strUserProductName.isEmpty() ? defaultWindowTitle() : strUserProductName);
+            /* Append user product name (besides macOS): */
+            const QString strUserProductName = uimachine()->machineWindowNamePostfix();
+            strMachineName += " - " + (strUserProductName.isEmpty() ? defaultWindowTitle() : strUserProductName);
 #endif /* !VBOX_WS_MAC */
 
-        /* Append screen number only if there are more than one present: */
-        ulong cMonitorCount = 0;
-        uimachine()->acquireMonitorCount(cMonitorCount);
-        if (cMonitorCount > 1)
-            strMachineName += QString(" : %1").arg(m_uScreenId + 1);
-
-        /* Assign title finally: */
-        setWindowTitle(strMachineName);
+            /* Append screen number only if there are more than one present: */
+            ulong cMonitorCount = 0;
+            uimachine()->acquireMonitorCount(cMonitorCount);
+            if (cMonitorCount > 1)
+                strMachineName += QString(" : %1").arg(m_uScreenId + 1);
+
+            /* Assign title finally: */
+            setWindowTitle(strMachineName);
+        }
     }
 }

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

@@ -189 +189 @@
 
     /* Helpers: */
-    const QString& defaultWindowTitle() const { return m_strWindowTitlePrefix; }
+    QString defaultWindowTitle() const { return m_strWindowTitlePrefix; }
     static Qt::Alignment viewAlignment(UIVisualStateType visualStateType);