Changeset 67109 in vbox for trunk/src/VBox

Timestamp:

May 26, 2017 9:53:10 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Tools pane: Simplify ToolType enum public access.

Location:

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

Files:

• UIToolsPane.cpp (modified) (8 diffs)
• UIToolsPane.h (modified) (4 diffs)

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

@@ -73 +73 @@
 
     /* Translate actions: */
-    m_actions[ToolsType_SnapshotManager]->setText(tr("Snapshot Manager"));
-    m_actions[ToolsType_VirtualMediaManager]->setText(tr("Virtual Media Manager"));
-    m_actions[ToolsType_HostNetworkManager]->setText(tr("Host Network Manager"));
+    m_actions[ToolType_SnapshotManager]->setText(tr("Snapshot Manager"));
+    m_actions[ToolType_VirtualMediaManager]->setText(tr("Virtual Media Manager"));
+    m_actions[ToolType_HostNetworkManager]->setText(tr("Host Network Manager"));
 
     /* Translate tab-bar: */
     for (int iTabIndex = 0; iTabIndex < m_pTabBar->count(); ++iTabIndex)
     {
-        const ToolsType enmType = m_pTabBar->tabData(iTabIndex).value<ToolsType>();
+        const ToolType enmType = m_pTabBar->tabData(iTabIndex).value<ToolType>();
         m_pTabBar->setTabText(iTabIndex, m_actions.value(enmType)->text());
     }
@@ -92 +92 @@
 
     /* Acquire sender's type: */
-    const ToolsType enmType = pAction->property("ToolsType").value<ToolsType>();
-    AssertReturnVoid(enmType != ToolsType_Invalid);
+    const ToolType enmType = pAction->property("ToolType").value<ToolType>();
+    AssertReturnVoid(enmType != ToolType_Invalid);
 
     /* Activate corresponding tab: */
@@ -120 +120 @@
 
     /* Acquire sender's type: */
-    const ToolsType enmType = pButton->property("ToolsType").value<ToolsType>();
-    AssertReturnVoid(enmType != ToolsType_Invalid);
+    const ToolType enmType = pButton->property("ToolType").value<ToolType>();
+    AssertReturnVoid(enmType != ToolType_Invalid);
 
     /* Search for the tab with such type: */
     int iActualTabIndex = -1;
     for (int iTabIndex = 0; iTabIndex < m_pTabBar->count(); ++iTabIndex)
-        if (m_pTabBar->tabData(iTabIndex).value<ToolsType>() == enmType)
+        if (m_pTabBar->tabData(iTabIndex).value<ToolType>() == enmType)
             iActualTabIndex = iTabIndex;
     AssertReturnVoid(iActualTabIndex != -1);
@@ -173 +173 @@
 
             /* Add and activate snapshots pane: */
-            activateTabBarTab(ToolsType_SnapshotManager, false);
+            activateTabBarTab(ToolType_SnapshotManager, false);
 
             /* Add into layout: */
@@ -252 +252 @@
 
         /* Create SnapShot manager action: */
-        m_actions[ToolsType_SnapshotManager] = m_pMenu->addAction(UIIconPool::iconSetFull(":/snapshot_manager_22px.png",
+        m_actions[ToolType_SnapshotManager] = m_pMenu->addAction(UIIconPool::iconSetFull(":/snapshot_manager_22px.png",
                                                                                           ":/snapshot_manager_16px.png"),
                                                                   QString(), this, &UIToolsPane::sltHandleMenuToolbarTrigger);
         {
-            m_actions[ToolsType_SnapshotManager]->setCheckable(true);
-            m_actions[ToolsType_SnapshotManager]->
-                setProperty("ToolsType", QVariant::fromValue(ToolsType_SnapshotManager));
+            m_actions[ToolType_SnapshotManager]->setCheckable(true);
+            m_actions[ToolType_SnapshotManager]->
+                setProperty("ToolType", QVariant::fromValue(ToolType_SnapshotManager));
         }
 
         /* Create Virtual Media manager action: */
-        m_actions[ToolsType_VirtualMediaManager] = m_pMenu->addAction(UIIconPool::iconSetFull(":/diskimage_22px.png",
+        m_actions[ToolType_VirtualMediaManager] = m_pMenu->addAction(UIIconPool::iconSetFull(":/diskimage_22px.png",
                                                                                               ":/diskimage_16px.png"),
                                                                       QString(), this, &UIToolsPane::sltHandleMenuToolbarTrigger);
         {
-            m_actions[ToolsType_VirtualMediaManager]->setCheckable(true);
-            m_actions[ToolsType_VirtualMediaManager]->
-                setProperty("ToolsType", QVariant::fromValue(ToolsType_VirtualMediaManager));
+            m_actions[ToolType_VirtualMediaManager]->setCheckable(true);
+            m_actions[ToolType_VirtualMediaManager]->
+                setProperty("ToolType", QVariant::fromValue(ToolType_VirtualMediaManager));
         }
 
         /* Create Host Network manager action: */
-        m_actions[ToolsType_HostNetworkManager] = m_pMenu->addAction(UIIconPool::iconSetFull(":/host_iface_manager_22px.png",
+        m_actions[ToolType_HostNetworkManager] = m_pMenu->addAction(UIIconPool::iconSetFull(":/host_iface_manager_22px.png",
                                                                                              ":/host_iface_manager_16px.png"),
                                                                      QString(), this, &UIToolsPane::sltHandleMenuToolbarTrigger);
         {
-            m_actions[ToolsType_HostNetworkManager]->setCheckable(true);
-            m_actions[ToolsType_HostNetworkManager]->
-                setProperty("ToolsType", QVariant::fromValue(ToolsType_HostNetworkManager));
+            m_actions[ToolType_HostNetworkManager]->setCheckable(true);
+            m_actions[ToolType_HostNetworkManager]->
+                setProperty("ToolType", QVariant::fromValue(ToolType_HostNetworkManager));
         }
 
@@ -298 +298 @@
 }
 
-void UIToolsPane::activateTabBarTab(ToolsType enmType, bool fCloseable)
+void UIToolsPane::activateTabBarTab(ToolType enmType, bool fCloseable)
 {
     /* Search for a tab with such type: */
     int iActualTabIndex = -1;
     for (int iTabIndex = 0; iTabIndex < m_pTabBar->count(); ++iTabIndex)
-        if (m_pTabBar->tabData(iTabIndex).value<ToolsType>() == enmType)
+        if (m_pTabBar->tabData(iTabIndex).value<ToolType>() == enmType)
             iActualTabIndex = iTabIndex;
 
@@ -313 +313 @@
         switch (enmType)
         {
-            case ToolsType_SnapshotManager:
+            case ToolType_SnapshotManager:
                 m_pPaneSnapshots = new UISnapshotPane;
                 m_pStackedLayout->addWidget(m_pPaneSnapshots);
                 break;
-            case ToolsType_VirtualMediaManager:
+            case ToolType_VirtualMediaManager:
                 m_pStackedLayout->addWidget(new UIMediumManagerWidget(EmbedTo_Stack));
                 break;
-            case ToolsType_HostNetworkManager:
+            case ToolType_HostNetworkManager:
                 m_pStackedLayout->addWidget(new UIHostNetworkManagerWidget(EmbedTo_Stack));
                 break;
@@ -342 +342 @@
 #endif
                     pButtonClose->setIcon(UIIconPool::iconSet(":/close_16px.png"));
-                    pButtonClose->setProperty("ToolsType", QVariant::fromValue(enmType));
+                    pButtonClose->setProperty("ToolType", QVariant::fromValue(enmType));
                     connect(pButtonClose, &QIToolButton::clicked, this, &UIToolsPane::sltHandleTabBarButtonClick);
                     /* Add into tab-bar: */

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

@@ -37 +37 @@
 
 
+/** Tool types. */
+enum ToolType
+{
+    ToolType_Invalid,
+    ToolType_SnapshotManager,
+    ToolType_VirtualMediaManager,
+    ToolType_HostNetworkManager,
+};
+
+/* Make sure QVariant can eat ToolType: */
+Q_DECLARE_METATYPE(ToolType);
+
+
 /** QWidget subclass representing container for tool panes. */
 class UIToolsPane : public QIWithRetranslateUI<QWidget>
@@ -43 +56 @@
 
 public:
-
-    /** Tools types. */
-    enum ToolsType
-    {
-        ToolsType_Invalid,
-        ToolsType_SnapshotManager,
-        ToolsType_VirtualMediaManager,
-        ToolsType_HostNetworkManager,
-    };
 
     /** Constructs tools pane passing @a pParent to the base-class. */
@@ -94 +98 @@
 
     /** Activates corresponding tab-bar tab, adds new if necessary. */
-    void activateTabBarTab(ToolsType enmType, bool fCloseable);
+    void activateTabBarTab(ToolType enmType, bool fCloseable);
 
     /** Holds the main layout isntance. */
@@ -111 +115 @@
     QMenu                     *m_pMenu;
     /** Holds the menu action instances. */
-    QMap<ToolsType, QAction*>  m_actions;
+    QMap<ToolType, QAction*>  m_actions;
 };
-
-/* Make sure QVariant can eat UIToolsPane::ToolsType: */
-Q_DECLARE_METATYPE(UIToolsPane::ToolsType);
 
 #endif /* !___UIToolsPane_h___ */