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

Timestamp:

Nov 22, 2018 12:47:42 PM (6 years ago)

Author:

vboxsync

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

126854

Message:

FE/Qt: bugref:6699. Some translation work

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIGuestControlFileTable.cpp (modified) (6 diffs)
• UIGuestFileTable.cpp (modified) (5 diffs)
• UIHostFileTable.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp

@@ -428 +428 @@
     QString detailsString(m_strProperty);
     detailsString += "<br/>";
-    detailsString += "<b>Total Size:</b> " + QString::number(directoryStatistics.m_totalSize) + QString(" bytes");
+    detailsString += "<b>" + UIGuestControlFileManager::tr("Total Size") + "</b> " +
+        QString::number(directoryStatistics.m_totalSize) + UIGuestControlFileManager::tr(" bytes");
     if (directoryStatistics.m_totalSize >= UIGuestControlFileTable::m_iKiloByte)
         detailsString += " (" + UIGuestControlFileTable::humanReadableSize(directoryStatistics.m_totalSize) + ")";
     detailsString += "<br/>";
 
-    detailsString += "<b>File Count:</b> " + QString::number(directoryStatistics.m_uFileCount);
+    detailsString += "<b>" + UIGuestControlFileManager::tr("File Count") + ":</b> " +
+        QString::number(directoryStatistics.m_uFileCount);
 
     m_pInfoEdit->setHtml(detailsString);
-
-}
+}
+
 
 /*********************************************************************************************************************************
-*   UIDirectoryStatistics implementation.
-                                                                                        *
+*   UIDirectoryStatistics implementation.                                                                                        *
 *********************************************************************************************************************************/
 
@@ -479 +480 @@
         return;
     m_childItems.append(item);
-
     m_childMap.insert(item->name(), item);
 }
@@ -662 +662 @@
         pLayout->addWidget(m_pAskNextTimeCheckBox);
         m_pAskNextTimeCheckBox->setText(UIGuestControlFileManager::tr("Ask for this confirmation next time"));
+        m_pAskNextTimeCheckBox->setToolTip(UIGuestControlFileManager::tr("Delete confirmation can be "
+                                                                         "disabled/enabled also from the Options panel."));
     }
 }
@@ -830 +832 @@
     QVector<QVariant> headData;
     headData.resize(UIGuestControlFileModelColumn_Max);
-    headData[UIGuestControlFileModelColumn_Name] = "Name";
-    headData[UIGuestControlFileModelColumn_Size] = "Size";
-    headData[UIGuestControlFileModelColumn_ChangeTime] = "Change Time";
-    headData[UIGuestControlFileModelColumn_Owner] = "Owner";
-    headData[UIGuestControlFileModelColumn_Permissions] = "Permissions";
     m_pRootItem = new UIFileTableItem(headData, 0, FileObjectType_Directory);
     UIFileTableItem* startItem = new UIFileTableItem(createTreeItemData(startPath, 4096, QDateTime(),
@@ -1253 +1250 @@
 void UIGuestControlFileTable::retranslateUi()
 {
+    if (m_pRootItem)
+    {
+        m_pRootItem->setData(UIGuestControlFileManager::tr("Name"), UIGuestControlFileModelColumn_Name);
+        m_pRootItem->setData(UIGuestControlFileManager::tr("Size"), UIGuestControlFileModelColumn_Size);
+        m_pRootItem->setData(UIGuestControlFileManager::tr("Change Time"), UIGuestControlFileModelColumn_ChangeTime);
+        m_pRootItem->setData(UIGuestControlFileManager::tr("Owner"), UIGuestControlFileModelColumn_Owner);
+        m_pRootItem->setData(UIGuestControlFileManager::tr("Permissions"), UIGuestControlFileModelColumn_Permissions);
+    }
 }
 
@@ -1397 +1402 @@
 QString UIGuestControlFileTable::fileTypeString(FileObjectType type)
 {
-    QString strType("Unknown");
+    QString strType = UIGuestControlFileManager::tr("Unknown");
     switch(type)
     {
         case FileObjectType_File:
-            strType = "File";
+            strType = UIGuestControlFileManager::tr("File");
             break;
         case FileObjectType_Directory:
-            strType = "Directory";
+            strType = UIGuestControlFileManager::tr("Directory");
             break;
         case FileObjectType_SymLink:
-            strType = "Symbolic Link";
+            strType = UIGuestControlFileManager::tr("Symbolic Link");
             break;
         case FileObjectType_Other:
-            strType = "Other";
+            strType = UIGuestControlFileManager::tr("Other");
             break;
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp

@@ -29 +29 @@
 # include "UIActionPool.h"
 # include "UIErrorString.h"
+# include "UIGuestControlFileManager.h"
 # include "UIGuestFileTable.h"
 # include "UIMessageCenter.h"
@@ -167 +168 @@
 {
     if (m_pLocationLabel)
-        m_pLocationLabel->setText(QApplication::translate("UIGuestControlFileManager", "Guest System"));
+        m_pLocationLabel->setText(UIGuestControlFileManager::tr("Guest System"));
     UIGuestControlFileTable::retranslateUi();
 }
@@ -439 +440 @@
 
         /* Name: */
-        propertyString += "<b>Name:</b> " + UIPathOperations::getObjectName(fileInfo.GetName()) + "\n";
-        propertyString += "<br/>";
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Name") + ":</b> " +
+            UIPathOperations::getObjectName(fileInfo.GetName()) + "\n" + "<br/>";
         /* Size: */
         LONG64 size = fileInfo.GetObjectSize();
-        propertyString += "<b>Size:</b> " + QString::number(size) + QString(" bytes");
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Size") + ":</b> " + QString::number(size) +
+            UIGuestControlFileManager::tr(" bytes");
         if (size >= 1024)
-            propertyString += " (" + humanReadableSize(size) + ")";
-        propertyString += "<br/>";
+            propertyString += " (" + humanReadableSize(size) + ")" + "<br/>";
         /* Type: */
-        propertyString += "<b>Type:</b> " + fileTypeString(fileType(fileInfo));
-        propertyString += "<br/>";
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Type") + ":</b> " + fileTypeString(fileType(fileInfo)) + "<br/>";
         /* Creation Date: */
-        propertyString += "<b>Created:</b> " + QDateTime::fromMSecsSinceEpoch(fileInfo.GetChangeTime()/1000000).toString();
-        propertyString += "<br/>";
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Created") + ":</b> " +
+            QDateTime::fromMSecsSinceEpoch(fileInfo.GetChangeTime()/1000000).toString() + "<br/>";
         /* Last Modification Date: */
-        propertyString += "<b>Modified:</b> " + QDateTime::fromMSecsSinceEpoch(fileInfo.GetModificationTime()/1000000).toString();
-        propertyString += "<br/>";
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Modified") + ":</b> " +
+            QDateTime::fromMSecsSinceEpoch(fileInfo.GetModificationTime()/1000000).toString() + "<br/>";
         /* Owner: */
-        propertyString += "<b>Owner:</b> " + fileInfo.GetUserName();
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Owner") + ":</b> " + fileInfo.GetUserName();
         return propertyString;
     }
@@ -483 +483 @@
     }
     QString propertyString;
-    propertyString += "<b>Selected:</b> " + QString::number(fileCount) + " files ";
-    propertyString += "and " + QString::number(directoryCount) + " directories";
-    propertyString += "<br/>";
-    propertyString += "<b>Size:</b> " + QString::number(totalSize) + QString(" bytes");
+    propertyString += "<b>" + UIGuestControlFileManager::tr("Selected:") + "</b> " + QString::number(fileCount) + " files ";
+    propertyString += UIGuestControlFileManager::tr("and ") + QString::number(directoryCount) + " " +
+        UIGuestControlFileManager::tr("directories") + "<br/>";
+    propertyString += "<b>" + UIGuestControlFileManager::tr("Size:") + "</b> " + QString::number(totalSize) +
+        UIGuestControlFileManager::tr(" bytes");
     if (totalSize >= m_iKiloByte)
         propertyString += " (" + humanReadableSize(totalSize) + ")";
@@ -527 +528 @@
     // }
 
-    m_pPropertiesDialog->setWindowTitle("Properties");
+    m_pPropertiesDialog->setWindowTitle(UIGuestControlFileManager::tr("Properties"));
     m_pPropertiesDialog->setPropertyText(fsPropertyString);
     m_pPropertiesDialog->execute();

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp

@@ -28 +28 @@
 # include "QILabel.h"
 # include "UIActionPool.h"
+# include "UIGuestControlFileManager.h"
 # include "UIGuestControlFileModel.h"
 # include "UIHostFileTable.h"
@@ -142 +143 @@
 {
     if (m_pLocationLabel)
-        m_pLocationLabel->setText(QApplication::translate("UIGuestControlFileManager", "Host System"));
+        m_pLocationLabel->setText(UIGuestControlFileManager::tr("Host System"));
     UIGuestControlFileTable::retranslateUi();
 }
@@ -367 +368 @@
         QString propertyString;
         /* Name: */
-        propertyString += "<b>Name:</b> " + fileInfo.fileName() + "\n";
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Name") + ":</b> " + fileInfo.fileName() + "\n";
         if (!fileInfo.suffix().isEmpty())
             propertyString += "." + fileInfo.suffix();
         propertyString += "<br/>";
         /* Size: */
-        propertyString += "<b>Size:</b> " + QString::number(fileInfo.size()) + QString(" bytes");
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Size") + ":</b> " +
+            QString::number(fileInfo.size()) + UIGuestControlFileManager::tr(" bytes");
         if (fileInfo.size() >= m_iKiloByte)
             propertyString += " (" + humanReadableSize(fileInfo.size()) + ")";
         propertyString += "<br/>";
         /* Type: */
-        propertyString += "<b>Type:</b> " + fileTypeString(fileType(fileInfo));
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Type") + ":</b> " + fileTypeString(fileType(fileInfo));
         propertyString += "<br/>";
         /* Creation Date: */
-        propertyString += "<b>Created:</b> " + fileInfo.created().toString();
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Created") + ":</b> " + fileInfo.created().toString();
         propertyString += "<br/>";
         /* Last Modification Date: */
-        propertyString += "<b>Modified:</b> " + fileInfo.lastModified().toString();
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Modified") + ":</b> " + fileInfo.lastModified().toString();
         propertyString += "<br/>";
         /* Owner: */
-        propertyString += "<b>Owner:</b> " + fileInfo.owner();
+        propertyString += "<b>" + UIGuestControlFileManager::tr("Owner") + ":</b> " + fileInfo.owner();
 
         return propertyString;
@@ -407 +409 @@
     }
     QString propertyString;
-    propertyString += "<b>Selected:</b> " + QString::number(fileCount) + " files ";
-    propertyString += "and " + QString::number(directoryCount) + " directories";
+    propertyString += "<b>" + UIGuestControlFileManager::tr("Selected") + ":</b> " + QString::number(fileCount) +
+        " " + UIGuestControlFileManager::tr("files") + " ";
+    propertyString += UIGuestControlFileManager::tr("and") + " " + QString::number(directoryCount) + " " +
+        UIGuestControlFileManager::tr("directories");
     propertyString += "<br/>";
-    propertyString += "<b>Size:</b> " + QString::number(totalSize) + QString(" bytes");
+    propertyString += "<b>" + UIGuestControlFileManager::tr("Size") + ":</b> " + QString::number(totalSize) + " " +
+        UIGuestControlFileManager::tr("bytes");
     if (totalSize >= m_iKiloByte)
         propertyString += " (" + humanReadableSize(totalSize) + ")";