儲存庫 vbox 的更動 66724

時間撮記:

2017-4-28 下午03:16:39 (8 年 以前)

作者:

vboxsync

訊息:

FE/Qt: bugref:8847: Host Network Manager: A bit of macOS adjustments.

檔案:

• trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsDialog.cpp (修改) (5 筆差異)

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

@@ -38 +38 @@
     : QIWithRetranslateUI2<QIDialog>(pParent)
     , m_data(data)
+    , m_pTabWidget(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)
+    , m_pCheckBoxDHCP(0) , m_pLabelDHCPAddress(0), m_pEditorDHCPAddress(0), m_pLabelDHCPMask(0), m_pEditorDHCPMask(0)
+    , m_pLabelDHCPLowerAddress(0), m_pEditorDHCPLowerAddress(0), m_pLabelDHCPUpperAddress(0), m_pEditorDHCPUpperAddress(0)
 {
     /* Prepare: */
@@ -137 +142 @@
         AssertPtrReturnVoid(pLayoutInterface);
         {
+#ifdef VBOX_WS_MAC
+            /* Configure layout: */
+            pLayoutInterface->setContentsMargins(10, 10, 10, 10);
+#endif
             /* Create IPv4 address label: */
             m_pLabelIPv4 = new QLabel;
@@ -233 +242 @@
         AssertPtrReturnVoid(pLayoutDHCPServer);
         {
+#ifdef VBOX_WS_MAC
+            /* Configure layout: */
+            pLayoutDHCPServer->setContentsMargins(10, 10, 10, 10);
+#endif
             /* Create DHCP server status check-box: */
             m_pCheckBoxDHCP = new QCheckBox;
@@ -241 +254 @@
                         this, &UIHostNetworkDetailsDialog::sltDhcpServerStatusChanged);
                 /* Add into layout: */
-                pLayoutDHCPServer->addWidget(m_pCheckBoxDHCP, 0, 0, 1, 3);
+                pLayoutDHCPServer->addWidget(m_pCheckBoxDHCP, 0, 0, 1, 2);
             }
             /* Create DHCP address label: */
@@ -390 +403 @@
 {
     /* Toggle DHCP server fields availability: */
-    const bool fIsManual = m_pCheckBoxDHCP->isChecked();
-    m_pLabelDHCPAddress->setEnabled(fIsManual);
-    m_pLabelDHCPMask->setEnabled(fIsManual);
-    m_pLabelDHCPLowerAddress->setEnabled(fIsManual);
-    m_pLabelDHCPUpperAddress->setEnabled(fIsManual);
-    m_pEditorDHCPAddress->setEnabled(fIsManual);
-    m_pEditorDHCPMask->setEnabled(fIsManual);
-    m_pEditorDHCPLowerAddress->setEnabled(fIsManual);
-    m_pEditorDHCPUpperAddress->setEnabled(fIsManual);
-    if (fIsManual)
+    const bool fIsDHCPServerEnabled = m_data.m_dhcpserver.m_fEnabled;
+    m_pLabelDHCPAddress->setEnabled(fIsDHCPServerEnabled);
+    m_pLabelDHCPMask->setEnabled(fIsDHCPServerEnabled);
+    m_pLabelDHCPLowerAddress->setEnabled(fIsDHCPServerEnabled);
+    m_pLabelDHCPUpperAddress->setEnabled(fIsDHCPServerEnabled);
+    m_pEditorDHCPAddress->setEnabled(fIsDHCPServerEnabled);
+    m_pEditorDHCPMask->setEnabled(fIsDHCPServerEnabled);
+    m_pEditorDHCPLowerAddress->setEnabled(fIsDHCPServerEnabled);
+    m_pEditorDHCPUpperAddress->setEnabled(fIsDHCPServerEnabled);
+    if (fIsDHCPServerEnabled)
     {
         /* Load DHCP server fields: */