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

Timestamp:

Feb 18, 2009 6:27:52 PM (16 years ago)

Author:

vboxsync

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

43063

Message:

NetAdp/win: enabled add/remove tap if UI, make the proper adapters to be displayed in the list

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMSettingsNetwork.h (modified) (2 diffs)
• src/VBoxVMSettingsNetwork.cpp (modified) (11 diffs)

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

@@ -106 +106 @@
     bool isWrongInterface() const;
     void setCurrentInterface (const QString &aName);
-
+#if defined (Q_WS_WIN) && defined(VBOX_WITH_NETFLT)
+    void updateInterfacesList(KNetworkAttachmentType enmAttachmentType);
+#endif
 signals:
 
@@ -123 +125 @@
 
 private:
-
+#if defined (Q_WS_WIN) && defined(VBOX_WITH_NETFLT)
+    void populateInterfacesList(KNetworkAttachmentType enmAttachmentType);
+#else
     void populateInterfacesList();
-
+#endif
     QILabelSeparator *mLbTitle;
     QTreeWidget      *mList;
 
-# if defined (Q_WS_WIN) && !defined(VBOX_WITH_NETFLT)
+# if defined (Q_WS_WIN)
     QAction *mAddAction;
     QAction *mDelAction;
+#  ifdef VBOX_WITH_NETFLT
+    KNetworkAttachmentType mEnmAttachmentType;
+#  endif
 # endif
 };

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

@@ -456 +456 @@
 
     /* Prepare actions */
-# if defined (Q_WS_WIN) && !defined (VBOX_WITH_NETFLT)
+# if defined (Q_WS_WIN)
     mAddAction = new QAction (mList);
     mDelAction = new QAction (mList);
@@ -467 +467 @@
     mDelAction->setIcon (VBoxGlobal::iconSet (":/remove_host_iface_16px.png",
                                               ":/remove_host_iface_disabled_16px.png"));
-# endif /* Q_WS_WIN && !VBOX_WITH_NETFLT */
-
-# if defined (Q_WS_WIN) && !defined (VBOX_WITH_NETFLT)
+# endif /* Q_WS_WIN */
+
+# if defined (Q_WS_WIN)
     /* Prepare toolbar */
     VBoxToolBar *toolBar = new VBoxToolBar (this);
@@ -478 +478 @@
     toolBar->addAction (mDelAction);
     layout->addWidget (toolBar);
-# endif /* Q_WS_WIN && !VBOX_WITH_NETFLT */
+# endif /* Q_WS_WIN */
 
     /* Setup connections */
     connect (mList, SIGNAL (currentItemChanged (QTreeWidgetItem *, QTreeWidgetItem *)),
              this, SLOT (onCurrentItemChanged (QTreeWidgetItem *, QTreeWidgetItem *)));
-# if defined (Q_WS_WIN) && !defined (VBOX_WITH_NETFLT)
+# if defined (Q_WS_WIN)
     connect (mAddAction, SIGNAL (triggered (bool)),
              this, SLOT (addHostInterface()));
     connect (mDelAction, SIGNAL (triggered (bool)),
              this, SLOT (delHostInterface()));
-# endif /* Q_WS_WIN && !VBOX_WITH_NETFLT */
-
+# endif /* Q_WS_WIN */
+
+#if !defined(Q_WS_WIN) && !defined(VBOX_WITH_NETFLT)
     /* Populating interface list */
     populateInterfacesList();
+#endif
 
     /* Applying language settings */
@@ -549 +551 @@
                                        QTreeWidgetItem *)
 {
-# if defined (Q_WS_WIN) && !defined (VBOX_WITH_NETFLT)
-    VBoxNIListItem *item = aCurrent &&
-        aCurrent->type() == VBoxNIListItem::typeId ?
-        static_cast<VBoxNIListItem*> (aCurrent) : 0;
-    mDelAction->setEnabled (item && !item->isWrong());
+# if defined (Q_WS_WIN)
+#  if defined (VBOX_WITH_NETFLT)
+    if(mEnmAttachmentType == KNetworkAttachmentType_HostOnly)
+#  endif
+    {
+        VBoxNIListItem *item = aCurrent &&
+            aCurrent->type() == VBoxNIListItem::typeId ?
+            static_cast<VBoxNIListItem*> (aCurrent) : 0;
+        mDelAction->setEnabled (item && !item->isWrong());
+    }
+#  if defined (VBOX_WITH_NETFLT)
+    else
+    {
+        mDelAction->setEnabled (false);
+    }
+#  endif
 # else
     NOREF (aCurrent);
@@ -564 +577 @@
 void VBoxNIList::addHostInterface()
 {
-# if defined (Q_WS_WIN) && !defined (VBOX_WITH_NETFLT)
+# if defined (Q_WS_WIN)
     /* Allow the started helper process to make itself the foreground window */
     AllowSetForegroundWindow (ASFW_ANY);
@@ -607 +620 @@
     /* Allow the started helper process to make itself the foreground window */
     AllowSetForegroundWindow (ASFW_ANY);
-# endif /* Q_WS_WIN && !VBOX_WITH_NETFLT */
+# endif /* Q_WS_WIN */
 }
 
@@ -614 +627 @@
     Assert (mList->currentItem());
 
-# if defined (Q_WS_WIN) && !defined (VBOX_WITH_NETFLT)
+# if defined (Q_WS_WIN)
     /* Allow the started helper process to make itself the foreground window */
     AllowSetForegroundWindow (ASFW_ANY);
@@ -664 +677 @@
 
     emit listChanged();
-# endif /* Q_WS_WIN && !VBOX_WITH_NETFLT */
+# endif /* Q_WS_WIN */
 }
 
@@ -673 +686 @@
     mList->setWhatsThis (tr ("Lists all available host interfaces."));
 
-# if defined (Q_WS_WIN) && !defined (VBOX_WITH_NETFLT)
+# if defined (Q_WS_WIN)
     mAddAction->setText (tr ("A&dd New Host Interface"));
     mDelAction->setText (tr ("&Remove Selected Host Interface"));
@@ -682 +695 @@
     mDelAction->setToolTip (mDelAction->text().remove ('&') +
         QString (" (%1)").arg (mDelAction->shortcut().toString()));
-# endif /* Q_WS_WIN && !VBOX_WITH_NETFLT */
-}
-
+# endif /* Q_WS_WIN */
+}
+
+#if defined(Q_WS_WIN) && defined(VBOX_WITH_NETFLT)
+void VBoxNIList::updateInterfacesList(KNetworkAttachmentType enmAttachmentType)
+{
+    bool bHostOnly = enmAttachmentType == KNetworkAttachmentType_HostOnly;
+    mEnmAttachmentType = enmAttachmentType;
+    mAddAction->setEnabled(bHostOnly);
+    mDelAction->setEnabled(bHostOnly);
+    populateInterfacesList(enmAttachmentType);
+}
+
+void VBoxNIList::populateInterfacesList(KNetworkAttachmentType enmAttachmentType)
+#else
 void VBoxNIList::populateInterfacesList()
+#endif
 {
     /* Load current inner list */
     QList<QTreeWidgetItem*> itemsList;
     CHostNetworkInterfaceVector interfaces =
-        vboxGlobal().virtualBox().GetHost().GetNetworkInterfaces();
+#if defined(Q_WS_WIN) && defined(VBOX_WITH_NETFLT)
+            enmAttachmentType == KNetworkAttachmentType_HostOnly ?
+                    vboxGlobal().virtualBox().GetHost().GetTapInterfaces()
+                    :
+#endif
+                    vboxGlobal().virtualBox().GetHost().GetNetworkInterfaces();
     for (CHostNetworkInterfaceVector::ConstIterator it = interfaces.begin();
          it != interfaces.end(); ++it)
@@ -897 +928 @@
     VBoxVMSettingsNetwork *page =
         static_cast <VBoxVMSettingsNetwork*> (mTwAdapters->currentWidget());
-
-    bool isHostInterfaceAttached = vboxGlobal().toNetworkAttachmentType (
-        page->mCbNAType->currentText()) == KNetworkAttachmentType_HostInterface;
+    KNetworkAttachmentType enmType = vboxGlobal().toNetworkAttachmentType (page->mCbNAType->currentText());
+
+    bool isHostInterfaceAttached = enmType == KNetworkAttachmentType_HostInterface;
 
     mNIList->setEnabled (isHostInterfaceAttached);
+# ifdef Q_WS_WIN
+    if(!isHostInterfaceAttached)
+    {
+        mNIList->setEnabled (enmType == KNetworkAttachmentType_HostOnly);
+    }
+    mNIList->updateInterfacesList(enmType);
+# endif
 }
 #endif