Changeset 78074 in vbox

Timestamp:

Apr 10, 2019 10:43:14 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9152: A bit of cleanup for Export Appliance wizard.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance

Files:

• UIWizardExportAppPageBasic2.cpp (modified) (6 diffs)
• UIWizardExportAppPageBasic2.h (modified) (1 diff)
• UIWizardExportAppPageExpert.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

@@ -68 +68 @@
     , m_pManifestCheckbox(0)
     , m_pIncludeISOsCheckbox(0)
-    , m_pAccountComboBoxLabel(0)
+    , m_pAccountLabel(0)
     , m_pAccountComboBox(0)
     , m_pAccountToolButton(0)
@@ -930 +930 @@
                     m_pSettingsLayout2->setColumnStretch(1, 1);
 
-                    /* Create provider label: */
-                    m_pAccountComboBoxLabel = new QLabel;
-                    if (m_pAccountComboBoxLabel)
+                    /* Create account label: */
+                    m_pAccountLabel = new QLabel;
+                    if (m_pAccountLabel)
                     {
-                        m_pAccountComboBoxLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+                        m_pAccountLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
 
                         /* Add into layout: */
-                        m_pSettingsLayout2->addWidget(m_pAccountComboBoxLabel, 0, 0);
+                        m_pSettingsLayout2->addWidget(m_pAccountLabel, 0, 0);
                     }
                     /* Create sub-layout: */
@@ -946 +946 @@
                         pSubLayout->setSpacing(1);
 
-                        /* Create provider combo-box: */
+                        /* Create account combo-box: */
                         m_pAccountComboBox = new QComboBox;
                         if (m_pAccountComboBox)
                         {
-                            m_pAccountComboBoxLabel->setBuddy(m_pAccountComboBox);
+                            m_pAccountLabel->setBuddy(m_pAccountComboBox);
 
                             /* Add into layout: */
                             pSubLayout->addWidget(m_pAccountComboBox);
                         }
-                        /* Create provider combo-box: */
+                        /* Create account tool-button: */
                         m_pAccountToolButton = new QIToolButton;
                         if (m_pAccountToolButton)
@@ -1003 +1003 @@
     /* Populate MAC address policies: */
     populateMACAddressPolicies();
-    /* Populate providers: */
+    /* Populate accounts: */
     populateAccounts();
-    /* Populate profile properties: */
+    /* Populate account properties: */
     populateAccountProperties();
 
@@ -1121 +1121 @@
     m_pIncludeISOsCheckbox->setText(UIWizardExportApp::tr("&Include ISO image files"));
 
-    /* Translate Account combo-box: */
-    m_pAccountComboBoxLabel->setText(UIWizardExportApp::tr("&Account:"));
+    /* Translate Account label: */
+    m_pAccountLabel->setText(UIWizardExportApp::tr("&Account:"));
 
     /* Adjust label widths: */
@@ -1130 +1130 @@
     labels << m_pMACComboBoxLabel;
     labels << m_pAdditionalLabel;
-    labels << m_pAccountComboBoxLabel;
+    labels << m_pAccountLabel;
     int iMaxWidth = 0;
     foreach (QWidget *pLabel, labels)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h

@@ -219 +219 @@
     QCheckBox *m_pIncludeISOsCheckbox;
 
-    /** Holds the account combo-box label instance. */
-    QLabel       *m_pAccountComboBoxLabel;
+    /** Holds the account label instance. */
+    QLabel       *m_pAccountLabel;
     /** Holds the account combo-box instance. */
     QComboBox    *m_pAccountComboBox;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp

@@ -264 +264 @@
 
                             /* Create account label: */
-                            m_pAccountComboBoxLabel = new QLabel;
-                            if (m_pAccountComboBoxLabel)
-                            {
-                                m_pAccountComboBoxLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-
-                                /* Add into layout: */
-                                m_pSettingsLayout2->addWidget(m_pAccountComboBoxLabel, 0, 0);
+                            m_pAccountLabel = new QLabel;
+                            if (m_pAccountLabel)
+                            {
+                                m_pAccountLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+
+                                /* Add into layout: */
+                                m_pSettingsLayout2->addWidget(m_pAccountLabel, 0, 0);
                             }
                             /* Create sub-layout: */
@@ -279 +279 @@
                                 pSubLayout->setSpacing(1);
 
-                                /* Create provider combo-box: */
+                                /* Create account combo-box: */
                                 m_pAccountComboBox = new QComboBox;
                                 if (m_pAccountComboBox)
                                 {
-                                    m_pAccountComboBoxLabel->setBuddy(m_pAccountComboBox);
+                                    m_pAccountLabel->setBuddy(m_pAccountComboBox);
 
                                     /* Add into layout: */
                                     pSubLayout->addWidget(m_pAccountComboBox);
                                 }
-                                /* Create provider combo-box: */
+                                /* Create account tool-button: */
                                 m_pAccountToolButton = new QIToolButton;
                                 if (m_pAccountToolButton)
@@ -462 +462 @@
     m_pIncludeISOsCheckbox->setText(UIWizardExportApp::tr("&Include ISO image files"));
 
-    /* Translate Account combo-box: */
-    m_pAccountComboBoxLabel->setText(UIWizardExportApp::tr("&Account:"));
+    /* Translate Account label: */
+    m_pAccountLabel->setText(UIWizardExportApp::tr("&Account:"));
 
     /* Adjust label widths: */
@@ -471 +471 @@
     labels << m_pMACComboBoxLabel;
     labels << m_pAdditionalLabel;
-    labels << m_pAccountComboBoxLabel;
+    labels << m_pAccountLabel;
     int iMaxWidth = 0;
     foreach (QWidget *pLabel, labels)