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

Timestamp:

Aug 27, 2018 2:35:32 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8472. Don't re-enumerate the medium tree when just retranslation would suffice

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumEnumerator.cpp (modified) (2 diffs)
• medium/UIMediumEnumerator.h (modified) (2 diffs)

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

@@ -2445 +2445 @@
 }
 
+void VBoxGlobal::refreshMediums()
+{
+    /* Make sure VBoxGlobal is already valid: */
+    AssertReturnVoid(m_fValid);
+
+    /* Make sure medium-enumerator is already created: */
+    if (!m_pMediumEnumerator)
+        return;
+
+    /* Make sure enumeration is not already started: */
+    if (isMediumEnumerationInProgress())
+        return;
+
+    /* Ignore the request during VBoxGlobal cleanup: */
+    if (s_fCleaningUp)
+        return;
+
+    /* If asked to restore snapshot, don't do this till *after* we're done
+     * restoring or the code with have a heart attack. */
+    if (shouldRestoreCurrentSnapshot())
+        return;
+
+    /* We assume it's safe to call it without locking,
+     * since we are performing blocking operation here. */
+    m_pMediumEnumerator->refreshMediums();
+}
+
 bool VBoxGlobal::isMediumEnumerationInProgress() const
 {
@@ -3684 +3711 @@
     /* Re-enumerate uimedium since they contain some translations too: */
     if (m_fValid)
-        startMediumEnumeration();
+        refreshMediums();
 
 #ifdef VBOX_WS_X11

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

@@ -478 +478 @@
         /** Starts medium enumeration. */
         void startMediumEnumeration();
+        /** Calls refresh for each medium which has been already enumerated. */
+        void refreshMediums();
         /** Returns whether medium enumeration is in progress. */
         bool isMediumEnumerationInProgress() const;

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -172 +172 @@
         if (!strMediumID.isNull() && strMediumID != UIMedium::nullID())
             createMediumEnumerationTask(m_mediums[strMediumID]);
+}
+
+void UIMediumEnumerator::refreshMediums()
+{
+    /* Make sure we are not already in progress: */
+    AssertReturnVoid(!m_fMediumEnumerationInProgress);
+
+    /* Refresh all known media we have: */
+    foreach (const QString &strMediumID, m_mediums.keys())
+        m_mediums[strMediumID].refresh();
 }
 
@@ -579 +589 @@
 
 #include "UIMediumEnumerator.moc"
-

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -66 +66 @@
     bool isMediumEnumerationInProgress() const { return m_fMediumEnumerationInProgress; }
     void enumerateMediums();
+    void refreshMediums();
 
 private slots:
@@ -105 +106 @@
 
 #endif /* !___UIMediumEnumerator_h___ */
-