Changeset 27333 in vbox

Timestamp:

Mar 12, 2010 3:17:19 PM (15 years ago)

Author:

vboxsync

Message:

E/Qt4: New running VM core: mini-tool-bar support for seamless mode.

Location:

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

Files:

• UIMachineView.h (modified) (1 diff)
• seamless/UIMachineViewSeamless.h (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (11 diffs)
• seamless/UIMachineWindowSeamless.h (modified) (5 diffs)

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

@@ -65 +65 @@
     int keyboardState() const;
     int mouseState() const;
+    virtual QRegion lastVisibleRegion() const { return QRegion(); }
 
     /* Public setters: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h

@@ -79 +79 @@
     void maybeRestrictMinimumSize() {}
     void updateSliders() {}
+    QRegion lastVisibleRegion() const { return m_lastVisibleRegion; }
 
     /* Private variables: */

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

@@ -30 +30 @@
 /* Local includes */
 #include "VBoxGlobal.h"
+#include "VBoxMiniToolBar.h"
 
 #ifdef Q_WS_MAC
@@ -35 +36 @@
 #endif /* Q_WS_MAC */
 #include "UISession.h"
+#include "UIActionsPool.h"
 #include "UIMachineLogic.h"
 #include "UIMachineView.h"
@@ -43 +45 @@
     , UIMachineWindow(pMachineLogic, uScreenId)
     , m_pMainMenu(0)
+    , m_pMiniToolBar(0)
 {
     /* "This" is machine window: */
@@ -63 +66 @@
     prepareMenu();
 
-    /* Retranslate seamless window finally: */
-    retranslateUi();
-
     /* Prepare machine view container: */
     prepareMachineViewContainer();
@@ -72 +72 @@
     prepareMachineView();
 
+    /* Prepare mini tool-bar: */
+    prepareMiniToolBar();
+
+    /* Retranslate fullscreen window finally: */
+    retranslateUi();
+
 #ifdef Q_WS_MAC
     /* Load seamless window settings: */
@@ -86 +92 @@
 UIMachineWindowSeamless::~UIMachineWindowSeamless()
 {
-    /* Cleanup normal machine view: */
+    /* Save window settings: */
+    saveWindowSettings();
+
+    /* Cleanup machine view: */
     cleanupMachineView();
 
@@ -103 +112 @@
     if (m_pMainMenu && !m_pMainMenu->isEmpty())
         m_pMainMenu->popup(machineWindow()->geometry().center());
+}
+
+void UIMachineWindowSeamless::sltUpdateMiniToolBarMask()
+{
+    if (m_pMiniToolBar)
+        setMask(machineView()->lastVisibleRegion());
 }
 
@@ -191 +206 @@
 }
 
+void UIMachineWindowSeamless::prepareMiniToolBar()
+{
+    /* Get current machine: */
+    CMachine machine = session().GetConsole().GetMachine();
+    /* Check if mini tool-bar should present: */
+    bool fIsActive = machine.GetExtraData(VBoxDefs::GUI_ShowMiniToolBar) != "no";
+    if (fIsActive)
+    {
+        /* Get the mini tool-bar alignment: */
+        bool fIsAtTop = machine.GetExtraData(VBoxDefs::GUI_MiniToolBarAlignment) == "top";
+        /* Get the mini tool-bar auto-hide feature availability: */
+        bool fIsAutoHide = machine.GetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide) != "off";
+        m_pMiniToolBar = new VBoxMiniToolBar(centralWidget(),
+                                             fIsAtTop ? VBoxMiniToolBar::AlignTop : VBoxMiniToolBar::AlignBottom,
+                                             true, fIsAutoHide);
+        m_pMiniToolBar->setSeamlessMode(true);
+        m_pMiniToolBar->updateDisplay(true, true);
+        QList<QMenu*> menus;
+        menus << uisession()->actionsPool()->action(UIActionIndex_Menu_Machine)->menu();
+        menus << uisession()->actionsPool()->action(UIActionIndex_Menu_Devices)->menu();
+        *m_pMiniToolBar << menus;
+        connect(m_pMiniToolBar, SIGNAL(exitAction()),
+                uisession()->actionsPool()->action(UIActionIndex_Toggle_Seamless), SLOT(trigger()));
+        connect(m_pMiniToolBar, SIGNAL(closeAction()),
+                uisession()->actionsPool()->action(UIActionIndex_Simple_Close), SLOT(trigger()));
+        connect(m_pMiniToolBar, SIGNAL(geometryUpdated()), this, SLOT(sltUpdateMiniToolBarMask()));
+    }
+}
+
 void UIMachineWindowSeamless::prepareMachineView()
 {
@@ -230 +274 @@
 #endif
 
+void UIMachineWindowSeamless::saveWindowSettings()
+{
+    /* Get machine: */
+    CMachine machine = session().GetConsole().GetMachine();
+
+    /* Save extra-data settings: */
+    {
+        /* Save mini tool-bar settings: */
+        if (m_pMiniToolBar)
+            machine.SetExtraData(VBoxDefs::GUI_MiniToolBarAutoHide, m_pMiniToolBar->isAutoHide() ? QString() : "off");
+    }
+}
+
 void UIMachineWindowSeamless::cleanupMachineView()
 {
@@ -244 +301 @@
     delete m_pMainMenu;
     m_pMainMenu = 0;
+}
+
+void UIMachineWindowSeamless::updateAppearanceOf(int iElement)
+{
+    /* Base class update: */
+    UIMachineWindow::updateAppearanceOf(iElement);
+
+    /* If mini tool-bar is present: */
+    if (m_pMiniToolBar)
+    {
+        /* Get machine: */
+        CMachine machine = session().GetConsole().GetMachine();
+        /* Get snapshot(s): */
+        QString strSnapshotName;
+        if (machine.GetSnapshotCount() > 0)
+        {
+            CSnapshot snapshot = machine.GetCurrentSnapshot();
+            strSnapshotName = " (" + snapshot.GetName() + ")";
+        }
+        /* Update mini tool-bar text: */
+        m_pMiniToolBar->setDisplayText(machine.GetName() + strSnapshotName);
+    }
 }
 
@@ -264 +343 @@
 #endif
 
-#if 0 // TODO: Add mini-toolbar support!
-    /* Including mini toolbar area */
-    QRegion toolBarRegion(mMiniToolBar->mask());
-    toolBarRegion.translate(mMiniToolBar->mapToGlobal (toolBarRegion.boundingRect().topLeft()) - QPoint (1, 0));
+    /* Including mini tool-bar area */
+    QRegion toolBarRegion(m_pMiniToolBar->mask());
+    toolBarRegion.translate(m_pMiniToolBar->mapToGlobal(toolBarRegion.boundingRect().topLeft()) - QPoint(1, 0));
     region += toolBarRegion;
-#endif
 
 #if 0 // TODO: Is it really needed now?

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

@@ -32 +32 @@
 #endif
 
+/* Local forwards */
+class VBoxMiniToolBar;
+
 class UIMachineWindowSeamless : public QIWithRetranslateUI2<QIMainDialog>, public UIMachineWindow
 {
@@ -49 +52 @@
     /* Popup main menu: */
     void sltPopupMainMenu();
+
+    /* Update mini tool-bar mask: */
+    void sltUpdateMiniToolBarMask();
 
     /* Close window reimplementation: */
@@ -70 +76 @@
     void prepareSeamless();
     void prepareMenu();
+    void prepareMiniToolBar();
     void prepareMachineView();
 #ifdef Q_WS_MAC
@@ -76 +83 @@
 
     /* Cleanup helpers: */
-#ifdef Q_WS_MAC
-    //void saveWindowSettings() {}
-#endif /* Q_WS_MAC */
+    void saveWindowSettings();
     void cleanupMachineView();
+    //void cleanupMiniToolBar() {}
     void cleanupMenu();
     //void cleanupSeamless() {}
+
+    /* Update routines: */
+    void updateAppearanceOf(int iElement);
 
     /* Other members: */
@@ -90 +99 @@
     /* Private variables: */
     QMenu *m_pMainMenu;
+    VBoxMiniToolBar *m_pMiniToolBar;
 #ifdef Q_WS_WIN
     QRegion m_prevRegion;