儲存庫 vbox 的更動 66781

時間撮記:

2017-5-4 上午10:58:22 (8 年 以前)

作者:

vboxsync

訊息:

FE/Qt: bugref:8847: Host Network Manager: Adding possibility to automatically configure host-only network interfaces (by enabling DHCP).

位置:

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

檔案:

• UIHostNetworkDetailsDialog.cpp (修改) (14 筆差異)
• UIHostNetworkDetailsDialog.h (修改) (6 筆差異)
• UIHostNetworkManager.cpp (修改) (3 筆差異)

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

@@ -23 +23 @@
 # include <QCheckBox>
 # include <QLabel>
+# include <QRadioButton>
+# include <QRegExpValidator>
 # include <QStyleOption>
-# include <QRegExpValidator>
 # include <QVBoxLayout>
 
@@ -42 +43 @@
     : QIWithRetranslateUI2<QWidget>(pParent)
     , m_pTabWidget(0)
+    , m_pButtonAutomatic(0), m_pButtonManual(0)
     , m_pLabelIPv4(0), m_pEditorIPv4(0), m_pLabelNMv4(0), m_pEditorNMv4(0)
     , m_pLabelIPv6(0), m_pEditorIPv6(0), m_pLabelNMv6(0), m_pEditorNMv6(0)
@@ -106 +108 @@
 
     /* Translate 'Interface' tab content: */
+    m_pButtonAutomatic->setText(tr("Configure Adapter &Automatically"));
+    m_pButtonManual->setText(tr("Configure Adapter &Manually"));
     m_pLabelIPv4->setText(tr("&IPv4 Address:"));
     m_pEditorIPv4->setToolTip(tr("Holds the host IPv4 address for this adapter."));
@@ -179 +183 @@
             pLayoutInterface->setContentsMargins(10, 10, 10, 10);
 #endif
+            /* Create automatic interface configuration radio-button: */
+            m_pButtonAutomatic = new QRadioButton;
+            AssertPtrReturnVoid(m_pButtonAutomatic);
+            {
+                /* Configure radio-button: */
+                connect(m_pButtonAutomatic, &QRadioButton::toggled,
+                        this, &UIHostNetworkDetailsDialog::sltToggledButtonAutomatic);
+                /* Add into layout: */
+                pLayoutInterface->addWidget(m_pButtonAutomatic, 0, 0, 1, 3);
+            }
+            /* Create manual interface configuration radio-button: */
+            m_pButtonManual = new QRadioButton;
+            AssertPtrReturnVoid(m_pButtonManual);
+            {
+                /* Configure radio-button: */
+                connect(m_pButtonManual, &QRadioButton::toggled,
+                        this, &UIHostNetworkDetailsDialog::sltToggledButtonManual);
+                /* Add into layout: */
+                pLayoutInterface->addWidget(m_pButtonManual, 1, 0, 1, 3);
+            }
             /* Create IPv4 address label: */
             m_pLabelIPv4 = new QLabel;
@@ -186 +210 @@
                 m_pLabelIPv4->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
                 /* Add into layout: */
-                pLayoutInterface->addWidget(m_pLabelIPv4, 0, 0);
+                pLayoutInterface->addWidget(m_pLabelIPv4, 2, 1);
             }
             /* Create IPv4 address editor: */
@@ -197 +221 @@
                         this, &UIHostNetworkDetailsDialog::sltTextChangedIPv4);
                 /* Add into layout: */
-                pLayoutInterface->addWidget(m_pEditorIPv4, 0, 1);
+                pLayoutInterface->addWidget(m_pEditorIPv4, 2, 2);
             }
             /* Create IPv4 network mask label: */
@@ -206 +230 @@
                 m_pLabelNMv4->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
                 /* Add into layout: */
-                pLayoutInterface->addWidget(m_pLabelNMv4, 1, 0);
+                pLayoutInterface->addWidget(m_pLabelNMv4, 3, 1);
             }
             /* Create IPv4 network mask editor: */
@@ -217 +241 @@
                         this, &UIHostNetworkDetailsDialog::sltTextChangedNMv4);
                 /* Add into layout: */
-                pLayoutInterface->addWidget(m_pEditorNMv4, 1, 1);
+                pLayoutInterface->addWidget(m_pEditorNMv4, 3, 2);
             }
             /* Create IPv6 address label: */
@@ -226 +250 @@
                 m_pLabelIPv6->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
                 /* Add into layout: */
-                pLayoutInterface->addWidget(m_pLabelIPv6, 2, 0);
+                pLayoutInterface->addWidget(m_pLabelIPv6, 4, 1);
             }
             /* Create IPv6 address editor: */
@@ -237 +261 @@
                         this, &UIHostNetworkDetailsDialog::sltTextChangedIPv6);
                 /* Add into layout: */
-                pLayoutInterface->addWidget(m_pEditorIPv6, 2, 1);
+                pLayoutInterface->addWidget(m_pEditorIPv6, 4, 2);
             }
             /* Create IPv6 network mask label: */
@@ -246 +270 @@
                 m_pLabelNMv6->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
                 /* Add into layout: */
-                pLayoutInterface->addWidget(m_pLabelNMv6, 3, 0);
+                pLayoutInterface->addWidget(m_pLabelNMv6, 5, 1);
             }
             /* Create IPv6 network mask editor: */
@@ -257 +281 @@
                         this, &UIHostNetworkDetailsDialog::sltTextChangedNMv6);
                 /* Add into layout: */
-                pLayoutInterface->addWidget(m_pEditorNMv6, 3, 1);
+                pLayoutInterface->addWidget(m_pEditorNMv6, 5, 2);
+            }
+            /* Create indent: */
+            QStyleOption options;
+            options.initFrom(m_pButtonManual);
+            const int iWidth = m_pButtonManual->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, &options, m_pButtonManual) +
+                               m_pButtonManual->style()->pixelMetric(QStyle::PM_RadioButtonLabelSpacing, &options, m_pButtonManual) -
+                               pLayoutInterface->spacing() - 1;
+            QSpacerItem *pSpacer1 = new QSpacerItem(iWidth, 0, QSizePolicy::Fixed, QSizePolicy::Expanding);
+            AssertPtrReturnVoid(pSpacer1);
+            {
+                /* Add into layout: */
+                pLayoutInterface->addItem(pSpacer1, 2, 0, 4);
             }
             /* Create stretch: */
-            QSpacerItem *pSpacer1 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
-            AssertPtrReturnVoid(pSpacer1);
-            {
-                /* Add into layout: */
-                pLayoutInterface->addItem(pSpacer1, 4, 0, 1, 2);
+            QSpacerItem *pSpacer2 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+            AssertPtrReturnVoid(pSpacer2);
+            {
+                /* Add into layout: */
+                pLayoutInterface->addItem(pSpacer2, 6, 0, 1, 3);
             }
         }
@@ -379 +415 @@
             QStyleOption options;
             options.initFrom(m_pCheckBoxDHCP);
-            const int iWidth2 = m_pCheckBoxDHCP->style()->pixelMetric(QStyle::PM_IndicatorWidth, &options, m_pCheckBoxDHCP) +
-                                m_pCheckBoxDHCP->style()->pixelMetric(QStyle::PM_CheckBoxLabelSpacing, &options, m_pCheckBoxDHCP) -
-                                pLayoutDHCPServer->spacing() - 1;
-            QSpacerItem *pSpacer2 = new QSpacerItem(iWidth2, 0, QSizePolicy::Fixed, QSizePolicy::Expanding);
+            const int iWidth = m_pCheckBoxDHCP->style()->pixelMetric(QStyle::PM_IndicatorWidth, &options, m_pCheckBoxDHCP) +
+                               m_pCheckBoxDHCP->style()->pixelMetric(QStyle::PM_CheckBoxLabelSpacing, &options, m_pCheckBoxDHCP) -
+                               pLayoutDHCPServer->spacing() - 1;
+            QSpacerItem *pSpacer1 = new QSpacerItem(iWidth, 0, QSizePolicy::Fixed, QSizePolicy::Expanding);
+            AssertPtrReturnVoid(pSpacer1);
+            {
+                /* Add into layout: */
+                pLayoutDHCPServer->addItem(pSpacer1, 1, 0, 4);
+            }
+            /* Create stretch: */
+            QSpacerItem *pSpacer2 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
             AssertPtrReturnVoid(pSpacer2);
             {
                 /* Add into layout: */
-                pLayoutDHCPServer->addItem(pSpacer2, 1, 0, 4);
-            }
-            /* Create stretch: */
-            QSpacerItem *pSpacer3 = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
-            AssertPtrReturnVoid(pSpacer3);
-            {
-                /* Add into layout: */
-                pLayoutDHCPServer->addItem(pSpacer3, 5, 0, 1, 3);
+                pLayoutDHCPServer->addItem(pSpacer2, 5, 0, 1, 3);
             }
         }
@@ -403 +439 @@
 void UIHostNetworkDetailsDialog::loadDataForInterface()
 {
+    /* Toggle IPv4 & IPv6 interface fields availability: */
+    const bool fIsInterfaceConfigurable = !m_newData.m_interface.m_fDHCPEnabled;
+    m_pLabelIPv4->setEnabled(fIsInterfaceConfigurable);
+    m_pLabelNMv4->setEnabled(fIsInterfaceConfigurable);
+    m_pEditorIPv4->setEnabled(fIsInterfaceConfigurable);
+    m_pEditorNMv4->setEnabled(fIsInterfaceConfigurable);
+
     /* Load IPv4 interface fields: */
+    m_pButtonAutomatic->setChecked(!fIsInterfaceConfigurable);
+    m_pButtonManual->setChecked(fIsInterfaceConfigurable);
     m_pEditorIPv4->setText(m_newData.m_interface.m_strAddress);
     m_pEditorNMv4->setText(m_newData.m_interface.m_strMask);
 
     /* Toggle IPv6 interface fields availability: */
-    const bool fIsIpv6Supported = m_newData.m_interface.m_fSupportedIPv6;
-    m_pLabelIPv6->setEnabled(fIsIpv6Supported);
-    m_pLabelNMv6->setEnabled(fIsIpv6Supported);
-    m_pEditorIPv6->setEnabled(fIsIpv6Supported);
-    m_pEditorNMv6->setEnabled(fIsIpv6Supported);
+    const bool fIsIpv6Configurable = fIsInterfaceConfigurable && m_newData.m_interface.m_fSupportedIPv6;
+    m_pLabelIPv6->setEnabled(fIsIpv6Configurable);
+    m_pLabelNMv6->setEnabled(fIsIpv6Configurable);
+    m_pEditorIPv6->setEnabled(fIsIpv6Configurable);
+    m_pEditorNMv6->setEnabled(fIsIpv6Configurable);
 
     /* Load IPv6 interface fields: */

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

@@ -28 +28 @@
 class QCheckBox;
 class QLabel;
+class QRadioButton;
 class QILineEdit;
 class QITabWidget;
@@ -38 +39 @@
     UIDataHostNetworkInterface()
         : m_strName(QString())
+        , m_fDHCPEnabled(false)
         , m_strAddress(QString())
         , m_strMask(QString())
@@ -50 +52 @@
         return true
                && (m_strName == other.m_strName)
+               && (m_fDHCPEnabled == other.m_fDHCPEnabled)
                && (m_strAddress == other.m_strAddress)
                && (m_strMask == other.m_strMask)
@@ -65 +68 @@
     /** Holds interface name. */
     QString m_strName;
+    /** Holds whether DHCP is enabled for that interface. */
+    bool m_fDHCPEnabled;
     /** Holds IPv4 interface address. */
     QString m_strAddress;
@@ -181 +186 @@
     /** @name Change handling stuff.
      * @{ */
+        /** Handles interface automatic configuration choice change. */
+        void sltToggledButtonAutomatic(bool fChecked) { m_newData.m_interface.m_fDHCPEnabled = fChecked; loadDataForInterface(); notify(); }
+        /** Handles interface manual configuration choice change. */
+        void sltToggledButtonManual(bool fChecked) { m_newData.m_interface.m_fDHCPEnabled = !fChecked; loadDataForInterface(); notify(); }
         /** Handles interface IPv4 text change. */
         void sltTextChangedIPv4(const QString &strText) { m_newData.m_interface.m_strAddress = strText; notify(); }
@@ -252 +261 @@
     /** @name Interface variables.
      * @{ */
+        /** Holds the automatic interface configuration button. */
+        QRadioButton *m_pButtonAutomatic;
+        /** Holds the manual interface configuration button. */
+        QRadioButton *m_pButtonManual;
         /** Holds the IPv4 address label. */
-        QLabel     *m_pLabelIPv4;
+        QLabel       *m_pLabelIPv4;
         /** Holds the IPv4 address editor. */
-        QILineEdit *m_pEditorIPv4;
+        QILineEdit   *m_pEditorIPv4;
         /** Holds the IPv4 network mask label. */
-        QLabel     *m_pLabelNMv4;
+        QLabel       *m_pLabelNMv4;
         /** Holds the IPv4 network mask editor. */
-        QILineEdit *m_pEditorNMv4;
+        QILineEdit   *m_pEditorNMv4;
         /** Holds the IPv6 address label. */
-        QLabel     *m_pLabelIPv6;
+        QLabel       *m_pLabelIPv6;
         /** Holds the IPv6 address editor. */
-        QILineEdit *m_pEditorIPv6;
+        QILineEdit   *m_pEditorIPv6;
         /** Holds the IPv6 network mask label. */
-        QLabel     *m_pLabelNMv6;
+        QLabel       *m_pLabelNMv6;
         /** Holds the IPv6 network mask editor. */
-        QILineEdit *m_pEditorNMv6;
+        QILineEdit   *m_pEditorNMv6;
     /** @} */
 

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

@@ -102 +102 @@
     /* Interface information: */
     strToolTip += strHeader.arg(UIHostNetworkManager::tr("Adapter"))
-                           .arg(UIHostNetworkManager::tr("Manually configured", "interface"));
+                           .arg(m_interface.m_fDHCPEnabled ?
+                                UIHostNetworkManager::tr("Automatically configured", "interface") :
+                                UIHostNetworkManager::tr("Manually configured", "interface"));
     strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("IPv4 Address"))
                               .arg(m_interface.m_strAddress.isEmpty() ?
@@ -477 +479 @@
     else
     {
-        /* Save IPv4 interface configuration: */
-        if (   comInterface.isOk()
-            && (   newData.m_interface.m_strAddress != oldData.m_interface.m_strAddress
-                || newData.m_interface.m_strMask != oldData.m_interface.m_strMask))
-            comInterface.EnableStaticIPConfig(newData.m_interface.m_strAddress, newData.m_interface.m_strMask);
-        /* Save IPv6 interface configuration: */
-        if (   comInterface.isOk()
-            && newData.m_interface.m_fSupportedIPv6
-            && (   newData.m_interface.m_strAddress6 != oldData.m_interface.m_strAddress6
-                || newData.m_interface.m_strMaskLength6 != oldData.m_interface.m_strMaskLength6))
-            comInterface.EnableStaticIPConfigV6(newData.m_interface.m_strAddress6, newData.m_interface.m_strMaskLength6.toULong());
+        /* Save automatic interface configuration: */
+        if (newData.m_interface.m_fDHCPEnabled)
+        {
+            if (   comInterface.isOk()
+                && !oldData.m_interface.m_fDHCPEnabled)
+                comInterface.EnableDynamicIPConfig();
+        }
+        /* Save manual interface configuration: */
+        else
+        {
+            /* Save IPv4 interface configuration: */
+            if (   comInterface.isOk()
+                && (   oldData.m_interface.m_fDHCPEnabled
+                    || newData.m_interface.m_strAddress != oldData.m_interface.m_strAddress
+                    || newData.m_interface.m_strMask != oldData.m_interface.m_strMask))
+                comInterface.EnableStaticIPConfig(newData.m_interface.m_strAddress, newData.m_interface.m_strMask);
+            /* Save IPv6 interface configuration: */
+            if (   comInterface.isOk()
+                && newData.m_interface.m_fSupportedIPv6
+                && (   oldData.m_interface.m_fDHCPEnabled
+                    || newData.m_interface.m_strAddress6 != oldData.m_interface.m_strAddress6
+                    || newData.m_interface.m_strMaskLength6 != oldData.m_interface.m_strMaskLength6))
+                comInterface.EnableStaticIPConfigV6(newData.m_interface.m_strAddress6, newData.m_interface.m_strMaskLength6.toULong());
+        }
 
         /* Show error message if necessary: */
@@ -976 +991 @@
         data.m_interface.m_strName = comInterface.GetName();
     if (comInterface.isOk())
+        data.m_interface.m_fDHCPEnabled = comInterface.GetDHCPEnabled();
+    if (comInterface.isOk())
         data.m_interface.m_strAddress = comInterface.GetIPAddress();
     if (comInterface.isOk())