Index: /trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (revision 9226) +++ /trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (revision 9227) @@ -311,4 +311,7 @@ VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsParallel.ui,$(VirtualBox_QT_UISRCS3)) VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsParallel.ui + +VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsUSB.ui,$(VirtualBox_QT_UISRCS3)) +VirtualBox_QT_UISRCS4 += ui/VBoxVMSettingsUSB.ui VirtualBox_QT_UISRCS3 := $(filter-out ui/VBoxVMSettingsDlg.ui,$(VirtualBox_QT_UISRCS3)) @@ -469,4 +472,5 @@ include/VBoxVMSettingsSerial.h \ include/VBoxVMSettingsParallel.h \ + include/VBoxVMSettingsUSB.h \ include/VBoxVMSettingsDlg.h @@ -553,4 +557,5 @@ src/VBoxVMSettingsSerial.cpp \ src/VBoxVMSettingsParallel.cpp \ + src/VBoxVMSettingsUSB.cpp \ src/VBoxVMSettingsDlg.cpp Index: /trunk/src/VBox/Frontends/VirtualBox4/VBoxUI.pro =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/VBoxUI.pro (revision 9226) +++ /trunk/src/VBox/Frontends/VirtualBox4/VBoxUI.pro (revision 9227) @@ -29,5 +29,5 @@ ui/VBoxVMSettingsSerial.ui \ ui/VBoxVMSettingsParallel.ui \ - ui/VBoxUSBFilterSettings.ui \ + ui/VBoxVMSettingsUSB.ui \ ui/VBoxSharedFoldersSettings.ui \ ui/VBoxNewVMWzd.ui \ Index: /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGlobalSettingsDlg.ui.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGlobalSettingsDlg.ui.h (revision 9226) +++ /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxGlobalSettingsDlg.ui.h (revision 9227) @@ -380,8 +380,10 @@ // grbUSBFiltersLayout->addWidget (wstUSBFilters); /* create a default (disabled) filter settings widget at index 0 */ + /* VBoxUSBFilterSettings *settings = new VBoxUSBFilterSettings (wstUSBFilters); settings->setup (VBoxUSBFilterSettings::HostType); wstUSBFilters->addWidget (settings, 0); lvUSBFilters_currentChanged (NULL); + */ /* setup toolbutton icons */ tbAddUSBFilter->setIconSet (VBoxGlobal::iconSet (":/usb_new_16px.png", @@ -871,4 +873,5 @@ bool aIsNew) { + /* Q3ListViewItem *currentItem = aIsNew ? lvUSBFilters->currentItem() @@ -885,5 +888,5 @@ item->mId = wstUSBFilters->addWidget (settings); - /* fix the tab order so that main dialog's buttons are always the last */ + // fix the tab order so that main dialog's buttons are always the last setTabOrder (settings->focusProxy(), buttonHelp); setTabOrder (buttonHelp, buttonOk); @@ -900,5 +903,5 @@ this, SLOT (lvUSBFilters_setCurrentText (const QString &))); - /* setup validation */ + // setup validation QIWidgetValidator *wval = @@ -908,4 +911,5 @@ wval->revalidate(); + */ } Index: unk/src/VBox/Frontends/VirtualBox4/ui/VBoxUSBFilterSettings.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxUSBFilterSettings.ui (revision 9226) +++ (revision ) @@ -1,368 +1,0 @@ - -VBoxUSBFilterSettings - -:mode=html:tabSize=4:indentSize=4:noTabs=true: -:folding=explicit:collapseFolds=1: - - Copyright (C) 2006-2007 Sun Microsystems, Inc. - - This file is part of VirtualBox Open Source Edition (OSE), as - available from http://www.virtualbox.org. This file is free software; - you can redistribute it and/or modify it under the terms of the GNU - General Public License (GPL) as published by the Free Software - Foundation, in version 2 as it comes in the "COPYING" file of the - VirtualBox OSE distribution. VirtualBox OSE is distributed in the - hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - - Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - Clara, CA 95054 USA or visit http://www.sun.com if you need - additional information or have any questions. - - - - VBoxUSBFilterSettings - - - - 0 - 0 - 381 - 100 - - - - - 5 - 0 - 0 - 0 - - - - VBoxUSBFilterSettings - don't translate - - - - unnamed - - - 0 - - - - layout141 - - - - unnamed - - - - textLabel1_2 - - - &Name - - - leUSBFilterName - - - - - leUSBFilterName - - - LineEditPanel - - - Sunken - - - Displays the filter name. - - - - - - - frame46 - - - - 5 - 0 - 5 - 0 - - - - NoFrame - - - Plain - - - - unnamed - - - 0 - - - - textLabel1_2_2_3 - - - &Manufacturer - - - leUSBFilterManufacturer - - - - - textLabel1_2_2_3_2 - - - Pro&duct - - - leUSBFilterProduct - - - - - textLabel1_2_2_3_2_2 - - - &Serial No. - - - leUSBFilterSerial - - - - - leUSBFilterManufacturer - - - <qt>Defines the manufacturer filter as an -<i>exact match</i> string. An empty string will match any -value.</qt> - - - - - leUSBFilterProduct - - - <qt>Defines the product name filter as an -<i>exact match</i> string. An empty string will match any -value.</qt> - - - - - leUSBFilterSerial - - - <qt>Defines the serial number filter as an -<i>exact match</i> string. An empty string will match any -value.</qt> - - - - - cbRemote - - - <qt>Defines whether this filter applies -to USB devices attached locally to the host computer (<i>No</i>), -to a VRDP client's computer (<i>Yes</i>), -or both (<i>Any</i>).</qt> - - - - - txUSBFilterRemote - - - R&emote - - - cbRemote - - - - - txUSBFilterAction - - - &Action - - - cbAction - - - - - cbAction - - - <qt>Defines an action performed by the host -computer when a matching device is attached: give it up to the host OS -(<i>Ignore</i>) or grab it for later usage by virtual machines -(<i>Hold</i>).</qt> - - - - - - - frame45 - - - - 5 - 0 - 3 - 0 - - - - NoFrame - - - Raised - - - - unnamed - - - 0 - - - - textLabel1_2_2 - - - &Vendor ID - - - leUSBFilterVendorId - - - - - textLabel1_2_2_2 - - - &Product ID - - - leUSBFilterProductId - - - - - textLabel1_2_2_2_2 - - - &Revision - - - leUSBFilterRevision - - - - - textLabel1_2_2_2_2_2 - - - Por&t - - - leUSBFilterPort - - - - - leUSBFilterVendorId - - - <qt>Defines the vendor ID filter. The -<i>exact match</i> string format is <tt>XXXX</tt> where -<tt>X</tt> is a hexadecimal digit. An empty string will match any -value.</qt> - - - - - leUSBFilterProductId - - - <qt>Defines the product ID filter. The -<i>exact match</i> string format is <tt>XXXX</tt> where -<tt>X</tt> is a hexadecimal digit. An empty string will match any -value.</qt> - - - - - leUSBFilterRevision - - - <qt>Defines the revision number filter. The -<i>exact match</i> string format is <tt>IIFF</tt> where -<tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> -is a decimal digit of the fractional part. An empty string will match any -value.</qt> - - - - - leUSBFilterPort - - - <qt>Defines the host USB port filter as an -<i>exact match</i> string. An empty string will match any -value.</qt> - - - - - - - - leUSBFilterName - leUSBFilterVendorId - leUSBFilterManufacturer - leUSBFilterProductId - leUSBFilterProduct - leUSBFilterRevision - leUSBFilterSerial - leUSBFilterPort - cbRemote - - - qvalidator.h - COMDefs.h - VBoxGlobal.h - - - enum FilterType { WrongType = 0, HostType = 1, MachineType = 2 }; - CUSBDeviceFilter mFilter; - FilterType mType; - - - init() - getFromFilter( const CUSBDeviceFilter & aFilter ) - putBackToFilter() - filter() { return mFilter; } - setup( VBoxUSBFilterSettings::FilterType ) - - - - Index: unk/src/VBox/Frontends/VirtualBox4/ui/VBoxUSBFilterSettings.ui.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxUSBFilterSettings.ui.h (revision 9226) +++ (revision ) @@ -1,184 +1,0 @@ -//Added by qt3to4: -#include -/** - * - * VBox frontends: Qt GUI ("VirtualBox"): - * "USB device filter" settings dialog UI include (Qt Designer) - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -/**************************************************************************** -** ui.h extension file, included from the uic-generated form implementation. -** -** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. -** -** You should not define a constructor or destructor in this file. -** Instead, write your code in functions called init() and destroy(). -** These will automatically be called by the form's constructor and -** destructor. -*****************************************************************************/ - -void VBoxUSBFilterSettings::init() -{ - // by default, the widget is entirely disabled - setEnabled (false); - - mType = VBoxUSBFilterSettings::WrongType; - - // set the dummy focus proxy to let others know which our child - // is the last in the focus chain - cbRemote->insertItem (tr ("Any", "remote")); // 0 - cbRemote->insertItem (tr ("Yes", "remote")); // 1 - cbRemote->insertItem (tr ("No", "remote")); // 2 - cbAction->insertItem (vboxGlobal().toString (KUSBDeviceFilterAction_Ignore)); // 0 - cbAction->insertItem (vboxGlobal().toString (KUSBDeviceFilterAction_Hold)); // 1 -} - -void VBoxUSBFilterSettings::getFromFilter (const CUSBDeviceFilter &aFilter) -{ - mFilter = aFilter; - - leUSBFilterName->setValidator (new QRegExpValidator (QRegExp (".+"), this)); - - leUSBFilterName->setText (aFilter.GetName()); - - leUSBFilterVendorId->setText (aFilter.GetVendorId()); - leUSBFilterProductId->setText (aFilter.GetProductId()); - leUSBFilterRevision->setText (aFilter.GetRevision()); - leUSBFilterPort->setText (aFilter.GetPort()); - - leUSBFilterManufacturer->setText (aFilter.GetManufacturer()); - leUSBFilterProduct->setText (aFilter.GetProduct()); - leUSBFilterSerial->setText (aFilter.GetSerialNumber()); - switch (mType) - { - case VBoxUSBFilterSettings::MachineType: - { - Q3CString remote = aFilter.GetRemote().latin1(); - if (remote == "yes" || remote == "true" || remote == "1") - cbRemote->setCurrentItem (1); - else if (remote == "no" || remote == "false" || remote == "0") - cbRemote->setCurrentItem (2); - else - cbRemote->setCurrentItem (0); - break; - } - case VBoxUSBFilterSettings::HostType: - { - const CHostUSBDeviceFilter filter = CUnknown (aFilter); - KUSBDeviceFilterAction action = filter.GetAction(); - if (action == KUSBDeviceFilterAction_Ignore) - cbAction->setCurrentItem (0); - else if (action == KUSBDeviceFilterAction_Hold) - cbAction->setCurrentItem (1); - else - AssertMsgFailed (("Invalid USBDeviceFilterAction type")); - break; - } - default: - { - AssertMsgFailed (("Invalid VBoxUSBFilterSettings type")); - break; - } - } - - setEnabled (true); -} - -inline static QString emptyToNull (const QString &str) -{ - return str.isEmpty() ? QString::null : str; -} - -COMResult VBoxUSBFilterSettings::putBackToFilter() -{ - do - { - mFilter.SetName (leUSBFilterName->text()); - if (!mFilter.isOk()) - break; - - mFilter.SetVendorId (emptyToNull (leUSBFilterVendorId->text())); - if (!mFilter.isOk()) - break; - mFilter.SetProductId (emptyToNull (leUSBFilterProductId->text())); - if (!mFilter.isOk()) - break; - mFilter.SetRevision (emptyToNull (leUSBFilterRevision->text())); - if (!mFilter.isOk()) - break; - mFilter.SetPort (emptyToNull (leUSBFilterPort->text())); - if (!mFilter.isOk()) - break; - - mFilter.SetManufacturer (emptyToNull (leUSBFilterManufacturer->text())); - if (!mFilter.isOk()) - break; - mFilter.SetProduct (emptyToNull (leUSBFilterProduct->text())); - if (!mFilter.isOk()) - break; - mFilter.SetSerialNumber (emptyToNull (leUSBFilterSerial->text())); - if (!mFilter.isOk()) - break; - switch (mType) - { - case VBoxUSBFilterSettings::MachineType: - { - switch (cbRemote->currentItem()) - { - case 1: mFilter.SetRemote ("yes"); break; - case 2: mFilter.SetRemote ("no"); break; - default: AssertMsgFailed (("Invalid combo box index")); - case 0: mFilter.SetRemote (QString::null); break; - } - break; - } - case VBoxUSBFilterSettings::HostType: - { - CHostUSBDeviceFilter filter = CUnknown (mFilter); - filter.SetAction (vboxGlobal().toUSBDevFilterAction ( - cbAction->currentText())); - break; - } - default: - { - AssertMsgFailed (("Invalid mType enum value")); - break; - } - } - if (!mFilter.isOk()) - break; - } - while (0); - - return !mFilter.isOk() ? COMResult (mFilter) : COMResult(); -} - -void VBoxUSBFilterSettings::setup (VBoxUSBFilterSettings::FilterType aType) -{ - mType = aType; - txUSBFilterRemote->setHidden (mType != VBoxUSBFilterSettings::MachineType); - cbRemote->setHidden (mType != VBoxUSBFilterSettings::MachineType); - txUSBFilterAction->setHidden (mType != VBoxUSBFilterSettings::HostType); - cbAction->setHidden (mType != VBoxUSBFilterSettings::HostType); - if (mType == VBoxUSBFilterSettings::MachineType) - setFocusProxy (cbRemote); - else if (mType == VBoxUSBFilterSettings::HostType) - setFocusProxy (cbAction); -} Index: /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui (revision 9226) +++ /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui (revision 9227) @@ -572,161 +572,5 @@ - - - - 0 - - - 5 - - - 0 - - - 0 - - - - - When checked, enables the virtual USB controller of this machine. - - - Enable &USB Controller - - - true - - - false - - - - 5 - - - - - When checked, enables the virtual USB EHCI controller of this machine. The USB ECHI controller provides USB 2.0 support. - - - Enable USB E&HCI Controller - - - - - - - - - - USB Device &Filters - - - - 5 - - - - - - - - [filter] - - - - - - - - 0 - - - - - Adds a new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device. - - - - - - true - - - - - - - Adds a new USB filter with all fields set to the values of the selected USB device attached to the host PC. - - - - - - true - - - - - - - Removes the selected USB filter. - - - - - - true - - - - - - - Moves the selected USB filter up. - - - - - - true - - - - - - - Moves the selected USB filter down. - - - - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - + Index: /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsUSB.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsUSB.ui (revision 9227) +++ /trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsUSB.ui (revision 9227) @@ -0,0 +1,384 @@ + + VBoxVMSettingsUSB + + + + 0 + 0 + 402 + 424 + + + + + 0 + + + 5 + + + 0 + + + 0 + + + + + When checked, enables the virtual USB controller of this machine. + + + Enable &USB Controller + + + true + + + false + + + + 5 + + + + + When checked, enables the virtual USB EHCI controller of this machine. The USB ECHI controller provides USB 2.0 support. + + + Enable USB E&HCI Controller + + + + + + + + + + USB Device &Filters + + + + 5 + + + + + + + Lists all USB filters of this machine. The checkbox to the left defines whether the particular filter is enabled or not. Use the context menu or buttons to the right to add or remove USB filters. + + + false + + + + [filter] + + + + + + + + 0 + + + + + Adds a new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device. + + + + + + true + + + + + + + Adds a new USB filter with all fields set to the values of the selected USB device attached to the host PC. + + + + + + true + + + + + + + Removes the selected USB filter. + + + + + + true + + + + + + + Moves the selected USB filter up. + + + + + + true + + + + + + + Moves the selected USB filter down. + + + + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + &Name + + + mLeName + + + + + + + Displays the filter name. + + + + + + + + + + + &Vendor ID + + + mLeVendorID + + + + + + + Defines the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value. + + + + + + + &Manufacturer + + + mLeManufacturer + + + + + + + Defines the manufacturer filter as an <i>exact match</i> string. An empty string will match any value. + + + + + + + &Product ID + + + mLeProductID + + + + + + + Defines the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value. + + + + + + + Pro&duct + + + mLeProduct + + + + + + + Defines the product name filter as an <i>exact match</i> string. An empty string will match any value. + + + + + + + &Revision + + + mLeRevision + + + + + + + Defines the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value. + + + + + + + &Serial No. + + + mLeSerialNo + + + + + + + Defines the serial number filter as an <i>exact match</i> string. An empty string will match any value. + + + + + + + Por&t + + + mLePort + + + + + + + Defines the host USB port filter as an <i>exact match</i> string. An empty string will match any value. + + + + + + + R&emote + + + mCbRemote + + + + + + + + 0 + 0 + + + + Defines whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>). + + + + + + + &Action + + + mCbAction + + + + + + + + 0 + 0 + + + + Defines an action performed by the host computer when a matching device is attached: give it up to the host OS (<i>Ignore</i>) or grab it for later usage by virtual machines (<i>Hold</i>). + + + + + + + + + + + + +