Changeset 28178 in vbox

Timestamp:

Apr 12, 2010 8:20:25 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Introduce a soft limit to save careless users from assigning the maximum value for VRAM to a VM. That value depends on the number of virtual monitors.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm

Files:

• VBoxVMSettingsDisplay.cpp (modified) (7 diffs)
• VBoxVMSettingsDisplay.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.cpp

@@ -56 +56 @@
     m_minVRAM = sys.GetMinGuestVRAM();
     m_maxVRAM = sys.GetMaxGuestVRAM();
+    m_maxVRAMVisible = m_maxVRAM;
     const uint MinMonitors = 1;
     const uint MaxMonitors = sys.GetMaxGuestMonitors();
 
     /* Setup validators */
-    mLeMemory->setValidator (new QIntValidator (m_minVRAM, m_maxVRAM, this));
+    mLeMemory->setValidator (new QIntValidator (m_minVRAM, m_maxVRAMVisible, this));
     mLeMonitors->setValidator (new QIntValidator (MinMonitors, MaxMonitors, this));
     mLeVRDPPort->setValidator (new QRegExpValidator (QRegExp ("(([0-9]{1,5}(\\-[0-9]{1,5}){0,1}),)*([0-9]{1,5}(\\-[0-9]{1,5}){0,1})"), this));
@@ -72 +73 @@
 
     /* Setup initial values */
-    mSlMemory->setPageStep (calcPageStep (m_maxVRAM));
+    mSlMemory->setPageStep (calcPageStep (m_maxVRAMVisible));
     mSlMemory->setSingleStep (mSlMemory->pageStep() / 4);
     mSlMemory->setTickInterval (mSlMemory->pageStep());
@@ -80 +81 @@
     /* Setup the scale so that ticks are at page step boundaries */
     mSlMemory->setMinimum ((m_minVRAM / mSlMemory->pageStep()) * mSlMemory->pageStep());
-    mSlMemory->setMaximum (m_maxVRAM);
+    mSlMemory->setMaximum (m_maxVRAMVisible);
     mSlMemory->setSnappingEnabled (true);
     quint64 needMBytes = VBoxGlobal::requiredVideoMemory (&mMachine) / _1M;
     mSlMemory->setErrorHint (0, 1);
     mSlMemory->setWarningHint (1, needMBytes);
-    mSlMemory->setOptimalHint (needMBytes, m_maxVRAM);
+    mSlMemory->setOptimalHint (needMBytes, m_maxVRAMVisible);
     mSlMonitors->setMinimum (MinMonitors);
     mSlMonitors->setMaximum (MaxMonitors);
@@ -123 +124 @@
     mMachine = aMachine;
 
+    int currentSize = mMachine.GetVRAMSize();
+    m_initialVRAM = RT_MIN(currentSize, m_maxVRAM);
+
+    /* must come _before_ setting the initial memory value */
+    checkMultiMonitorReqs();
+
     /* Memory Size */
-    mSlMemory->setValue (mMachine.GetVRAMSize());
+    mSlMemory->setValue (currentSize);
 
     /* Monitors Count */
@@ -155 +162 @@
         mTwDisplay->setTabEnabled (1, false);
     }
-
-    checkMultiMonitorReqs();
 }
 
@@ -262 +267 @@
 
     CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
-    mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (sys.GetMinGuestVRAM()));
-    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (sys.GetMaxGuestVRAM()));
+    mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (m_minVRAM));
+    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (m_maxVRAMVisible));
     mLbMonitorsMin->setText (tr ("<qt>%1</qt>").arg (1));
     mLbMonitorsMax->setText (tr ("<qt>%1</qt>").arg (sys.GetMaxGuestMonitors()));
@@ -316 +321 @@
     /* The memory requirements have changed too. */
     quint64 needMBytes = VBoxGlobal::requiredVideoMemory (&mMachine, cVal) / _1M;
+    /* Limit the maximum memory to save careless users from setting useless big values */
+    m_maxVRAMVisible = 128 + (cVal - 1) * 32;
+    if (m_maxVRAMVisible < m_initialVRAM)
+        m_maxVRAMVisible = m_initialVRAM;
     mSlMemory->setWarningHint (1, needMBytes);
-    mSlMemory->setOptimalHint (needMBytes, m_maxVRAM);
-}
-
+    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()? */
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.h

@@ -67 +67 @@
     QIWidgetValidator *mValidator;
 
+    /* System minimum lower limit of VRAM (MB). */
     int m_minVRAM;
+    /* System maximum limit of VRAM (MB). */
     int m_maxVRAM;
+    /* Upper limit of VRAM in MB for this dialog. This value is lower than
+     * m_maxVRAM to save careless users from setting useless big values. */
+    int m_maxVRAMVisible;
+    /* Initial VRAM value when the dialog is opened. */
+    int m_initialVRAM;
 };