Changeset 6993 in vbox

Timestamp:

Feb 18, 2008 1:49:09 PM (17 years ago)

Author:

vboxsync

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

28188

Message:

2679: Add selector of NIC type to network configuration GUI.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (2 diffs)
• ui/VBoxVMNetworkSettings.ui (modified) (8 diffs)
• ui/VBoxVMNetworkSettings.ui.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -361 +361 @@
         AssertMsg (it != audioControllerTypes.end(), ("No value for {%s}", s.latin1()));
         return CEnums::AudioControllerType (it - audioControllerTypes.begin());
+    }
+
+    QString toString (CEnums::NetworkAdapterType t) const
+    {
+        AssertMsg (!networkAdapterTypes [t].isNull(), ("No text for %d", t));
+        return networkAdapterTypes [t];
+    }
+
+    CEnums::NetworkAdapterType toNetworkAdapterType (const QString &s) const
+    {
+        QStringVector::const_iterator it =
+            qFind (networkAdapterTypes.begin(), networkAdapterTypes.end(), s);
+        AssertMsg (it != networkAdapterTypes.end(), ("No value for {%s}", s.latin1()));
+        return CEnums::NetworkAdapterType (it - networkAdapterTypes.begin());
     }
 
@@ -624 +638 @@
     QStringVector audioDriverTypes;
     QStringVector audioControllerTypes;
+    QStringVector networkAdapterTypes;
     QStringVector networkAttachmentTypes;
     QStringVector clipboardTypes;

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

@@ -748 +748 @@
     , audioDriverTypes (CEnums::AudioDriverType_COUNT)
     , audioControllerTypes (CEnums::AudioControllerType_COUNT)
+    , networkAdapterTypes (CEnums::NetworkAdapterType_COUNT)
     , networkAttachmentTypes (CEnums::NetworkAttachmentType_COUNT)
     , clipboardTypes (CEnums::ClipboardMode_COUNT)
@@ -2250 +2251 @@
         tr ("SoundBlaster 16", "AudioControllerType");
 
+    networkAdapterTypes [CEnums::NetworkAdapterAm79C970A] =
+        tr ("PCnet-PCI II (Am79C970A)", "NetworkAdapterType");
+    networkAdapterTypes [CEnums::NetworkAdapterAm79C973] =
+        tr ("PCnet-FAST III (Am79C973)", "NetworkAdapterType");
+    networkAdapterTypes [CEnums::NetworkAdapter82540EM] =
+        tr ("E1000 PRO MT Desktop (82540EM)", "NetworkAdapterType");
+
     networkAttachmentTypes [CEnums::NoNetworkAttachment] =
         tr ("Not attached", "NetworkAttachmentType");

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

@@ -78 +78 @@
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="QLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>txHostInterface_WIN</cstring>
@@ -97 +97 @@
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="QLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>txInternalNetwork</cstring>
@@ -116 +116 @@
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="3" column="1">
+                        <widget class="QLineEdit" row="4" column="1">
                             <property name="name">
                                 <cstring>leMACAddress</cstring>
@@ -138 +138 @@
                             </property>
                         </widget>
+                        <widget class="QLabel" row="0" column="0">
+                            <property name="name">
+                                <cstring>txAdapterType</cstring>
+                            </property>
+                            <property name="sizePolicy">
+                                <sizepolicy>
+                                    <hsizetype>0</hsizetype>
+                                    <vsizetype>0</vsizetype>
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
+                            </property>
+                            <property name="text">
+                                <string>Adapter &amp;type</string>
+                            </property>
+                            <property name="buddy" stdset="0">
+                                <cstring>cbAdapterType</cstring>
+                            </property>
+                        </widget>
                         <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
                             <property name="name">
+                                <cstring>cbAdapterType</cstring>
+                            </property>
+                            <property name="whatsThis" stdset="0">
+                                <string>Type of the virtual network adapter. Depending on this value, VirtualBox will provide a different virtual network hardware to the guest.</string>
+                            </property>
+                        </widget>
+                        <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
+                            <property name="name">
                                 <cstring>cbNetworkAttachment</cstring>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                    <string>Controls the way how this virtual adapter is attached to the real network of the Host OS.</string>
-                            </property>
-                        </widget>
-                        <widget class="QToolButton" row="3" column="2">
+                                <string>Controls the way how this virtual adapter is attached to the real network of the Host OS.</string>
+                            </property>
+                        </widget>
+                        <widget class="QToolButton" row="4" column="2">
                             <property name="name">
                                 <cstring>pbGenerateMAC</cstring>
@@ -168 +195 @@
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="QLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>txNetworkAttachment</cstring>
@@ -187 +214 @@
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="QLabel" row="4" column="0">
                             <property name="name">
                                 <cstring>txMACAddress</cstring>
@@ -206 +233 @@
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
+                        <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>cbHostInterfaceName</cstring>
@@ -214 +241 @@
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="2">
+                        <widget class="QComboBox" row="3" column="1" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>cbInternalNetworkName</cstring>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui.h

@@ -28 +28 @@
 void VBoxVMNetworkSettings::init()
 {
+    cbAdapterType->insertItem (vboxGlobal().toString (CEnums::NetworkAdapterAm79C970A));
+    cbAdapterType->insertItem (vboxGlobal().toString (CEnums::NetworkAdapterAm79C973));
+    cbAdapterType->insertItem (vboxGlobal().toString (CEnums::NetworkAdapter82540EM));
+
     leMACAddress->setValidator (new QRegExpValidator
                                 (QRegExp ("[0-9A-Fa-f][02468ACEace][0-9A-Fa-f]{10}"), this));
@@ -135 +139 @@
     grbEnabled->setChecked (adapter.GetEnabled());
 
+    cbAdapterType->setCurrentText (vboxGlobal().
+        toString (adapter.GetAdapterType()));
+
     CEnums::NetworkAttachmentType type = adapter.GetAttachmentType();
     cbNetworkAttachment->setCurrentItem (0);
@@ -175 +182 @@
     cadapter.SetEnabled (grbEnabled->isChecked());
 
+    cadapter.SetAdapterType (vboxGlobal().
+        toNetworkAdapterType (cbAdapterType->currentText()));
+
     CEnums::NetworkAttachmentType type =
         vboxGlobal().toNetworkAttachmentType (cbNetworkAttachment->currentText());