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

Timestamp:

Apr 14, 2010 10:30:03 AM (15 years ago)

Author:

vboxsync

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

60042

Message:

Devices, Main, FE/Qt: reverted r60036 for now

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• settings/vm/VBoxVMSettingsNetwork.cpp (modified) (6 diffs)
• settings/vm/VBoxVMSettingsNetwork.h (modified) (2 diffs)
• settings/vm/VBoxVMSettingsNetwork.ui (modified) (1 diff)

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

@@ -2155 +2155 @@
                     attType = attType.arg (tr ("Host-only adapter, '%1'",
                         "details report (network)").arg (adapter.GetHostInterface()));
-                                                               /* ENABLE VDE */
-                else if (type == KNetworkAttachmentType_VDE)
-                    attType = attType.arg (tr ("VDE network, '%1'",
-                        "details report (network)").arg (adapter.GetVDENetwork()));
-                                                               /* /ENABLE VDE */
                 else
                     attType = attType.arg (vboxGlobal().toString (type));
@@ -3118 +3113 @@
     mNetworkAttachmentTypes [KNetworkAttachmentType_HostOnly] =
         tr ("Host-only Adapter", "NetworkAttachmentType");
-               /* ENABLE VDE */
-    mNetworkAttachmentTypes [KNetworkAttachmentType_VDE] =
-        tr ("VDE Adapter", "NetworkAttachmentType");
-               /* /ENABLE VDE */
 
     mClipboardTypes [KClipboardMode_Disabled] =

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.cpp

@@ -105 +105 @@
             if (mHoiName.isEmpty()) mHoiName = QString::null;
             break;
-                                               /* ENABLE VDE */
-        case KNetworkAttachmentType_VDE:
-            mVDEName = mAdapter.GetVDENetwork();
-            if (mVDEName.isEmpty()) mVDEName = QString::null;
-            break;
-                                               /* /ENABLE VDE */
         default:
             break;
@@ -151 +145 @@
             mAdapter.AttachToHostOnlyInterface();
             break;
-                                               /* ENABLE VDE */
-                               case KNetworkAttachmentType_VDE:
-                                               mAdapter.SetVDENetwork (alternativeName());
-                                               mAdapter.AttachToVDE();
-                                               break;
-                                               /* /ENABLE VDE */
         default:
             break;
@@ -269 +257 @@
             result = mHoiName;
             break;
-                                               /* ENABLE VDE*/
-        case KNetworkAttachmentType_VDE:
-            result = mVDEName;
-            break;
-                                               /* /ENABLE VDE*/
         default:
             break;
@@ -350 +333 @@
             mCbAdapterName->setEditable (false);
             break;
-                                               /* ENABLE VDE */
-        case KNetworkAttachmentType_VDE:
-                                               mCbAdapterName->insertItem(0, alternativeName());
-            mCbAdapterName->setEditable (true);
-            mCbAdapterName->setCompleter (0);
-            break;
-                                               /* /ENABLE VDE */
         default:
             break;
@@ -456 +432 @@
             break;
         }
-                               /* ENABLE VDE */
-        case KNetworkAttachmentType_VDE:
-        {
-            QString newName ((mCbAdapterName->itemData (mCbAdapterName->currentIndex()).toString() ==
-                              QString (emptyItemCode) &&
-                              mCbAdapterName->currentText() ==
-                              mCbAdapterName->itemText (mCbAdapterName->currentIndex())) ||
-                              mCbAdapterName->currentText().isEmpty() ?
-                              QString::null : mCbAdapterName->currentText());
-            if (mVDEName != newName)
-                mVDEName = newName;
-            break;
-        }
-                               /* /ENABLE VDE */
         default:
             break;
@@ -586 +548 @@
     mCbAttachmentType->setItemData (4,
         mCbAttachmentType->itemText (4), Qt::ToolTipRole);
-               /* ENABLE VDE */
-    mCbAttachmentType->insertItem (5,
-        vboxGlobal().toString (KNetworkAttachmentType_VDE));
-    mCbAttachmentType->setItemData (5,
-        KNetworkAttachmentType_VDE);
-    mCbAttachmentType->setItemData (5,
-        mCbAttachmentType->itemText (5), Qt::ToolTipRole);
-               /* /ENABLE VDE */
 
     /* Set the old value */

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.h

@@ -77 +77 @@
     QString mIntName;
     QString mHoiName;
-               /* ENABLE VDE */
-    QString mVDEName;
-               /* /ENABLE VDE */
 
     bool mPolished;
@@ -96 +93 @@
     QStringList intList (bool aRefresh = false);
     QStringList hoiList (bool aRefresh = false);
-    QStringList vdeList (bool aRefresh = false);
 
 protected:

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.ui

@@ -111 +111 @@
         </property>
         <property name="whatsThis" >
-         <string>Selects the name of the network adapter for &lt;b&gt;Bridged Adapter&lt;/b&gt; or &lt;b&gt;Host-only Adapter&lt;/b&gt; attachments and the name of the network &lt;b&gt;Internal Network&lt;/b&gt; or the switch for &lt;b&gt;VDE&lt;/b&gt; attachments.</string>
+         <string>Selects the name of the network adapter for &lt;b&gt;Bridged Adapter&lt;/b&gt; or &lt;b&gt;Host-only Adapter&lt;/b&gt; attachments and the name of the network &lt;b&gt;Internal Network&lt;/b&gt; attachments.</string>
         </property>
        </widget>