Changeset 37051 in vbox

Timestamp:

May 12, 2011 1:48:15 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 4989: Lazy init VM settings dialog: Erase cache before loading data.

Location:

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

Files:

• UISettingsDefs.h (modified) (2 diffs)
• UISettingsPage.h (modified) (1 diff)
• machine/UIMachineSettingsAudio.cpp (modified) (1 diff)
• machine/UIMachineSettingsDisplay.cpp (modified) (1 diff)
• machine/UIMachineSettingsGeneral.cpp (modified) (1 diff)
• machine/UIMachineSettingsNetwork.cpp (modified) (1 diff)
• machine/UIMachineSettingsParallel.cpp (modified) (1 diff)
• machine/UIMachineSettingsSF.cpp (modified) (3 diffs)
• machine/UIMachineSettingsSF.h (modified) (1 diff)
• machine/UIMachineSettingsSerial.cpp (modified) (1 diff)
• machine/UIMachineSettingsStorage.cpp (modified) (4 diffs)
• machine/UIMachineSettingsStorage.h (modified) (1 diff)
• machine/UIMachineSettingsSystem.cpp (modified) (1 diff)
• machine/UIMachineSettingsUSB.cpp (modified) (2 diffs)

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

@@ -83 +83 @@
     void cacheCurrentData(const CacheData &currentData) { m_value.second = currentData; }
 
-    /* Reset the current data to be empty: */
-    void reset() { m_value.second = CacheData(); }
-
     /* Reset the initial and the current data to be both empty: */
     void clear() { m_value.first = CacheData(); m_value.second = CacheData(); }
@@ -141 +138 @@
     }
 
-    /* Reset the current data to be empty.
-     * Perform the same for all the children: */
-    void reset()
-    {
-        UISettingsCache<ParentCacheData>::reset();
-        for (int iChildIndex = 0; iChildIndex < childCount(); ++iChildIndex)
-            child(iChildIndex).reset();
-    }
-
     /* Reset the initial and the current data to be both empty.
-     * Perform the same for all the children: */
+     * Removes all the children: */
     void clear()
     {
         UISettingsCache<ParentCacheData>::clear();
-        for (int iChildIndex = 0; iChildIndex < childCount(); ++iChildIndex)
-            child(iChildIndex).clear();
+        m_children.clear();
     }
 

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

@@ -100 +100 @@
     /* Settings dialog type stuff: */
     SettingsDialogType dialogType() const { return m_dialogType; }
-    virtual void setDialogType(SettingsDialogType settingsDialogType) { m_dialogType = settingsDialogType; }
+    virtual void setDialogType(SettingsDialogType settingsDialogType) { m_dialogType = settingsDialogType; polishPage(); }
     bool isMachineOffline() const { return dialogType() == SettingsDialogType_Offline; }
     bool isMachineSaved() const { return dialogType() == SettingsDialogType_Saved; }

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

@@ -35 +35 @@
     /* Fetch data to machine: */
     UISettingsPageMachine::fetchData(data);
+
+    /* Clear cache initially: */
+    m_cache.clear();
 
     /* Prepare audio data: */

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

@@ -153 +153 @@
     UISettingsPageMachine::fetchData(data);
 
+    /* Clear cache initially: */
+    m_cache.clear();
+
     /* Prepare display data: */
     UIDataSettingsMachineDisplay displayData;

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

@@ -74 +74 @@
     /* Fetch data to machine: */
     UISettingsPageMachine::fetchData(data);
+
+    /* Clear cache initially: */
+    m_cache.clear();
 
     /* Prepare general data: */

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

@@ -748 +748 @@
     /* Fetch data to machine: */
     UISettingsPageMachine::fetchData(data);
+
+    /* Clear cache initially: */
+    m_cache.clear();
 
     /* Cache names lists: */

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

@@ -202 +202 @@
     /* Fetch data to machine: */
     UISettingsPageMachine::fetchData(data);
+
+    /* Clear cache initially: */
+    m_cache.clear();
 
     /* For each parallel port: */

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

@@ -223 +223 @@
     UISettingsPageMachine::fetchData(data);
 
+    /* Clear cache initially: */
+    m_cache.clear();
+
     /* Load machine (permanent) shared folders into shared folders cache if possible: */
     if (isSharedFolderTypeSupported(MachineType))
@@ -269 +272 @@
 void UIMachineSettingsSF::getFromCache()
 {
+    /* Clear list initially: */
+    mTwFolders->clear();
+
     /* Update root items visibility: */
     updateRootItemsVisibility();
@@ -686 +692 @@
 }
 
+void UIMachineSettingsSF::polishPage()
+{
+    /* Update root items visibility: */
+    updateRootItemsVisibility();
+}
+
 CSharedFolderVector UIMachineSettingsSF::getSharedFolders(UISharedFolderType sharedFoldersType)
 {

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

@@ -130 +130 @@
     void setRootItemVisible(UISharedFolderType sharedFolderType, bool fVisible);
 
+    void polishPage();
+
     CSharedFolderVector getSharedFolders(UISharedFolderType sharedFoldersType);
 

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

@@ -236 +236 @@
     /* Fetch data to machine: */
     UISettingsPageMachine::fetchData(data);
+
+    /* Clear cache initially: */
+    m_cache.clear();
 
     /* For each serial port: */

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

@@ -1423 +1423 @@
 {
     m_dialogType = dialogType;
+}
+
+void StorageModel::clear()
+{
+    while (mRootItem->childCount())
+    {
+        beginRemoveRows(root(), 0, 0);
+        delete mRootItem->childByPos(0);
+        endRemoveRows();
+    }
 }
 
@@ -1784 +1794 @@
     UISettingsPageMachine::fetchData(data);
 
+    /* Clear cache initially: */
+    m_cache.clear();
+
     /* Prepare storage data: */
     UIDataSettingsMachineStorage storageData;
@@ -1849 +1862 @@
 void UIMachineSettingsStorage::getFromCache()
 {
+    /* Clear model initially: */
+    mStorageModel->clear();
+
     /* Get storage data from cache: */
     const UIDataSettingsMachineStorage &storageData = m_cache.base();
@@ -3424 +3440 @@
 void UIMachineSettingsStorage::setDialogType(SettingsDialogType settingsDialogType)
 {
+    /* Update 'settings dialog type' of base class: */
     UISettingsPageMachine::setDialogType(settingsDialogType);
+    /* Update model 'settings dialog type': */
     mStorageModel->setDialogType(dialogType());
+    /* Update action states: */
+    updateActionsState();
 }
 

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

@@ -503 +503 @@
     void setChipsetType(KChipsetType type);
 
-    void setDialogType(SettingsDialogType dialogType);
+    void setDialogType(SettingsDialogType settingsDialogType);
+
+    void clear();
 
     QMap<KStorageBus, int> currentControllerTypes() const;

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

@@ -169 +169 @@
     /* Fetch data to machine: */
     UISettingsPageMachine::fetchData(data);
+
+    /* Clear cache initially: */
+    m_cache.clear();
 
     /* Prepare system data: */

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

@@ -152 +152 @@
     /* Fetch data to properties & settings or machine: */
     fetchData(data);
+
+    /* Clear cache initially: */
+    m_cache.clear();
 
     /* Depending on page type: */
@@ -257 +260 @@
 void UIMachineSettingsUSB::getFromCache()
 {
+    /* Clear list initially: */
+    mTwFilters->clear();
+    m_filters.clear();
+
     /* Depending on page type: */
     switch (pageType())