Changeset 53057 in vbox

Timestamp:

Oct 14, 2014 3:29:38 PM (11 years ago)

Author:

vboxsync

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

96555

Message:

FE/Qt: Runtime UI: Status-bar indicators: Make sure they are auto-updated for shown machine-windows which were initially hidden.

Location:

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

Files:

• UIMachineWindow.cpp (modified) (1 diff)
• UIMachineWindow.h (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

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

@@ -266 +266 @@
 #endif /* Q_WS_X11 */
 
-void UIMachineWindow::closeEvent(QCloseEvent *pEvent)
+void UIMachineWindow::showEvent(QShowEvent *pShowEvent)
+{
+    /* Call to base class: */
+    QMainWindow::showEvent(pShowEvent);
+
+    /* Update appearance for indicator-pool: */
+    updateAppearanceOf(UIVisualElement_IndicatorPoolStuff);
+}
+
+void UIMachineWindow::closeEvent(QCloseEvent *pCloseEvent)
 {
     /* Always ignore close-event first: */
-    pEvent->ignore();
+    pCloseEvent->ignore();
 
     /* Make sure machine is in one of the allowed states: */

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

@@ -99 +99 @@
     /* Event handlers: */
 #ifdef Q_WS_X11
+    /** X11: Native event handler. */
     bool x11Event(XEvent *pEvent);
 #endif /* Q_WS_X11 */
-    void closeEvent(QCloseEvent *pEvent);
+
+    /** Show event handler. */
+    void showEvent(QShowEvent *pShowEvent);
+
+    /** Close event handler. */
+    void closeEvent(QCloseEvent *pCloseEvent);
 
 #ifdef Q_WS_MAC

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

@@ -166 +166 @@
     statusBar()->setVisible(pActionStatusBarSwitch->isChecked());
     /* Update status-bar indicators-pool: */
-    m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible());
+    m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
 
     /* Normalize geometry without moving: */
@@ -328 +328 @@
         /* Update status-bar visibility: */
         statusBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->isChecked());
-        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible());
+        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -286 +286 @@
 
 #if defined(VBOX_WITH_TRANSLUCENT_SEAMLESS) && defined(Q_WS_WIN)
-void UIMachineWindowSeamless::showEvent(QShowEvent*)
-{
+void UIMachineWindowSeamless::showEvent(QShowEvent *pShowEvent)
+{
+    /* Call to base class: */
+    UIMachineWindow::showEvent(pShowEvent);
+
     /* Following workaround allows to fix the next Qt BUG:
      * https://bugreports.qt-project.org/browse/QTBUG-17548