Index: /trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsNetwork.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsNetwork.h (revision 10695) +++ /trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsNetwork.h (revision 10696) @@ -80,4 +80,7 @@ void prepareComboboxes(); + void setTapEnabled (bool aEnabled); + void setTapVisible (bool aVisible); + CNetworkAdapter mAdapter; QIWidgetValidator *mValidator; @@ -93,5 +96,5 @@ * QGroupBox sub-class which represents network interface list. */ -class VBoxNIList : public QIWithRetranslateUI +class VBoxNIList : public QIWithRetranslateUI { Q_OBJECT; @@ -123,5 +126,6 @@ void populateInterfacesList(); - QTreeWidget *mList; + QILabelSeparator *mLbTitle; + QTreeWidget *mList; QAction *mAddAction; @@ -180,4 +184,6 @@ }; +#undef Q_WS_WIN + #endif // __VBoxVMSettingsNetwork_h__ Index: /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsNetwork.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsNetwork.cpp (revision 10695) +++ /trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsNetwork.cpp (revision 10696) @@ -65,9 +65,9 @@ /* Setup dialog for current platform */ #ifndef Q_WS_X11 - mGbTAP->setHidden (true); + setTapVisible (false); #endif #ifdef Q_WS_MAC /* No Host Interface Networking on the Mac yet */ - mGbTAP->setHidden (true); + setTapVisible (false); #endif #ifdef Q_WS_X11 @@ -78,4 +78,6 @@ ":/select_file_dis_16px.png")); #endif + + layout()->activate(); /* Applying language settings */ @@ -266,5 +268,5 @@ bool enableHostIf = vboxGlobal().toNetworkAttachmentType (aString) == KNetworkAttachmentType_HostInterface; - mGbTAP->setEnabled (enableHostIf); + setTapEnabled (enableHostIf); #endif if (mValidator) @@ -307,11 +309,19 @@ mCbAType->insertItem (0, vboxGlobal().toString (KNetworkAdapterType_Am79C970A)); + mCbAType->setItemData (0, + mCbAType->itemText(0), Qt::ToolTipRole); mCbAType->insertItem (1, vboxGlobal().toString (KNetworkAdapterType_Am79C973)); + mCbAType->setItemData (1, + mCbAType->itemText(1), Qt::ToolTipRole); #ifdef VBOX_WITH_E1000 mCbAType->insertItem (2, vboxGlobal().toString (KNetworkAdapterType_I82540EM)); + mCbAType->setItemData (2, + mCbAType->itemText(2), Qt::ToolTipRole); mCbAType->insertItem (3, vboxGlobal().toString (KNetworkAdapterType_I82543GC)); + mCbAType->setItemData (3, + mCbAType->itemText(3), Qt::ToolTipRole); #endif /* Set the old value */ @@ -325,11 +335,19 @@ mCbNAType->insertItem (0, vboxGlobal().toString (KNetworkAttachmentType_Null)); + mCbNAType->setItemData (0, + mCbNAType->itemText(0), Qt::ToolTipRole); mCbNAType->insertItem (1, vboxGlobal().toString (KNetworkAttachmentType_NAT)); + mCbNAType->setItemData (1, + mCbNAType->itemText(1), Qt::ToolTipRole); #ifndef Q_WS_MAC /* Not yet on the Mac */ mCbNAType->insertItem (2, vboxGlobal().toString (KNetworkAttachmentType_HostInterface)); + mCbNAType->setItemData (2, + mCbNAType->itemText(2), Qt::ToolTipRole); mCbNAType->insertItem (3, vboxGlobal().toString (KNetworkAttachmentType_Internal)); + mCbNAType->setItemData (3, + mCbNAType->itemText(3), Qt::ToolTipRole); #endif /* Set the old value */ @@ -337,4 +355,29 @@ } +void VBoxVMSettingsNetwork::setTapEnabled (bool aEnabled) +{ + mGbTap->setEnabled (aEnabled); + 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); +} + +void VBoxVMSettingsNetwork::setTapVisible (bool aVisible) +{ + mGbTap->setVisible (aVisible); + 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); +} /* VBoxNIList Stuff */ @@ -379,10 +422,17 @@ VBoxNIList::VBoxNIList (QWidget *aParent) - : QIWithRetranslateUI (aParent) -{ + : QIWithRetranslateUI (aParent) +{ + QGridLayout *mainLayout = new QGridLayout (this); + VBoxGlobal::setLayoutMargin (mainLayout, 0); + mLbTitle = new QILabelSeparator(); + mainLayout->addWidget (mLbTitle, 0, 0, 1, 2); +// mainLayout->addItem (new QSpacerItem (8, 16, QSizePolicy::Fixed, QSizePolicy::Minimum), 1, 0); /* Creating List Widget */ - QHBoxLayout *layout = new QHBoxLayout (this); + QHBoxLayout *layout = new QHBoxLayout (); + mainLayout->addLayout (layout, 1, 0); mList = new QTreeWidget (this); setFocusProxy (mList); + mLbTitle->setBuddy (mList); mList->setColumnCount (1); mList->header()->hide(); @@ -574,5 +624,5 @@ void VBoxNIList::retranslateUi() { - setTitle (tr ("Host &Interfaces")); + mLbTitle->setText (tr ("Host &Interfaces")); mList->setWhatsThis (tr ("Lists all available host interfaces.")); @@ -635,6 +685,7 @@ layout->addWidget (mNIList); #else - layout->addStretch(); -#endif +// layout->addItem (new QSpacerItem (0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding)); +#endif +// layout->activate(); } @@ -672,4 +723,6 @@ connect (page->mCbNetwork, SIGNAL (editTextChanged (const QString&)), this, SLOT (updateNetworksList())); + page->layout()->activate(); + page->updateGeometry(); } Index: /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsNetwork.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsNetwork.ui (revision 10695) +++ /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsNetwork.ui (revision 10696) @@ -23,37 +23,60 @@ 0 0 - 318 - 403 + 417 + 348 - - - - - - 0 - 0 - - + + + When checked, plugs this virtual network adapter into the virtual machine. - + &Enable Network Adapter - - - true true + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + 0 + - 5 + 0 + + + 0 + + + 0 - A&dapter Type + A&dapter Type: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -62,5 +85,5 @@ - + @@ -72,5 +95,8 @@ - &Attached to + &Attached to: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -79,5 +105,5 @@ - + @@ -89,5 +115,8 @@ - &Network Name + &Network Name: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -96,5 +125,5 @@ - + @@ -109,5 +138,8 @@ - &MAC Address + &MAC Address: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -118,4 +150,10 @@ + + + 0 + 0 + + Displays the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}. Note that the second character must be an even digit. @@ -136,5 +174,5 @@ - + @@ -143,4 +181,112 @@ Ca&ble Connected + + + + + + + &Host Interface Settings + + + mLeInterface_x11 + + + + + + + &Interface Name: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + mLeInterface_x11 + + + + + + + + 0 + 0 + + + + Displays the TAP interface name. + + + + + + + &Setup Application: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + mLeSetup_x11 + + + + + + + + 0 + 0 + + + + Displays the command executed to set up the TAP interface. + + + + + + + Selects the setup application. + + + true + + + + + + + &Terminate Application: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + mLeTerminate_x11 + + + + + + + + 0 + 0 + + + + Displays the command executed to terminate the TAP interface. + + + + + + + Selects the terminate application. + + + true @@ -149,134 +295,57 @@ - - - - - 0 - 0 - - - - Host Interface Settings - - - Host Interface Settings - - - - 5 - - - - - 0 - - - - - &Interface Name - - - mLeInterface_x11 - - - - - - - Displays the TAP interface name. - - - - - - - - - 0 - - - - - &Setup Application - - - mLeSetup_x11 - - - - - - - 6 - - - - - Displays the command executed to set up the TAP interface. - - - - - - - Selects the setup application. - - - true - - - - - - - - - - - 0 - - - - - &Terminate Application - - - mLeTerminate_x11 - - - - - - - 6 - - - - - Displays the command executed to terminate the TAP interface. - - - - - - - Selects the terminate application. - - - true - - - - - - - - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + QILabelSeparator + QLabel +
QILabelSeparator.h
+ + - + + + mGbAdapter + toggled(bool) + mNetworkChild + setEnabled(bool) + + + 190 + 19 + + + 203 + 164 + + + +