Changeset 36920 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 3, 2011 7:06:48 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 4989: UISettingsCache template integrated into Display page.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsDisplay.cpp (modified) (4 diffs)
• UIMachineSettingsDisplay.h (modified) (2 diffs)

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

@@ -153 +153 @@
     UISettingsPageMachine::fetchData(data);
 
-    /* Fill internal variables with corresponding values: */
-    m_cache.m_iCurrentVRAM = m_machine.GetVRAMSize();
-    m_cache.m_cMonitorCount = m_machine.GetMonitorCount();
-    m_cache.m_f3dAccelerationEnabled = m_machine.GetAccelerate3DEnabled();
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    m_cache.m_f2dAccelerationEnabled = m_machine.GetAccelerate2DVideoEnabled();
-#endif
+    /* Prepare display data: */
+    UIDataSettingsMachineDisplay displayData;
+
+    /* Gather display data: */
+    displayData.m_iCurrentVRAM = m_machine.GetVRAMSize();
+    displayData.m_cMonitorCount = m_machine.GetMonitorCount();
+    displayData.m_f3dAccelerationEnabled = m_machine.GetAccelerate3DEnabled();
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    displayData.m_f2dAccelerationEnabled = m_machine.GetAccelerate2DVideoEnabled();
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+    /* Check if VRDE server is valid: */
     CVRDEServer vrdeServer = m_machine.GetVRDEServer();
-    m_cache.m_fVRDEServerSupported = !vrdeServer.isNull();
-    m_cache.m_fVRDEServerEnabled = m_cache.m_fVRDEServerSupported && vrdeServer.GetEnabled();
-    m_cache.m_strVRDEPort = vrdeServer.GetVRDEProperty("TCP/Ports");
-    m_cache.m_iVRDEAuthType = vrdeServer.GetAuthType();
-    m_cache.m_uVRDETimeout = vrdeServer.GetAuthTimeout();
-    m_cache.m_fMultipleConnectionsAllowed = vrdeServer.GetAllowMultiConnection();
-
-    /* Other variables: */
-    m_initialVRAM = RT_MIN(m_cache.m_iCurrentVRAM, m_maxVRAM);
+    displayData.m_fVRDEServerSupported = !vrdeServer.isNull();
+    if (!vrdeServer.isNull())
+    {
+        displayData.m_fVRDEServerEnabled = vrdeServer.GetEnabled();
+        displayData.m_strVRDEPort = vrdeServer.GetVRDEProperty("TCP/Ports");
+        displayData.m_VRDEAuthType = vrdeServer.GetAuthType();
+        displayData.m_uVRDETimeout = vrdeServer.GetAuthTimeout();
+        displayData.m_fMultipleConnectionsAllowed = vrdeServer.GetAllowMultiConnection();
+    }
+
+    /* Initialize other variables: */
+    m_initialVRAM = RT_MIN(displayData.m_iCurrentVRAM, m_maxVRAM);
+
+    /* Cache display data: */
+    m_cache.cacheInitialData(displayData);
 
     /* Upload machine to data: */
@@ -179 +189 @@
 void UIMachineSettingsDisplay::getFromCache()
 {
-    /* Apply internal variables data to QWidget(s): */
-    mSlMonitors->setValue(m_cache.m_cMonitorCount);
+    /* Get display data from cache: */
+    const UIDataSettingsMachineDisplay &displayData = m_cache.base();
+
+    /* Load display data to page: */
+    mSlMonitors->setValue(displayData.m_cMonitorCount);
     mCb3D->setEnabled(vboxGlobal().virtualBox().GetHost().GetAcceleration3DAvailable());
-    mCb3D->setChecked(m_cache.m_f3dAccelerationEnabled);
+    mCb3D->setChecked(displayData.m_f3dAccelerationEnabled);
 #ifdef VBOX_WITH_VIDEOHWACCEL
     mCb2DVideo->setEnabled(VBoxGlobal::isAcceleration2DVideoAvailable());
-    mCb2DVideo->setChecked(m_cache.m_f2dAccelerationEnabled);
-#endif
+    mCb2DVideo->setChecked(displayData.m_f2dAccelerationEnabled);
+#endif /* VBOX_WITH_VIDEOHWACCEL */
     checkVRAMRequirements();
-    mSlMemory->setValue(m_cache.m_iCurrentVRAM);
-    if (m_cache.m_fVRDEServerSupported)
-    {
-        mCbVRDE->setChecked(m_cache.m_fVRDEServerEnabled);
-        mLeVRDEPort->setText(m_cache.m_strVRDEPort);
-        mCbVRDEMethod->setCurrentIndex(mCbVRDEMethod->findText(vboxGlobal().toString(m_cache.m_iVRDEAuthType)));
-        mLeVRDETimeout->setText(QString::number(m_cache.m_uVRDETimeout));
-        mCbMultipleConn->setChecked(m_cache.m_fMultipleConnectionsAllowed);
+    mSlMemory->setValue(displayData.m_iCurrentVRAM);
+    if (displayData.m_fVRDEServerSupported)
+    {
+        mCbVRDE->setChecked(displayData.m_fVRDEServerEnabled);
+        mLeVRDEPort->setText(displayData.m_strVRDEPort);
+        mCbVRDEMethod->setCurrentIndex(mCbVRDEMethod->findText(vboxGlobal().toString(displayData.m_VRDEAuthType)));
+        mLeVRDETimeout->setText(QString::number(displayData.m_uVRDETimeout));
+        mCbMultipleConn->setChecked(displayData.m_fMultipleConnectionsAllowed);
     }
     else
@@ -208 +221 @@
 void UIMachineSettingsDisplay::putToCache()
 {
-    /* Gather internal variables data from QWidget(s): */
-    m_cache.m_iCurrentVRAM = mSlMemory->value();
-    m_cache.m_cMonitorCount = mSlMonitors->value();
-    m_cache.m_f3dAccelerationEnabled = mCb3D->isChecked();
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    m_cache.m_f2dAccelerationEnabled = mCb2DVideo->isChecked();
-#endif
-    if (m_cache.m_fVRDEServerSupported)
-    {
-        m_cache.m_fVRDEServerEnabled = mCbVRDE->isChecked();
-        m_cache.m_strVRDEPort = mLeVRDEPort->text();
-        m_cache.m_iVRDEAuthType = vboxGlobal().toAuthType(mCbVRDEMethod->currentText());
-        m_cache.m_uVRDETimeout = mLeVRDETimeout->text().toULong();
-        m_cache.m_fMultipleConnectionsAllowed = mCbMultipleConn->isChecked();
-    }
+    /* Prepare audio data: */
+    UIDataSettingsMachineDisplay displayData = m_cache.base();
+
+    /* Gather display data: */
+    displayData.m_iCurrentVRAM = mSlMemory->value();
+    displayData.m_cMonitorCount = mSlMonitors->value();
+    displayData.m_f3dAccelerationEnabled = mCb3D->isChecked();
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    displayData.m_f2dAccelerationEnabled = mCb2DVideo->isChecked();
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+    if (displayData.m_fVRDEServerSupported)
+    {
+        displayData.m_fVRDEServerEnabled = mCbVRDE->isChecked();
+        displayData.m_strVRDEPort = mLeVRDEPort->text();
+        displayData.m_VRDEAuthType = vboxGlobal().toAuthType(mCbVRDEMethod->currentText());
+        displayData.m_uVRDETimeout = mLeVRDETimeout->text().toULong();
+        displayData.m_fMultipleConnectionsAllowed = mCbMultipleConn->isChecked();
+    }
+
+    /* Cache display data: */
+    m_cache.cacheCurrentData(displayData);
 }
 
@@ -232 +251 @@
     UISettingsPageMachine::fetchData(data);
 
-    if (isMachineOffline())
-    {
-        /* Video tab: */
-        m_machine.SetVRAMSize(m_cache.m_iCurrentVRAM);
-        m_machine.SetMonitorCount(m_cache.m_cMonitorCount);
-        m_machine.SetAccelerate3DEnabled(m_cache.m_f3dAccelerationEnabled);
-#ifdef VBOX_WITH_VIDEOHWACCEL
-        m_machine.SetAccelerate2DVideoEnabled(m_cache.m_f2dAccelerationEnabled);
+    /* Check if display data was changed: */
+    if (m_cache.wasChanged())
+    {
+        /* Get display data from cache: */
+        const UIDataSettingsMachineDisplay &displayData = m_cache.data();
+
+        /* Store display data: */
+        if (isMachineOffline())
+        {
+            /* Video tab: */
+            m_machine.SetVRAMSize(displayData.m_iCurrentVRAM);
+            m_machine.SetMonitorCount(displayData.m_cMonitorCount);
+            m_machine.SetAccelerate3DEnabled(displayData.m_f3dAccelerationEnabled);
+#ifdef VBOX_WITH_VIDEOHWACCEL
+            m_machine.SetAccelerate2DVideoEnabled(displayData.m_f2dAccelerationEnabled);
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-    }
-    /* VRDE tab: */
-    CVRDEServer vrdeServer = m_machine.GetVRDEServer();
-    if (!vrdeServer.isNull())
-    {
-        if (isMachineInValidMode())
+        }
+        /* Check if VRDE server still valid: */
+        CVRDEServer vrdeServer = m_machine.GetVRDEServer();
+        if (!vrdeServer.isNull())
         {
-            vrdeServer.SetEnabled(m_cache.m_fVRDEServerEnabled);
-            vrdeServer.SetVRDEProperty("TCP/Ports", m_cache.m_strVRDEPort);
-            vrdeServer.SetAuthType(m_cache.m_iVRDEAuthType);
-            vrdeServer.SetAuthTimeout(m_cache.m_uVRDETimeout);
-        }
-        if (isMachineOffline() || isMachineSaved())
-        {
-            vrdeServer.SetAllowMultiConnection(m_cache.m_fMultipleConnectionsAllowed);
+            /* Store VRDE data: */
+            if (isMachineInValidMode())
+            {
+                vrdeServer.SetEnabled(displayData.m_fVRDEServerEnabled);
+                vrdeServer.SetVRDEProperty("TCP/Ports", displayData.m_strVRDEPort);
+                vrdeServer.SetAuthType(displayData.m_VRDEAuthType);
+                vrdeServer.SetAuthTimeout(displayData.m_uVRDETimeout);
+            }
+            if (isMachineOffline() || isMachineSaved())
+            {
+                vrdeServer.SetAllowMultiConnection(displayData.m_fMultipleConnectionsAllowed);
+            }
         }
     }

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

@@ -24 +24 @@
 #include "UIMachineSettingsDisplay.gen.h"
 
-/* Machine settings / Display page / Cache: */
-struct UISettingsCacheMachineDisplay
+/* Machine settings / Display page / Data: */
+struct UIDataSettingsMachineDisplay
 {
+    /* Default constructor: */
+    UIDataSettingsMachineDisplay()
+        : m_iCurrentVRAM(0)
+        , m_cMonitorCount(0)
+        , m_f3dAccelerationEnabled(false)
+#ifdef VBOX_WITH_VIDEOHWACCEL
+        , m_f2dAccelerationEnabled(false)
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+        , m_fVRDEServerSupported(false)
+        , m_fVRDEServerEnabled(false)
+        , m_strVRDEPort(QString())
+        , m_VRDEAuthType(KAuthType_Null)
+        , m_uVRDETimeout(0)
+        , m_fMultipleConnectionsAllowed(false) {}
+    /* Functions: */
+    bool equal(const UIDataSettingsMachineDisplay &other) const
+    {
+        return (m_iCurrentVRAM == other.m_iCurrentVRAM) &&
+               (m_cMonitorCount == other.m_cMonitorCount) &&
+               (m_f3dAccelerationEnabled == other.m_f3dAccelerationEnabled) &&
+#ifdef VBOX_WITH_VIDEOHWACCEL
+               (m_f2dAccelerationEnabled == other.m_f2dAccelerationEnabled) &&
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+               (m_fVRDEServerSupported == other.m_fVRDEServerSupported) &&
+               (m_fVRDEServerEnabled == other.m_fVRDEServerEnabled) &&
+               (m_strVRDEPort == other.m_strVRDEPort) &&
+               (m_VRDEAuthType == other.m_VRDEAuthType) &&
+               (m_uVRDETimeout == other.m_uVRDETimeout) &&
+               (m_fMultipleConnectionsAllowed == other.m_fMultipleConnectionsAllowed);
+    }
+    /* Operators: */
+    bool operator==(const UIDataSettingsMachineDisplay &other) const { return equal(other); }
+    bool operator!=(const UIDataSettingsMachineDisplay &other) const { return !equal(other); }
+    /* Variables: */
     int m_iCurrentVRAM;
     int m_cMonitorCount;
     bool m_f3dAccelerationEnabled;
+#ifdef VBOX_WITH_VIDEOHWACCEL
     bool m_f2dAccelerationEnabled;
+#endif /* VBOX_WITH_VIDEOHWACCEL */
     bool m_fVRDEServerSupported;
     bool m_fVRDEServerEnabled;
     QString m_strVRDEPort;
-    KAuthType m_iVRDEAuthType;
+    KAuthType m_VRDEAuthType;
     ulong m_uVRDETimeout;
     bool m_fMultipleConnectionsAllowed;
 };
+typedef UISettingsCache<UIDataSettingsMachineDisplay> UICacheSettingsMachineDisplay;
 
 /* Machine settings / Display page: */
@@ -110 +147 @@
 
     /* Cache: */
-    UISettingsCacheMachineDisplay m_cache;
+    UICacheSettingsMachineDisplay m_cache;
 };