Changeset 17846 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 13, 2009 4:10:52 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 2869: Rework network adapter UI - DHCP configuration blocked for all the platforms except Win.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/VBoxVMSettingsNetworkDetails.cpp (modified) (7 diffs)
• ui/VBoxVMSettingsNetworkDetails.ui (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetworkDetails.cpp

@@ -58 +58 @@
     connect (mCbHOI, SIGNAL (currentIndexChanged (int)),
              this, SLOT (hostOnlyInterfaceChanged()));
-    connect (mRbAuto, SIGNAL (toggled (bool)),
-             this, SLOT (hostOnlyDHCPChanged()));
-    connect (mRbManual, SIGNAL (toggled (bool)),
-             this, SLOT (hostOnlyDHCPChanged()));
-    populateComboboxes();
 #if defined (Q_WS_WIN32)
     mTbAdd->setIcon (VBoxGlobal::iconSet (":/add_host_iface_16px.png",
@@ -70 +65 @@
     connect (mTbAdd, SIGNAL (clicked()), this, SLOT (addInterface()));
     connect (mTbDel, SIGNAL (clicked()), this, SLOT (delInterface()));
+    connect (mRbAuto, SIGNAL (toggled (bool)),
+             this, SLOT (hostOnlyDHCPChanged()));
+    connect (mRbManual, SIGNAL (toggled (bool)),
+             this, SLOT (hostOnlyDHCPChanged()));
 #endif
 
@@ -109 +108 @@
         setProperty ("HOI_Name", QVariant (ifsName));
         setProperty ("HOI_DhcpEnabled", QVariant (ifs.GetDhcpEnabled()));
+#if defined (Q_WS_WIN32)
         setProperty ("HOI_IPv6Supported", QVariant (ifs.GetIPV6Supported()));
+#endif
         if (!ifs.GetDhcpEnabled())
         {
@@ -188 +189 @@
     mLbHOI->setVisible (mType == KNetworkAttachmentType_HostOnly);
     mCbHOI->setVisible (mType == KNetworkAttachmentType_HostOnly);
-    mLbCT->setVisible (mType == KNetworkAttachmentType_HostOnly);
-    mRbAuto->setVisible (mType == KNetworkAttachmentType_HostOnly);
-    mRbManual->setVisible (mType == KNetworkAttachmentType_HostOnly);
     mLbIPv4->setVisible (mType == KNetworkAttachmentType_HostOnly);
     mLeIPv4->setVisible (mType == KNetworkAttachmentType_HostOnly);
@@ -202 +200 @@
     mTbAdd->setVisible (mType == KNetworkAttachmentType_HostOnly);
     mTbDel->setVisible (mType == KNetworkAttachmentType_HostOnly);
+    mLbCT->setVisible (mType == KNetworkAttachmentType_HostOnly);
+    mRbAuto->setVisible (mType == KNetworkAttachmentType_HostOnly);
+    mRbManual->setVisible (mType == KNetworkAttachmentType_HostOnly);
 #endif
 
@@ -411 +412 @@
 void VBoxVMSettingsNetworkDetails::hostOnlyInterfaceChanged()
 {
+#if defined (Q_WS_WIN32)
     CHostNetworkInterface iface =
         vboxGlobal().virtualBox().GetHost().FindHostNetworkInterfaceByName (mCbHOI->currentText());
@@ -434 +436 @@
         mRbAuto->blockSignals (false);
     }
-    hostOnlyDHCPChanged();
-
-#if defined (Q_WS_WIN32)
+
     mTbDel->setEnabled (isValid);
 #endif
+
+    hostOnlyDHCPChanged();
 }
 

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsNetworkDetails.ui

@@ -136 +136 @@
    <item row="4" column="1" >
     <widget class="QLabel" name="mLbCT" >
+     <property name="visible" >
+      <bool>false</bool>
+     </property>
      <property name="text" >
       <string>Configuration Type:</string>
@@ -146 +149 @@
    <item row="4" column="2" colspan="3" >
     <widget class="QRadioButton" name="mRbAuto" >
+     <property name="visible" >
+      <bool>false</bool>
+     </property>
      <property name="toolTip" >
       <string>Use DHCP automatic configuration for this host-only network interface.</string>
@@ -156 +162 @@
    <item row="5" column="2" colspan="3" >
     <widget class="QRadioButton" name="mRbManual" >
+     <property name="visible" >
+      <bool>false</bool>
+     </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
      <property name="toolTip" >
       <string>Use manual configuration for this host-only network interface.</string>
@@ -269 +281 @@
    </item>
    <item row="10" column="0" colspan="5" >
-    <widget class="QILabelSeparator" name="mLsHost" >
+    <widget class="QILabelSeparator" name="mLsGuest" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >