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

Timestamp:

Aug 4, 2008 9:50:20 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt3: Host interface support on the mac.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMNetworkSettings.ui.h (modified) (9 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (5 diffs)

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

@@ -56 +56 @@
 #endif
 
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
     /* disable unused interface name UI */
     grbTAP->setHidden (true);
@@ -80 +80 @@
      * (remove the relative code at all? -- just leave for some time...) */
     frmTAPDescriptor->setHidden (true);
-
-#if defined Q_WS_MAC /** @todo hif on mac  */
-    /* no Host Interface Networking on the Mac yet */
-    grbTAP->setHidden (true);
-#endif
 }
 
@@ -95 +90 @@
         return CheckPage_Ok;
     else
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
     if (type == KNetworkAttachmentType_HostInterface &&
         isInterfaceInvalid (aList, cbHostInterfaceName->currentText()))
@@ -113 +108 @@
                                                const QString &aNillItem)
 {
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
     /* save current list item name */
     QString currentListItemName = cbHostInterfaceName->currentText();
@@ -166 +161 @@
     chbCableConnected->setChecked (adapter.GetCableConnected());
 
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
     if (!adapter.GetHostInterface().isEmpty())
         cbHostInterfaceName->setCurrentText (adapter.GetHostInterface());
@@ -215 +210 @@
     if (type == KNetworkAttachmentType_HostInterface)
     {
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
         if (!cbHostInterfaceName->currentText().isEmpty())
             cadapter.SetHostInterface (cbHostInterfaceName->currentText());
@@ -246 +241 @@
 void VBoxVMNetworkSettings::grbEnabledToggled (bool aOn)
 {
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
     cbNetworkAttachment_activated (cbNetworkAttachment->currentText());
 #else
@@ -261 +256 @@
                         vboxGlobal().toNetworkAttachmentType (aString) ==
                         KNetworkAttachmentType_Internal;
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
     txHostInterface_WIN->setEnabled (enableHostIf);
     cbHostInterfaceName->setEnabled (enableHostIf);
@@ -274 +269 @@
                                                 const QString &aIface)
 {
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
     return aList.find (aIface) == aList.end();
 #else

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

@@ -663 +663 @@
     /* Network Page */
 
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !defined Q_OS_MAC
     gbInterfaceList->setHidden (true);
 #endif
+#ifdef Q_OS_MAC
+    pbHostAdd->setHidden (true);
+    pbHostRemove->setHidden (true);
+#endif
+
     /* setup tab widget */
     mNoInterfaces = tr ("<No suitable interfaces>");
@@ -973 +978 @@
 void VBoxVMSettingsDlg::loadInterfacesList()
 {
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
     /* clear inner list */
     mInterfaceList.clear();
@@ -1149 +1154 @@
 {
     if (!aWidget) return;
-#if defined Q_WS_WIN
+#if defined Q_WS_WIN || defined Q_OS_MAC
     VBoxVMNetworkSettings *set = static_cast<VBoxVMNetworkSettings*> (aWidget);
     set->loadInterfaceList (mInterfaceList, mNoInterfaces);
@@ -2175 +2180 @@
     page->revalidate();
 
-#ifdef Q_WS_WIN
+#ifdef Q_WS_WIN || defined Q_OS_MAC
 
     /* fix focus order (make sure the Host Interface list UI goes after the
@@ -2181 +2186 @@
 
     setTabOrder (page->chbCableConnected, lbHostInterface);
+# if defined Q_OS_WIN
     setTabOrder (lbHostInterface, pbHostAdd);
     setTabOrder (pbHostAdd, pbHostRemove);
+# endif
 
 #endif