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

Timestamp:

Feb 27, 2009 5:13:14 PM (16 years ago)

Author:

vboxsync

Message:

make VBOX_WITH_NETFLT= compile on Linux hosts again

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMSettingsNetwork.h (modified) (1 diff)
• src/VBoxVMSettingsNetwork.cpp (modified) (8 diffs)
• ui/VBoxVMSettingsNetwork.ui (modified) (1 diff)

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

@@ -71 +71 @@
     void naTypeChanged (const QString &aString);
     void genMACClicked();
-#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
-    void tapSetupClicked();
-    void tapTerminateClicked();
-#endif
 
 private:

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

@@ -66 +66 @@
 #if !defined (Q_WS_X11) || defined (VBOX_WITH_NETFLT)
     setTapVisible (false);
-#else
-    /* Setup iconsets */
-    mTbSetup_x11->setIcon (VBoxGlobal::iconSet (":/select_file_16px.png",
-                                                ":/select_file_dis_16px.png"));
-    mTbTerminate_x11->setIcon (VBoxGlobal::iconSet (":/select_file_16px.png",
-                                                    ":/select_file_dis_16px.png"));
 #endif
 
@@ -116 +110 @@
 #if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
     mLeInterface_x11->setText (aAdapter.GetHostInterface());
-    mLeSetup_x11->setText (aAdapter.GetTAPSetupApplication());
-    mLeTerminate_x11->setText (aAdapter.GetTAPTerminateApplication());
 #endif
 }
@@ -168 +160 @@
         QString iface = mLeInterface_x11->text();
         mAdapter.SetHostInterface (iface.isEmpty() ? QString::null : iface);
-        QString setup = mLeSetup_x11->text();
-        mAdapter.SetTAPSetupApplication (setup.isEmpty() ? QString::null : setup);
-        QString term = mLeTerminate_x11->text();
-        mAdapter.SetTAPTerminateApplication (term.isEmpty() ? QString::null : term);
 #endif
     }
@@ -200 +188 @@
              mValidator, SLOT (revalidate()));
     connect (mPbMAC, SIGNAL (clicked()), this, SLOT (genMACClicked()));
-#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
-    connect (mTbSetup_x11, SIGNAL (clicked()), this, SLOT (tapSetupClicked()));
-    connect (mTbTerminate_x11, SIGNAL (clicked()), this, SLOT (tapTerminateClicked()));
-#endif
 
     mValidator->revalidate();
@@ -218 +202 @@
     setTabOrder (mPbMAC, mCbCable);
     setTabOrder (mCbCable, mLeInterface_x11);
-    setTabOrder (mLeInterface_x11, mLeSetup_x11);
-    setTabOrder (mLeSetup_x11, mTbSetup_x11);
-    setTabOrder (mTbSetup_x11, mLeTerminate_x11);
-    setTabOrder (mLeTerminate_x11, mTbTerminate_x11);
-    return mTbTerminate_x11;
+    return mLeInterface_x11;
 }
 
@@ -289 +269 @@
     mLeMAC->setText (mAdapter.GetMACAddress());
 }
-
-#if defined (Q_WS_X11) && !defined (VBOX_WITH_NETFLT)
-void VBoxVMSettingsNetwork::tapSetupClicked()
-{
-    QString selected = QFileDialog::getOpenFileName (
-        this, tr ("Select TAP setup application"), "/");
-
-    if (!selected.isEmpty())
-        mLeSetup_x11->setText (selected);
-}
-
-void VBoxVMSettingsNetwork::tapTerminateClicked()
-{
-    QString selected = QFileDialog::getOpenFileName (
-        this, tr ("Select TAP terminate application"), "/");
-
-    if (!selected.isEmpty())
-        mLeTerminate_x11->setText (selected);
-}
-#endif
 
 void VBoxVMSettingsNetwork::prepareComboboxes()
@@ -374 +334 @@
     mLbInterface_x11->setEnabled (aEnabled);
     mLeInterface_x11->setEnabled (aEnabled);
-    mLbSetup_x11->setEnabled (aEnabled);
-    mLeSetup_x11->setEnabled (aEnabled);
-    mTbSetup_x11->setEnabled (aEnabled);
-    mLbTerminate_x11->setEnabled (aEnabled);
-    mLeTerminate_x11->setEnabled (aEnabled);
-    mTbTerminate_x11->setEnabled (aEnabled);
 }
 
@@ -387 +341 @@
     mLbInterface_x11->setVisible (aVisible);
     mLeInterface_x11->setVisible (aVisible);
-    mLbSetup_x11->setVisible (aVisible);
-    mLeSetup_x11->setVisible (aVisible);
-    mTbSetup_x11->setVisible (aVisible);
-    mLbTerminate_x11->setVisible (aVisible);
-    mLeTerminate_x11->setVisible (aVisible);
-    mTbTerminate_x11->setVisible (aVisible);
 #ifdef Q_WS_MAC
     /* Make sure the layout is recalculated (Important on the mac). */

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

@@ -217 +217 @@
        </widget>
       </item>
-      <item row="7" column="0" >
-       <widget class="QLabel" name="mLbSetup_x11" >
-        <property name="text" >
-         <string>&amp;Setup Application:</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-        <property name="buddy" >
-         <cstring>mLeSetup_x11</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="1" >
-       <widget class="QLineEdit" name="mLeSetup_x11" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="whatsThis" >
-         <string>Displays the command executed to set up the TAP interface.</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="2" >
-       <widget class="QToolButton" name="mTbSetup_x11" >
-        <property name="whatsThis" >
-         <string>Selects the setup application.</string>
-        </property>
-        <property name="autoRaise" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="0" >
-       <widget class="QLabel" name="mLbTerminate_x11" >
-        <property name="text" >
-         <string>&amp;Terminate Application:</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-        <property name="buddy" >
-         <cstring>mLeTerminate_x11</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1" >
-       <widget class="QLineEdit" name="mLeTerminate_x11" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="whatsThis" >
-         <string>Displays the command executed to terminate the TAP interface.</string>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="2" >
-       <widget class="QToolButton" name="mTbTerminate_x11" >
-        <property name="whatsThis" >
-         <string>Selects the terminate application.</string>
-        </property>
-        <property name="autoRaise" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>