Changeset 51550 in vbox for trunk/src/VBox

Timestamp:

Jun 5, 2014 11:51:31 AM (11 years ago)

Author:

vboxsync

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

94199

Message:

FE/Qt: Runtime UI: Load machine-window customizations and availability settings *before* geometry.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -431 +431 @@
     /* Get machine: */
     CMachine m = machine();
+
+    /* Load GUI customizations: */
+    {
+        VBoxGlobalSettings settings = vboxGlobal().settings();
+#ifndef Q_WS_MAC
+        menuBar()->setHidden(settings.isFeatureActive("noMenuBar"));
+#endif /* !Q_WS_MAC */
+        statusBar()->setHidden(settings.isFeatureActive("noStatusBar"));
+        if (statusBar()->isHidden())
+            m_pIdleTimer->stop();
+    }
+
+    /* Load availability settings: */
+    {
+        /* USB Stuff: */
+        if (indicatorsPool()->indicator(IndicatorType_USB))
+        {
+            bool fUSBEnabled =    !m.GetUSBDeviceFilters().isNull()
+                               && !m.GetUSBControllers().isEmpty()
+                               && m.GetUSBProxyAvailable();
+
+            if (!fUSBEnabled)
+            {
+                /* Hide USB menu: */
+                indicatorsPool()->indicator(IndicatorType_USB)->setHidden(true);
+            }
+            else
+            {
+                /* Toggle USB LED: */
+                indicatorsPool()->indicator(IndicatorType_USB)->setState(KDeviceActivity_Idle);
+            }
+        }
+    }
 
     /* Load window geometry: */
@@ -484 +517 @@
         normalizeGeometry(true);
 #endif /* !Q_WS_X11 */
-    }
-
-    /* Load availability settings: */
-    {
-        /* USB Stuff: */
-        if (indicatorsPool()->indicator(IndicatorType_USB))
-        {
-            bool fUSBEnabled =    !m.GetUSBDeviceFilters().isNull()
-                               && !m.GetUSBControllers().isEmpty()
-                               && m.GetUSBProxyAvailable();
-
-            if (!fUSBEnabled)
-            {
-                /* Hide USB menu: */
-                indicatorsPool()->indicator(IndicatorType_USB)->setHidden(true);
-            }
-            else
-            {
-                /* Toggle USB LED: */
-                indicatorsPool()->indicator(IndicatorType_USB)->setState(KDeviceActivity_Idle);
-            }
-        }
-    }
-
-    /* Load global settings: */
-    {
-        VBoxGlobalSettings settings = vboxGlobal().settings();
-#ifndef Q_WS_MAC
-        menuBar()->setHidden(settings.isFeatureActive("noMenuBar"));
-#endif /* !Q_WS_MAC */
-        statusBar()->setHidden(settings.isFeatureActive("noStatusBar"));
-        if (statusBar()->isHidden())
-            m_pIdleTimer->stop();
     }
 }