Changeset 108113 in vbox

Timestamp:

Feb 7, 2025 1:20:40 PM (2 weeks ago)

Author:

vboxsync

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

167411

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UINameAndSystemEditor.cpp (modified) (1 diff)
• wizards/clonevm/UIWizardCloneVMExpertPage.cpp (modified) (1 diff)
• wizards/editors/UIHostnameDomainNameEditor.cpp (modified) (3 diffs)
• wizards/editors/UIUserNamePasswordEditor.cpp (modified) (3 diffs)
• wizards/editors/UIWizardCloneVMEditors.cpp (modified) (1 diff)
• wizards/editors/UIWizardNewVMEditors.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMExpertPage.cpp (modified) (6 diffs)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (5 diffs)
• wizards/newvm/UIWizardNewVMSummaryPage.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMUnattendedPage.cpp (modified) (1 diff)

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

@@ -285 +285 @@
 {
     if (m_pLabelName)
-        m_pLabelName->setText(tr("&Name:"));
+        m_pLabelName->setText(tr("VM &Name:"));
     if (m_pLabelPath)
-        m_pLabelPath->setText(tr("&Folder:"));
+        m_pLabelPath->setText(tr("VM &Folder:"));
     if (m_pLabelImage)
         m_pLabelImage->setText(tr("&ISO Image:"));
     if (m_pLabelEdition)
-        m_pLabelEdition->setText(tr("&Edition:"));
+        m_pLabelEdition->setText(tr("OS &Edition:"));
     if (m_pLabelFamily)
         m_pLabelFamily->setText(tr("&Type:"));
     if (m_pLabelDistribution)
-        m_pLabelDistribution->setText(tr("&Subtype:"));
+        m_pLabelDistribution->setText(tr("Va&riant:"));
     if (m_pLabelType)
         m_pLabelType->setText(tr("&Version:"));
 
     if (m_pEditorName)
-        m_pEditorName->setToolTip(tr("Holds the name for virtual machine."));
+        m_pEditorName->setToolTip(tr("Descriptive name to uniquely identify the virtual machine."));
     if (m_pSelectorPath)
-        m_pSelectorPath->setToolTip(tr("Selects the folder hosting virtual machine."));
+        m_pSelectorPath->setToolTip(tr("Storage location for virtual machine files."));
     if (m_pComboEdition)
-        m_pComboEdition->setToolTip(tr("Selects the operating system edition when possible."));
+        m_pComboEdition->setToolTip(tr("Edition of guest operating system to install."));
     if (m_pComboFamily)
-        m_pComboFamily->setToolTip(tr("Selects the operating system type that "
-                                      "you plan to install into this virtual machine."));
+        m_pComboFamily->setToolTip(tr("Guest operating systme type."));
+
     if (m_pComboDistribution)
-        m_pComboDistribution->setToolTip(tr("Selects the operating system subtype that "
-                                            "you plan to install into this virtual machine."));
+        m_pComboDistribution->setToolTip(tr("Guest operating system variant, if applicable."));
     if (m_pComboType)
-        m_pComboType->setToolTip(tr("Selects the operating system version that "
-                                    "you plan to install into this virtual machine "
-                                    "(called a guest operating system)."));
+        m_pComboType->setToolTip(tr("Guest operating system version to install"));
+
     if (m_pSelectorImage)
-        m_pSelectorImage->setToolTip(tr("Selects an ISO image to be attached to the "
-                                        "virtual machine or used in unattended install."));
+        m_pSelectorImage->setToolTip(tr("ISO image to be attached to the "
+                                        "virtual machine and possibly used in unattended install."));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMExpertPage.cpp

@@ -106 +106 @@
         m_pCloneModeGroupBox->setTitle(UIWizardCloneVM::tr("Snapshots"));
     if (m_pAdditionalOptionsGroupBox)
-        m_pAdditionalOptionsGroupBox->setTitle(UIWizardCloneVM::tr("Additional Options"));
+        m_pAdditionalOptionsGroupBox->setTitle(UIWizardCloneVM::tr("OS Installation Options"));
 }
 

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

@@ -79 +79 @@
     if (m_pHostnameLineEdit)
         m_pHostnameLineEdit->mark(!m_pHostnameLineEdit->hasAcceptableInput(),
-                                  tr("Hostname should be at least 2 character long. "
+                                  tr("Host name should be at least 2 character long. "
                                      "Allowed characters are alphanumerics, \"-\" and \".\""),
-                                  tr("Hostname is valid"));
+                                  tr("Host name is valid"));
     if (m_pDomainNameLineEdit)
         m_pDomainNameLineEdit->mark(!m_pDomainNameLineEdit->hasAcceptableInput(),
@@ -118 +118 @@
 {
     if (m_pHostnameLabel)
-        m_pHostnameLabel->setText(tr("Hostna&me:"));
-    if (m_pHostnameLineEdit)
-        m_pHostnameLineEdit->setToolTip(tr("Holds the hostname."));
+        m_pHostnameLabel->setText(tr("Host Na&me:"));
+    if (m_pHostnameLineEdit)
+        m_pHostnameLineEdit->setToolTip(tr("Host name to be assigned to the virtual machine."));
     if (m_pDomainNameLabel)
         m_pDomainNameLabel->setText(tr("&Domain Name:"));
     if (m_pDomainNameLineEdit)
-        m_pDomainNameLineEdit->setToolTip(tr("Holds the domain name."));
+        m_pDomainNameLineEdit->setToolTip(tr("Doamin name to be assigned to the virtual machine."));
     if (m_pProductKeyLabel)
         m_pProductKeyLabel->setText(UIWizardNewVM::tr("&Product Key:"));
     if (m_pProductKeyLineEdit)
-        m_pProductKeyLineEdit->setToolTip(UIWizardNewVM::tr("Holds the product key."));
+        m_pProductKeyLineEdit->setToolTip(UIWizardNewVM::tr("The product key."));
 
     if (m_pStartHeadlessCheckBox)
     {
         m_pStartHeadlessCheckBox->setText(UIWizardNewVM::tr("&Install in Background"));
-        m_pStartHeadlessCheckBox->setToolTip(UIWizardNewVM::tr("When checked, headless boot (with no GUI) will be enabled for "
-                                                               "unattended guest OS installation of newly created virtual machine."));
+        m_pStartHeadlessCheckBox->setToolTip(UIWizardNewVM::tr("Start the virtusl machine without a GUI."));
     }
 }
@@ -207 +206 @@
 {
     m_pHostnameLineEdit->mark(!m_pHostnameLineEdit->hasAcceptableInput(),
-                              tr("Hostname should be at least 2 character long. "
+                              tr("Host name should be at least 2 character long. "
                                  "Allowed characters are alphanumerics, \"-\" and \".\""),
-                              tr("Hostname is valid"));
+                              tr("Host name is valid"));
     emit sigHostnameDomainNameChanged(hostnameDomainName(), isComplete());
 }

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

@@ -228 +228 @@
     bool fComplete = (m_pUserNameLineEdit && !m_pUserNameLineEdit->text().isEmpty());
     if (m_pUserNameLineEdit)
-        m_pUserNameLineEdit->mark(!fComplete, UIUserNamePasswordEditor::tr("Username cannot be an empty string"),
-                                  UIUserNamePasswordEditor::tr("Username is valid"));
+        m_pUserNameLineEdit->mark(!fComplete, UIUserNamePasswordEditor::tr("User name cannot be an empty string"),
+                                  UIUserNamePasswordEditor::tr("User name is valid"));
     return fComplete;
 }
@@ -277 +277 @@
 {
     QString strPassword = tr("Pass&word");
-    QString strRepeatPassword = tr("&Repeat Password");
-    QString strUsername = tr("U&sername");
+    QString strRepeatPassword = tr("&Confirm Password");
+    QString strUsername = tr("U&ser Name");
     if (m_pUserNameLabel)
         m_pUserNameLabel->setText(QString("%1%2").arg(strUsername).arg(":"));
@@ -307 +307 @@
     }
     if(m_pUserNameLineEdit)
-        m_pUserNameLineEdit->setToolTip(tr("Holds username."));
+        m_pUserNameLineEdit->setToolTip(tr("User name for the guest operating system."));
     if (m_pPasswordLineEdit)
-        m_pPasswordLineEdit->setToolTip(tr("Holds password."));
+        m_pPasswordLineEdit->setToolTip(tr("Password for the guest operating system user account."));
     if (m_pPasswordRepeatLineEdit)
-        m_pPasswordRepeatLineEdit->setToolTip(tr("Holds the repeated password."));
+        m_pPasswordRepeatLineEdit->setToolTip(tr("Password must match."));
     m_strPasswordError = tr("Invalid password pair");
 }

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

@@ -369 +369 @@
 
     if (m_pAdditionalOptionsLabel)
-        m_pAdditionalOptionsLabel->setText(UIWizardCloneVM::tr("Additional Options:"));
+        m_pAdditionalOptionsLabel->setText(UIWizardCloneVM::tr("OS Installation Options:"));
     if (m_pKeepDiskNamesCheckBox)
     {

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

@@ -80 +80 @@
 void UIUserNamePasswordGroupBox::sltRetranslateUI()
 {
-    setTitle(UIWizardNewVM::tr("Username and Password"));
+    setTitle(UIWizardNewVM::tr("User Name and Password"));
 }
 
@@ -178 +178 @@
     if (m_pGAISOPathLabel)
         m_pGAISOPathLabel->setText(UIWizardNewVM::tr("Guest &Additions ISO:"));
-    setTitle(UIWizardNewVM::tr("Gu&est Additions"));
+    setTitle(UIWizardNewVM::tr("Install Gu&est Additions"));
     setToolTip(UIWizardNewVM::tr("When checked, the guest additions will be installed after the guest OS install."));
 }
@@ -256 +256 @@
 void UIAdditionalUnattendedOptions::sltRetranslateUI()
 {
-    setTitle(UIWizardNewVM::tr("Additional Options"));
+    setTitle(UIWizardNewVM::tr("OS Installation Options"));
 }
 

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

@@ -391 +391 @@
 {
     UINativeWizard::sltRetranslateUI();
-    setWindowTitle(tr("Create Virtual Machine"));
+    setWindowTitle(tr("New Virtual Machine"));
 }
 

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

@@ -168 +168 @@
     bool const fOsTypeFixed = UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor,
                                                                                              pWizard->detectedOSTypeId());
-    printf("os type %s\n", qPrintable(pWizard->detectedOSTypeId()));
     if (fOsTypeFixed)
         m_userModifiedParameters << "GuestOSTypeFromISO";
@@ -470 +469 @@
     if (m_pNameAndSystemEditor)
     {
-        m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty(),
-                                               tr("Guest machine name cannot be empty"), tr("Guest machine name is valid"));
+        if (m_pNameAndSystemEditor->name().isEmpty())
+            m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty(),
+                                                   tr("Virtual machine name cannot be empty"), tr("Virtual machine name is valid"));
+        else
+            m_pNameAndSystemEditor->markNameEditor((QDir(m_pNameAndSystemEditor->fullPath()).exists()),
+                                                   tr("Virtual machine path is not unique"), tr("Virtual machine name is valid"));
+
         m_pNameAndSystemEditor->markImageEditor(!UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor),
                                                 UIWizardNewVM::tr("Invalid file path or unreadable file"),
                                                 UIWizardNewVM::tr("File path is valid"));
-        m_pNameAndSystemEditor->markNameEditor((QDir(m_pNameAndSystemEditor->fullPath()).exists()),
-                                               tr("Guest machine path is not unique"), tr("Guest machine name is valid"));
     }
     UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
@@ -604 +606 @@
                 m_pToolBox->setPageTitleIcon(ExpertToolboxItems_Unattended,
                                              UIIconPool::iconSet(":/status_error_16px.png"),
-                                             UIWizardNewVM::tr("Invalid username and/or password"));
+                                             UIWizardNewVM::tr("Invalid user name and/or password"));
                 fIsComplete = false;
             }
@@ -614 +616 @@
                 m_pToolBox->setPageTitleIcon(ExpertToolboxItems_Unattended,
                                              UIIconPool::iconSet(":/status_error_16px.png"),
-                                             UIWizardNewVM::tr("Invalid hostname or domain name"));
+                                             UIWizardNewVM::tr("Invalid host name or domain name"));
                 fIsComplete = false;
             }
@@ -626 +628 @@
             m_pToolBox->setPageTitleIcon(ExpertToolboxItems_NameAndOSType,
                                          UIIconPool::iconSet(":/status_error_16px.png"),
-                                         UIWizardNewVM::tr("Virtual machine name is invalid"));
+                                         UIWizardNewVM::tr("Virtual machine name is invalid (possibly empty)"));
+            fIsComplete = false;
+        }
+        else if (QDir(m_pNameAndSystemEditor->fullPath()).exists())
+        {
+            m_pToolBox->setPageTitleIcon(ExpertToolboxItems_NameAndOSType,
+                                         UIIconPool::iconSet(":/status_error_16px.png"),
+                                         UIWizardNewVM::tr("Virtual` machine path is not unique"));
             fIsComplete = false;
         }
@@ -634 +643 @@
                                          UIIconPool::iconSet(":/status_error_16px.png"),
                                          UIWizardNewVM::tr("Invalid ISO file"));
-            fIsComplete = false;
-        }
-        if (QDir(m_pNameAndSystemEditor->fullPath()).exists())
-        {
-            m_pToolBox->setPageTitleIcon(ExpertToolboxItems_NameAndOSType,
-                                         UIIconPool::iconSet(":/status_error_16px.png"),
-                                         UIWizardNewVM::tr("Guest machine path is not unique"));
             fIsComplete = false;
         }

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

@@ -567 +567 @@
 void UIWizardNewVMNameOSTypePage::sltRetranslateUI()
 {
-    setTitle(UIWizardNewVM::tr("Virtual machine Name and Operating System"));
+    setTitle(UIWizardNewVM::tr("Virtual machine name and operating system"));
 
     if (m_pNameOSTypeLabel)
@@ -607 +607 @@
         strMessage = UIWizardNewVM::tr("No ISO image is selected, the guest OS will need to be installed manually.");
     else if (pWizard->detectedOSTypeId().isEmpty())
-        strMessage = UIWizardNewVM::tr("OS type cannot be determined from the selected ISO, "
-                                       "the guest OS will need to be installed manually.");
+        strMessage = UIWizardNewVM::tr("VirtualBox can't install an OS from the selected ISO. OS cannot be determined, the guest OS will need to be installed manually.");
     else if (!pWizard->detectedOSTypeId().isEmpty())
     {
@@ -615 +614 @@
             strMessage = UIWizardNewVM::tr("Detected OS type: %1. %2")
                                            .arg(strType)
-                                           .arg(UIWizardNewVM::tr("This OS type cannot be installed unattendedly. "
-                                                                  "The install needs to be started manually."));
+                .arg(UIWizardNewVM::tr("This OS can't be installed using Unattended Installation. "
+                                       "The installation needs to be done manually."));
+
         else if (pWizard->skipUnattendedInstall())
             strMessage = UIWizardNewVM::tr("You have selected to skip unattended guest OS install, "
@@ -623 +623 @@
             strMessage = UIWizardNewVM::tr("Detected OS type: %1. %2")
                                            .arg(strType)
-                                           .arg(UIWizardNewVM::tr("This OS type can be installed unattendedly. "
-                                                                  "The install will start after this wizard is closed."));
-
-
-
+                                           .arg(UIWizardNewVM::tr("VirtualBox will install the OS using an unattended installation when the VM is created. "
+                                                                  "Supply the required information in the following steps."));
     }
 
@@ -786 +783 @@
     if (m_pNameAndSystemEditor)
     {
-        m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty(),
-                                               tr("Guest machine name cannot be empty"), tr("Guest machine name is valid"));
+        if (m_pNameAndSystemEditor->name().isEmpty())
+            m_pNameAndSystemEditor->markNameEditor(m_pNameAndSystemEditor->name().isEmpty(),
+                                                   tr("Virtual machine name cannot be empty"), tr("Virtual machine name is valid"));
+        else
         m_pNameAndSystemEditor->markNameEditor((QDir(m_pNameAndSystemEditor->fullPath()).exists()),
-                                               tr("Guest machine path is not unique"), tr("Guest machine name is valid"));
+                                               tr("Virtual machine path is not unique"), tr("Virtual machine name is valid"));
+
         m_pNameAndSystemEditor->markImageEditor(!UIWizardNewVMNameOSTypeCommon::checkISOFile(m_pNameAndSystemEditor),
                                                 UIWizardNewVM::tr("Invalid file path or unreadable file"),

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

@@ -368 +368 @@
     const QString &ISOPath = pWizard->ISOFilePath();
     if (!ISOPath.isNull() && !ISOPath.isEmpty())
-        pNameRoot->addChild(UIWizardNewVM::tr("Skip Unattended Install"), pWizard->skipUnattendedInstall());
+        pNameRoot->addChild(UIWizardNewVM::tr("Proceed with Unattended Install"), pWizard->skipUnattendedInstall());
 
     /* Unattended install related info: */
@@ -377 +377 @@
         pUnattendedRoot->setIsSectionTitle(true);
 
-        pUnattendedRoot->addChild(UIWizardNewVM::tr("Username"), pWizard->userName());
+        pUnattendedRoot->addChild(UIWizardNewVM::tr("User Name"), pWizard->userName());
         pUnattendedRoot->addChild(UIWizardNewVM::tr("Product Key"), pWizard->installGuestAdditions());
-        pUnattendedRoot->addChild(UIWizardNewVM::tr("Hostname/Domain Name"), pWizard->hostnameDomainName());
+        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());

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

@@ -112 +112 @@
 void UIWizardNewVMUnattendedPage::sltRetranslateUI()
 {
-    setTitle(UIWizardNewVM::tr("Unattended Guest OS Install Setup"));
+    setTitle(UIWizardNewVM::tr("Set up unattended guest OS installation"));
     if (m_pLabel)
-        m_pLabel->setText(UIWizardNewVM::tr("You can configure the unattended guest OS install by modifying username, password, "
-                                            "and hostname. Additionally you can enable guest additions install. "
-                                            "For Microsoft Windows guests it is possible to provide a product key."));
+        m_pLabel->setText(UIWizardNewVM::tr("Enter the information that will be required when the OS is installed."));
+
     if (m_pUserNamePasswordGroupBox)
-        m_pUserNamePasswordGroupBox->setTitle(UIWizardNewVM::tr("Username and Password"));
+        m_pUserNamePasswordGroupBox->setTitle(UIWizardNewVM::tr("User Name and Password"));
 }