Changeset 2495 in vbox

Timestamp:

May 4, 2007 12:57:03 PM (18 years ago)

Author:

vboxsync

Message:

Fixing statusBar clearing issue for required popup menus.
Currently status bar will be cleared upon aboutToHide() signal received [for required QPopupMenu] only if the last status bar message was posted by this menu item highlighting event.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -150 +150 @@
     void activateSFMenu();
 
+    void statusTipChanged (const QString &);
+    void clearStatusBar();
+
     void showIndicatorContextMenu (QIStateIndicator *ind, QContextMenuEvent *e);
 
@@ -219 +222 @@
     int devicesVRDPMenuSeparatorId;
     int devicesSFMenuSeparatorId;
+
+    bool waitForStatusBarChange;
+    bool statusBarChangedInside;
 
 #ifdef VBOX_WITH_DEBUGGER_GUI

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

@@ -559 +559 @@
     connect (devicesNetworkMenu, SIGNAL(aboutToShow()), this, SLOT(prepareNetworkMenu()));
 
+    connect (statusBar(), SIGNAL(messageChanged (const QString &)), this, SLOT(statusTipChanged (const QString &)));
+
     connect (devicesMountFloppyMenu, SIGNAL(activated(int)), this, SLOT(captureFloppy(int)));
     connect (devicesMountDVDMenu, SIGNAL(activated(int)), this, SLOT(captureDVD(int)));
@@ -577 +579 @@
      * is constructed of dynamic items only) */
     connect (devicesMountFloppyMenu, SIGNAL (aboutToHide()),
-             statusBar(), SLOT (clear()));
+             this, SLOT (clearStatusBar()));
     connect (devicesMountDVDMenu, SIGNAL (aboutToHide()),
-             statusBar(), SLOT (clear()));
+             this, SLOT (clearStatusBar()));
     connect (devicesNetworkMenu, SIGNAL (aboutToHide()),
-             statusBar(), SLOT (clear()));
+             this, SLOT (clearStatusBar()));
 
     connect (helpWebAction, SIGNAL (activated()),
@@ -1057 +1059 @@
         {
             StatusTipEvent *ev = (StatusTipEvent*) e;
-            ((QMainWindow*)this)->statusBar()->message (ev->mTip);
+            statusBar()->message (ev->mTip);
             break;
         }
@@ -2212 +2214 @@
         StatusTipEvent *ev = new StatusTipEvent (tip);
         QApplication::postEvent (this, ev);
-    }
+        waitForStatusBarChange = true;
+    }
+}
+
+void VBoxConsoleWnd::statusTipChanged (const QString & /*aMes*/)
+{
+    statusBarChangedInside = waitForStatusBarChange;
+    waitForStatusBarChange = false;
+}
+
+void VBoxConsoleWnd::clearStatusBar()
+{
+    if (statusBarChangedInside)
+        statusBar()->clear();
 }