Changeset 108162 in vbox

Timestamp:

Feb 11, 2025 3:31:18 PM (10 days ago)

Author:

vboxsync

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

167475

Message:

FE/Qt: bugref:10843 Integrating doc team's text reviews into new vm wizard. part 2.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UIBaseMemoryEditor.cpp (modified) (1 diff)
• settings/editors/UINameAndSystemEditor.cpp (modified) (2 diffs)
• settings/editors/UIVirtualCPUEditor.cpp (modified) (1 diff)
• widgets/UIMediumSizeEditor.cpp (modified) (2 diffs)
• wizards/editors/UIWizardDiskEditors.cpp (modified) (2 diffs)
• wizards/editors/UIWizardNewVMEditors.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVDExpertPage.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMDiskPage.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMDiskPage.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVMExpertPage.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMHardwarePage.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMSummaryPage.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.cpp

@@ -302 +302 @@
 {
     if (m_pLabelMemory)
-        m_pLabelMemory->setText(tr("Base &Memory:"));
-
-    const QString strToolTip(tr("Holds the amount of base memory the virtual machine will have."));
+        m_pLabelMemory->setText(tr("Base &Memory"));
+
+    const QString strToolTip(tr("The amount of RAM that VirtualBox will allocate to the virtual machine every time it is started."));
     if (m_pSlider)
         m_pSlider->setToolTip(strToolTip);

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -285 +285 @@
 {
     if (m_pLabelName)
-        m_pLabelName->setText(tr("VM &Name:"));
+        m_pLabelName->setText(tr("VM &Name"));
     if (m_pLabelPath)
-        m_pLabelPath->setText(tr("VM &Folder:"));
+        m_pLabelPath->setText(tr("VM &Folder"));
     if (m_pLabelImage)
-        m_pLabelImage->setText(tr("&ISO Image:"));
+        m_pLabelImage->setText(tr("&ISO Image"));
     if (m_pLabelEdition)
-        m_pLabelEdition->setText(tr("OS &Edition:"));
+        m_pLabelEdition->setText(tr("OS &Edition"));
     if (m_pLabelFamily)
-        m_pLabelFamily->setText(tr("&Type:"));
+        m_pLabelFamily->setText(tr("OS &Type"));
     if (m_pLabelDistribution)
-        m_pLabelDistribution->setText(tr("Va&riant:"));
+        m_pLabelDistribution->setText(tr("OS Va&riant"));
     if (m_pLabelType)
-        m_pLabelType->setText(tr("&Version:"));
+        m_pLabelType->setText(tr("OS &Version"));
 
     if (m_pEditorName)
@@ -306 +306 @@
         m_pComboEdition->setToolTip(tr("Edition of guest operating system to install."));
     if (m_pComboFamily)
-        m_pComboFamily->setToolTip(tr("Guest operating systme type."));
+        m_pComboFamily->setToolTip(tr("Guest operating system type."));
 
     if (m_pComboDistribution)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.cpp

@@ -84 +84 @@
 {
     if (m_pLabelVCPU)
-        m_pLabelVCPU->setText(tr("&Processors:"));
-
-    QString strToolTip(tr("Holds the number of virtual CPUs in the virtual machine. You need hardware "
-                          "virtualization support on your host system to use more than one virtual CPU."));
+        m_pLabelVCPU->setText(tr("&Processors"));
+
+    QString strToolTip(tr("The number of virtual CPUs in the virtual machine. Do not assign more than half of the total processor threads on the host."));
+
     if (m_pSlider)
         m_pSlider->setToolTip(strToolTip);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.cpp

@@ -280 +280 @@
 
     /* Translate fields: */
-    m_pSlider->setToolTip(tr("Holds the size of this medium."));
-    m_pEditor->setToolTip(tr("Holds the size of this medium."));
-    m_pLabelMinSize->setToolTip(tr("Minimum size for this medium."));
-    m_pLabelMaxSize->setToolTip(tr("Maximum size for this medium."));
+    m_pSlider->setToolTip(tr("Medium size"));
+    m_pEditor->setToolTip(tr("Medium size"));
+    m_pLabelMinSize->setToolTip(tr("Minimum possible disk size"));
+    m_pLabelMaxSize->setToolTip(tr("Maximum possible disk size"));
 }
 
@@ -399 +399 @@
 void UIMediumSizeEditor::updateSizeToolTips(qulonglong uSize)
 {
-    const QString strToolTip = tr("%1 (%2 B)").arg(UITranslator::formatSize(uSize)).arg(uSize);
+    const QString strToolTip = tr("Disk size set to %1").arg(UITranslator::formatSize(uSize));
     m_pSlider->setToolTip(strToolTip);
     m_pEditor->setToolTip(strToolTip);

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

@@ -219 +219 @@
     {
         m_pFixedCheckBox->setText(tr("Pre-allocate &Full Size"));
-        m_pFixedCheckBox->setToolTip(tr("When checked, the virtual disk image is allocated with its full size during VM creation time"));
+        m_pFixedCheckBox->setToolTip(tr("Disk space is allocated in full to the virtual machine when created"));
     }
     if (m_pSplitBox)
     {
-        m_pSplitBox->setText(tr("&Split Into 2GB Parts"));
-        m_pSplitBox->setToolTip(tr("When checked, the virtual hard disk file is split into 2GB parts."));
+        m_pSplitBox->setText(tr("&Split Disk Into 2 GB Parts"));
+        m_pSplitBox->setToolTip(tr("The virtual hard disk file is split into 2 GB parts"));
     }
 }
@@ -414 +414 @@
     if (m_pLocationOpenButton)
     {
-        m_pLocationOpenButton->setToolTip(tr("Specify a location for new virtual hard disk file..."));
+        m_pLocationOpenButton->setToolTip(tr("Specify the location for the new virtual hard disk file..."));
         /* Some screen readers do no read tooltips: */
         m_pLocationOpenButton->setText(tr("Specify a location for new virtual hard disk file..."));

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

@@ -394 +394 @@
     if (m_pEFICheckBox)
     {
-        m_pEFICheckBox->setText(UIWizardNewVM::tr("&Enable EFI (special OSes only)"));
-        m_pEFICheckBox->setToolTip(UIWizardNewVM::tr("When checked, the guest will support the Extended Firmware Interface (EFI), "
-                                                     "which is required to boot certain guest OSes. Non-EFI aware OSes will not "
-                                                     "be able to boot if this option is activated."));
+        m_pEFICheckBox->setText(UIWizardNewVM::tr("&Use EFI"));
+        m_pEFICheckBox->setToolTip(UIWizardNewVM::tr("Use Extended Firmware Interface (EFI). This is required to boot some OSs."));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDExpertPage.cpp

@@ -145 +145 @@
 {
     if (m_pFormatVariantGroupBox)
-        m_pFormatVariantGroupBox->setTitle(UIWizardNewVD::tr("Hard Disk File &Type and Variant"));
+        m_pFormatVariantGroupBox->setTitle(UIWizardNewVD::tr("Hard Disk File &Type and Format"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMDiskPage.cpp

@@ -75 +75 @@
     , m_pDiskSelector(0)
     , m_pDiskSelectionButton(0)
-    , m_pLabel(0)
     , m_pMediumSizeEditorLabel(0)
     , m_pMediumSizeEditor(0)
@@ -94 +93 @@
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
 
-    m_pLabel = new QIRichTextLabel(this);
-    pMainLayout->addWidget(m_pLabel);
     pMainLayout->addWidget(createDiskWidgets());
 
@@ -219 +216 @@
 void UIWizardNewVMDiskPage::sltRetranslateUI()
 {
-    setTitle(UIWizardNewVM::tr("Virtual Hard disk"));
-
-    if (m_pLabel)
-        m_pLabel->setText(UIWizardNewVM::tr("If you wish you can add a virtual hard disk to the new machine. "
-                                            "You can either create a new hard disk file or select an existing one. "
-                                            "Alternatively you can create a virtual machine without a virtual hard disk."));
+    setTitle(UIWizardNewVM::tr("Specify virtual hard disk"));
 
     if (m_pDiskEmpty)
-        m_pDiskEmpty->setText(UIWizardNewVM::tr("&Do Not Add a Virtual Hard Disk"));
+        m_pDiskEmpty->setText(UIWizardNewVM::tr("C&reate Virtual Machine Without a Virtual Hard Disk"));
     if (m_pDiskNew)
-        m_pDiskNew->setText(UIWizardNewVM::tr("&Create a Virtual Hard Disk Now"));
+        m_pDiskNew->setText(UIWizardNewVM::tr("&Create a New Virtual Hard Disk"));
     if (m_pDiskExisting)
         m_pDiskExisting->setText(UIWizardNewVM::tr("U&se an Existing Virtual Hard Disk File"));
     if (m_pDiskSelectionButton)
-        m_pDiskSelectionButton->setToolTip(UIWizardNewVM::tr("Chooses a Virtual Hard Fisk File..."));
+        m_pDiskSelectionButton->setToolTip(UIWizardNewVM::tr("Select a Virtual Hard Disk File..."));
 
     if (m_pMediumSizeEditorLabel)
-        m_pMediumSizeEditorLabel->setText(UIWizardNewVM::tr("D&isk Size:"));
+        m_pMediumSizeEditorLabel->setText(UIWizardNewVM::tr("D&isk Size"));
 
     if (m_pFixedCheckBox)
     {
         m_pFixedCheckBox->setText(UIWizardNewVM::tr("Pre-allocate &Full Size"));
-        m_pFixedCheckBox->setToolTip(UIWizardNewVM::tr("When checked, the virtual disk image is allocated with its full size during VM creation time"));
+        m_pFixedCheckBox->setToolTip(UIWizardNewVM::tr("Disk space is allocated in full to the virtual machine when created"));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMDiskPage.h

@@ -104 +104 @@
        UIMediaComboBox *m_pDiskSelector;
        QIToolButton *m_pDiskSelectionButton;
-       QIRichTextLabel *m_pLabel;
        QLabel          *m_pMediumSizeEditorLabel;
        UIMediumSizeEditor *m_pMediumSizeEditor;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

@@ -229 +229 @@
     if (m_pToolBox)
     {
-        m_pToolBox->setPageTitle(ExpertToolboxItems_NameAndOSType, QString(UIWizardNewVM::tr("Name and &Operating System")));
-        m_pToolBox->setPageTitle(ExpertToolboxItems_Unattended, UIWizardNewVM::tr("&Unattended Install"));
-        m_pToolBox->setPageTitle(ExpertToolboxItems_Disk, UIWizardNewVM::tr("Hard Dis&k"));
-        m_pToolBox->setPageTitle(ExpertToolboxItems_Hardware, UIWizardNewVM::tr("H&ardware"));
+        m_pToolBox->setPageTitle(ExpertToolboxItems_NameAndOSType, QString(UIWizardNewVM::tr("Virtual machine name and &operating system")));
+        m_pToolBox->setPageTitle(ExpertToolboxItems_Unattended, UIWizardNewVM::tr("Set up &unattended guest OS installation"));
+        m_pToolBox->setPageTitle(ExpertToolboxItems_Disk, UIWizardNewVM::tr("Specify virtual hard dis&k"));
+        m_pToolBox->setPageTitle(ExpertToolboxItems_Hardware, UIWizardNewVM::tr("Specify virtual h&ardware"));
     }
 
     if (m_pDiskEmpty)
-        m_pDiskEmpty->setText(UIWizardNewVM::tr("&Do Not Add a Virtual Hard Disk"));
+        m_pDiskEmpty->setText(UIWizardNewVM::tr("C&reate Virtual Machine Without a Virtual Hard Disk"));
     if (m_pDiskNew)
-        m_pDiskNew->setText(UIWizardNewVM::tr("&Create a Virtual Hard Disk Now"));
+        m_pDiskNew->setText(UIWizardNewVM::tr("&Create a New Virtual Hard Disk"));
     if (m_pDiskExisting)
         m_pDiskExisting->setText(UIWizardNewVM::tr("U&se an Existing Virtual Hard Disk File"));
     if (m_pDiskSelectionButton)
-        m_pDiskSelectionButton->setToolTip(UIWizardNewVM::tr("Chooses a Virtual Hard Fisk File..."));
+        m_pDiskSelectionButton->setToolTip(UIWizardNewVM::tr("Select a Virtual Hard Disk File..."));
     if (m_pDiskSelectionButton)
-        m_pDiskSelectionButton->setText(UIWizardNewVM::tr("Choose a Virtual Hard Fisk File"));
+        m_pDiskSelectionButton->setText(UIWizardNewVM::tr("Select a Virtual Hard Disk File"));
 
     if (m_pNameAndSystemLayout && m_pNameAndSystemEditor)
@@ -250 +250 @@
 
     if (m_pDiskFormatVariantGroupBox)
-        m_pDiskFormatVariantGroupBox->setTitle(UIWizardNewVM::tr("Hard Disk File &Type and Variant"));
+        m_pDiskFormatVariantGroupBox->setTitle(UIWizardNewVM::tr("Hard Disk File &Type and Format"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMHardwarePage.cpp

@@ -78 +78 @@
 void UIWizardNewVMHardwarePage::sltRetranslateUI()
 {
-    setTitle(UIWizardNewVM::tr("Hardware"));
+    setTitle(UIWizardNewVM::tr("Specify virtual hardware"));
 
     if (m_pLabel)
-        m_pLabel->setText(UIWizardNewVM::tr("You can modify virtual machine's hardware by changing amount of RAM and "
-                                            "virtual CPU count. Enabling EFI is also possible."));
+        m_pLabel->setText(UIWizardNewVM::tr("Specify the VM's hardware. Resources allocated to the VM will not be available to the host when the VM is running."));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -570 +570 @@
 
     if (m_pNameOSTypeLabel)
-        m_pNameOSTypeLabel->setText(UIWizardNewVM::tr("Please choose a descriptive name and destination folder for the new "
-                                                      "virtual machine. The name you choose will be used throughout VirtualBox "
-                                                      "to identify this machine. Additionally, you can select an ISO image which "
-                                                      "may be used to install the guest operating system."));
+        m_pNameOSTypeLabel->setText(UIWizardNewVM::tr("The ISO image is used to install the operating system on the VM."));
 
     if (m_pUnattendedCheckBox)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMSummaryPage.cpp

@@ -356 +356 @@
     m_pRootItem = new UIWizardNewVMSummaryItem(pParentTree, "root");
 
-    UIWizardNewVMSummaryItem *pNameRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Machine Name and OS Type"),
+    UIWizardNewVMSummaryItem *pNameRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Virtual Machine Name and Operating System"),
                                                                 QVariant(), UIIconPool::iconSet(":/name_16px.png"));
     pNameRoot->setIsSectionTitle(true);
 
     /* Name and OS Type page stuff: */
-    pNameRoot->addChild(UIWizardNewVM::tr("Machine Name"), pWizard->machineBaseName());
-    pNameRoot->addChild(UIWizardNewVM::tr("Machine Folder"), pWizard->machineFolder());
+    pNameRoot->addChild(UIWizardNewVM::tr("VM Name"), pWizard->machineBaseName());
+    pNameRoot->addChild(UIWizardNewVM::tr("VM Folder"), pWizard->machineFolder());
     pNameRoot->addChild(UIWizardNewVM::tr("ISO Image"), pWizard->ISOFilePath());
     pNameRoot->addChild(UIWizardNewVM::tr("Guest OS Type"), gpGlobalSession->guestOSTypeManager().getDescription(pWizard->guestOSTypeId()));
@@ -368 +368 @@
     const QString &ISOPath = pWizard->ISOFilePath();
     if (!ISOPath.isNull() && !ISOPath.isEmpty())
-        pNameRoot->addChild(UIWizardNewVM::tr("Proceed with Unattended Install"), pWizard->skipUnattendedInstall());
+        pNameRoot->addChild(UIWizardNewVM::tr("Proceed with Unattended Install"), !pWizard->skipUnattendedInstall());
 
     /* Unattended install related info: */
     if (pWizard->isUnattendedEnabled())
     {
-        UIWizardNewVMSummaryItem *pUnattendedRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Unattended Install"), QVariant(),
+        UIWizardNewVMSummaryItem *pUnattendedRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Unattended Installation of Guest OS"), QVariant(),
                                                                           UIIconPool::iconSet(":/extension_pack_install_16px.png"));
         pUnattendedRoot->setIsSectionTitle(true);
 
         pUnattendedRoot->addChild(UIWizardNewVM::tr("User Name"), pWizard->userName());
-        pUnattendedRoot->addChild(UIWizardNewVM::tr("Product Key"), pWizard->installGuestAdditions());
+        pUnattendedRoot->addChild(UIWizardNewVM::tr("Product Key"), pWizard->productKey());
         pUnattendedRoot->addChild(UIWizardNewVM::tr("Host Name/Domain Name"), pWizard->hostnameDomainName());
         pUnattendedRoot->addChild(UIWizardNewVM::tr("Install in Background"), pWizard->startHeadless());
         pUnattendedRoot->addChild(UIWizardNewVM::tr("Install Guest Additions"), pWizard->installGuestAdditions());
         if (pWizard->installGuestAdditions())
-            pUnattendedRoot->addChild(UIWizardNewVM::tr("Guest Additions ISO"), pWizard->guestAdditionsISOPath());
-    }
-
-
-    UIWizardNewVMSummaryItem *pHardwareRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Hardware"), QVariant(),
+            pUnattendedRoot->addChild(UIWizardNewVM::tr("Guest Additions ISO Image"), pWizard->guestAdditionsISOPath());
+    }
+
+
+    UIWizardNewVMSummaryItem *pHardwareRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Virtual Hardware"), QVariant(),
                                                                     UIIconPool::iconSet(":/cpu_16px.png"));
     pHardwareRoot->setIsSectionTitle(true);
     pHardwareRoot->addChild(UIWizardNewVM::tr("Base Memory"), pWizard->memorySize());
-    pHardwareRoot->addChild(UIWizardNewVM::tr("Processor(s)"), pWizard->CPUCount());
-    pHardwareRoot->addChild(UIWizardNewVM::tr("EFI Enable"), pWizard->EFIEnabled());
+    pHardwareRoot->addChild(UIWizardNewVM::tr("Processors"), pWizard->CPUCount());
+    pHardwareRoot->addChild(UIWizardNewVM::tr("Use EFI"), pWizard->EFIEnabled());
 
     /* Disk related info: */
-    UIWizardNewVMSummaryItem *pDiskRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Disk"), QVariant(),
+    UIWizardNewVMSummaryItem *pDiskRoot = m_pRootItem->addChild(UIWizardNewVM::tr("Virtual Hard Disk"), QVariant(),
                                                                 UIIconPool::iconSet(":/hd_16px.png"));
     pDiskRoot->setIsSectionTitle(true);
@@ -459 +459 @@
     setTitle(UIWizardNewVM::tr("Summary"));
     if (m_pLabel)
-        m_pLabel->setText(UIWizardNewVM::tr("The following table summarizes the configuration you have"
-                                            " chosen for the new virtual machine. When you are happy with the configuration"
-                                            " press Finish to create the virtual machine. Alternatively you can go back"
-                                            " and modify the configuration."));
+        m_pLabel->setText(UIWizardNewVM::tr("A new VM will be created with the following configuration."));
+
     if (m_pTree)
         m_pTree->setWhatsThis(UIWizardNewVM::tr("Lists chosen configuration of the guest system."));