Changeset 23142 in vbox

Timestamp:

Sep 18, 2009 3:39:59 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: context menu when right clicking on the network icon in the status bar.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -222 +222 @@
     void prepareFloppyMenu();
     void prepareDVDMenu();
+    void prepareNetworkMenu();
+    void prepareSFMenu();
 
     void captureFloppy (QAction *aAction);
@@ -322 +324 @@
     QMenu *mDevicesMountFloppyMenu;
     QMenu *mDevicesMountDVDMenu;
-    /* see showIndicatorContextMenu for a description of mDevicesSFMenu */
-    /* QMenu *mDevicesSFMenu; */
+    QMenu *mDevicesSFMenu;
+    QMenu *mDevicesNetworkMenu;
     VBoxUSBMenu *mDevicesUSBMenu;
     /* VBoxSwitchMenu *mDevicesVRDPMenu; */

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

@@ -416 +416 @@
 
     mMainMenu = new QIMenu (this);
+    mDevicesNetworkMenu = new QMenu(this);
+    mDevicesSFMenu = new QMenu(this);
 
     /* Machine submenu */
@@ -474 +476 @@
     mDevicesUSBMenuSeparator = mDevicesMenu->addSeparator();
 
-    /* see showIndicatorContextMenu for a description of mDevicesSFMenu */
-    /* mDevicesSFMenu = mDevicesMenu->addMenu (QString::null); */
     mDevicesMenu->addAction (mDevicesSFDialogAction);
     mDevicesSFMenuSeparator = mDevicesMenu->addSeparator();
@@ -664 +664 @@
     connect (mDevicesMountFloppyMenu, SIGNAL(aboutToShow()), this, SLOT(prepareFloppyMenu()));
     connect (mDevicesMountDVDMenu, SIGNAL(aboutToShow()), this, SLOT(prepareDVDMenu()));
+    connect (mDevicesNetworkMenu, SIGNAL(aboutToShow()), this, SLOT(prepareNetworkMenu()));
+    connect (mDevicesSFMenu, SIGNAL(aboutToShow()), this, SLOT(prepareSFMenu()));
 
     connect (statusBar(), SIGNAL(messageChanged (const QString &)), this, SLOT(statusTipChanged (const QString &)));
@@ -1983 +1985 @@
 
         mDevicesNetworkDialogAction->setEnabled (isRunningOrPaused && count > 0);
+        mDevicesNetworkMenu->setEnabled (isRunningOrPaused && count > 0);
 
         /* update tooltip */
@@ -2079 +2082 @@
         QString data;
         QMap <QString, QString> sfs;
+
+        mDevicesSFMenu->setEnabled (true);
 
         /// @todo later: add global folders
@@ -3244 +3249 @@
 }
 
+void VBoxConsoleWnd::prepareNetworkMenu()
+{
+    mDevicesNetworkMenu->clear();
+    mDevicesNetworkMenu->addAction (mDevicesNetworkDialogAction);
+}
+
+void VBoxConsoleWnd::prepareSFMenu()
+{
+    mDevicesSFMenu->clear();
+    mDevicesSFMenu->addAction (mDevicesSFDialogAction);
+}
+
 void VBoxConsoleWnd::statusTipChanged (const QString & /*aMes*/)
 {
@@ -3395 +3412 @@
     if (ind == sf_light)
     {
-        /* Showing the context menu that always contains a single item is a
-         * bit stupid; let's better execute this item's action directly. The
-         * menu itself is kept just in case if we need more than one item in
-         * the future. */
-        /* mDevicesSFMenu->exec (e->globalPos()); */
-        if (mDevicesSFDialogAction->isEnabled())
-            mDevicesSFDialogAction->trigger();
+        if (mDevicesSFMenu->isEnabled())
+        {
+            mDevicesSFMenu->menuAction()->setData (true);
+            mDevicesSFMenu->exec (e->globalPos());
+            mDevicesSFMenu->menuAction()->setData (false);
+        }
     }
     else
     if (ind == net_light)
     {
-        if (mDevicesNetworkDialogAction->isEnabled())
-            mDevicesNetworkDialogAction->trigger();
+        if (mDevicesNetworkMenu->isEnabled())
+        {
+            mDevicesNetworkMenu->menuAction()->setData (true);
+            mDevicesNetworkMenu->exec (e->globalPos());
+            mDevicesNetworkMenu->menuAction()->setData (false);
+        }
     }
 }