Changeset 66729 in vbox

Timestamp:

Apr 29, 2017 9:39:51 AM (8 years ago)

Author:

vboxsync

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

115133

Message:

FE/Qt: bugref:8847: Host Network Manager: Rework 'Edit' action to be 'Show Details' action as it already is since r115129.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork

Files:

• UIHostNetworkManager.cpp (modified) (10 diffs)
• UIHostNetworkManager.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -198 +198 @@
     , m_pActionAdd(0)
     , m_pActionRemove(0)
-    , m_pActionEdit(0)
+    , m_pActionDetails(0)
     , m_pSplitter(0)
     , m_pTreeWidget(0)
@@ -255 +255 @@
         m_pActionRemove->setStatusTip(tr("Removes selected host-only network."));
     }
-    if (m_pActionEdit)
-    {
-        m_pActionEdit->setText(tr("&Modify..."));
-        m_pActionEdit->setToolTip(tr("Modify Host-only Network (%1)").arg(m_pActionEdit->shortcut().toString()));
-        m_pActionEdit->setStatusTip(tr("Modifies selected host-only network."));
+    if (m_pActionDetails)
+    {
+        m_pActionDetails->setText(tr("&Details..."));
+        m_pActionDetails->setToolTip(tr("Open Host-only Network Details (%1)").arg(m_pActionDetails->shortcut().toString()));
+        m_pActionDetails->setStatusTip(tr("Opens pane with the selected host-only network details."));
     }
 
@@ -434 +434 @@
 }
 
-void UIHostNetworkManager::sltEditHostNetwork()
-{
-    /* Open details area: */
-    const QList<int> sizes = m_pSplitter->sizes();
-    AssertReturnVoid(sizes.size() >= 2);
-    if (sizes.at(1) == 0)
+void UIHostNetworkManager::sltShowHostNetworkDetails(bool fShow)
+{
+    /* Show/hide details area: */
+    if (fShow)
     {
         m_pSplitter->setSizes(QList<int>() << m_pSplitter->height() << 1);
@@ -445 +443 @@
     }
     else
-    /* Close details area: */
-    if (sizes.at(1) > 0)
     {
         m_pSplitter->setSizes(QList<int>() << m_pSplitter->height() << 0);
@@ -656 +652 @@
     /* Update actions availability: */
     m_pActionRemove->setEnabled(pItem);
-    m_pActionEdit->setEnabled(pItem);
+    m_pActionDetails->setEnabled(pItem);
 
     /* If there is an item => update details data: */
@@ -677 +673 @@
     {
         menu.addAction(m_pActionRemove);
-        menu.addAction(m_pActionEdit);
+        menu.addAction(m_pActionDetails);
     }
     else
@@ -751 +747 @@
     }
 
-    /* Create 'Edit' action: */
-    m_pActionEdit = new QAction(this);
-    AssertPtrReturnVoid(m_pActionEdit);
-    {
-        /* Configure 'Edit' action: */
-        m_pActionEdit->setShortcut(QKeySequence("Ctrl+Space"));
-        m_pActionEdit->setIcon(UIIconPool::iconSetFull(":/edit_host_iface_22px.png",
-                                                       ":/edit_host_iface_16px.png",
-                                                       ":/edit_host_iface_disabled_22px.png",
-                                                       ":/edit_host_iface_disabled_16px.png"));
-        connect(m_pActionEdit, &QAction::triggered, this, &UIHostNetworkManager::sltEditHostNetwork);
+    /* Create 'Details' action: */
+    m_pActionDetails = new QAction(this);
+    AssertPtrReturnVoid(m_pActionDetails);
+    {
+        /* Configure 'Details' action: */
+        m_pActionDetails->setCheckable(true);
+        m_pActionDetails->setShortcut(QKeySequence("Ctrl+Space"));
+        m_pActionDetails->setIcon(UIIconPool::iconSetFull(":/edit_host_iface_22px.png",
+                                                          ":/edit_host_iface_16px.png",
+                                                          ":/edit_host_iface_disabled_22px.png",
+                                                          ":/edit_host_iface_disabled_16px.png"));
+        connect(m_pActionDetails, &QAction::toggled, this, &UIHostNetworkManager::sltShowHostNetworkDetails);
     }
 
@@ -777 +774 @@
         m_pMenu->addAction(m_pActionAdd);
         m_pMenu->addAction(m_pActionRemove);
-        m_pMenu->addAction(m_pActionEdit);
+        m_pMenu->addAction(m_pActionDetails);
     }
 
@@ -825 +822 @@
         if (m_pActionRemove)
             m_pToolBar->addAction(m_pActionRemove);
-        if (m_pActionEdit)
-            m_pToolBar->addAction(m_pActionEdit);
+        if (m_pActionDetails)
+            m_pToolBar->addAction(m_pActionDetails);
         /* Integrate tool-bar into dialog: */
         QVBoxLayout *pMainLayout = qobject_cast<QVBoxLayout*>(centralWidget()->layout());
@@ -881 +878 @@
         connect(m_pTreeWidget, &QITreeWidget::currentItemChanged,
                 this, &UIHostNetworkManager::sltHandleCurrentItemChange);
-        connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
-                this, &UIHostNetworkManager::sltEditHostNetwork);
         connect(m_pTreeWidget, &QITreeWidget::customContextMenuRequested,
                 this, &UIHostNetworkManager::sltHandleContextMenuRequest);
         connect(m_pTreeWidget, &QITreeWidget::itemChanged,
                 this, &UIHostNetworkManager::sltHandleItemChange);
+        connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
+                m_pActionDetails, &QAction::setChecked);
         /* Add tree-widget into splitter: */
         m_pSplitter->addWidget(m_pTreeWidget);

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.h

@@ -78 +78 @@
         /** Handles command to remove host network. */
         void sltRemoveHostNetwork();
-        /** Handles command to edit host network. */
-        void sltEditHostNetwork();
+        /** Handles command to @a fShow host network details. */
+        void sltShowHostNetworkDetails(bool fShow);
     /** @} */
 
@@ -167 +167 @@
         /** Holds the Remove action instance. */
         QAction   *m_pActionRemove;
-        /** Holds the Edit action instance. */
-        QAction   *m_pActionEdit;
+        /** Holds the Details action instance. */
+        QAction   *m_pActionDetails;
     /** @} */