Changeset 34567 in vbox

Timestamp:

Dec 1, 2010 1:20:13 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68361

Message:

FE/Qt4: Do not warn about to low VRAM settings for all OS's.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (1 diff)

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

@@ -3686 +3686 @@
 
     return QString ("%1 %2").arg (number).arg (Suffixes [suffix]);
+}
+
+/* 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;
 }
 

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

@@ -610 +610 @@
     /* public static stuff */
 
+    static bool shouldWarnAboutToLowVRAM(const CMachine *pMachine = 0);
     static bool isDOSType (const QString &aOSTypeId);
 

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

@@ -274 +274 @@
     /* Video RAM amount test */
     quint64 needBytes = VBoxGlobal::requiredVideoMemory (&m_machine, mSlMonitors->value());
-    if ((quint64) mSlMemory->value() * _1M < needBytes)
+    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.")
+                       "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));
     }