儲存庫 vbox 的更動 48022

時間撮記:

2013-8-23 下午12:04:01 (11 年 以前)

作者:

vboxsync

訊息:

FE/Qt: Settings Dialog: USB page: Validation mechanism: Do not disable USB 2.0 even if its not available.

位置:

trunk/src/VBox/Frontends/VirtualBox/src

檔案:

• globals/UIMessageCenter.cpp (修改) (1 筆差異)
• globals/UIMessageCenter.h (修改) (1 筆差異)
• settings/machine/UIMachineSettingsUSB.cpp (修改) (3 筆差異)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -949 +949 @@
           formatErrorInfo(res),
           "warnAboutUnaccessibleUSB");
-}
-
-void UIMessageCenter::warnAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent /*= 0*/)
-{
-    if (warningShown("warnAboutUnsupportedUSB2"))
-        return;
-    setWarningShown("warnAboutUnsupportedUSB2", true);
-
-    alert(pParent, MessageType_Warning,
-          tr("<p>USB 2.0 is currently enabled for this virtual machine. "
-             "However, this requires the <b><nobr>%1</nobr></b> to be installed.</p>"
-             "<p>Please install the Extension Pack from the VirtualBox download site. "
-             "After this you will be able to re-enable USB 2.0. "
-             "It will be disabled in the meantime unless you cancel the current settings changes.</p>")
-             .arg(strExtPackName));
-
-    setWarningShown("warnAboutUnsupportedUSB2", false);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -220 +220 @@
     /* API: Machine settings warnings: */
     void warnAboutUnaccessibleUSB(const COMBaseWithEI &object, QWidget *pParent = 0) const;
-    void warnAboutUnsupportedUSB2(const QString &strExtPackName, QWidget *pParent = 0);
     void warnAboutStateChange(QWidget *pParent = 0) const;
     bool confirmSettingsReloading(QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -330 +330 @@
     usbData.m_fUSBEnabled = mGbUSB->isChecked();
     /* USB 2.0 (EHCI): */
-    CExtPack extPack = vboxGlobal().virtualBox().GetExtensionPackManager().Find(GUI_ExtPackName);
-    usbData.m_fEHCIEnabled = extPack.isNull() || !extPack.GetUsable() ? false : mCbUSB2->isChecked();
+    usbData.m_fEHCIEnabled = mCbUSB2->isChecked();
 
     /* Update USB cache: */
@@ -356 +355 @@
         {
             /* Get USB data from cache: */
-
             const UIDataSettingsMachineUSB &usbData = m_cache.data();
             /* Store USB data: */
@@ -440 +438 @@
         message.second << tr("USB 2.0 is currently enabled for this virtual machine. "
                              "However, this requires the <b>%1</b> to be installed. "
-                             "Please install the Extension Pack from the VirtualBox download site. "
-                             "After this you will be able to re-enable USB 2.0. "
-                             "It will be disabled in the meantime unless you cancel the current settings changes.")
+                             "Please install the Extension Pack from the VirtualBox download site "
+                             "or disable USB 2.0 to be able to start the machine.")
                              .arg(GUI_ExtPackName);
         /* Serialize message: */
         if (!message.second.isEmpty())
             messages << message;
-        /* Show message-center warning: */
-        msgCenter().warnAboutUnsupportedUSB2(GUI_ExtPackName, this);
-        /* Disable USB2.0 if enabled: */
-        mCbUSB2->setChecked(false);
     }
 #endif /* VBOX_WITH_EXTPACK */