Changeset 104566 in vbox

Timestamp:

May 8, 2024 4:37:21 PM (7 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10670: New Cloud VM wizard: A bunch of coding-style fixes in the same area.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm

Files:

• UIWizardNewCloudVMPageExpert.cpp (modified) (3 diffs)
• UIWizardNewCloudVMPageExpert.h (modified) (2 diffs)
• UIWizardNewCloudVMPageProperties.cpp (modified) (1 diff)
• UIWizardNewCloudVMPageSource.cpp (modified) (3 diffs)
• UIWizardNewCloudVMPageSource.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp

@@ -248 +248 @@
     /* Translate provider label: */
     if (m_pProviderLabel)
-        m_pProviderLabel->setText(UIWizardNewCloudVM::tr("&Location:"));
+        m_pProviderLabel->setText(UIWizardNewCloudVM::tr("&Provider:"));
     /* Translate received values of Provider combo-box.
      * We are enumerating starting from 0 for simplicity: */
@@ -260 +260 @@
     /* Translate profile stuff: */
     if (m_pProfileLabel)
-        m_pProfileLabel->setText(UIWizardNewCloudVM::tr("&Profile:"));
+        m_pProfileLabel->setText(UIWizardNewCloudVM::tr("P&rofile:"));
     if (m_pProfileComboBox)
         m_pProfileComboBox->setToolTip(UIWizardNewCloudVM::tr("Selects cloud profile."));
@@ -277 +277 @@
 
     /* Translate source image list: */
-    m_pSourceImageList->setWhatsThis(UIWizardNewCloudVM::tr("Lists all the source images or boot volumes."));
+    if (m_pSourceImageList)
+        m_pSourceImageList->setWhatsThis(UIWizardNewCloudVM::tr("Lists all the source images or boot volumes."));
 
     /* Translate cloud VM properties table: */
-    m_pFormEditor->setWhatsThis(UIWizardNewCloudVM::tr("Lists all the cloud VM properties."));
+    if (m_pFormEditor)
+        m_pFormEditor->setWhatsThis(UIWizardNewCloudVM::tr("Lists all the cloud VM properties."));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h

@@ -39 +39 @@
 class QGridLayout;
 class QLabel;
+class QIListWidget;
 class UIToolBox;
 class UIWizardNewCloudVM;
@@ -99 +100 @@
     UIToolBox *m_pToolBox;
 
-    /** Holds the location layout instance. */
+    /** Holds the provider layout instance. */
     QGridLayout  *m_pLayoutProvider;
     /** Holds the provider type label instance. */
     QLabel       *m_pProviderLabel;
-    /** Holds the location type combo-box instance. */
+    /** Holds the provider type combo-box instance. */
     QIComboBox   *m_pProviderComboBox;
     /** Holds the profile label instance. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageProperties.cpp

@@ -102 +102 @@
 
     /* Translate description label: */
-    m_pLabel->setText(UIWizardNewCloudVM::tr("These are the the suggested settings of the cloud VM creation procedure, they are "
-                                             "influencing the resulting cloud VM instance.  You can change many of the "
-                                             "properties shown by double-clicking on the items and disable others using the "
-                                             "check boxes below."));
+    if (m_pLabel)
+        m_pLabel->setText(UIWizardNewCloudVM::tr("These are the the suggested settings of the cloud VM creation procedure, they "
+                                                 "are influencing the resulting cloud VM instance.  You can change many of the "
+                                                 "properties shown by double-clicking on the items and disable others using the "
+                                                 "check boxes below."));
 
     /* Translate cloud VM properties table: */
-    m_pFormEditor->setWhatsThis(UIWizardNewCloudVM::tr("Lists all the cloud VM properties."));
+    if (m_pFormEditor)
+        m_pFormEditor->setWhatsThis(UIWizardNewCloudVM::tr("Lists all the cloud VM properties."));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp

@@ -470 +470 @@
 
     /* Translate main label: */
-    m_pLabelMain->setText(UIWizardNewCloudVM::tr("Please choose the location to create cloud virtual machine in.  This can "
-                                                 "be one of known cloud service providers below."));
+    if (m_pLabelMain)
+        m_pLabelMain->setText(UIWizardNewCloudVM::tr("Please choose the location to create cloud virtual machine in.  This can "
+                                                     "be one of known cloud service providers below."));
 
     /* Translate provider label: */
-    m_pProviderLabel->setText(UIWizardNewCloudVM::tr("&Location:"));
+    if (m_pProviderLabel)
+        m_pProviderLabel->setText(UIWizardNewCloudVM::tr("&Provider:"));
     /* Translate received values of Provider combo-box.
      * We are enumerating starting from 0 for simplicity: */
@@ -485 +487 @@
 
     /* Translate description label: */
-    m_pLabelDescription->setText(UIWizardNewCloudVM::tr("Please choose one of cloud service profiles you have registered to "
-                                                        "create virtual machine for.  Existing images list will be "
-                                                        "updated.  To continue, select one of images to create virtual "
-                                                        "machine on the basis of it."));
+    if (m_pLabelDescription)
+        m_pLabelDescription->setText(UIWizardNewCloudVM::tr("Please choose one of cloud service profiles you have registered to "
+                                                            "create virtual machine for.  Existing images list will be "
+                                                            "updated.  To continue, select one of images to create virtual "
+                                                            "machine on the basis of it."));
 
     /* Translate profile stuff: */
-    m_pProfileLabel->setText(UIWizardNewCloudVM::tr("&Profile:"));
+    if (m_pProfileLabel)
+        m_pProfileLabel->setText(UIWizardNewCloudVM::tr("P&rofile:"));
     if (m_pProfileComboBox)
         m_pProfileComboBox->setToolTip(UIWizardNewCloudVM::tr("Selects cloud profile."));
@@ -499 +503 @@
         m_pProfileToolButton->setToolTip(UIWizardNewCloudVM::tr("Opens cloud profile manager..."));
     }
-    m_pSourceImageLabel->setText(UIWizardNewCloudVM::tr("&Source:"));
-
-    /* Translate source tab-bar: */
-    m_pSourceTabBar->setTabText(0, UIWizardNewCloudVM::tr("&Images"));
-    m_pSourceTabBar->setTabText(1, UIWizardNewCloudVM::tr("&Boot Volumes"));
+
+    /* Translate source stuff: */
+    if (m_pSourceImageLabel)
+        m_pSourceImageLabel->setText(UIWizardNewCloudVM::tr("&Source:"));
+    if (m_pSourceTabBar)
+    {
+        m_pSourceTabBar->setTabText(0, UIWizardNewCloudVM::tr("&Images"));
+        m_pSourceTabBar->setTabText(1, UIWizardNewCloudVM::tr("&Boot Volumes"));
+    }
 
     /* Translate source image list: */
-    m_pSourceImageList->setWhatsThis(UIWizardNewCloudVM::tr("Lists all the source images or boot volumes."));
+    if (m_pSourceImageList)
+        m_pSourceImageList->setWhatsThis(UIWizardNewCloudVM::tr("Lists all the source images or boot volumes."));
 
     /* Adjust label widths: */
     QList<QWidget*> labels;
-    labels << m_pProviderLabel;
-    labels << m_pProfileLabel;
-    labels << m_pSourceImageLabel;
+    if (m_pProviderLabel)
+        labels << m_pProviderLabel;
+    if (m_pProfileLabel)
+        labels << m_pProfileLabel;
+    if (m_pSourceImageLabel)
+        labels << m_pSourceImageLabel;
     int iMaxWidth = 0;
     foreach (QWidget *pLabel, labels)
         iMaxWidth = qMax(iMaxWidth, pLabel->minimumSizeHint().width());
-    m_pProviderLayout->setColumnMinimumWidth(0, iMaxWidth);
-    m_pOptionsLayout->setColumnMinimumWidth(0, iMaxWidth);
+    if (m_pProviderLayout)
+        m_pProviderLayout->setColumnMinimumWidth(0, iMaxWidth);
+    if (m_pOptionsLayout)
+        m_pOptionsLayout->setColumnMinimumWidth(0, iMaxWidth);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.h

@@ -166 +166 @@
     /** Holds the profile management tool-button instance. */
     QIToolButton *m_pProfileToolButton;
+
     /** Holds the source image label instance. */
     QLabel       *m_pSourceImageLabel;