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

Timestamp:

Jul 31, 2017 12:41:10 PM (8 years ago)

Author:

vboxsync

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

117297

Message:

FE/Qt: bugref:8900: Selector UI: Global Tools are now there as well!

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• VirtualBox2.qrc (modified) (1 diff)
• VirtualBox2_hidpi.qrc (modified) (1 diff)
• images/hidpi/tools_global_32px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hidpi/vm_start_32px_hidpi.png )
• images/tools_global_32px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/vm_start_32px.png )
• src/selector/UIActionPoolSelector.cpp (modified) (2 diffs)
• src/selector/UIActionPoolSelector.h (modified) (1 diff)
• src/selector/UISelectorWindow.cpp (modified) (15 diffs)
• src/selector/UISelectorWindow.h (modified) (5 diffs)
• src/selector/UIToolsPaneGlobal.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.cpp ) (13 diffs)
• src/selector/UIToolsPaneGlobal.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneMachine.h ) (5 diffs)
• src/selector/UIToolsToolbar.cpp (modified) (8 diffs)
• src/selector/UIToolsToolbar.h (modified) (5 diffs)

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

@@ -380 +380 @@
         src/selector/UISnapshotDetailsWidget.h \
         src/selector/UISnapshotPane.h \
+        src/selector/UIToolsPaneGlobal.h \
         src/selector/UIToolsPaneMachine.h \
         src/selector/UIToolsToolbar.h \
@@ -697 +698 @@
         src/selector/UISnapshotDetailsWidget.cpp \
         src/selector/UISnapshotPane.cpp \
+        src/selector/UIToolsPaneGlobal.cpp \
         src/selector/UIToolsPaneMachine.cpp \
         src/selector/UIToolsToolbar.cpp \

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

@@ -186 +186 @@
         <file alias="statusbar_settings_16px.png">images/statusbar_settings_16px.png</file>
         <file alias="statusbar_settings_disabled_16px.png">images/statusbar_settings_disabled_16px.png</file>
+        <file alias="tools_global_32px.png">images/tools_global_32px.png</file>
         <file alias="tools_machine_32px.png">images/tools_machine_32px.png</file>
         <file alias="tpixel.png">images/tpixel.png</file>

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

@@ -195 +195 @@
         <file alias="statusbar_settings_16px_hidpi.png">images/hidpi/statusbar_settings_16px_hidpi.png</file>
         <file alias="statusbar_settings_disabled_16px_hidpi.png">images/hidpi/statusbar_settings_disabled_16px_hidpi.png</file>
+        <file alias="tools_global_32px_hidpi.png">images/hidpi/tools_global_32px_hidpi.png</file>
         <file alias="tools_machine_32px_hidpi.png">images/hidpi/tools_machine_32px_hidpi.png</file>
         <file alias="usb_16px_hidpi.png">images/hidpi/usb_16px_hidpi.png</file>

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -1021 +1021 @@
         setName(QApplication::translate("UIActionPool", "&Snapshots"));
         setStatusTip(QApplication::translate("UIActionPool", "Open machine snapshots pane"));
+    }
+};
+
+
+class UIActionToggleToolsGlobal : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionToggleToolsGlobal(UIActionPool *pParent)
+        : UIActionToggle(pParent, ":/tools_global_32px.png") {}
+
+protected:
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("ToolsGlobal");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Global Tools"));
+        setStatusTip(QApplication::translate("UIActionPool", "Switch to global tools"));
+    }
+};
+
+class UIActionMenuToolsGlobal : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionMenuToolsGlobal(UIActionPool *pParent)
+        : UIActionMenu(pParent) {}
+
+protected:
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("ToolsGlobalMenu");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Global Tools Menu"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open global tools menu"));
+    }
+};
+
+class UIActionSimpleToolsGlobalVirtualMediaManager : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleToolsGlobalVirtualMediaManager(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/diskimage_22px.png", ":/diskimage_16px.png",
+                         ":/diskimage_22px.png", ":/diskimage_16px.png") {}
+
+protected:
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("ToolsGlobalVirtualMediaManager");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Virtual Media Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open Virtual Media Manager"));
+    }
+};
+
+class UIActionSimpleToolsGlobalHostNetworkManager : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleToolsGlobalHostNetworkManager(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/host_iface_manager_22px.png", ":/host_iface_manager_16px.png",
+                         ":/host_iface_manager_22px.png", ":/host_iface_manager_16px.png") {}
+
+protected:
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("ToolsGlobalHostNetworkManager");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Host Network Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Open Host Network Manager"));
     }
 };
@@ -1224 +1321 @@
     m_pool[UIActionIndexST_M_Tools_M_Machine_Snapshots] = new UIActionSimpleToolsMachineSnapshots(this);
 
+    /* Global Tools actions: */
+    m_pool[UIActionIndexST_M_Tools_T_Global] = new UIActionToggleToolsGlobal(this);
+    m_pool[UIActionIndexST_M_Tools_M_Global] = new UIActionMenuToolsGlobal(this);
+    m_pool[UIActionIndexST_M_Tools_M_Global_VirtualMediaManager] = new UIActionSimpleToolsGlobalVirtualMediaManager(this);
+    m_pool[UIActionIndexST_M_Tools_M_Global_HostNetworkManager] = new UIActionSimpleToolsGlobalHostNetworkManager(this);
+
     /* Call to base-class: */
     UIActionPool::preparePool();

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h

@@ -98 +98 @@
     UIActionIndexST_M_Tools_M_Machine_Snapshots,
 
+    /* Global Tools actions: */
+    UIActionIndexST_M_Tools_T_Global,
+    UIActionIndexST_M_Tools_M_Global,
+    UIActionIndexST_M_Tools_M_Global_VirtualMediaManager,
+    UIActionIndexST_M_Tools_M_Global_HostNetworkManager,
+
     /* Maximum index: */
     UIActionIndexST_Max

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -44 +44 @@
 # include "UISelectorWindow.h"
 # include "UISettingsDialogSpecific.h"
+# include "UISlidingWidget.h"
 # include "UISpacerWidgets.h"
 # include "UIToolBar.h"
@@ -111 +112 @@
     , m_fWarningAboutInaccessibleMediaShown(false)
     , m_pActionPool(0)
+    , m_pSlidingWidget(0)
     , m_pSplitter(0)
 #ifndef VBOX_WS_MAC
@@ -119 +121 @@
     , m_pPaneChooser(0)
     , m_pPaneToolsMachine(0)
+    , m_pPaneToolsGlobal(0)
     , m_pGroupMenuAction(0)
     , m_pMachineMenuAction(0)
@@ -279 +282 @@
 
     /* Make sure MM window is not opened: */
-    if (m_pManagerVirtualMedia)
+    if (   m_pManagerVirtualMedia
+        || m_pPaneToolsGlobal->isToolOpened(ToolTypeGlobal_VirtualMedia))
         return;
 
@@ -384 +388 @@
 void UISelectorWindow::sltOpenVirtualMediumManagerWindow()
 {
+    /* First check if instance of widget opened embedded: */
+    if (m_pPaneToolsGlobal->isToolOpened(ToolTypeGlobal_VirtualMedia))
+    {
+        m_pPaneToolsGlobal->openTool(ToolTypeGlobal_VirtualMedia);
+        return;
+    }
+
     /* Create instance if not yet created: */
     if (!m_pManagerVirtualMedia)
@@ -410 +421 @@
 void UISelectorWindow::sltOpenHostNetworkManagerWindow()
 {
+    /* First check if instance of widget opened embedded: */
+    if (m_pPaneToolsGlobal->isToolOpened(ToolTypeGlobal_HostNetwork))
+    {
+        m_pPaneToolsGlobal->openTool(ToolTypeGlobal_HostNetwork);
+        return;
+    }
+
     /* Create instance if not yet created: */
     if (!m_pManagerHostNetwork)
@@ -1009 +1027 @@
 }
 
+void UISelectorWindow::sltHandleToolsTypeSwitch()
+{
+    /* If Machine tool button is checked => go backward: */
+    if (actionPool()->action(UIActionIndexST_M_Tools_T_Machine)->isChecked())
+        m_pSlidingWidget->moveBackward();
+
+    else
+
+    /* If Global tool button is checked => go forward: */
+    if (actionPool()->action(UIActionIndexST_M_Tools_T_Global)->isChecked())
+        m_pSlidingWidget->moveForward();
+
+    /* Update action visibility: */
+    updateActionsVisibility();
+}
+
 void UISelectorWindow::sltHandleToolOpenedMachine(ToolTypeMachine enmType)
 {
@@ -1026 +1060 @@
 }
 
+void UISelectorWindow::sltHandleToolOpenedGlobal(ToolTypeGlobal enmType)
+{
+    /* Open corresponding tool: */
+    m_pPaneToolsGlobal->openTool(enmType);
+}
+
 void UISelectorWindow::sltHandleToolClosedMachine(ToolTypeMachine enmType)
 {
     /* Close corresponding tool: */
     m_pPaneToolsMachine->closeTool(enmType);
+}
+
+void UISelectorWindow::sltHandleToolClosedGlobal(ToolTypeGlobal enmType)
+{
+    /* Close corresponding tool: */
+    m_pPaneToolsGlobal->closeTool(enmType);
 }
 
@@ -1064 +1110 @@
            "<p>The right part of this window represents a set of tools "
            "you have opened for the currently chosen machine. "
+           "For more tools check the corresponding menu at the right side "
+           "of the main tool bar located at the top of the window.</p>"
+           "<p>You can press the <b>%1</b> key to get instant help, "
+           "or visit "
+           "<a href=https://www.virtualbox.org>www.virtualbox.org</a> "
+           "for the latest information and news.</p>")
+           .arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
+
+    /* Translate Global Tools welcome screen: */
+    m_pPaneToolsGlobal->setDetailsText(
+        tr("<h3>Welcome to VirtualBox!</h3>"
+           "<p>This window represents a set of global tools "
+           "you have opened. They are not related to any particular machine "
+           "but to whole VirtualBox instead. This list will be extended with "
+           "new tools in the future releases. "
+           "<img src=:/welcome.png align=right/></p>"
            "For more tools check the corresponding menu at the right side "
            "of the main tool bar located at the top of the window.</p>"
@@ -1713 +1775 @@
                 /* Add 'Tools' actions into action-group: */
                 pActionGroupTools->addAction(actionPool()->action(UIActionIndexST_M_Tools_T_Machine));
+                pActionGroupTools->addAction(actionPool()->action(UIActionIndexST_M_Tools_T_Global));
             }
 
@@ -1779 +1842 @@
 #endif /* !VBOX_WS_MAC */
 
-            /* Create splitter: */
-            m_pSplitter = new QISplitter;
-            AssertPtrReturnVoid(m_pSplitter);
+            /* Create sliding-widget: */
+            m_pSlidingWidget = new UISlidingWidget;
+            AssertPtrReturnVoid(m_pSlidingWidget);
             {
-                /* Configure splitter: */
+                /* Create splitter: */
+                m_pSplitter = new QISplitter;
+                AssertPtrReturnVoid(m_pSplitter);
+                {
+                    /* Configure splitter: */
 #ifdef VBOX_WS_X11
-                m_pSplitter->setHandleType(QISplitter::Native);
+                    m_pSplitter->setHandleType(QISplitter::Native);
 #endif
 
-                /* Prepare Chooser-pane: */
-                m_pPaneChooser = new UIGChooser(this);
-                AssertPtrReturnVoid(m_pPaneChooser);
-                {
-                    /* Add into splitter: */
-                    m_pSplitter->addWidget(m_pPaneChooser);
+                    /* Prepare Chooser-pane: */
+                    m_pPaneChooser = new UIGChooser(this);
+                    AssertPtrReturnVoid(m_pPaneChooser);
+                    {
+                        /* Add into splitter: */
+                        m_pSplitter->addWidget(m_pPaneChooser);
+                    }
+
+                    /* Prepare Machine Tools-pane: */
+                    m_pPaneToolsMachine = new UIToolsPaneMachine(actionPool());
+                    AssertPtrReturnVoid(m_pPaneToolsMachine);
+                    {
+                        /* Add into splitter: */
+                        m_pSplitter->addWidget(m_pPaneToolsMachine);
+                    }
+
+                    /* Adjust splitter colors according to main widgets it splits: */
+                    m_pSplitter->configureColors(m_pPaneChooser->palette().color(QPalette::Active, QPalette::Window),
+                                                 m_pPaneToolsMachine->palette().color(QPalette::Active, QPalette::Window));
+                    /* Set the initial distribution. The right site is bigger. */
+                    m_pSplitter->setStretchFactor(0, 2);
+                    m_pSplitter->setStretchFactor(1, 3);
                 }
 
-                /* Prepare Machine Tools-pane: */
-                m_pPaneToolsMachine = new UIToolsPaneMachine(actionPool());
-                AssertPtrReturnVoid(m_pPaneToolsMachine);
-                {
-                    /* Add into splitter: */
-                    m_pSplitter->addWidget(m_pPaneToolsMachine);
-                }
-
-                /* Adjust splitter colors according to main widgets it splits: */
-                m_pSplitter->configureColors(m_pPaneChooser->palette().color(QPalette::Active, QPalette::Window),
-                                             m_pPaneToolsMachine->palette().color(QPalette::Active, QPalette::Window));
-                /* Set the initial distribution. The right site is bigger. */
-                m_pSplitter->setStretchFactor(0, 2);
-                m_pSplitter->setStretchFactor(1, 3);
+                /* Prepare Global Tools-pane: */
+                m_pPaneToolsGlobal = new UIToolsPaneGlobal(actionPool());
+                AssertPtrReturnVoid(m_pPaneToolsGlobal);
+
+                /* Add left/right widgets into sliding widget: */
+                m_pSlidingWidget->setWidgets(m_pSplitter, m_pPaneToolsGlobal);
 
                 /* Add into layout: */
-                pLayout->addWidget(m_pSplitter);
+                pLayout->addWidget(m_pSlidingWidget);
             }
         }
@@ -1891 +1966 @@
     connect(actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_PowerOff), SIGNAL(triggered()), this, SLOT(sltPerformPowerOffMachine()));
 
+    /* 'Tools' actions connections: */
+    connect(actionPool()->action(UIActionIndexST_M_Tools_T_Machine), &UIAction::toggled,
+            this, &UISelectorWindow::sltHandleToolsTypeSwitch);
+    connect(actionPool()->action(UIActionIndexST_M_Tools_T_Global), &UIAction::toggled,
+            this, &UISelectorWindow::sltHandleToolsTypeSwitch);
+
     /* Status-bar connections: */
     connect(statusBar(), SIGNAL(customContextMenuRequested(const QPoint&)),
@@ -1910 +1991 @@
 #endif /* VBOX_WS_MAC */
     connect(m_pToolbarTools, &UIToolsToolbar::sigToolOpenedMachine, this, &UISelectorWindow::sltHandleToolOpenedMachine);
+    connect(m_pToolbarTools, &UIToolsToolbar::sigToolOpenedGlobal,  this, &UISelectorWindow::sltHandleToolOpenedGlobal);
     connect(m_pToolbarTools, &UIToolsToolbar::sigToolClosedMachine, this, &UISelectorWindow::sltHandleToolClosedMachine);
+    connect(m_pToolbarTools, &UIToolsToolbar::sigToolClosedGlobal,  this, &UISelectorWindow::sltHandleToolClosedGlobal);
 
     /* VM desktop connections: */
@@ -2073 +2156 @@
 {
     /* Determine whether Machine or Group menu should be shown at all: */
+    const bool fMachineOrGroupMenuShown = actionPool()->action(UIActionIndexST_M_Tools_T_Machine)->isChecked();
     const bool fMachineMenuShown = !m_pPaneChooser->isSingleGroupSelected();
-    m_pMachineMenuAction->setVisible(fMachineMenuShown);
-    m_pGroupMenuAction->setVisible(!fMachineMenuShown);
+    m_pMachineMenuAction->setVisible(fMachineOrGroupMenuShown && fMachineMenuShown);
+    m_pGroupMenuAction->setVisible(fMachineOrGroupMenuShown && !fMachineMenuShown);
 
     /* Hide action shortcuts: */
@@ -2084 +2168 @@
         foreach (UIAction *pAction, m_groupActions)
             pAction->hideShortcut();
+
+    /* Update actions visibility: */
+    foreach (UIAction *pAction, m_machineActions)
+        pAction->setVisible(fMachineOrGroupMenuShown);
 
     /* Show what should be shown: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -25 +25 @@
 #include "QIMainWindow.h"
 #include "QIWithRetranslateUI.h"
+#include "UIToolsPaneGlobal.h"
 #include "UIToolsPaneMachine.h"
 #include "VBoxGlobal.h"
@@ -38 +39 @@
 class UIMainBar;
 #endif
+class UISlidingWidget;
 class UIToolBar;
 class UIToolsToolbar;
@@ -183 +185 @@
     /** @} */
 
+    /** @name Tools-toolbar stuff.
+      * @{ */
+        /** Handles tools type switch. */
+        void sltHandleToolsTypeSwitch();
+    /** @} */
+
     /** @name Tools-pane stuff.
       * @{ */
         /** Handles rquest to open Machine tool of passed @a enmType. */
         void sltHandleToolOpenedMachine(ToolTypeMachine enmType);
+        /** Handles rquest to open Global tool of passed @a enmType. */
+        void sltHandleToolOpenedGlobal(ToolTypeGlobal enmType);
 
         /** Handles rquest to close Machine tool of passed @a enmType. */
         void sltHandleToolClosedMachine(ToolTypeMachine enmType);
+        /** Handles rquest to close Global tool of passed @a enmType. */
+        void sltHandleToolClosedGlobal(ToolTypeGlobal enmType);
     /** @} */
 
@@ -313 +325 @@
     UIActionPool *m_pActionPool;
 
+    /** Holds the sliding-widget isntance. */
+    UISlidingWidget *m_pSlidingWidget;
+
     /** Holds the central splitter instance. */
     QISplitter *m_pSplitter;
@@ -329 +344 @@
     /** Holds the Machine Tools-pane instance. */
     UIToolsPaneMachine *m_pPaneToolsMachine;
+    /** Holds the Global Tools-pane instance. */
+    UIToolsPaneGlobal  *m_pPaneToolsGlobal;
 
     /** Holds the list of Group menu actions. */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIToolsPaneMachine class implementation.
+ * VBox Qt GUI - UIToolsPaneGlobal class implementation.
  */
 
@@ -26 +26 @@
 # include "UIActionPoolSelector.h"
 # include "UIDesktopPane.h"
-# include "UIGDetails.h"
-# include "UISnapshotPane.h"
-# include "UIToolsPaneMachine.h"
+# include "UIMediumManager.h"
+# include "UIHostNetworkManager.h"
+# include "UIToolsPaneGlobal.h"
 
 /* Other VBox includes: */
@@ -36 +36 @@
 
 
-UIToolsPaneMachine::UIToolsPaneMachine(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
+UIToolsPaneGlobal::UIToolsPaneGlobal(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
     : QWidget(pParent)
     , m_pActionPool(pActionPool)
     , m_pLayout(0)
     , m_pPaneDesktop(0)
-    , m_pPaneDetails(0)
-    , m_pPaneSnapshots(0)
+    , m_pPaneMedia(0)
+    , m_pPaneNetwork(0)
 {
     /* Prepare: */
@@ -48 +48 @@
 }
 
-UIToolsPaneMachine::~UIToolsPaneMachine()
+UIToolsPaneGlobal::~UIToolsPaneGlobal()
 {
     /* Cleanup: */
@@ -54 +54 @@
 }
 
-bool UIToolsPaneMachine::isToolOpened(ToolTypeMachine enmType) const
+bool UIToolsPaneGlobal::isToolOpened(ToolTypeGlobal enmType) const
 {
     /* Search through the stacked widgets: */
     for (int iIndex = 0; iIndex < m_pLayout->count(); ++iIndex)
-        if (m_pLayout->widget(iIndex)->property("ToolType").value<ToolTypeMachine>() == enmType)
+        if (m_pLayout->widget(iIndex)->property("ToolType").value<ToolTypeGlobal>() == enmType)
             return true;
     return false;
 }
 
-void UIToolsPaneMachine::openTool(ToolTypeMachine enmType)
+void UIToolsPaneGlobal::openTool(ToolTypeGlobal enmType)
 {
     /* Search through the stacked widgets: */
     int iActualIndex = -1;
     for (int iIndex = 0; iIndex < m_pLayout->count(); ++iIndex)
-        if (m_pLayout->widget(iIndex)->property("ToolType").value<ToolTypeMachine>() == enmType)
+        if (m_pLayout->widget(iIndex)->property("ToolType").value<ToolTypeGlobal>() == enmType)
             iActualIndex = iIndex;
 
@@ -83 +83 @@
         switch (enmType)
         {
-            case ToolTypeMachine_Desktop:
+            case ToolTypeGlobal_Desktop:
             {
                 /* Create Desktop pane: */
-                m_pPaneDesktop = new UIDesktopPane(m_pActionPool->action(UIActionIndexST_M_Group_S_Refresh));
+                m_pPaneDesktop = new UIDesktopPane;
                 AssertPtrReturnVoid(m_pPaneDesktop);
                 {
                     /* Configure pane: */
-                    m_pPaneDesktop->setProperty("ToolType", QVariant::fromValue(ToolTypeMachine_Desktop));
+                    m_pPaneDesktop->setProperty("ToolType", QVariant::fromValue(ToolTypeGlobal_Desktop));
 
                     /* Add into layout: */
@@ -98 +98 @@
                 break;
             }
-            case ToolTypeMachine_Details:
+            case ToolTypeGlobal_VirtualMedia:
             {
-                /* Create Details pane: */
-                m_pPaneDetails = new UIGDetails;
-                AssertPtrReturnVoid(m_pPaneDetails);
+                /* Create Virtual Media Manager: */
+                m_pPaneMedia = new UIMediumManagerWidget(EmbedTo_Stack);
+                AssertPtrReturnVoid(m_pPaneMedia);
                 {
                     /* Configure pane: */
-                    m_pPaneDetails->setProperty("ToolType", QVariant::fromValue(ToolTypeMachine_Details));
-                    connect(this, &UIToolsPaneMachine::sigSlidingStarted, m_pPaneDetails, &UIGDetails::sigSlidingStarted);
-                    connect(this, &UIToolsPaneMachine::sigToggleStarted,  m_pPaneDetails, &UIGDetails::sigToggleStarted);
-                    connect(this, &UIToolsPaneMachine::sigToggleFinished, m_pPaneDetails, &UIGDetails::sigToggleFinished);
-                    connect(m_pPaneDetails, &UIGDetails::sigLinkClicked,  this, &UIToolsPaneMachine::sigLinkClicked);
+                    m_pPaneMedia->setProperty("ToolType", QVariant::fromValue(ToolTypeGlobal_VirtualMedia));
 
                     /* Add into layout: */
-                    m_pLayout->addWidget(m_pPaneDetails);
-                    m_pLayout->setCurrentWidget(m_pPaneDetails);
+                    m_pLayout->addWidget(m_pPaneMedia);
+                    m_pLayout->setCurrentWidget(m_pPaneMedia);
                 }
                 break;
             }
-            case ToolTypeMachine_Snapshots:
+            case ToolTypeGlobal_HostNetwork:
             {
-                /* Create Snapshots pane: */
-                m_pPaneSnapshots = new UISnapshotPane;
-                AssertPtrReturnVoid(m_pPaneSnapshots);
+                /* Create Host Network Manager: */
+                m_pPaneNetwork = new UIHostNetworkManagerWidget(EmbedTo_Stack);
+                AssertPtrReturnVoid(m_pPaneNetwork);
                 {
                     /* Configure pane: */
-                    m_pPaneSnapshots->setProperty("ToolType", QVariant::fromValue(ToolTypeMachine_Snapshots));
+                    m_pPaneNetwork->setProperty("ToolType", QVariant::fromValue(ToolTypeGlobal_HostNetwork));
 
                     /* Add into layout: */
-                    m_pLayout->addWidget(m_pPaneSnapshots);
-                    m_pLayout->setCurrentWidget(m_pPaneSnapshots);
+                    m_pLayout->addWidget(m_pPaneNetwork);
+                    m_pLayout->setCurrentWidget(m_pPaneNetwork);
                 }
                 break;
@@ -138 +134 @@
 }
 
-void UIToolsPaneMachine::closeTool(ToolTypeMachine enmType)
+void UIToolsPaneGlobal::closeTool(ToolTypeGlobal enmType)
 {
     /* Search through the stacked widgets: */
     int iActualIndex = -1;
     for (int iIndex = 0; iIndex < m_pLayout->count(); ++iIndex)
-        if (m_pLayout->widget(iIndex)->property("ToolType").value<ToolTypeMachine>() == enmType)
+        if (m_pLayout->widget(iIndex)->property("ToolType").value<ToolTypeGlobal>() == enmType)
             iActualIndex = iIndex;
 
@@ -152 +148 @@
         switch (enmType)
         {
-            case ToolTypeMachine_Desktop:   m_pPaneDesktop = 0; break;
-            case ToolTypeMachine_Details:   m_pPaneDetails = 0; break;
-            case ToolTypeMachine_Snapshots: m_pPaneSnapshots = 0; break;
+            case ToolTypeGlobal_Desktop:      m_pPaneDesktop = 0; break;
+            case ToolTypeGlobal_VirtualMedia: m_pPaneMedia = 0; break;
+            case ToolTypeGlobal_HostNetwork:  m_pPaneNetwork = 0; break;
             default: break;
         }
@@ -164 +160 @@
 }
 
-void UIToolsPaneMachine::setDetailsText(const QString &strText)
+void UIToolsPaneGlobal::setDetailsText(const QString &strText)
 {
     /* Update desktop pane: */
@@ -171 +167 @@
 }
 
-void UIToolsPaneMachine::setDetailsError(const QString &strError)
+void UIToolsPaneGlobal::setDetailsError(const QString &strError)
 {
     /* Update desktop pane: */
@@ -178 +174 @@
 }
 
-void UIToolsPaneMachine::setItems(const QList<UIVMItem*> &items)
-{
-    /* Update details pane: */
-    AssertPtrReturnVoid(m_pPaneDetails);
-    m_pPaneDetails->setItems(items);
-}
-
-void UIToolsPaneMachine::setMachine(const CMachine &comMachine)
-{
-    /* Update snapshots pane: */
-    AssertPtrReturnVoid(m_pPaneSnapshots);
-    m_pPaneSnapshots->setMachine(comMachine);
-}
-
-void UIToolsPaneMachine::prepare()
+void UIToolsPaneGlobal::prepare()
 {
     /* Create stacked-layout: */
@@ -204 +186 @@
 
     /* Create desktop pane: */
-    openTool(ToolTypeMachine_Desktop);
-}
-
-void UIToolsPaneMachine::cleanup()
+    openTool(ToolTypeGlobal_Desktop);
+}
+
+void UIToolsPaneGlobal::cleanup()
 {
     /* Remove all widgets prematurelly: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPaneGlobal.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIToolsPaneMachine class declaration.
+ * VBox Qt GUI - UIToolsPaneGlobal class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef ___UIToolsPaneMachine_h___
-#define ___UIToolsPaneMachine_h___
+#ifndef ___UIToolsPaneGlobal_h___
+#define ___UIToolsPaneGlobal_h___
 
 /* Qt includes: */
@@ -28 +28 @@
 class UIActionPool;
 class UIDesktopPane;
-class UIGDetails;
-class UISnapshotPane;
+class UIHostNetworkManagerWidget;
+class UIMediumManagerWidget;
 class UIVMItem;
 class CMachine;
 
 
-/** Machine tool types. */
-enum ToolTypeMachine
+/** Global tool types. */
+enum ToolTypeGlobal
 {
-    ToolTypeMachine_Invalid,
-    ToolTypeMachine_Desktop,
-    ToolTypeMachine_Details,
-    ToolTypeMachine_Snapshots,
+    ToolTypeGlobal_Invalid,
+    ToolTypeGlobal_Desktop,
+    ToolTypeGlobal_VirtualMedia,
+    ToolTypeGlobal_HostNetwork,
 };
 
-/* Make sure QVariant can eat ToolTypeMachine: */
-Q_DECLARE_METATYPE(ToolTypeMachine);
+/* Make sure QVariant can eat ToolTypeGlobal: */
+Q_DECLARE_METATYPE(ToolTypeGlobal);
 
 
 /** QWidget subclass representing container for tool panes. */
-class UIToolsPaneMachine : public QWidget
+class UIToolsPaneGlobal : public QWidget
 {
     Q_OBJECT;
-
-signals:
-
-    /** Redirects signal from UISelectorWindow to UIGDetails. */
-    void sigSlidingStarted();
-    /** Redirects signal from UISelectorWindow to UIGDetails. */
-    void sigToggleStarted();
-    /** Redirects signal from UISelectorWindow to UIGDetails. */
-    void sigToggleFinished();
-    /** Redirects signal from UIGDetails to UISelectorWindow. */
-    void sigLinkClicked(const QString &strCategory, const QString &strControl, const QString &strId);
 
 public:
 
     /** Constructs tools pane passing @a pParent to the base-class. */
-    UIToolsPaneMachine(UIActionPool *pActionPool, QWidget *pParent = 0);
+    UIToolsPaneGlobal(UIActionPool *pActionPool, QWidget *pParent = 0);
     /** Destructs tools pane. */
-    virtual ~UIToolsPaneMachine() /* override */;
+    virtual ~UIToolsPaneGlobal() /* override */;
 
     /** Returns whether tool of particular @a enmType is opened. */
-    bool isToolOpened(ToolTypeMachine enmType) const;
+    bool isToolOpened(ToolTypeGlobal enmType) const;
     /** Activates tool of passed @a enmType, creates new one if necessary. */
-    void openTool(ToolTypeMachine enmType);
+    void openTool(ToolTypeGlobal enmType);
     /** Closes tool of passed @a enmType, deletes one if exists. */
-    void closeTool(ToolTypeMachine enmType);
+    void closeTool(ToolTypeGlobal enmType);
 
     /** Defines @a strText and switches to text details pane. */
@@ -81 +70 @@
     /** Defines @a strError and switches to error details pane. */
     void setDetailsError(const QString &strError);
-
-    /** Defines the machine @a items. */
-    void setItems(const QList<UIVMItem*> &items);
-
-    /** Defines the @a comMachine object. */
-    void setMachine(const CMachine &comMachine);
 
 private:
@@ -101 +84 @@
 
     /** Holds the stacked-layout instance. */
-    QStackedLayout *m_pLayout;
+    QStackedLayout             *m_pLayout;
     /** Holds the Desktop pane instance. */
-    UIDesktopPane  *m_pPaneDesktop;
-    /** Holds the Details pane instance. */
-    UIGDetails     *m_pPaneDetails;
-    /** Holds the Snapshots pane instance. */
-    UISnapshotPane *m_pPaneSnapshots;
+    UIDesktopPane              *m_pPaneDesktop;
+    /** Holds the Virtual Media Manager instance. */
+    UIMediumManagerWidget      *m_pPaneMedia;
+    /** Holds the Host Network Manager instance. */
+    UIHostNetworkManagerWidget *m_pPaneNetwork;
 };
 
-#endif /* !___UIToolsPaneMachine_h___ */
+#endif /* !___UIToolsPaneGlobal_h___ */
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.cpp

@@ -45 +45 @@
     , m_pLayoutStacked(0)
     , m_pTabBarMachine(0)
+    , m_pTabBarGlobal(0)
     , m_pToolBar(0)
 {
@@ -74 +75 @@
 }
 
+void UIToolsToolbar::sltHandleOpenToolGlobal()
+{
+    /* Acquire sender action: */
+    const QAction *pAction = sender() ? qobject_cast<const QAction*>(sender()) : 0;
+    /* Acquire action type: */
+    const ToolTypeGlobal enmType = pAction->property("ToolTypeGlobal").value<ToolTypeGlobal>();
+
+    /* Get corresponding tab id: */
+    QUuid idTab;
+    if (m_mapTabIdsGlobal.contains(enmType))
+        idTab = m_mapTabIdsGlobal.value(enmType);
+    else
+    {
+        idTab = m_pTabBarGlobal->addTab(pAction->icon(), pAction->text().remove('&'));
+        m_mapTabIdsGlobal[enmType] = idTab;
+    }
+    /* And make it active: */
+    m_pTabBarGlobal->setCurrent(idTab);
+
+    /* Notify listeners: */
+    emit sigToolOpenedGlobal(enmType);
+}
+
 void UIToolsToolbar::sltHandleCloseToolMachine(const QUuid &uuid)
 {
@@ -88 +112 @@
 }
 
+void UIToolsToolbar::sltHandleCloseToolGlobal(const QUuid &uuid)
+{
+    /* If the ID is registered: */
+    if (m_mapTabIdsGlobal.values().contains(uuid))
+    {
+        /* Notify listeners: */
+        emit sigToolClosedGlobal(m_mapTabIdsGlobal.key(uuid));
+
+        /* And remove the tab: */
+        m_pTabBarGlobal->removeTab(uuid);
+        m_mapTabIdsGlobal.remove(m_mapTabIdsGlobal.key(uuid));
+    }
+}
+
 void UIToolsToolbar::sltHandleToolChosenMachine(const QUuid &uuid)
 {
@@ -93 +131 @@
     if (m_mapTabIdsMachine.values().contains(uuid))
         emit sigToolOpenedMachine(m_mapTabIdsMachine.key(uuid));
+}
+
+void UIToolsToolbar::sltHandleToolChosenGlobal(const QUuid &uuid)
+{
+    /* If the ID is registered => Notify listeners: */
+    if (m_mapTabIdsGlobal.values().contains(uuid))
+        emit sigToolOpenedGlobal(m_mapTabIdsGlobal.key(uuid));
 }
 
@@ -107 +152 @@
         if (pAction == m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine))
             m_pLayoutStacked->setCurrentWidget(m_pTabBarMachine);
+
+        else
+
+        if (pAction == m_pActionPool->action(UIActionIndexST_M_Tools_T_Global))
+            m_pLayoutStacked->setCurrentWidget(m_pTabBarGlobal);
     }
 }
@@ -143 +193 @@
     connect(m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine), &UIAction::toggled,
             this, &UIToolsToolbar::sltHandleActionToggle);
+
+    /* Configure 'Global' menu: */
+    UIMenu *pMenuGlobal = m_pActionPool->action(UIActionIndexST_M_Tools_M_Global)->menu();
+    AssertPtrReturnVoid(pMenuGlobal);
+    {
+        /* Add 'Virtual Media Manager' action: */
+        pMenuGlobal->addAction(m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_VirtualMediaManager));
+        connect(m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_VirtualMediaManager), &UIAction::triggered,
+                this, &UIToolsToolbar::sltHandleOpenToolGlobal);
+        m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_VirtualMediaManager)
+            ->setProperty("ToolTypeGlobal", QVariant::fromValue(ToolTypeGlobal_VirtualMedia));
+
+        /* Add 'Host Network Manager' action: */
+        pMenuGlobal->addAction(m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_HostNetworkManager));
+        connect(m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_HostNetworkManager), &UIAction::triggered,
+                this, &UIToolsToolbar::sltHandleOpenToolGlobal);
+        m_pActionPool->action(UIActionIndexST_M_Tools_M_Global_HostNetworkManager)
+            ->setProperty("ToolTypeGlobal", QVariant::fromValue(ToolTypeGlobal_HostNetwork));
+    }
+
+    /* Configure 'Global' toggle action: */
+    m_pActionPool->action(UIActionIndexST_M_Tools_T_Global)->setMenu(pMenuGlobal);
+    connect(m_pActionPool->action(UIActionIndexST_M_Tools_T_Global), &UIAction::toggled,
+            this, &UIToolsToolbar::sltHandleActionToggle);
+
+    /* By default 'Machine' toggle action is toggled: */
+    m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine)->setChecked(true);
 }
 
@@ -173 +250 @@
             }
 
+            /* Create Global tab-bar: */
+            m_pTabBarGlobal = new UITabBar;
+            AssertPtrReturnVoid(m_pTabBarGlobal);
+            {
+                /* Configure tab-bar: */
+                connect(m_pTabBarGlobal, &UITabBar::sigTabRequestForClosing,
+                        this, &UIToolsToolbar::sltHandleCloseToolGlobal);
+                connect(m_pTabBarGlobal, &UITabBar::sigCurrentTabChanged,
+                        this, &UIToolsToolbar::sltHandleToolChosenGlobal);
+
+                /* Add into layout: */
+                m_pLayoutStacked->addWidget(m_pTabBarGlobal);
+            }
+
             /* Add into layout: */
             m_pLayoutMain->addLayout(m_pLayoutStacked);
@@ -189 +280 @@
 
             /* Add actions: */
-            UIAction *pActionMachine = m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine);
-            m_pToolBar->addAction(pActionMachine);
-            QToolButton *pNamedMenuToolButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(pActionMachine));
-            pNamedMenuToolButton->setPopupMode(QToolButton::InstantPopup);
+            m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Tools_T_Machine));
+            m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Tools_T_Global));
 
             /* Add into layout: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsToolbar.h

@@ -25 +25 @@
 
 /* GUI includes: */
+#include "UIToolsPaneGlobal.h"
 #include "UIToolsPaneMachine.h"
 
@@ -47 +48 @@
     /** Notify listeners about Machine tool of particular @a enmType opened. */
     void sigToolOpenedMachine(const ToolTypeMachine enmType);
+    /** Notify listeners about Global tool of particular @a enmType opened. */
+    void sigToolOpenedGlobal(const ToolTypeGlobal enmType);
 
     /** Notify listeners about Machine tool of particular @a enmType closed. */
     void sigToolClosedMachine(const ToolTypeMachine enmType);
+    /** Notify listeners about Global tool of particular @a enmType closed. */
+    void sigToolClosedGlobal(const ToolTypeGlobal enmType);
 
 public:
@@ -61 +66 @@
     /** Handles request to open Machine tool. */
     void sltHandleOpenToolMachine();
+    /** Handles request to open Global tool. */
+    void sltHandleOpenToolGlobal();
 
     /** Handles request to close Machine tool with passed @a uuid. */
     void sltHandleCloseToolMachine(const QUuid &uuid);
+    /** Handles request to close Global tool with passed @a uuid. */
+    void sltHandleCloseToolGlobal(const QUuid &uuid);
 
     /** Handles request to make Machine tool with passed @a uuid current one. */
     void sltHandleToolChosenMachine(const QUuid &uuid);
+    /** Handles request to make Global tool with passed @a uuid current one. */
+    void sltHandleToolChosenGlobal(const QUuid &uuid);
 
     /** Handles action toggle. */
@@ -90 +101 @@
     /** Holds the Machine tab-bar instance. */
     UITabBar *m_pTabBarMachine;
+    /** Holds the Global tab-bar instance. */
+    UITabBar *m_pTabBarGlobal;
 
     /** Holds the toolbar instance. */
@@ -96 +109 @@
     /** Holds the map of opened Machine tool IDs. */
     QMap<ToolTypeMachine, QUuid>  m_mapTabIdsMachine;
+    /** Holds the map of opened Global tool IDs. */
+    QMap<ToolTypeGlobal, QUuid>   m_mapTabIdsGlobal;
 };