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

Timestamp:

May 26, 2017 11:49:48 AM (8 years ago)

Author:

vboxsync

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

115781

Message:

FE/Qt: Selector UI: Tools pane: Initial integration.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (14 diffs)
• UISelectorWindow.h (modified) (6 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -56 +56 @@
 # include "UISelectorWindow.h"
 # include "UISettingsDialogSpecific.h"
-# include "UISnapshotPane.h"
 # include "UISpacerWidgets.h"
 # include "UISpecialControls.h"
@@ -130 +129 @@
     , m_pPaneDetails(0)
     , m_pPaneDesktop(0)
-    , m_pPaneSnapshots(0)
+    , m_pPaneTools(0)
     , m_pGroupMenuAction(0)
     , m_pMachineMenuAction(0)
@@ -306 +305 @@
 
     /* Make sure MM window is not opened: */
-    if (m_pManagerVirtualMedia)
+    if (   m_pManagerVirtualMedia
+        || m_pPaneTools->isToolOpened(ToolType_VirtualMediaManager))
         return;
 
@@ -425 +425 @@
 void UISelectorWindow::sltOpenVirtualMediumManagerWindow()
 {
+    /* First check if instance of widget opened embedded: */
+    if (m_pPaneTools->isToolOpened(ToolType_VirtualMediaManager))
+    {
+        sltPerformSegmentedButtonSwitch(SegmentType_Tools);
+        m_pPaneTools->setCurrentTool(ToolType_VirtualMediaManager);
+        return;
+    }
+
     /* Create instance if not yet created: */
     if (!m_pManagerVirtualMedia)
@@ -451 +459 @@
 void UISelectorWindow::sltOpenHostNetworkManagerWindow()
 {
+    /* First check if instance of widget opened embedded: */
+    if (m_pPaneTools->isToolOpened(ToolType_HostNetworkManager))
+    {
+        sltPerformSegmentedButtonSwitch(SegmentType_Tools);
+        m_pPaneTools->setCurrentTool(ToolType_HostNetworkManager);
+        return;
+    }
+
     /* Create instance if not yet created: */
     if (!m_pManagerHostNetwork)
@@ -1062 +1078 @@
         {
             case SegmentType_Details: m_pContainerDetails->setCurrentWidget(m_pPaneDetails); break;
-            case SegmentType_Snapshots: m_pContainerDetails->setCurrentWidget(m_pPaneSnapshots); break;
-            default: break;
+            case SegmentType_Tools:   m_pContainerDetails->setCurrentWidget(m_pPaneTools); break;
+            default:                  break;
         }
     }
@@ -1092 +1108 @@
 }
 
+void UISelectorWindow::sltHandleToolsPaneToolOpened(ToolType enmType)
+{
+    switch (enmType)
+    {
+        case ToolType_VirtualMediaManager: sltCloseVirtualMediumManagerWindow(); break;
+        case ToolType_HostNetworkManager:  sltCloseHostNetworkManagerWindow(); break;
+        default:                           break;
+    }
+}
+
 UIVMItem* UISelectorWindow::currentItem() const
 {
@@ -1102 +1128 @@
 }
 
-void UISelectorWindow::updateSnapshots(UIVMItem *pItem, const CMachine &comMachine)
-{
-    /* Update segmented-button text: */
-    // TODO: Bring that NLS to "&Snapshots" / "&Snapshots (%1)" form
-    //       as translator should be able to translate whole sentence.
-    //       And move it from UIDesktopPane to UISelectorWindow context.
-    QString strName = QApplication::translate("UIDesktopPane", "&Snapshots");
-    if (pItem)
-    {
-        /* Append the snapshot count (if any): */
-        const ULONG count = pItem->snapshotCount();
-        if (count)
-            strName += QString(" (%1)").arg(count);
-    }
-    m_pSegmentedButton->setTitle(SegmentType_Snapshots, strName);
-
+void UISelectorWindow::updateSnapshots(UIVMItem * /* pItem */, const CMachine &comMachine)
+{
     /* Update snapshot pane availability: */
     if (comMachine.isNotNull())
-        m_pSegmentedButton->setEnabled(SegmentType_Snapshots, true);
+        m_pSegmentedButton->setEnabled(SegmentType_Tools, true);
     else
         lockSnapshots();
 
-    /* Update snapshot pane finally: */
-    m_pPaneSnapshots->setMachine(comMachine);
+    /* Update tools pane finally: */
+    m_pPaneTools->setMachine(comMachine);
 }
 
@@ -1133 +1145 @@
     sltPerformSegmentedButtonSwitchToDetails();
     /* Then lock the snapshot pane: */
-    m_pSegmentedButton->setEnabled(SegmentType_Snapshots, false);
+    m_pSegmentedButton->setEnabled(SegmentType_Tools, false);
 }
 
@@ -1153 +1165 @@
     // TODO: Move that NLS from UIDesktopPane to UISelectorWindow context.
     m_pSegmentedButton->setTitle(SegmentType_Details, QApplication::translate("UIDesktopPane", "&Details"));
+    m_pSegmentedButton->setTitle(SegmentType_Tools, QApplication::translate("UIDesktopPane", "&Tools"));
 
     /* Make sure details and snapshot panes are updated: */
@@ -1783 +1796 @@
     /* Create/add segmented-button: */
     m_pSegmentedButton = new UITexturedSegmentedButton(this, 2);
-    m_pSegmentedButton->setIcon(SegmentType_Details, UIIconPool::iconSet(":/vm_settings_16px.png",
-                                                                         ":/vm_settings_disabled_16px.png"));
-    m_pSegmentedButton->setIcon(SegmentType_Snapshots, UIIconPool::iconSet(":/snapshot_take_16px.png",
-                                                                           ":/snapshot_take_disabled_16px.png"));
+    m_pSegmentedButton->setIcon(SegmentType_Details, UIIconPool::iconSet(":/edataman_16px.png",
+                                                                         ":/edataman_16px.png"));
+    m_pSegmentedButton->setIcon(SegmentType_Tools, UIIconPool::iconSet(":/guesttools_16px.png",
+                                                                       ":/guesttools_disabled_16px.png"));
     m_pToolBar->addWidget(m_pSegmentedButton);
 
@@ -1815 +1828 @@
     m_pPaneDesktop = new UIDesktopPane(actionPool()->action(UIActionIndexST_M_Group_S_Refresh), this);
 
-    /* Prepare snapshot pane: */
-    m_pPaneSnapshots = new UISnapshotPane(this);
-
-    /* Crate container: */
+    /* Prepare tools pane: */
+    m_pPaneTools = new UIToolsPane(this);
+
+    /* Create container: */
     m_pContainerDetails = new QStackedWidget(this);
     m_pContainerDetails->addWidget(m_pPaneDetails);
     m_pContainerDetails->addWidget(m_pPaneDesktop);
-    m_pContainerDetails->addWidget(m_pPaneSnapshots);
+    m_pContainerDetails->addWidget(m_pPaneTools);
 
     /* Layout all the widgets: */
@@ -1947 +1960 @@
     connect(m_pPaneDetails, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)),
             this, SLOT(sltOpenMachineSettingsDialog(const QString&, const QString&, const QString&)));
+    connect(m_pPaneTools, &UIToolsPane::sigToolOpened, this, &UISelectorWindow::sltHandleToolsPaneToolOpened);
 
     /* Global event handlers: */

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 #include "QIMainWindow.h"
 #include "QIWithRetranslateUI.h"
+#include "UIToolsPane.h"
 #include "VBoxGlobal.h"
 
@@ -40 +41 @@
 class UIGDetails;
 class UIMainBar;
-class UISnapshotPane;
 class UITexturedSegmentedButton;
 class UIToolBar;
@@ -54 +54 @@
     enum SegmentType
     {
-        SegmentType_Details   = 0,
-        SegmentType_Snapshots
+        SegmentType_Details,
+        SegmentType_Tools,
     };
 
@@ -204 +204 @@
     /** @} */
 
+    /** @name Tools-pane stuff.
+      * @{ */
+        void sltHandleToolsPaneToolOpened(ToolType enmType);
+    /** @} */
+
 private:
 
@@ -348 +353 @@
     /** Holds the Desktop-pane instance. */
     UIDesktopPane *m_pPaneDesktop;
-    /** Holds the Snapshot-pane instance. */
-    UISnapshotPane *m_pPaneSnapshots;
+    /** Holds the Tools-pane instance. */
+    UIToolsPane *m_pPaneTools;
 
     /** Holds the list of Group menu actions. */