Changeset 69722 in vbox

Timestamp:

Nov 17, 2017 11:14:15 AM (7 years ago)

Author:

vboxsync

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

119108

Message:

FE/Qt: bugref:9027: Setting WM_CLASS so that different VM windows get different 'name' only if a global flag is up.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)

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

@@ -140 +140 @@
 #ifdef VBOX_WS_X11
 const char* UIExtraDataDefs::GUI_Fullscreen_LegacyMode = "GUI/Fullscreen/LegacyMode";
+const char* UIExtraDataDefs::GUI_DistinguishMachineWindowGroups = "GUI/DistinguishMachineWindowGroups";
 #endif /* VBOX_WS_X11 */
 const char* UIExtraDataDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -248 +248 @@
         /** Holds whether legacy full-screen mode is requested. */
         extern const char* GUI_Fullscreen_LegacyMode;
+        /** Holds whether internal machine-window names should be unique. */
+        extern const char* GUI_DistinguishMachineWindowGroups;
 #endif /* VBOX_WS_X11 */
         /** Holds whether guest-screen auto-resize according machine-window size is enabled. */

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

@@ -1982 +1982 @@
 #ifdef VBOX_WS_X11
            << GUI_Fullscreen_LegacyMode
+           << GUI_DistinguishMachineWindowGroups
 #endif /* VBOX_WS_X11 */
            << GUI_AutoresizeGuest << GUI_LastVisibilityStatusForGuestScreen << GUI_LastGuestSizeHint
@@ -3556 +3557 @@
     /* 'False' unless feature allowed: */
     return isFeatureAllowed(GUI_Fullscreen_LegacyMode);
+}
+
+bool UIExtraDataManager::distinguishMachineWindowGroups(const QString &strID)
+{
+    /* 'False' unless feature allowed: */
+    return isFeatureAllowed(GUI_DistinguishMachineWindowGroups, strID);
+}
+
+void UIExtraDataManager::setDistinguishMachineWindowGroups(const QString &strID, bool fEnabled)
+{
+    /* 'True' if feature allowed, null-string otherwise: */
+    setExtraDataString(GUI_DistinguishMachineWindowGroups, toFeatureAllowed(fEnabled), strID);
 }
 #endif /* VBOX_WS_X11 */

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

@@ -481 +481 @@
         /** Returns whether legacy full-screen mode is requested. */
         bool legacyFullscreenModeRequested();
+
+        /** Returns whether internal machine-window name should be unique. */
+        bool distinguishMachineWindowGroups(const QString &strID);
+        /** Defines whether internal machine-window name should be unique. */
+        void setDistinguishMachineWindowGroups(const QString &strID, bool fEnabled);
 #endif /* VBOX_WS_X11 */
 

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

@@ -97 +97 @@
 {
 #ifdef VBOX_WS_X11
-    /* Compose window name: */
-    const QString strWindowName = QString("VirtualBox Machine UUID: %1").arg(vboxGlobal().managedVMUuid());
-    vboxGlobal().setWMClass(this, strWindowName, strWindowName);
+    /* Prepare default class/name values: */
+    const QString strWindowClass = QString("VirtualBox Machine");
+    QString strWindowName = strWindowClass;
+    /* Check if we want Window Manager to distinguish Virtual Machine windows: */
+    if (gEDataManager->distinguishMachineWindowGroups(vboxGlobal().managedVMUuid()))
+        strWindowName = QString("VirtualBox Machine UUID: %1").arg(vboxGlobal().managedVMUuid());
+    /* Assign WM_CLASS property: */
+    vboxGlobal().setWMClass(this, strWindowName, strWindowClass);
 #endif