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

Timestamp:

May 16, 2017 10:01:18 AM (8 years ago)

Author:

vboxsync

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

115431

Message:

FE/Qt: bugref:8847: Host Network Manager: Move Apply button from dialog button-box to toolbar (no icon for now, later).

Location:

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

Files:

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

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

@@ -201 +201 @@
     , m_pActionRemove(0)
     , m_pActionDetails(0)
+    , m_pActionCommit(0)
     , m_pTreeWidget(0)
     , m_pDetailsWidget(0)
@@ -241 +242 @@
     /* Translate menu: */
     if (m_pMenu)
-        m_pMenu->setTitle(QApplication::translate("UIActionPool", "&File"));
+        m_pMenu->setTitle(QApplication::translate("UIActionPool", "&Network"));
 
     /* Translate actions: */
@@ -261 +262 @@
         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."));
+    }
+    if (m_pActionCommit)
+    {
+        m_pActionCommit->setText(tr("&Apply..."));
+        m_pActionCommit->setToolTip(tr("Apply Changes in Host-only Network Details (%1)").arg(m_pActionCommit->shortcut().toString()));
+        m_pActionCommit->setStatusTip(tr("Applies changes in host-only network details pane."));
     }
 
@@ -435 +442 @@
 }
 
-void UIHostNetworkManager::sltShowHostNetworkDetails(bool fShow)
+void UIHostNetworkManager::sltToggleHostNetworkDetailsVisibility(bool fShow)
 {
     /* Show/hide details area and Apply button: */
     m_pDetailsWidget->setVisible(fShow);
-    m_pButtonBox->button(QDialogButtonBox::Apply)->setVisible(fShow);
-}
-
-void UIHostNetworkManager::sltHandleButtonClicked(QAbstractButton *pButton)
-{
-    /* Handle known button (Apply) only: */
-    if (pButton != m_pButtonBox->button(QDialogButtonBox::Apply))
-        return;
-
+    m_pActionCommit->setVisible(fShow);
+}
+
+void UIHostNetworkManager::sltApplyHostNetworkDetailsChanges()
+{
     /* Disable button first of all: */
-    m_pButtonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
+    m_pActionCommit->setEnabled(false);
 
     /* Get network item: */
@@ -685 +688 @@
     m_pActionRemove->setEnabled(pItem);
     m_pActionDetails->setEnabled(pItem);
+    m_pActionCommit->setEnabled(false);
 
     /* If there is an item => update details data: */
@@ -693 +697 @@
         /* Otherwise => clear details and close the area: */
         m_pDetailsWidget->clearData();
-        sltShowHostNetworkDetails(false);
+        sltToggleHostNetworkDetailsVisibility(false);
     }
 }
@@ -789 +793 @@
                                                           ":/edit_host_iface_disabled_22px.png",
                                                           ":/edit_host_iface_disabled_16px.png"));
-        connect(m_pActionDetails, &QAction::toggled, this, &UIHostNetworkManager::sltShowHostNetworkDetails);
+        connect(m_pActionDetails, &QAction::toggled, this, &UIHostNetworkManager::sltToggleHostNetworkDetailsVisibility);
+    }
+
+    /* Create 'Apply' action: */
+    m_pActionCommit = new QAction(this);
+    AssertPtrReturnVoid(m_pActionCommit);
+    {
+        /* Configure 'Apply' action: */
+        m_pActionCommit->setVisible(false);
+        m_pActionCommit->setShortcut(QKeySequence("Ctrl+Return"));
+        m_pActionCommit->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, m_pActionCommit, &QAction::setVisible);
+        connect(m_pActionCommit, &QAction::triggered, this, &UIHostNetworkManager::sltApplyHostNetworkDetailsChanges);
     }
 
@@ -798 +817 @@
 void UIHostNetworkManager::prepareMenuBar()
 {
-    /* Create 'File' menu: */
+    /* Create 'Network' menu: */
     m_pMenu = menuBar()->addMenu(QString());
     AssertPtrReturnVoid(m_pMenu);
     {
-        /* Configure 'File' menu: */
+        /* Configure menu: */
         m_pMenu->addAction(m_pActionAdd);
         m_pMenu->addAction(m_pActionRemove);
         m_pMenu->addAction(m_pActionDetails);
+        m_pMenu->addAction(m_pActionCommit);
     }
 
@@ -854 +874 @@
         if (m_pActionRemove)
             m_pToolBar->addAction(m_pActionRemove);
+        if ((m_pActionAdd || m_pActionRemove) && (m_pActionDetails || m_pActionCommit))
+            m_pToolBar->addSeparator();
         if (m_pActionDetails)
             m_pToolBar->addAction(m_pActionDetails);
+        if (m_pActionCommit)
+            m_pToolBar->addAction(m_pActionCommit);
         /* Integrate tool-bar into dialog: */
         QVBoxLayout *pMainLayout = qobject_cast<QVBoxLayout*>(centralWidget()->layout());
@@ -912 +936 @@
         m_pDetailsWidget->setVisible(false);
         m_pDetailsWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+        connect(m_pDetailsWidget, &UIHostNetworkDetailsDialog::sigDataChanged,
+                m_pActionCommit, &QAction::setEnabled);
 
         /* Add into layout: */
@@ -925 +951 @@
     {
         /* Configure button-box: */
-        m_pButtonBox->setStandardButtons(QDialogButtonBox::Close | QDialogButtonBox::Apply);
+        m_pButtonBox->setStandardButtons(QDialogButtonBox::Close);
         m_pButtonBox->button(QDialogButtonBox::Close)->setShortcut(Qt::Key_Escape);
-        m_pButtonBox->button(QDialogButtonBox::Apply)->hide();
         connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIHostNetworkManager::close);
-        connect(m_pButtonBox, &QIDialogButtonBox::clicked, this, &UIHostNetworkManager::sltHandleButtonClicked);
-        connect(m_pDetailsWidget, &UIHostNetworkDetailsDialog::sigDataChanged,
-                m_pButtonBox->button(QDialogButtonBox::Apply), &QWidget::setEnabled);
-
-        /* Add button-box into layout: */
+
+        /* Add into layout: */
         centralWidget()->layout()->addWidget(m_pButtonBox);
     }

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

@@ -77 +77 @@
         /** Handles command to remove host network. */
         void sltRemoveHostNetwork();
-        /** Handles command to @a fShow host network details. */
-        void sltShowHostNetworkDetails(bool fShow);
-    /** @} */
-
-    /** @name Button-box stuff.
-     * @{ */
-        /** Handles button-box @a pButton click. */
-        void sltHandleButtonClicked(QAbstractButton *pButton);
+        /** Handles command to make host network details @a fVisible. */
+        void sltToggleHostNetworkDetailsVisibility(bool fVisible);
+        /** Handles command to apply host network details changes. */
+        void sltApplyHostNetworkDetailsChanges();
     /** @} */
 
@@ -166 +162 @@
         /** Holds the Details action instance. */
         QAction   *m_pActionDetails;
+        /** Holds the Commit action instance. */
+        QAction   *m_pActionCommit;
     /** @} */