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

Timestamp:

Feb 8, 2017 3:57:18 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Global preferences: Language page: Integrate settings caching.

Location:

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

Files:

• UIGlobalSettingsLanguage.cpp (modified) (6 diffs)
• UIGlobalSettingsLanguage.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp

@@ -181 +181 @@
 UIGlobalSettingsLanguage::UIGlobalSettingsLanguage()
     : m_fPolished(false)
-    , m_fIsLanguageChanged(false)
 {
     /* Apply UI decorations: */
@@ -210 +209 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Load to cache: */
-    m_cache.m_strLanguageId = m_settings.languageId();
+    /* Clear cache initially: */
+    m_cache.clear();
+
+    /* Prepare old data: */
+    UIDataSettingsGlobalLanguage oldData;
+
+    /* Gather old data: */
+    oldData.m_strLanguageId = m_settings.languageId();
+
+    /* Cache old data: */
+    m_cache.cacheInitialData(oldData);
 
     /* Upload properties & settings to data: */
@@ -219 +227 @@
 void UIGlobalSettingsLanguage::getFromCache()
 {
-    /* Fetch from cache: */
-    reload(m_cache.m_strLanguageId);
+    /* Get old data from cache: */
+    const UIDataSettingsGlobalLanguage &oldData = m_cache.base();
+
+    /* Load old data from cache: */
+    reload(oldData.m_strLanguageId);
 }
 
 void UIGlobalSettingsLanguage::putToCache()
 {
-    /* Upload to cache: */
+    /* Prepare new data: */
+    UIDataSettingsGlobalLanguage newData = m_cache.base();
+
+    /* Gather new data: */
     QTreeWidgetItem *pCurrentItem = m_pLanguageTree->currentItem();
     Assert(pCurrentItem);
     if (pCurrentItem)
-        m_cache.m_strLanguageId = pCurrentItem->text(1);
+        newData.m_strLanguageId = pCurrentItem->text(1);
+
+    /* Cache new data: */
+    m_cache.cacheCurrentData(newData);
 }
 
@@ -239 +256 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Save from cache: */
-    if (m_fIsLanguageChanged)
-        m_settings.setLanguageId(m_cache.m_strLanguageId);
+    /* Save new data from cache: */
+    if (m_cache.wasChanged())
+    {
+        /* Save from cache: */
+        if (m_cache.data().m_strLanguageId != m_cache.base().m_strLanguageId)
+            m_settings.setLanguageId(m_cache.data().m_strLanguageId);
+    }
 
     /* Upload properties & settings to data: */
@@ -339 +360 @@
     m_pLanguageTree->sortItems(0, Qt::AscendingOrder);
     m_pLanguageTree->scrollToItem(pItem);
-    m_fIsLanguageChanged = false;
 }
 
@@ -373 +393 @@
                              .arg(tr("Author(s):"))
                              .arg(pItem->text(3)));
-
-    m_fIsLanguageChanged = true;
-}
-
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.h

@@ -24 +24 @@
 
 
-/** Global settings: Language page cache structure. */
-struct UISettingsCacheGlobalLanguage
+/** Global settings: Language page data structure. */
+struct UIDataSettingsGlobalLanguage
 {
+    /** Constructs data. */
+    UIDataSettingsGlobalLanguage()
+        : m_strLanguageId(QString())
+    {}
+
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool equal(const UIDataSettingsGlobalLanguage &other) const
+    {
+        return true
+               && (m_strLanguageId == other.m_strLanguageId)
+               ;
+    }
+
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool operator==(const UIDataSettingsGlobalLanguage &other) const { return equal(other); }
+    /** Returns whether the @a other passed data is different from this one. */
+    bool operator!=(const UIDataSettingsGlobalLanguage &other) const { return !equal(other); }
+
     /** Holds the current language id. */
     QString m_strLanguageId;
 };
+typedef UISettingsCache<UIDataSettingsGlobalLanguage> UISettingsCacheGlobalLanguage;
 
 
@@ -83 +102 @@
     /* Variables: */
     bool m_fPolished;
-    bool m_fIsLanguageChanged;
 
     /* Cache: */