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

Timestamp:

May 20, 2011 4:56:46 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: VM Settings Dialog: Page correlation moved into corresponding page files.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• settings/UISettingsDialog.cpp (modified) (2 diffs)
• settings/UISettingsDialog.h (modified) (1 diff)
• settings/UISettingsDialogSpecific.cpp (modified) (1 diff)
• settings/UISettingsDialogSpecific.h (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (6 diffs)
• settings/machine/UIMachineSettingsDisplay.h (modified) (4 diffs)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (4 diffs)
• settings/machine/UIMachineSettingsGeneral.h (modified) (3 diffs)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (10 diffs)
• settings/machine/UIMachineSettingsStorage.h (modified) (3 diffs)
• settings/machine/UIMachineSettingsSystem.cpp (modified) (4 diffs)
• settings/machine/UIMachineSettingsSystem.h (modified) (2 diffs)
• wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)

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

@@ -3805 +3805 @@
 }
 
-/* static */
-bool VBoxGlobal::shouldWarnAboutToLowVRAM(const CMachine *pMachine /* = 0 */)
-{
-    static QStringList osList = QStringList()
-        << "Other" << "DOS" << "Netware" << "L4" << "QNX" << "JRockitVE";
-
-    bool fResult = true;
-    if (   pMachine
-        && !pMachine->isNull()
-        && osList.contains(pMachine->GetOSTypeId()))
-        fResult = false;
-
-    return fResult;
-}
-
 /**
  *  Returns the required video memory in bytes for the current desktop
@@ -3825 +3810 @@
  */
 /* static */
-quint64 VBoxGlobal::requiredVideoMemory (CMachine *aMachine /* = 0 */, int cMonitors /* = 1 */)
+quint64 VBoxGlobal::requiredVideoMemory(const QString &strGuestOSTypeId, int cMonitors /* = 1 */)
 {
     QSize desktopRes = QApplication::desktop()->screenGeometry().size();
@@ -3863 +3848 @@
                          needBits / (8 * _1M) /* convert to megabytes */;
 
-    if (aMachine && !aMachine->isNull())
-    {
-       QString typeId = aMachine->GetOSTypeId();
-       if (typeId.startsWith("Windows"))
+    if (strGuestOSTypeId.startsWith("Windows"))
+    {
+       /* Windows guests need offscreen VRAM too for graphics acceleration features: */
+#ifdef VBOX_WITH_CRHGSMI
+       if (strGuestOSTypeId == "WindowsVista" || strGuestOSTypeId == "Windows7")
        {
-           /* Windows guests need offscreen VRAM too for graphics acceleration features. */
-#ifdef VBOX_WITH_CRHGSMI
-           if (typeId == "WindowsVista" || typeId == "Windows7")
-           {
-               /* wddm mode, there are two surfaces for each screen: shadow & primary */
-               needMBytes *= 3;
-           }
-           else
-#endif
-           {
-               needMBytes *= 2;
-           }
+           /* wddm mode, there are two surfaces for each screen: shadow & primary */
+           needMBytes *= 3;
+       }
+       else
+#endif /* VBOX_WITH_CRHGSMI */
+       {
+           needMBytes *= 2;
        }
     }
@@ -4434 +4415 @@
 #ifdef VBOX_WITH_CRHGSMI
 /* static */
-quint64 VBoxGlobal::required3DWddmOffscreenVideoMemory(CMachine *aMachine /* = 0 */, int cMonitors /* = 1 */)
+quint64 VBoxGlobal::required3DWddmOffscreenVideoMemory(const QString &strGuestOSTypeId, int cMonitors /* = 1 */)
 {
     cMonitors = RT_MAX(cMonitors, 1);
-    quint64 cbSize = VBoxGlobal::requiredVideoMemory(aMachine, 1); /* why not cMonitors? */
+    quint64 cbSize = VBoxGlobal::requiredVideoMemory(strGuestOSTypeId, 1); /* why not cMonitors? */
     cbSize += 64 * _1M;
     return cbSize;
 }
-#endif
+#endif /* VBOX_WITH_CRHGSMI */
 
 #ifdef Q_WS_MAC

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

@@ -636 +636 @@
     /* public static stuff */
 
-    static bool shouldWarnAboutToLowVRAM(const CMachine *pMachine = 0);
     static bool isDOSType (const QString &aOSTypeId);
 
@@ -663 +662 @@
                                VBoxDefs::FormatSize aMode = VBoxDefs::FormatSize_Round);
 
-    static quint64 requiredVideoMemory (CMachine *aMachine = 0, int cMonitors = 1);
+    static quint64 requiredVideoMemory(const QString &strGuestOSTypeId, int cMonitors = 1);
 
     static QString locationForHTML (const QString &aFileName);
@@ -715 +714 @@
 
 #ifdef VBOX_WITH_CRHGSMI
-    static quint64 required3DWddmOffscreenVideoMemory(CMachine *aMachine = 0, int cMonitors = 1);
-#endif
+    static quint64 required3DWddmOffscreenVideoMemory(const QString &strGuestOSTypeId, int cMonitors = 1);
+#endif /* VBOX_WITH_CRHGSMI */
 
 #ifdef Q_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -174 +174 @@
     QString strTitle = m_pSelector->itemTextByPage(pSettingsPage);
 
+    /* Recorrelate page with others before revalidation: */
+    recorrelate(pSettingsPage);
+
     /* Revalidate the page: */
     bool fValid = pSettingsPage->revalidate(strWarning, strTitle);
-
-    /* If revalidation is fully passed - recorrelate the pages: */
-    if (fValid && strWarning.isEmpty())
-        fValid = recorrelate(pSettingsPage, strWarning);
 
     /* Compose a message: */
@@ -370 +369 @@
     if (pSettingsPage)
         assignValidator(pSettingsPage);
-}
-
-bool UISettingsDialog::recorrelate(QWidget * /* pPage */, QString & /* strWarning */)
-{
-    return true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -96 +96 @@
                  UISettingsPage* pSettingsPage = 0, int iParentId = -1);
 
-    /* Correlation handler: */
-    virtual bool recorrelate(QWidget *pPage, QString &strWarning);
+    /* Settings page correlator: */
+    virtual void recorrelate(UISettingsPage *pSettingsPage) { Q_UNUSED(pSettingsPage); }
 
     /* Protected variables: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -909 +909 @@
 }
 
-bool UISettingsDialogMachine::recorrelate(QWidget *pPage, QString &strWarning)
-{
-    /* This method performs correlation option check
-     * between different pages of VM Settings dialog: */
-
-    if (pPage == m_pSelector->idToPage(VMSettingsPage_General))
-    {
-        /* Get General & System pages: */
-        UIMachineSettingsGeneral *pGeneralPage =
-            qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
-        UIMachineSettingsSystem *pSystemPage =
-            qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
-
-        /* Guest OS type & VT-x/AMD-V option correlation test: */
-        if (pGeneralPage && pSystemPage &&
-            pGeneralPage->is64BitOSTypeSelected() && !pSystemPage->isHWVirtExEnabled())
-        {
-            strWarning = tr(
-                "you have selected a 64-bit guest OS type for this VM. As such guests "
-                "require hardware virtualization (VT-x/AMD-V), this feature will be enabled "
-                "automatically.");
-            return true;
-        }
-    }
-
-#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI)
-    /* 2D Video Acceleration is available for Windows guests only: */
-    if (pPage == m_pSelector->idToPage(VMSettingsPage_Display))
-    {
-        /* Get General & Display pages: */
-        UIMachineSettingsGeneral *pGeneralPage =
-            qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
-        UIMachineSettingsDisplay *pDisplayPage =
-            qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(VMSettingsPage_Display));
-#ifdef VBOX_WITH_CRHGSMI
-        if (pGeneralPage && pDisplayPage)
-        {
-            bool bWddmSupported = pGeneralPage->isWddmSupportedForOSType();
-            pDisplayPage->setWddmMode(bWddmSupported);
-        }
-#endif
-#ifdef VBOX_WITH_VIDEOHWACCEL
-        if (pGeneralPage && pDisplayPage &&
-            pDisplayPage->isAcceleration2DVideoSelected() && !pGeneralPage->isWindowsOSTypeSelected())
-        {
-            strWarning = tr(
-                "you have 2D Video Acceleration enabled. As 2D Video Acceleration "
-                "is supported for Windows guests only, this feature will be disabled.");
-            return true;
-        }
-#endif
-    }
-#endif /* VBOX_WITH_VIDEOHWACCEL */
-
-    if (pPage == m_pSelector->idToPage(VMSettingsPage_System))
-    {
-        /* Get System & USB pages: */
-        UIMachineSettingsSystem *pSystemPage =
-            qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
-        UIMachineSettingsUSB *pUsbPage =
-            qobject_cast<UIMachineSettingsUSB*>(m_pSelector->idToPage(VMSettingsPage_USB));
-        if (pSystemPage && pUsbPage &&
-            pSystemPage->isHIDEnabled() && !pUsbPage->isOHCIEnabled())
-        {
-            strWarning = tr(
-                "you have enabled a USB HID (Human Interface Device). "
-                "This will not work unless USB emulation is also enabled. "
-                "This will be done automatically when you accept the VM Settings "
-                "by pressing the OK button.");
-            return true;
-        }
-    }
-
-    if (pPage == m_pSelector->idToPage(VMSettingsPage_Storage))
-    {
-        /* Get System & Storage pages: */
-        UIMachineSettingsSystem *pSystemPage =
-            qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
-        UIMachineSettingsStorage *pStoragePage =
-            qobject_cast<UIMachineSettingsStorage*>(m_pSelector->idToPage(VMSettingsPage_Storage));
-        if (pSystemPage && pStoragePage)
-        {
-            /* Update chiset type for the Storage settings page: */
-            if (pStoragePage->chipsetType() != pSystemPage->chipsetType())
+void UISettingsDialogMachine::recorrelate(UISettingsPage *pSettingsPage)
+{
+    switch (pSettingsPage->id())
+    {
+        case VMSettingsPage_General:
+        {
+            UIMachineSettingsGeneral *pGeneralPage = qobject_cast<UIMachineSettingsGeneral*>(pSettingsPage);
+            UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
+            if (pGeneralPage && pSystemPage)
+                pGeneralPage->setHWVirtExEnabled(pSystemPage->isHWVirtExEnabled());
+            break;
+        }
+        case VMSettingsPage_Display:
+        {
+            UIMachineSettingsDisplay *pDisplayPage = qobject_cast<UIMachineSettingsDisplay*>(pSettingsPage);
+            UIMachineSettingsGeneral *pGeneralPage = qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
+            if (pDisplayPage && pGeneralPage)
+                pDisplayPage->setGuestOSType(pGeneralPage->guestOSType());
+            break;
+        }
+        case VMSettingsPage_System:
+        {
+            UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(pSettingsPage);
+            UIMachineSettingsUSB *pUsbPage = qobject_cast<UIMachineSettingsUSB*>(m_pSelector->idToPage(VMSettingsPage_USB));
+            if (pSystemPage && pUsbPage)
+                pSystemPage->setOHCIEnabled(pUsbPage->isOHCIEnabled());
+            break;
+        }
+        case VMSettingsPage_Storage:
+        {
+            UIMachineSettingsStorage *pStoragePage = qobject_cast<UIMachineSettingsStorage*>(pSettingsPage);
+            UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
+            if (pStoragePage && pSystemPage)
                 pStoragePage->setChipsetType(pSystemPage->chipsetType());
-            /* Check for excessive controllers on Storage page controllers list: */
-            QStringList excessiveList;
-            QMap<KStorageBus, int> currentType = pStoragePage->currentControllerTypes();
-            QMap<KStorageBus, int> maximumType = pStoragePage->maximumControllerTypes();
-            for (int iStorageBusType = KStorageBus_IDE; iStorageBusType <= KStorageBus_SAS; ++iStorageBusType)
-            {
-                if (currentType[(KStorageBus)iStorageBusType] > maximumType[(KStorageBus)iStorageBusType])
-                {
-                    QString strExcessiveRecord = QString("%1 (%2)");
-                    strExcessiveRecord = strExcessiveRecord.arg(QString("<b>%1</b>").arg(vboxGlobal().toString((KStorageBus)iStorageBusType)));
-                    strExcessiveRecord = strExcessiveRecord.arg(maximumType[(KStorageBus)iStorageBusType] == 1 ?
-                                                                tr("at most one supported") :
-                                                                tr("up to %1 supported").arg(maximumType[(KStorageBus)iStorageBusType]));
-                    excessiveList << strExcessiveRecord;
-                }
-            }
-            if (!excessiveList.isEmpty())
-            {
-                strWarning = tr(
-                    "you are currently using more storage controllers than a %1 chipset supports. "
-                    "Please change the chipset type on the System settings page or reduce the number "
-                    "of the following storage controllers on the Storage settings page: %2.")
-                    .arg(vboxGlobal().toString(pStoragePage->chipsetType()))
-                    .arg(excessiveList.join(", "));
-                return false;
-            }
-        }
-    }
-
-    return true;
+            break;
+        }
+        default:
+            break;
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

@@ -94 +94 @@
     QString title() const;
 
-    bool recorrelate(QWidget *pPage, QString &strWarning);
+    void recorrelate(UISettingsPage *pSettingsPage);
 
 private slots:

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

@@ -51 +51 @@
     , m_maxVRAMVisible(0)
     , m_initialVRAM(0)
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    , m_f2DVideoAccelerationSupported(false)
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 #ifdef VBOX_WITH_CRHGSMI
-    , m_bWddmMode(false)
-#endif
+    , m_fWddmModeSupported(false)
+#endif /* VBOX_WITH_CRHGSMI */
 {
     /* Apply UI decorations */
@@ -94 +97 @@
     mSlMemory->setMaximum (m_maxVRAMVisible);
     mSlMemory->setSnappingEnabled (true);
-    quint64 needMBytes = VBoxGlobal::requiredVideoMemory (&m_machine) / _1M;
     mSlMemory->setErrorHint (0, 1);
-    mSlMemory->setWarningHint (1, needMBytes);
-    mSlMemory->setOptimalHint (needMBytes, m_maxVRAMVisible);
     mSlMonitors->setMinimum (MinMonitors);
     mSlMonitors->setMaximum (MaxMonitors);
@@ -120 +120 @@
 #endif
 
-#ifdef VBOX_WITH_CRHGSMI
-    m_bWddmMode = false;
-#endif
-
     /* Applying language settings */
     retranslateUi();
 }
 
+void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType)
+{
+    /* Check if guest os type changed: */
+    if (m_guestOSType == guestOSType)
+        return;
+
+    /* Remember new guest os type: */
+    m_guestOSType = guestOSType;
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    /* Check if 2D video acceleration supported by the guest OS type: */
+    QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
+    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows";
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+#ifdef VBOX_WITH_CRHGSMI
+    /* Check if WDDM mode supported by the guest OS type: */
+    QString strguestOSTypeId = m_guestOSType.GetId();
+    m_fWddmModeSupported = strguestOSTypeId == "WindowsVista" || strguestOSTypeId == "Windows7";
+#endif /* VBOX_WITH_CRHGSMI */
+
+    /* Recheck video RAM requirement: */
+    checkVRAMRequirements();
+}
+
 #ifdef VBOX_WITH_VIDEOHWACCEL
 bool UIMachineSettingsDisplay::isAcceleration2DVideoSelected() const
@@ -133 +153 @@
     return mCb2DVideo->isChecked();
 }
-#endif
-
-#ifdef VBOX_WITH_CRHGSMI
-void UIMachineSettingsDisplay::setWddmMode(bool bWddm)
-{
-    if (bWddm == m_bWddmMode)
-        return;
-
-    m_bWddmMode = bWddm;
-    checkVRAMRequirements();
-}
-#endif
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 
 /* Load data to cashe from corresponding external object(s),
@@ -313 +322 @@
 }
 
-bool UIMachineSettingsDisplay::revalidate (QString &aWarning, QString & /* aTitle */)
-{
-    /* Video RAM amount test */
-    quint64 needBytes = VBoxGlobal::requiredVideoMemory (&m_machine, mSlMonitors->value());
-    if (   vboxGlobal().shouldWarnAboutToLowVRAM(&m_machine)
-        && (quint64)mSlMemory->value() * _1M < needBytes)
-    {
-        aWarning = tr (
-                       "you have assigned less than <b>%1</b> of video memory which is "
-                       "the minimum amount required to switch the virtual machine to "
-                       "fullscreen or seamless mode.")
-            .arg (vboxGlobal().formatSize (needBytes, 0, VBoxDefs::FormatSize_RoundUp));
-    }
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    else if (mCb2DVideo->isChecked())
-    {
-        needBytes += VBoxGlobal::required2DOffscreenVideoMemory();
-        if ((quint64) mSlMemory->value() * _1M < needBytes)
+bool UIMachineSettingsDisplay::revalidate(QString &strWarning, QString & /* strTitle */)
+{
+    /* Check if video RAM requirement changed first: */
+    checkVRAMRequirements();
+
+    /* Video RAM amount test: */
+    if (shouldWeWarnAboutLowVideoMemory() && !m_guestOSType.isNull())
+    {
+        quint64 uNeedBytes = VBoxGlobal::requiredVideoMemory(m_guestOSType.GetId(), mSlMonitors->value());
+
+        /* Basic video RAM amount test: */
+        if ((quint64)mSlMemory->value() * _1M < uNeedBytes)
         {
-            aWarning = tr (
-                "you have assigned less than <b>%1</b> of video memory which is "
-                "the minimum amount required for HD Video to be played efficiently.")
-                .arg (vboxGlobal().formatSize (needBytes, 0, VBoxDefs::FormatSize_RoundUp));
+            strWarning = tr("you have assigned less than <b>%1</b> of video memory which is "
+                            "the minimum amount required to switch the virtual machine to "
+                            "fullscreen or seamless mode.")
+                            .arg(vboxGlobal().formatSize(uNeedBytes, 0, VBoxDefs::FormatSize_RoundUp));
+            return true;
         }
-    }
-#endif
-#ifdef VBOX_WITH_CRHGSMI
-    else if (false) // m_bWddmMode && mCb3D->isChecked())
-    {
-        int cVal = mSlMonitors->value();
-        needBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(&m_machine, cVal);
-        needBytes = RT_MAX(needBytes, 128 * _1M);
-        needBytes = RT_MIN(needBytes, 256 * _1M);
-        if ((quint64) mSlMemory->value() * _1M < needBytes)
+#ifdef VBOX_WITH_VIDEOHWACCEL
+        /* 2D acceleration video RAM amount test: */
+        if (mCb2DVideo->isChecked() && m_f2DVideoAccelerationSupported)
         {
-            aWarning = tr(
-                "You have 3D Acceleration enabled for a operation system which uses the WDDM video driver. "
-                "For maximal performance set the guest VRAM to at least <b>%1</b>."
-                ).arg (vboxGlobal().formatSize (needBytes, 0, VBoxDefs::FormatSize_RoundUp));
+            uNeedBytes += VBoxGlobal::required2DOffscreenVideoMemory();
+            if ((quint64)mSlMemory->value() * _1M < uNeedBytes)
+            {
+                strWarning = tr("you have assigned less than <b>%1</b> of video memory which is "
+                                "the minimum amount required for HD Video to be played efficiently.")
+                                .arg(vboxGlobal().formatSize(uNeedBytes, 0, VBoxDefs::FormatSize_RoundUp));
+                return true;
+            }
         }
-    }
-#endif
-    checkVRAMRequirements();
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+#if 0
+# ifdef VBOX_WITH_CRHGSMI
+        if (mCb3D->isChecked() && m_fWddmModeSupported)
+        {
+            int cMonitorsCount = mSlMonitors->value();
+            uNeedBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cMonitorsCount);
+            uNeedBytes = RT_MAX(uNeedBytes, 128 * _1M);
+            uNeedBytes = RT_MIN(uNeedBytes, 256 * _1M);
+            if ((quint64)mSlMemory->value() * _1M < uNeedBytes)
+            {
+                strWarning = tr("you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. "
+                                "For maximal performance set the guest VRAM to at least <b>%1</b>.")
+                                .arg(vboxGlobal().formatSize(uNeedBytes, 0, VBoxDefs::FormatSize_RoundUp));
+                return true;
+            }
+        }
+# endif /* VBOX_WITH_CRHGSMI */
+#endif /* 0 */
+    }
+
+    /* Check mode availability: */
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    /* 2D video acceleration is available for Windows guests only: */
+    if (mCb2DVideo->isChecked() && !m_f2DVideoAccelerationSupported)
+    {
+        strWarning = tr("you have 2D Video Acceleration enabled. As 2D Video Acceleration "
+                        "is supported for Windows guests only, this feature will be disabled.");
+        return true;
+    }
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+
     return true;
 }
@@ -424 +454 @@
 void UIMachineSettingsDisplay::checkVRAMRequirements()
 {
-    int cVal = mSlMonitors->value();
-    /* The memory requirements have changed too. */
-    quint64 needMBytes = VBoxGlobal::requiredVideoMemory (&m_machine, cVal) / _1M;
-    /* Limit the maximum memory to save careless users from setting useless big values */
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    if (mCb2DVideo->isChecked())
-    {
-        needMBytes += VBoxGlobal::required2DOffscreenVideoMemory() / _1M;
-    }
-#endif
-#if 0 // def VBOX_WITH_CRHGSMI
-    if (m_bWddmMode && mCb3D->isChecked())
-    {
-        needMBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(&m_machine, cVal) / _1M;
-        needMBytes = RT_MAX(needMBytes, 128);
-        needMBytes = RT_MIN(needMBytes, 256);
+    if (m_guestOSType.isNull())
+        return;
+
+    /* Get monitors count and base video memory requirements: */
+    int cMonitorsCount = mSlMonitors->value();
+    quint64 uNeedMBytes = VBoxGlobal::requiredVideoMemory(m_guestOSType.GetId(), cMonitorsCount) / _1M;
+
+    /* Initial values: */
+    m_maxVRAMVisible = cMonitorsCount * 32;
+    if (m_maxVRAMVisible < 128)
+        m_maxVRAMVisible = 128;
+    if (m_maxVRAMVisible < m_initialVRAM)
+        m_maxVRAMVisible = m_initialVRAM;
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    if (mCb2DVideo->isChecked() && m_f2DVideoAccelerationSupported)
+    {
+        uNeedMBytes += VBoxGlobal::required2DOffscreenVideoMemory() / _1M;
+    }
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+#if 0
+# ifdef VBOX_WITH_CRHGSMI
+    if (mCb3D->isChecked() && m_fWddmModeSupported)
+    {
+        uNeedMBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cMonitorsCount) / _1M;
+        uNeedMBytes = RT_MAX(uNeedMBytes, 128);
+        uNeedMBytes = RT_MIN(uNeedMBytes, 256);
         m_maxVRAMVisible = 256;
     }
-    else
-#endif
-    {
-        m_maxVRAMVisible = cVal * 32;
-        if (m_maxVRAMVisible < 128)
-            m_maxVRAMVisible = 128;
-        if (m_maxVRAMVisible < m_initialVRAM)
-            m_maxVRAMVisible = m_initialVRAM;
-    }
-    mSlMemory->setWarningHint (1, needMBytes);
-    mSlMemory->setPageStep (calcPageStep (m_maxVRAMVisible));
-    mSlMemory->setMaximum (m_maxVRAMVisible);
-    mSlMemory->setOptimalHint (needMBytes, m_maxVRAMVisible);
-    mLeMemory->setValidator (new QIntValidator (m_minVRAM, m_maxVRAMVisible, this));
-    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (m_maxVRAMVisible));
-    /* ... or just call retranslateUi()? */
+# endif /* VBOX_WITH_CRHGSMI */
+#endif /* 0 */
+
+    mSlMemory->setWarningHint(1, uNeedMBytes);
+    mSlMemory->setPageStep(calcPageStep(m_maxVRAMVisible));
+    mSlMemory->setMaximum(m_maxVRAMVisible);
+    mSlMemory->setOptimalHint(uNeedMBytes, m_maxVRAMVisible);
+    mLeMemory->setValidator(new QIntValidator(m_minVRAM, m_maxVRAMVisible, this));
+    mLbMemoryMax->setText(tr("<qt>%1&nbsp;MB</qt>").arg(m_maxVRAMVisible));
+}
+
+bool UIMachineSettingsDisplay::shouldWeWarnAboutLowVideoMemory()
+{
+    bool fResult = true;
+
+    QStringList excludingOSList = QStringList()
+        << "Other" << "DOS" << "Netware" << "L4" << "QNX" << "JRockitVE";
+    if (excludingOSList.contains(m_guestOSType.GetId()))
+        fResult = false;
+
+    return fResult;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h

@@ -86 +86 @@
     UIMachineSettingsDisplay();
 
+    void setGuestOSType(CGuestOSType guestOSType);
+
 #ifdef VBOX_WITH_VIDEOHWACCEL
     bool isAcceleration2DVideoSelected() const;
-#endif
-
-#ifdef VBOX_WITH_CRHGSMI
-    void setWddmMode(bool bWddm);
-#endif
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 
 protected:
@@ -130 +128 @@
 
     void checkVRAMRequirements();
+    bool shouldWeWarnAboutLowVideoMemory();
 
     void polishPage();
@@ -135 +134 @@
     QIWidgetValidator *mValidator;
 
+    /* Guest OS type id: */
+    CGuestOSType m_guestOSType;
     /* System minimum lower limit of VRAM (MiB). */
     int m_minVRAM;
@@ -144 +145 @@
     /* Initial VRAM value when the dialog is opened. */
     int m_initialVRAM;
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    /* Specifies whether the guest OS supports 2D video-acceleration: */
+    bool m_f2DVideoAccelerationSupported;
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 #ifdef VBOX_WITH_CRHGSMI
-    /* Specifies whether the guest os is wddm-capable: */
-    bool m_bWddmMode;
-#endif
+    /* Specifies whether the guest OS supports WDDM: */
+    bool m_fWddmModeSupported;
+#endif /* VBOX_WITH_CRHGSMI */
 
     /* Cache: */

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

@@ -27 +27 @@
 UIMachineSettingsGeneral::UIMachineSettingsGeneral()
     : mValidator(0)
+    , m_fHWVirtExEnabled(false)
 {
     /* Apply UI decorations */
@@ -48 +49 @@
 }
 
+CGuestOSType UIMachineSettingsGeneral::guestOSType() const
+{
+    return mOSTypeSelector->type();
+}
+
+void UIMachineSettingsGeneral::setHWVirtExEnabled(bool fEnabled)
+{
+    m_fHWVirtExEnabled = fEnabled;
+}
+
 bool UIMachineSettingsGeneral::is64BitOSTypeSelected() const
 {
@@ -58 +69 @@
     return mOSTypeSelector->type().GetFamilyId() == "Windows";
 }
-#endif
-
-#ifdef VBOX_WITH_CRHGSMI
-bool UIMachineSettingsGeneral::isWddmSupportedForOSType() const
-{
-    const QString &strOsId = mOSTypeSelector->type().GetId();
-    return strOsId == "WindowsVista" || strOsId == "Windows7";
-}
-#endif
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 
 /* Load data to cashe from corresponding external object(s),
@@ -197 +200 @@
 }
 
+bool UIMachineSettingsGeneral::revalidate(QString &strWarning, QString& /* strTitle */)
+{
+    if (is64BitOSTypeSelected() && !m_fHWVirtExEnabled)
+        strWarning = tr("you have selected a 64-bit guest OS type for this VM. As such guests "
+                        "require hardware virtualization (VT-x/AMD-V), this feature will be enabled "
+                        "automatically.");
+    return true;
+}
+
 void UIMachineSettingsGeneral::setOrderAfter (QWidget *aWidget)
 {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

@@ -77 +77 @@
     UIMachineSettingsGeneral();
 
+    CGuestOSType guestOSType() const;
+    void setHWVirtExEnabled(bool fEnabled);
     bool is64BitOSTypeSelected() const;
-
 #ifdef VBOX_WITH_VIDEOHWACCEL
     bool isWindowsOSTypeSelected() const;
-#endif
-
-#ifdef VBOX_WITH_CRHGSMI
-    bool isWddmSupportedForOSType() const;
-#endif
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 
 protected:
@@ -107 +104 @@
 
     void setValidator (QIWidgetValidator *aVal);
+    bool revalidate(QString &strWarning, QString &strTitle);
 
     void setOrderAfter (QWidget *aWidget);
@@ -117 +115 @@
 
     QIWidgetValidator *mValidator;
+    bool m_fHWVirtExEnabled;
 
     /* Cache: */

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

@@ -1766 +1766 @@
 }
 
-KChipsetType UIMachineSettingsStorage::chipsetType() const
-{
-    return mStorageModel->chipsetType();
-}
-
 void UIMachineSettingsStorage::setChipsetType(KChipsetType type)
 {
     mStorageModel->setChipsetType(type);
     updateActionsState();
-}
-
-QMap<KStorageBus, int> UIMachineSettingsStorage::currentControllerTypes() const
-{
-    return mStorageModel->currentControllerTypes();
-}
-
-QMap<KStorageBus, int> UIMachineSettingsStorage::maximumControllerTypes() const
-{
-    return mStorageModel->maximumControllerTypes();
 }
 
@@ -1797 +1782 @@
     m_cache.clear();
 
-    /* Prepare storage data: */
-    UIDataSettingsMachineStorage storageData;
-
     /* Gather storage data: */
-    storageData.m_strMachineId = m_machine.GetId();
+    m_strMachineId = m_machine.GetId();
+    m_strMachineSettingsFilePath = m_machine.GetSettingsFilePath();
+    m_strMachineGuestOSTypeId = m_machine.GetOSTypeId();
 
     /* For each controller: */
@@ -1851 +1835 @@
     }
 
-    /* Cache storage data: */
-    m_cache.cacheInitialData(storageData);
-
     /* Upload machine to data: */
     UISettingsPageMachine::uploadData(data);
@@ -1865 +1846 @@
     mStorageModel->clear();
 
-    /* Get storage data from cache: */
-    const UIDataSettingsMachineStorage &storageData = m_cache.base();
-
     /* Load storage data to page: */
-    mStorageModel->setMachineId(storageData.m_strMachineId);
+    mStorageModel->setMachineId(m_strMachineId);
 
     /* For each storage controller: */
@@ -1985 +1963 @@
 }
 
-bool UIMachineSettingsStorage::revalidate (QString &aWarning, QString &)
-{
+bool UIMachineSettingsStorage::revalidate (QString &strWarning, QString& /* strTitle */)
+{
+    /* Check controllers for name emptiness & coincidence.
+     * Check attachments for the hd presence / uniqueness. */
     QModelIndex rootIndex = mStorageModel->root();
     QMap <QString, QString> config;
@@ -1998 +1978 @@
         if (ctrName.isEmpty())
         {
-            aWarning = tr("no name specified for controller at position <b>%1</b>.").arg(i + 1);
-            return aWarning.isNull();
+            strWarning = tr("no name specified for controller at position <b>%1</b>.").arg(i + 1);
+            return false;
         }
         /* Check for name coincidence: */
         if (names.values().contains(ctrName))
         {
-            aWarning = tr("controller at position <b>%1</b> uses the name that is "
+            strWarning = tr("controller at position <b>%1</b> uses the name that is "
                           "already used by controller at position <b>%2</b>.")
                           .arg(i + 1).arg(names.key(ctrName) + 1);
-            return aWarning.isNull();
+            return false;
         }
         else names.insert(i, ctrName);
@@ -2021 +2001 @@
             if (vboxGlobal().findMedium (key).isNull() && attDevice == KDeviceType_HardDisk)
             {
-                aWarning = tr ("no hard disk is selected for <i>%1</i>.").arg (value);
-                return aWarning.isNull();
+                strWarning = tr ("no hard disk is selected for <i>%1</i>.").arg (value);
+                return false;
             }
             /* Check for coincidence */
             if (!vboxGlobal().findMedium (key).isNull() && config.contains (key))
             {
-                aWarning = tr ("<i>%1</i> uses a medium that is already attached to <i>%2</i>.")
+                strWarning = tr ("<i>%1</i> uses a medium that is already attached to <i>%2</i>.")
                               .arg (value).arg (config [key]);
-                return aWarning.isNull();
+                return false;
             }
             else config.insert (key, value);
         }
     }
-    return aWarning.isNull();
+
+    /* Check for excessive controllers on Storage page controllers list: */
+    QStringList excessiveList;
+    QMap<KStorageBus, int> currentType = mStorageModel->currentControllerTypes();
+    QMap<KStorageBus, int> maximumType = mStorageModel->maximumControllerTypes();
+    for (int iStorageBusType = KStorageBus_IDE; iStorageBusType <= KStorageBus_SAS; ++iStorageBusType)
+    {
+        if (currentType[(KStorageBus)iStorageBusType] > maximumType[(KStorageBus)iStorageBusType])
+        {
+            QString strExcessiveRecord = QString("%1 (%2)");
+            strExcessiveRecord = strExcessiveRecord.arg(QString("<b>%1</b>").arg(vboxGlobal().toString((KStorageBus)iStorageBusType)));
+            strExcessiveRecord = strExcessiveRecord.arg(maximumType[(KStorageBus)iStorageBusType] == 1 ?
+                                                        tr("at most one supported", "controller") :
+                                                        tr("up to %1 supported", "controllers").arg(maximumType[(KStorageBus)iStorageBusType]));
+            excessiveList << strExcessiveRecord;
+        }
+    }
+    if (!excessiveList.isEmpty())
+    {
+        strWarning = tr("you are currently using more storage controllers than a %1 chipset supports. "
+                        "Please change the chipset type on the System settings page or reduce the number "
+                        "of the following storage controllers on the Storage settings page: %2.")
+                        .arg(vboxGlobal().toString(mStorageModel->chipsetType()))
+                        .arg(excessiveList.join(", "));
+        return false;
+    }
+
+    return true;
 }
 
@@ -2515 +2522 @@
 void UIMachineSettingsStorage::sltChooseExistingMedium()
 {
-    QString strMachineFolder(QFileInfo(m_machine.GetSettingsFilePath()).absolutePath());
+    QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
     QString strMediumId = vboxGlobal().openMediumWithFileOpenDialog(m_pMediumIdHolder->type(), this, strMachineFolder);
     if (!strMediumId.isNull())
@@ -2865 +2872 @@
     Assert(mStorageModel->data(index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
     QString strControllerName(mStorageModel->data(index, StorageModel::R_CtrName).toString());
-    QString strMachineFolder(QFileInfo(m_machine.GetSettingsFilePath()).absolutePath());
+    QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
 
     QString strMediumId;
@@ -2914 +2921 @@
     UINewHDWzd dlg(this);
     /* Initialize variables: */
-    CGuestOSType guestOSType = vboxGlobal().virtualBox().GetGuestOSType(m_machine.GetOSTypeId());
+    CGuestOSType guestOSType = vboxGlobal().virtualBox().GetGuestOSType(m_strMachineGuestOSTypeId);
     dlg.setRecommendedSize(guestOSType.GetRecommendedHDD());
-    QString strMachineSettingsFilepath = m_machine.GetSettingsFilePath();
-    QFileInfo fileInfo(strMachineSettingsFilepath);
+    QFileInfo fileInfo(m_strMachineSettingsFilePath);
     dlg.setDefaultPath(fileInfo.absolutePath());
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -608 +608 @@
 {
     /* Default constructor: */
-    UIDataSettingsMachineStorage()
-        : m_strMachineId(QString()) {}
+    UIDataSettingsMachineStorage() {}
     /* Operators: */
-    bool operator==(const UIDataSettingsMachineStorage &other) const { return m_strMachineId == other.m_strMachineId; }
-    bool operator!=(const UIDataSettingsMachineStorage &other) const { return m_strMachineId != other.m_strMachineId; }
-    /* Variables: */
-    QString m_strMachineId;
+    bool operator==(const UIDataSettingsMachineStorage& /* other */) const { return true; }
+    bool operator!=(const UIDataSettingsMachineStorage& /* other */) const { return false; }
 };
 typedef UISettingsCachePool<UIDataSettingsMachineStorage, UICacheSettingsMachineStorageController> UICacheSettingsMachineStorage;
@@ -628 +625 @@
     UIMachineSettingsStorage();
 
-    KChipsetType chipsetType() const;
     void setChipsetType(KChipsetType type);
-
-    QMap<KStorageBus, int> currentControllerTypes() const;
-    QMap<KStorageBus, int> maximumControllerTypes() const;
 
 signals:
@@ -742 +735 @@
     QIWidgetValidator *mValidator;
 
+    QString m_strMachineId;
+    QString m_strMachineSettingsFilePath;
+    QString m_strMachineGuestOSTypeId;
+
     StorageModel *mStorageModel;
 

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

@@ -31 +31 @@
     : mValidator(0)
     , mMinGuestCPU(0), mMaxGuestCPU(0)
+    , m_fOHCIEnabled(false)
 {
     /* Apply UI decorations */
@@ -148 +149 @@
 }
 
-int UIMachineSettingsSystem::cpuCount() const
-{
-    return mSlCPU->value();
-}
-
 bool UIMachineSettingsSystem::isHIDEnabled() const
 {
@@ -161 +157 @@
 {
     return (KChipsetType)mCbChipset->itemData(mCbChipset->currentIndex()).toInt();
+}
+
+void UIMachineSettingsSystem::setOHCIEnabled(bool fEnabled)
+{
+    m_fOHCIEnabled = fEnabled;
 }
 
@@ -427 +428 @@
             "you have assigned ICH9 chipset type to this VM. "
             "It will not work properly unless the IO-APIC feature is also enabled. "
+            "This will be done automatically when you accept the VM Settings "
+            "by pressing the OK button.");
+        return true;
+    }
+
+    /* HID dependency from OHCI feature: */
+    if (mCbUseAbsHID->isChecked() && !m_fOHCIEnabled)
+    {
+        aWarning = tr (
+            "you have enabled a USB HID (Human Interface Device). "
+            "This will not work unless USB emulation is also enabled. "
             "This will be done automatically when you accept the VM Settings "
             "by pressing the OK button.");

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -106 +106 @@
 
     bool isHWVirtExEnabled() const;
-    int cpuCount() const;
     bool isHIDEnabled() const;
     KChipsetType chipsetType() const;
+    void setOHCIEnabled(bool fEnabled);
 
 signals:
@@ -165 +165 @@
     QList<KDeviceType> m_possibleBootItems;
 
+    bool m_fOHCIEnabled;
+
     /* Cache: */
     UICacheSettingsMachineSystem m_cache;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -740 +740 @@
     /* VRAM size - select maximum between recommended and minimum for fullscreen */
     m_Machine.SetVRAMSize (qMax (type.GetRecommendedVRAM(),
-                                (ULONG) (VBoxGlobal::requiredVideoMemory(&m_Machine) / _1M)));
+                                (ULONG) (VBoxGlobal::requiredVideoMemory(typeId) / _1M)));
 
     /* Selecting recommended chipset type */