Changeset 3762 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 22, 2007 12:14:05 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed appearance of the popup version of the main menu (focus, position); this menu is now also shown in fullscreen mode.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (5 diffs)
• src/VBoxConsoleView.cpp (modified) (3 diffs)
• src/VBoxConsoleWnd.cpp (modified) (22 diffs)
• src/VBoxGlobal.cpp (modified) (1 diff)

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

@@ -71 +71 @@
     void refreshView();
 
-    bool isTrueFullscreen() const { return mIsInFullscreenMode; }
-
-    bool isTrueSeamless() const { return mIsInSeamlessMode; }
-
-    void setMouseIntegrationLocked (bool);
-
-    void popupSeamlessMenu();
+    bool isTrueFullscreen() const { return mIsFullscreen; }
+
+    bool isTrueSeamless() const { return mIsSeamless; }
+
+    void setMouseIntegrationLocked (bool aDisabled);
+
+    void popupMainMenu (bool aCenter);
 
 public slots:
@@ -180 +180 @@
 private:
 
-    QPopupMenu *mSeamlessPopupMenu;
+    /** Popup version of the main menu */
+    QPopupMenu *mMainMenu;
 
     QActionGroup *runningActions;
 
-    // VM actions
+    // Machine actions
     QAction *vmFullscreenAction;
     QAction *vmSeamlessAction;
@@ -199 +200 @@
     QAction *vmTakeSnapshotAction;
     QAction *vmDisableMouseIntegrAction;
-
-    // VM popup menus
-    VBoxSwitchMenu *vmAutoresizeMenu;
-    VBoxSwitchMenu *vmDisMouseIntegrMenu;
 
     // Devices actions
@@ -223 +220 @@
     QAction *helpAboutAction;
     QAction *helpResetMessagesAction;
+
+    // Machine popup menus
+    VBoxSwitchMenu *vmAutoresizeMenu;
+    VBoxSwitchMenu *vmDisMouseIntegrMenu;
 
     // Devices popup menus
@@ -288 +289 @@
 
     // variables for dealing with true fullscreen
-    bool mIsInFullscreenMode : 1;
-    bool mIsInSeamlessMode : 1;
-    bool mIsSeamlessModeSupported : 1;
+    bool mIsFullscreen : 1;
+    bool mIsSeamless : 1;
+    bool mIsSeamlessSupported : 1;
     int normal_wflags;
     bool was_max : 1;

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

@@ -1132 +1132 @@
                     else if (ke->key() == Key_Home)
                     {
-                        if (mainwnd->isTrueSeamless())
-                            mainwnd->popupSeamlessMenu();
+                        /* activate the main menu */
+                        if (mainwnd->isTrueSeamless() || mainwnd->isTrueFullscreen())
+                            mainwnd->popupMainMenu (mouse_captured);
                         else
                             mainwnd->menuBar()->setFocus();
@@ -1139 +1140 @@
                     else
                     {
-                        /*
-                         *  process hot keys not processed in keyEvent()
-                         *  (as in case of non-alphanumeric keys)
-                         */
+                        /* process hot keys not processed in keyEvent()
+                         * (as in case of non-alphanumeric keys) */
                         processHotKey (QKeySequence (ke->key()),
                                        mainwnd->menuBar());
@@ -1151 +1150 @@
                     if (isPaused())
                     {
-                        /*
-                         *  if the reminder is disabled we pass the event to
-                         *  Qt to enable normal keyboard functionality
-                         *  (for example, menu access with Alt+Letter)
-                         */
+                        /* if the reminder is disabled we pass the event to
+                         * Qt to enable normal keyboard functionality
+                         * (for example, menu access with Alt+Letter) */
                         if (!vboxProblem().remindAboutPausedVMInput())
                             break;

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

@@ -215 +215 @@
                 WFlags aFlags)
     : QMainWindow (aParent, aName, aFlags)
-    , mSeamlessPopupMenu (0)
+    , mMainMenu (0)
 #ifdef VBOX_WITH_DEBUGGER_GUI
     , dbgStatisticsAction (NULL)
@@ -226 +226 @@
     , machine_state (CEnums::InvalidMachineState)
     , no_auto_close (false)
-    , mIsInFullscreenMode (false)
-    , mIsInSeamlessMode (false)
-    , mIsSeamlessModeSupported (false)
+    , mIsFullscreen (false)
+    , mIsSeamless (false)
+    , mIsSeamlessSupported (false)
     , normal_wflags (getWFlags())
     , was_max (false)
@@ -377 +377 @@
     ///// Menubar ///////////////////////////////////////////////////////////
 
-    mSeamlessPopupMenu = new QPopupMenu (this, "mSeamlessPopupMenu");
-
-    /* VM popup menu */
+    mMainMenu = new QPopupMenu (this, "mMainMenu");
+
+    /* Machine submenu */
 
     QPopupMenu *vmMenu = new QPopupMenu (this, "vmMenu");
+
+    /* dynamic & status line popup menus */
+    vmAutoresizeMenu = new VBoxSwitchMenu (vmMenu, vmAutoresizeGuestAction);
+    vmDisMouseIntegrMenu = new VBoxSwitchMenu (vmMenu, vmDisableMouseIntegrAction,
+                                               true /* inverted toggle state */);
+
     vmFullscreenAction->addTo (vmMenu);
     vmSeamlessAction->addTo (vmMenu);
@@ -401 +407 @@
     vmMenu->insertSeparator();
     vmCloseAction->addTo (vmMenu);
+
     menuBar()->insertItem (QString::null, vmMenu, vmMenuId);
-    vmAutoresizeMenu = new VBoxSwitchMenu (vmMenu, vmAutoresizeGuestAction);
-    vmDisMouseIntegrMenu = new VBoxSwitchMenu (vmMenu, vmDisableMouseIntegrAction,
-                                               true /* inverted toggle state */);
-    mSeamlessPopupMenu->insertItem (QString::null, vmMenu, vmMenuId);
-
-    /* Devices popup menu */
+    mMainMenu->insertItem (QString::null, vmMenu, vmMenuId);
+
+    /* Devices submenu */
 
     devicesMenu = new QPopupMenu (this, "devicesMenu");
 
-    /* two dynamic submenus */
+    /* dynamic & statusline popup menus */
     devicesMountFloppyMenu = new QPopupMenu (devicesMenu, "devicesMountFloppyMenu");
     devicesMountDVDMenu = new QPopupMenu (devicesMenu, "devicesMountDVDMenu");
-
     devicesSharedFolders = new QPopupMenu (devicesMenu, "devicesSharedFolders");
     devicesNetworkMenu = new QPopupMenu (devicesMenu, "devicesNetworkMenu");
@@ -439 +442 @@
     devicesVRDPMenuSeparatorId = devicesMenu->insertSeparator();
     devicesInstallGuestToolsAction->addTo (devicesMenu);
+
     menuBar()->insertItem (QString::null, devicesMenu, devicesMenuId);
+    mMainMenu->insertItem (QString::null, devicesMenu, devicesMenuId);
 
     /* reset the "context menu" flag */
@@ -445 +450 @@
     devicesMenu->setItemParameter (devicesMountDVDMenuId, 0);
     devicesMenu->setItemParameter (devicesUSBMenuId, 0);
-    mSeamlessPopupMenu->insertItem (QString::null, devicesMenu, devicesMenuId);
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -455 +459 @@
         dbgCommandLineAction->addTo (dbgMenu);
         menuBar()->insertItem (QString::null, dbgMenu, dbgMenuId);
-        mSeamlessPopupMenu->insertItem (QString::null, dbgMenu, dbgMenuId);
+        mMainMenu->insertItem (QString::null, dbgMenu, dbgMenuId);
     }
     else
@@ -461 +465 @@
 #endif
 
-    /* Help popup menu */
+    /* Help submenu */
 
     QPopupMenu *helpMenu = new QPopupMenu( this, "helpMenu" );
+
     helpWebAction->addTo( helpMenu );
     helpMenu->insertSeparator();
@@ -469 +474 @@
     helpMenu->insertSeparator();
     helpResetMessagesAction->addTo (helpMenu);
+
     menuBar()->insertItem( QString::null, helpMenu, helpMenuId );
-    mSeamlessPopupMenu->insertItem (QString::null, helpMenu, helpMenuId);
+    mMainMenu->insertItem (QString::null, helpMenu, helpMenuId);
 
     ///// Status bar ////////////////////////////////////////////////////////
@@ -786 +792 @@
             normal_pos = QPoint (x, y);
             normal_size = QSize (w, h);
-            if (!mIsInFullscreenMode && !vmSeamlessAction->isOn())
+            if (!mIsFullscreen && !vmSeamlessAction->isOn())
             {
                 move (normal_pos);
@@ -803 +809 @@
             normal_pos = QPoint();
             normal_size = QSize();
-            if (!mIsInFullscreenMode && !vmSeamlessAction->isOn())
+            if (!mIsFullscreen && !vmSeamlessAction->isOn())
             {
                 console->normalizeGeometry (true /* adjustPosition */);
@@ -1039 +1045 @@
                                  .arg (normal_size.width())
                                  .arg (normal_size.height());
-        if (isMaximized() || (mIsInFullscreenMode && was_max)
-                          || (mIsInSeamlessMode && was_max))
+        if (isMaximized() || (mIsFullscreen && was_max)
+                          || (mIsSeamless && was_max))
             winPos += QString (",%1").arg (GUI_LastWindowPosition_Max);
 
@@ -1082 +1088 @@
 }
 
-void VBoxConsoleWnd::popupSeamlessMenu()
-{
-    mSeamlessPopupMenu->popup (QCursor::pos());
+/**
+ *  Shows up and activates the popup version of the main menu.
+ *
+ *  @param aCenter If @a true, center the popup menu on the screen, otherwise
+ *                 show it at the current mouse pointer location.
+ */
+void VBoxConsoleWnd::popupMainMenu (bool aCenter)
+{
+    QPoint pos = QCursor::pos();
+    if (aCenter)
+    {
+        QRect deskGeo = QApplication::desktop()->screenGeometry (this);
+        QRect popGeo = mMainMenu->frameGeometry();
+        popGeo.moveCenter (QPoint (deskGeo.width() / 2, deskGeo.height() / 2));
+        pos = popGeo.topLeft();
+    }
+    else
+    {
+        /* put the menu's bottom right corner to the pointer's hotspot point */
+        pos.setX (pos.x() - mMainMenu->frameGeometry().width());
+        pos.setY (pos.y() - mMainMenu->frameGeometry().height());
+    }
+
+    mMainMenu->popup (pos);
+    mMainMenu->setActiveWindow();
+    mMainMenu->setActiveItem (0);
 }
 
@@ -1102 +1131 @@
         {
             QResizeEvent *re = (QResizeEvent *) e;
-            if (!mIsInFullscreenMode && !mIsInSeamlessMode &&
+            if (!mIsFullscreen && !mIsSeamless &&
                 (windowState() & (WindowMaximized | WindowMinimized |
                                   WindowFullScreen)) == 0)
@@ -1115 +1144 @@
         case QEvent::Move:
         {
-            if (!mIsInFullscreenMode && !mIsInSeamlessMode &&
+            if (!mIsFullscreen && !mIsSeamless &&
                 (windowState() & (WindowMaximized | WindowMinimized |
                                   WindowFullScreen)) == 0)
@@ -1495 +1524 @@
 
     menuBar()->changeItem (vmMenuId, tr ("&Machine"));
-    mSeamlessPopupMenu->changeItem (vmMenuId,
-        VBoxGlobal::iconSet ("ico16x01.png"), tr ("&Machine"));
+    mMainMenu->changeItem (vmMenuId,
+        VBoxGlobal::iconSet ("machine_16px.png"), tr ("&Machine"));
     menuBar()->changeItem (devicesMenuId, tr ("&Devices"));
-    mSeamlessPopupMenu->changeItem (devicesMenuId,
-        VBoxGlobal::iconSet ("diskim_16px.png"), tr ("&Devices"));
+    mMainMenu->changeItem (devicesMenuId,
+        VBoxGlobal::iconSet ("settings_16px.png"), tr ("&Devices"));
 #ifdef VBOX_WITH_DEBUGGER_GUI
     if (vboxGlobal().isDebuggerEnabled())
     {
         menuBar()->changeItem (dbgMenuId, tr ("De&bug"));
-        mSeamlessPopupMenu->changeItem (dbgMenuId,
-            VBoxGlobal::iconSet ("global_settings_16px.png"), tr ("De&bug"));
+        mMainMenu->changeItem (dbgMenuId, tr ("De&bug"));
     }
 #endif
     menuBar()->changeItem (helpMenuId, tr ("&Help"));
-    mSeamlessPopupMenu->changeItem (helpMenuId,
+    mMainMenu->changeItem (helpMenuId,
         VBoxGlobal::iconSet ("help_16px.png"), tr ("&Help"));
 
@@ -1789 +1817 @@
 {
     if (aSeamless &&
-        (aOn && !mIsSeamlessModeSupported ||
-         aOn && mIsInFullscreenMode ||
-         !aOn && !mIsInSeamlessMode))
+        (aOn && !mIsSeamlessSupported ||
+         aOn && mIsFullscreen ||
+         !aOn && !mIsSeamless))
         return;
 
@@ -1797 +1825 @@
     AssertReturnVoid ((hidden_children.isEmpty() == aOn));
     if (aSeamless)
-        AssertReturnVoid (mIsInSeamlessMode != aOn);
+        AssertReturnVoid (mIsSeamless != aOn);
     else
-        AssertReturnVoid (mIsInFullscreenMode != aOn);
+        AssertReturnVoid (mIsFullscreen != aOn);
 
     if (aOn)
@@ -1833 +1861 @@
     else
     {
-        mIsInFullscreenMode = aOn;
+        mIsFullscreen = aOn;
         vmAdjustWindowAction->setEnabled (!aOn);
         vmSeamlessAction->setEnabled (!aOn);
@@ -1843 +1871 @@
     {
         if (aSeamless)
-            mIsInSeamlessMode = true;
+            mIsSeamless = true;
 
         /* Save the previous scroll-view minimum size before entering
@@ -1982 +2010 @@
 
         if (aSeamless)
-            mIsInSeamlessMode = false;
+            mIsSeamless = false;
     }
 
@@ -2759 +2787 @@
     vmAutoresizeGuestAction->setEnabled (aActive);
     vmSeamlessAction->setEnabled (aSeamless);
-    mIsSeamlessModeSupported = aSeamless;
+    mIsSeamlessSupported = aSeamless;
     if (aSeamless && vmSeamlessAction->isOn())
         vmSeamless (true);

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

@@ -2232 +2232 @@
     delete list;
 
-    /// @todo (r=dmik) not sure, we really need this
+    /// @todo (r=dmik) not sure if we really need this
 #if 0
     /* sanity check for decoration frames. With embedding, we