Changeset 20047 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 26, 2009 4:08:25 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3948: Mini-ToolBar for Full-screen & Seamless modes - Initial commit.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• VirtualBox.qrc (modified) (1 diff)
• images/pin_16px.png (added)
• include/VBoxConsoleWnd.h (modified) (4 diffs)
• include/VBoxMiniToolBar.h (added)
• include/VBoxToolBar.h (modified) (2 diffs)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (7 diffs)
• src/VBoxMiniToolBar.cpp (added)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -254 +254 @@
         include/VBoxConsoleWnd.h \
         include/VBoxConsoleView.h \
+        include/VBoxMiniToolBar.h \
         include/VBoxProblemReporter.h \
         include/VBoxProgressDialog.h \
@@ -345 +346 @@
         src/VBoxConsoleView.cpp \
         src/VBoxConsoleWnd.cpp \
+        src/VBoxMiniToolBar.cpp \
         src/VBoxDownloaderWgt.cpp \
         src/VBoxVMListView.cpp \

trunk/src/VBox/Frontends/VirtualBox/VirtualBox.qrc

@@ -340 +340 @@
     <file alias="chipset_disabled_16px.png">images/chipset_disabled_16px.png</file>
     <file alias="chipset_disabled_32px.png">images/chipset_disabled_32px.png</file>
+    <file alias="pin_16px.png">images/pin_16px.png</file>
+    <file alias="restore_16px.png">images/restore_16px.png</file>
  </qresource>
  </RCC>

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

@@ -57 +57 @@
 
 class VBoxChangeDockIconUpdateEvent;
+
+class VBoxMiniToolBar;
 
 /* We want to make the first action highlighted but not
@@ -250 +252 @@
     void setViewInSeamlessMode (const QRect &aTargetRect);
 
+    void mtExitMode();
+    void mtCloseVM();
+
 private:
 
@@ -307 +312 @@
 
     QMenu *mVMMenu;
+    QMenu *mMiniVMMenu;
     QMenu *mDevicesMenu;
     QMenu *mDevicesMountFloppyMenu;
@@ -392 +398 @@
     CGDisplayFadeReservationToken mFadeToken;
 #endif
+
+    VBoxMiniToolBar *mMiniToolBar;
 };
 

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

@@ -30 +30 @@
 
 /* Qt includes */
+#include <QLayout>
+#include <QMainWindow>
 #include <QToolBar>
-#include <QMainWindow>
 
 /* Note: This styles are available on _all_ platforms. */
@@ -123 +124 @@
         ::darwinSetShowsToolbarButton (this, aShow);
 #else  /* Q_WS_MAC */
-        NOREF (aShow);
+        Q_UNUSED (aShow);
 #endif /* !Q_WS_MAC */
     }

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

@@ -2603 +2603 @@
         doResizeHint (newSize);
     }
+
+    /* Reactivate the console window to preserve the focus position.
+     * Else focus will move to the mini-tool-bar. */
+    activateWindow();
 }
 

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

@@ -32 +32 @@
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
+#include "VBoxMiniToolBar.h"
 
 #include "QIStateIndicator.h"
@@ -503 +504 @@
 
     mHelpActions.addTo (mHelpMenu);
+
+    /* Machine submenu for mini toolbar */
+    mMiniVMMenu = new QMenu (this);
+    mMiniVMMenu->addAction (mVmTypeCADAction);
+#ifdef Q_WS_X11
+    mMiniVMMenu->addAction (mVmTypeCABSAction);
+#endif
+    mMiniVMMenu->addSeparator();
+    mMiniVMMenu->addAction (mVmTakeSnapshotAction);
+    mMiniVMMenu->addSeparator();
+    mMiniVMMenu->addAction (mVmShowInformationDlgAction);
+    mMiniVMMenu->addSeparator();
+    mMiniVMMenu->addAction (mVmResetAction);
+    mMiniVMMenu->addAction (mVmPauseAction);
+    mMiniVMMenu->addAction (mVmACPIShutdownAction);
+
+    /* Mini toolbar */
+    QList <QMenu*> menuList;
+    menuList.append (mMiniVMMenu);
+    menuList.append (mDevicesMenu);
+    mMiniToolBar = new VBoxMiniToolBar (menuList);
+    connect (mMiniToolBar, SIGNAL (exitAction()), this, SLOT (mtExitMode()));
+    connect (mMiniToolBar, SIGNAL (closeAction()), this, SLOT (mtCloseVM()));
+    connect (this, SIGNAL (closing()), mMiniToolBar, SLOT (close()));
 
     ///// Status bar ////////////////////////////////////////////////////////
@@ -1742 +1767 @@
 //    mVMMenu->setIcon (VBoxGlobal::iconSet (":/machine_16px.png"));
 
+    mMiniVMMenu->setTitle (tr ("&Machine"));
+
     mDevicesMenu->setTitle (tr ("&Devices"));
 //    mDevicesMenu->setIcon (VBoxGlobal::iconSet (":/settings_16px.png"));
@@ -1806 +1833 @@
                         " [" + vboxGlobal().toString (machine_state) + "] - " +
                         caption_prefix);
+        mMiniToolBar->setDisplayText (cmachine.GetName() + snapshotName);
 //#ifdef Q_WS_MAC
 //        SetWindowTitleWithCFString (reinterpret_cast <WindowPtr> (this->winId()), CFSTR("sfds"));
@@ -2327 +2355 @@
 
         /* Hide all but the central widget containing the console view. */
-        QList<QWidget *> list = findChildren<QWidget *>();
+        QList <QWidget*> list (findChildren <QWidget*> ());
+        QList <QWidget*> excludes;
+        excludes << centralWidget() << centralWidget()->findChildren <QWidget*> ();
         foreach (QWidget *w, list)
         {
-            /* todo: The list is now recursive. So think about a better way to
-             * prevent the childrens of the centralWidget to be hidden */
-            if (w != centralWidget() &&
-                w != console &&
-                w != console->viewport())
+            if (!excludes.contains (w))
             {
                 if (!w->isHidden())
@@ -2401 +2427 @@
         mIsWaitingModeResize = true;
 
+    if (!aOn)
+    {
+        /* Animation takes a bit long, the mini toolbar is still disappearing
+         * when switched to normal mode so hide it completely */
+        mMiniToolBar->hide();
+        mMiniToolBar->updateDisplay (false, true);
+    }
+
     /* Toggle qt full-screen mode */
     switchToFullscreen (aOn, aSeamless);
+
+    if (aOn)
+    {
+        mMiniToolBar->updateDisplay (true, true);
+    }
 
 #ifdef Q_WS_MAC
@@ -2519 +2558 @@
     NOREF (aTargetRect);
 #endif // !Q_WS_MAC
+}
+
+void VBoxConsoleWnd::mtExitMode()
+{
+    if (mIsSeamless)
+        mVmSeamlessAction->toggle();
+    else
+        mVmFullscreenAction->toggle();
+}
+
+void VBoxConsoleWnd::mtCloseVM()
+{
+    mVmCloseAction->trigger();
 }