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

Timestamp:

Jul 9, 2024 3:09:33 PM (10 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163888

Message:

FE/Qt: NLS stuff: Make sure indicator pool tags are properly distributed across existing contexts; Sync generator code as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (8 diffs)
• runtime/UIIndicatorsPool.cpp (modified) (4 diffs)

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

@@ -1361 +1361 @@
             /* Append adapter data: */
             strInfo += e_strTableRow1
-                .arg(QApplication::translate("UIIndicatorsPool", "Adapter %1 (%2)", "Network tooltip")
+                .arg(QApplication::translate("UIIndicatorNetwork", "Adapter %1 (%2)")
                         .arg(uSlot + 1).arg(gpConverter->toString(comAdapter.GetAttachmentType())));
             if (!strGuestIp.isEmpty())
                 strInfo += e_strTableRow3
-                    .arg(QApplication::translate("UIIndicatorsPool", "IP", "Network tooltip"), strGuestIp);
+                    .arg(QApplication::translate("UIIndicatorNetwork", "IP"), strGuestIp);
             strInfo += e_strTableRow3
-                .arg(QApplication::translate("UIIndicatorsPool", "Cable", "Network tooltip"))
+                .arg(QApplication::translate("UIIndicatorNetwork", "Cable"))
                 .arg(fCableConnected ?
-                     QApplication::translate("UIIndicatorsPool", "Connected", "cable (Network tooltip)") :
-                     QApplication::translate("UIIndicatorsPool", "Disconnected", "cable (Network tooltip)"));
+                     QApplication::translate("UIIndicatorNetwork", "Connected", "cable") :
+                     QApplication::translate("UIIndicatorNetwork", "Disconnected", "cable"));
         }
     }
@@ -1393 +1393 @@
         if (strInfo.isNull())
             strInfo = e_strTableRow1
-                .arg(QApplication::translate("UIIndicatorsPool", "No USB devices attached", "USB tooltip"));
+                .arg(QApplication::translate("UIIndicatorUSB", "No USB devices attached"));
     }
 }
@@ -1421 +1421 @@
     if (!fFoldersPresent)
         strInfo = e_strTableRow1
-            .arg(QApplication::translate("UIIndicatorsPool", "No shared folders", "Shared folders tooltip"));
+            .arg(QApplication::translate("UIIndicatorSharedFolders", "No shared folders"));
 }
 
@@ -1434 +1434 @@
     const QString strVRAMSize = QApplication::translate("UICommon", "<nobr>%1 MB</nobr>", "details report").arg(uVRAMSize);
     strInfo += e_strTableRow2
-        .arg(QApplication::translate("UIIndicatorsPool", "Video memory", "Display tooltip"), strVRAMSize);
+        .arg(QApplication::translate("UIIndicatorDisplay", "Video memory"), strVRAMSize);
 
     /* Monitor Count: */
@@ -1442 +1442 @@
         const QString strMonitorCount = QString::number(uMonitorCount);
         strInfo += e_strTableRow2
-            .arg(QApplication::translate("UIIndicatorsPool", "Screens", "Display tooltip"), strMonitorCount);
+            .arg(QApplication::translate("UIIndicatorDisplay", "Screens"), strMonitorCount);
     }
 
@@ -1453 +1453 @@
             : QApplication::translate("UICommon", "Disabled", "details report (3D Acceleration)");
         strInfo += e_strTableRow2
-            .arg(QApplication::translate("UIIndicatorsPool", "3D acceleration", "Display tooltip"), strAcceleration3D);
+            .arg(QApplication::translate("UIIndicatorDisplay", "3D acceleration"), strAcceleration3D);
     }
 }
@@ -1473 +1473 @@
         QString strToolTip;
         if (fVideoEnabled && fAudioEnabled)
-            strToolTip = QApplication::translate("UIIndicatorsPool", "Video/audio recording file", "Recording tooltip");
+            strToolTip = QApplication::translate("UIIndicatorRecording", "Video/audio recording file");
         else if (fAudioEnabled)
-            strToolTip = QApplication::translate("UIIndicatorsPool", "Audio recording file", "Recording tooltip");
+            strToolTip = QApplication::translate("UIIndicatorRecording", "Audio recording file");
         else if (fVideoEnabled)
-            strToolTip = QApplication::translate("UIIndicatorsPool", "Video recording file", "Recording tooltip");
+            strToolTip = QApplication::translate("UIIndicatorRecording", "Video recording file");
         strInfo += e_strTableRow2
             .arg(strToolTip)
@@ -1486 +1486 @@
     {
         strInfo += e_strTableRow1
-            .arg(QApplication::translate("UIIndicatorsPool", "Recording disabled", "Recording tooltip"));
+            .arg(QApplication::translate("UIIndicatorRecording", "Recording disabled"));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -27 +27 @@
 
 /* Qt includes: */
-#include <QApplication>
 #include <QAccessibleWidget>
 #include <QHBoxLayout>
@@ -1040 +1039 @@
     virtual void updateAppearance() RT_OVERRIDE
     {
-        const QString strToolTip = QApplication::translate("UIIndicatorsPool",
-                                                           "Indicates whether the host mouse pointer is "
-                                                           "captured by the guest OS:%1", "Mouse tooltip");
+        const QString strToolTip = tr("Indicates whether the host mouse pointer is "
+                                      "captured by the guest OS:%1", "Mouse tooltip");
         QString strFullData;
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/mouse_disabled_16px.png/>"))
-            .arg(QApplication::translate("UIIndicatorsPool", "pointer is not captured", "Mouse tooltip"));
+            .arg(tr("pointer is not captured", "Mouse tooltip"));
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/mouse_16px.png/>"))
-            .arg(QApplication::translate("UIIndicatorsPool", "pointer is captured", "Mouse tooltip"));
+            .arg(tr("pointer is captured", "Mouse tooltip"));
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/mouse_seamless_16px.png/>"))
-            .arg(QApplication::translate("UIIndicatorsPool", "mouse integration (MI) is On", "Mouse tooltip"));
+            .arg(tr("mouse integration (MI) is On", "Mouse tooltip"));
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/mouse_can_seamless_16px.png/>"))
-            .arg(QApplication::translate("UIIndicatorsPool", "MI is Off, pointer is captured", "Mouse tooltip"));
+            .arg(tr("MI is Off, pointer is captured", "Mouse tooltip"));
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/mouse_can_seamless_uncaptured_16px.png/>"))
-            .arg(QApplication::translate("UIIndicatorsPool", "MI is Off, pointer is not captured", "Mouse tooltip"));
+            .arg(tr("MI is Off, pointer is not captured", "Mouse tooltip"));
         strFullData = s_strTable.arg(strFullData);
-        strFullData += QApplication::translate("UIIndicatorsPool",
-                                               "Note that the mouse integration feature requires Guest "
-                                               "Additions to be installed in the guest OS.", "Mouse tooltip");
+        strFullData += tr("Note that the mouse integration feature requires Guest "
+                          "Additions to be installed in the guest OS.", "Mouse tooltip");
 
         /* Update tool-tip: */
@@ -1122 +1119 @@
     virtual void updateAppearance() RT_OVERRIDE
     {
-        const QString strToolTip = QApplication::translate("UIIndicatorsPool",
-                                                           "Indicates whether the host keyboard is "
-                                                           "captured by the guest OS:%1", "Keyboard tooltip");
+        const QString strToolTip = tr("Indicates whether the host keyboard is "
+                                      "captured by the guest OS:%1", "Keyboard tooltip");
         QString strFullData;
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/hostkey_16px.png/>"))
-            .arg(QApplication::translate("UIIndicatorsPool", "keyboard is not captured", "Keyboard tooltip"));
+            .arg(tr("keyboard is not captured", "Keyboard tooltip"));
         strFullData += s_strTableRow3
             .arg(QString("<img src=:/hostkey_captured_16px.png/>"))
-            .arg(QApplication::translate("UIIndicatorsPool", "keyboard is captured", "Keyboard tooltip"));
+            .arg(tr("keyboard is captured", "Keyboard tooltip"));
         strFullData = s_strTable.arg(strFullData);
 
@@ -1176 +1172 @@
     void sltRetranslateUI()
     {
-        setToolTip(QApplication::translate("UIMachineWindowNormal",
-                                           "Shows the currently assigned Host key.<br>"
-                                           "This key, when pressed alone, toggles the keyboard and mouse "
-                                           "capture state. It can also be used in combination with other keys "
-                                           "to quickly perform actions from the main menu."));
+        setToolTip(tr("Shows the currently assigned Host key.<br>"
+                      "This key, when pressed alone, toggles the keyboard and mouse "
+                      "capture state. It can also be used in combination with other keys "
+                      "to quickly perform actions from the main menu."));
     }
 };