Changeset 96487 in vbox

Timestamp:

Aug 25, 2022 11:37:31 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager / Chooser pane: Missed machine-items state translation for on language change.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualMachineItemCloud.cpp (modified) (6 diffs)
• UIVirtualMachineItemLocal.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.cpp

@@ -211 +211 @@
             /* Determine VM states: */
             m_enmMachineState = KCloudMachineState_Stopped;
-            m_strMachineStateName = gpConverter->toString(m_enmMachineState);
             switch (m_enmFakeCloudItemState)
             {
@@ -250 +249 @@
             /* Determine VM states: */
             m_enmMachineState = m_fAccessible ? m_comCloudMachine.GetState() : KCloudMachineState_Stopped;
-            m_strMachineStateName = gpConverter->toString(m_enmMachineState);
             m_machineStateIcon = gpConverter->toIcon(m_enmMachineState);
 
@@ -351 +349 @@
         if (itemType() == UIVirtualMachineItemType_CloudFake)
         {
-            /* Update machine/state name: */
+            /* Update fake machine state name: */
             switch (m_enmFakeCloudItemState)
             {
@@ -369 +367 @@
         else
         {
+            /* Update real machine state name: */
+            m_strMachineStateName = gpConverter->toString(m_enmMachineState);
+
             /* Update tool-tip: */
             m_strToolTipText = QString("<nobr><b>%1</b></nobr><br>"
@@ -379 +380 @@
     else
     {
+        /* We have our own translation for Null states: */
+        m_strMachineStateName = tr("Inaccessible", "VM");
+
         /* Update tool-tip: */
         m_strToolTipText = tr("<nobr><b>%1</b></nobr><br>"
@@ -384 +388 @@
                               "Inaccessible VM tooltip (name)")
                               .arg(m_strName);
-
-        /* We have our own translation for Null states: */
-        m_strMachineStateName = tr("Inaccessible", "VM");
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemLocal.cpp

@@ -94 +94 @@
         /* Determine VM states: */
         m_enmMachineState = m_comMachine.GetState();
-        m_strMachineStateName = gpConverter->toString(m_enmMachineState);
         m_machineStateIcon = gpConverter->toIcon(m_enmMachineState);
         m_enmSessionState = m_comMachine.GetSessionState();
-        m_strSessionStateName = gpConverter->toString(m_enmSessionState);
 
         /* Determine configuration access level: */
@@ -281 +279 @@
     if (m_fAccessible)
     {
+        /* Just use the usual translation for valid states: */
+        m_strMachineStateName = gpConverter->toString(m_enmMachineState);
+        m_strSessionStateName = gpConverter->toString(m_enmSessionState);
+
         /* Update tool-tip: */
         m_strToolTipText = QString("<b>%1</b>").arg(m_strName);
@@ -297 +299 @@
     else
     {
+        /* We have our own translation for Null states: */
+        m_strMachineStateName = tr("Inaccessible");
+        m_strSessionStateName = tr("Inaccessible");
+
         /* Update tool-tip: */
         m_strToolTipText = tr("<nobr><b>%1</b><br></nobr>"
@@ -303 +309 @@
                               .arg(m_strSettingsFile)
                               .arg(strDateTime);
-
-        /* We have our own translation for Null states: */
-        m_strMachineStateName = tr("Inaccessible");
-        m_strSessionStateName = tr("Inaccessible");
-    }
-}
+    }
+}