Changeset 95946 in vbox for trunk/src

Timestamp:

Jul 29, 2022 2:55:46 PM (3 years ago)

Author:

vboxsync

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

152702

Message:

FE/Qt/Ds: Fixing redundant NLS contexts for wizard editors stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors

Files:

• UIWizardCloneVMEditors.cpp (modified) (10 diffs)
• UIWizardNewVMEditors.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardCloneVMEditors.cpp

@@ -29 +29 @@
 #include "UICommon.h"
 #include "UIFilePathSelector.h"
+#include "UIWizardCloneVM.h"
 #include "UIWizardCloneVMEditors.h"
 
@@ -59 +60 @@
 
     bool fInvalidName = m_pNameLineEdit->text().isEmpty();
-    m_pNameLineEdit->mark(fInvalidName, tr("Clone name cannot be empty"));
+    m_pNameLineEdit->mark(fInvalidName, UIWizardCloneVM::tr("Clone name cannot be empty"));
 
     const QString &strPath = m_pPathSelector->path();
     QDir dir(strPath);
     bool fInvalidPath = strPath.isEmpty() || !dir.exists() || !dir.isReadable();
-    m_pPathSelector->mark(fInvalidPath, tr("Path is invalid"));
+    m_pPathSelector->mark(fInvalidPath, UIWizardCloneVM::tr("Path is invalid"));
 
     /* Check if there is already a machine folder for this name and path: */
@@ -74 +75 @@
             vbox.ComposeMachineFilename(m_pNameLineEdit->text(), strMachineGroup, QString(), m_pPathSelector->path());
         fExists = QDir(QDir::toNativeSeparators(QFileInfo(strCloneFilePath).absolutePath())).exists();
-        m_pNameLineEdit->mark(fExists, tr("The clone name is not unique"));
+        m_pNameLineEdit->mark(fExists, UIWizardCloneVM::tr("The clone name is not unique"));
     }
 
@@ -145 +146 @@
     {
         m_pContainerLayout->addWidget(m_pNameLineEdit, 0, 1, 1, 1);
-        m_pNameLineEdit->setText(tr("%1 Clone").arg(m_strOriginalName));
+        m_pNameLineEdit->setText(UIWizardCloneVM::tr("%1 Clone").arg(m_strOriginalName));
         connect(m_pNameLineEdit, &UIMarkableLineEdit::textChanged,
                 this, &UICloneVMNamePathEditor::sigCloneNameChanged);
@@ -178 +179 @@
 {
     if (m_pNameLabel)
-        m_pNameLabel->setText(tr("&Name:"));
+        m_pNameLabel->setText(UIWizardCloneVM::tr("&Name:"));
     if (m_pPathLabel)
-        m_pPathLabel->setText(tr("&Path:"));
+        m_pPathLabel->setText(UIWizardCloneVM::tr("&Path:"));
     if (m_pNameLineEdit)
         m_pNameLineEdit->setToolTip("Holds a name for the new virtual machine.");
@@ -320 +321 @@
 void UICloneVMAdditionalOptionsEditor::retranslateUi()
 {
-    m_pMACComboBoxLabel->setText(tr("MAC Address P&olicy:"));
-    m_pMACComboBox->setToolTip(tr("Determines MAC address policy for clonning:"));
+    m_pMACComboBoxLabel->setText(UIWizardCloneVM::tr("MAC Address P&olicy:"));
+    m_pMACComboBox->setToolTip(UIWizardCloneVM::tr("Determines MAC address policy for clonning:"));
     for (int i = 0; i < m_pMACComboBox->count(); ++i)
     {
@@ -329 +330 @@
             case MACAddressClonePolicy_KeepAllMACs:
                 {
-                    m_pMACComboBox->setItemText(i, tr("Include all network adapter MAC addresses"));
-                    m_pMACComboBox->setItemData(i, tr("Include all network adapter MAC addresses during cloning."), Qt::ToolTipRole);
+                    m_pMACComboBox->setItemText(i, UIWizardCloneVM::tr("Include all network adapter MAC addresses"));
+                    m_pMACComboBox->setItemData(i, UIWizardCloneVM::tr("Include all network adapter MAC addresses during "
+                                                                       "cloning."), Qt::ToolTipRole);
                     break;
                 }
             case MACAddressClonePolicy_KeepNATMACs:
                 {
-                    m_pMACComboBox->setItemText(i, tr("Include only NAT network adapter MAC addresses"));
-                    m_pMACComboBox->setItemData(i, tr("Include only NAT network adapter MAC addresses during cloning."), Qt::ToolTipRole);
+                    m_pMACComboBox->setItemText(i, UIWizardCloneVM::tr("Include only NAT network adapter MAC addresses"));
+                    m_pMACComboBox->setItemData(i, UIWizardCloneVM::tr("Include only NAT network adapter MAC addresses during "
+                                                                       "cloning."), Qt::ToolTipRole);
                     break;
                 }
             case MACAddressClonePolicy_StripAllMACs:
                 {
-                    m_pMACComboBox->setItemText(i, tr("Generate new MAC addresses for all network adapters"));
-                    m_pMACComboBox->setItemData(i, tr("Generate new MAC addresses for all network adapters during cloning."), Qt::ToolTipRole);
+                    m_pMACComboBox->setItemText(i, UIWizardCloneVM::tr("Generate new MAC addresses for all network adapters"));
+                    m_pMACComboBox->setItemData(i, UIWizardCloneVM::tr("Generate new MAC addresses for all network adapters during "
+                                                                       "cloning."), Qt::ToolTipRole);
                     break;
                 }
@@ -351 +355 @@
 
     if (m_pAdditionalOptionsLabel)
-        m_pAdditionalOptionsLabel->setText(tr("Additional Options:"));
+        m_pAdditionalOptionsLabel->setText(UIWizardCloneVM::tr("Additional Options:"));
     if (m_pKeepDiskNamesCheckBox)
     {
-        m_pKeepDiskNamesCheckBox->setToolTip(tr("Enables keeping the disk names during cloning."));
-        m_pKeepDiskNamesCheckBox->setText(tr("Keep &Disk Names"));
+        m_pKeepDiskNamesCheckBox->setToolTip(UIWizardCloneVM::tr("Enables keeping the disk names during cloning."));
+        m_pKeepDiskNamesCheckBox->setText(UIWizardCloneVM::tr("Keep &Disk Names"));
     }
     if (m_pKeepHWUUIDsCheckBox)
     {
-        m_pKeepHWUUIDsCheckBox->setToolTip(tr("Enables keeping hardware UUIDs during cloning."));
-        m_pKeepHWUUIDsCheckBox->setText(tr("Keep Hard&ware UUIDs"));
+        m_pKeepHWUUIDsCheckBox->setToolTip(UIWizardCloneVM::tr("Enables keeping hardware UUIDs during cloning."));
+        m_pKeepHWUUIDsCheckBox->setText(UIWizardCloneVM::tr("Keep Hard&ware UUIDs"));
     }
 }
@@ -478 +482 @@
     if (m_pFullCloneRadio)
     {
-        m_pFullCloneRadio->setText(tr("&Full clone"));
-        m_pFullCloneRadio->setToolTip(tr("When chosen, all the virtual disks of the source vm are also cloned."));
+        m_pFullCloneRadio->setText(UIWizardCloneVM::tr("&Full clone"));
+        m_pFullCloneRadio->setToolTip(UIWizardCloneVM::tr("When chosen, all the virtual disks of the source vm are also cloned."));
     }
     if (m_pLinkedCloneRadio)
     {
-        m_pLinkedCloneRadio->setText(tr("&Linked clone"));
-        m_pLinkedCloneRadio->setToolTip(tr("When chosen, the cloned vm will save space by sharing the source VM's disk images."));
+        m_pLinkedCloneRadio->setText(UIWizardCloneVM::tr("&Linked clone"));
+        m_pLinkedCloneRadio->setToolTip(UIWizardCloneVM::tr("When chosen, the cloned vm will save space by sharing the source VM's disk images."));
     }
 }
@@ -548 +552 @@
     if (m_pMachineRadio)
     {
-        m_pMachineRadio->setText(tr("Current &machine state"));
-        m_pMachineRadio->setToolTip(tr("When chosen, only the current state of the source vm is cloned."));
+        m_pMachineRadio->setText(UIWizardCloneVM::tr("Current &machine state"));
+        m_pMachineRadio->setToolTip(UIWizardCloneVM::tr("When chosen, only the current state of the source vm is cloned."));
     }
     if (m_pMachineAndChildsRadio)
-        m_pMachineAndChildsRadio->setText(tr("Current &snapshot tree branch"));
+        m_pMachineAndChildsRadio->setText(UIWizardCloneVM::tr("Current &snapshot tree branch"));
     if (m_pAllRadio)
     {
-        m_pAllRadio->setText(tr("&Everything"));
-        m_pAllRadio->setToolTip(tr("When chosen, all the saved states of the source vm are also cloned."));
+        m_pAllRadio->setText(UIWizardCloneVM::tr("&Everything"));
+        m_pAllRadio->setToolTip(UIWizardCloneVM::tr("When chosen, all the saved states of the source vm are also cloned."));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.cpp

@@ -184 +184 @@
     bool fError = !UIWizardNewVMUnattendedCommon::checkGAISOFile(path());
     if (m_pGAISOFilePathSelector)
-        m_pGAISOFilePathSelector->mark(fError, tr("Invalid Guest Additions installation media"));
+        m_pGAISOFilePathSelector->mark(fError, UIWizardNewVM::tr("Invalid Guest Additions installation media"));
 }
 
@@ -285 +285 @@
     }
     if (m_pProductKeyLineEdit)
-        m_pProductKeyLineEdit->setToolTip(tr("Holds the product key."));
+        m_pProductKeyLineEdit->setToolTip(UIWizardNewVM::tr("Holds the product key."));
 }