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

Timestamp:

Mar 12, 2010 2:57:27 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

58759

Message:

FE/Qt4: New running VM core: mini-tool-bar support for fullscreen mode.

Location:

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

Files:

• UIMachineWindowFullscreen.cpp (modified) (7 diffs)
• UIMachineWindowFullscreen.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -30 +30 @@
 /* Local includes */
 #include "VBoxGlobal.h"
+#include "VBoxMiniToolBar.h"
 
 #include "UISession.h"
+#include "UIActionsPool.h"
 #include "UIMachineLogic.h"
 #include "UIMachineView.h"
@@ -40 +42 @@
     , UIMachineWindow(pMachineLogic, uScreenId)
     , m_pMainMenu(0)
+    , m_pMiniToolBar(0)
 {
     /* "This" is machine window: */
@@ -57 +60 @@
     prepareMenu();
 
+    /* Prepare machine view container: */
+    prepareMachineViewContainer();
+
+    /* Prepare fullscreen machine view: */
+    prepareMachineView();
+
+    /* Prepare mini tool-bar: */
+    prepareMiniToolBar();
+
     /* Retranslate fullscreen window finally: */
     retranslateUi();
 
-    /* Prepare machine view container: */
-    prepareMachineViewContainer();
-
-    /* Prepare fullscreen machine view: */
-    prepareMachineView();
-
     /* Update all the elements: */
     updateAppearanceOf(UIVisualElement_AllStuff);
@@ -80 +86 @@
 UIMachineWindowFullscreen::~UIMachineWindowFullscreen()
 {
-    /* Cleanup normal machine view: */
+    /* Save window settings: */
+    saveWindowSettings();
+
+    /* Cleanup machine view: */
     cleanupMachineView();
 
@@ -152 +161 @@
 }
 
+void UIMachineWindowFullscreen::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->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_Fullscreen), SLOT(trigger()));
+        connect(m_pMiniToolBar, SIGNAL(closeAction()),
+                uisession()->actionsPool()->action(UIActionIndex_Simple_Close), SLOT(trigger()));
+    }
+}
+
 void UIMachineWindowFullscreen::prepareMachineView()
 {
@@ -184 +220 @@
 }
 
+void UIMachineWindowFullscreen::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 UIMachineWindowFullscreen::cleanupMachineView()
 {
@@ -200 +249 @@
 }
 
+void UIMachineWindowFullscreen::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);
+    }
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h

@@ -31 +31 @@
 # include <X11/Xlib.h>
 #endif
+
+/* Local forwards */
+class VBoxMiniToolBar;
 
 class UIMachineWindowFullscreen : public QIWithRetranslateUI2<QIMainDialog>, public UIMachineWindow
@@ -66 +69 @@
     /* Prepare helpers: */
     void prepareMenu();
+    void prepareMiniToolBar();
     void prepareMachineView();
+    //void loadWindowSettings() {}
 
     /* Cleanup helpers: */
-    //void saveWindowSettings() {}
+    void saveWindowSettings();
     void cleanupMachineView();
+    //void cleanupMiniToolBar() {}
     void cleanupMenu();
+
+    /* Update routines: */
+    void updateAppearanceOf(int iElement);
 
     /* Private variables: */
     QMenu *m_pMainMenu;
+    VBoxMiniToolBar *m_pMiniToolBar;
 
     /* Factory support: */