Changeset 84277 in vbox

Timestamp:

May 12, 2020 5:51:16 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: New Cloud VM wizard: Rename image label/list to source label/list, we are going to support more than one source type.

Location:

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

Files:

• UIWizardNewCloudVMPageBasic1.cpp (modified) (15 diffs)
• UIWizardNewCloudVMPageBasic1.h (modified) (2 diffs)
• UIWizardNewCloudVMPageExpert.cpp (modified) (4 diffs)

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

@@ -53 +53 @@
     , m_pAccountToolButton(0)
     , m_pAccountPropertyTable(0)
-    , m_pAccountImageLabel(0)
-    , m_pAccountImageList(0)
+    , m_pSourceImageLabel(0)
+    , m_pSourceImageList(0)
 {
 }
@@ -269 +269 @@
 }
 
-void UIWizardNewCloudVMPage1::populateAccountImages()
+void UIWizardNewCloudVMPage1::populateSourceImages()
 {
     /* Block signals while updating: */
-    m_pAccountImageList->blockSignals(true);
+    m_pSourceImageList->blockSignals(true);
 
     /* Clear list initially: */
-    m_pAccountImageList->clear();
+    m_pSourceImageList->clear();
     /* Clear Cloud Client: */
     setClient(CCloudClient());
@@ -326 +326 @@
             {
                 /* Create list item: */
-                QListWidgetItem *pItem = new QListWidgetItem(names.at(i), m_pAccountImageList);
+                QListWidgetItem *pItem = new QListWidgetItem(names.at(i), m_pSourceImageList);
                 if (pItem)
                 {
@@ -335 +335 @@
 
             /* Choose the 1st one by default if possible: */
-            if (m_pAccountImageList->count())
-                m_pAccountImageList->setCurrentRow(0);
+            if (m_pSourceImageList->count())
+                m_pSourceImageList->setCurrentRow(0);
         }
         while (0);
@@ -342 +342 @@
 
     /* Unblock signals after update: */
-    m_pAccountImageList->blockSignals(false);
+    m_pSourceImageList->blockSignals(false);
 }
 
@@ -475 +475 @@
 QString UIWizardNewCloudVMPage1::imageId() const
 {
-    QListWidgetItem *pItem = m_pAccountImageList->currentItem();
+    QListWidgetItem *pItem = m_pSourceImageList->currentItem();
     return pItem ? pItem->data(Qt::UserRole).toString() : QString();
 }
@@ -584 +584 @@
             }
             /* Create sub-layout: */
-            QHBoxLayout *pSubLayout = new QHBoxLayout;
-            if (pSubLayout)
-            {
-                pSubLayout->setContentsMargins(0, 0, 0, 0);
-                pSubLayout->setSpacing(1);
+            QHBoxLayout *pAccountLayout = new QHBoxLayout;
+            if (pAccountLayout)
+            {
+                pAccountLayout->setContentsMargins(0, 0, 0, 0);
+                pAccountLayout->setSpacing(1);
 
                 /* Create account combo-box: */
@@ -597 +597 @@
 
                     /* Add into layout: */
-                    pSubLayout->addWidget(m_pAccountComboBox);
+                    pAccountLayout->addWidget(m_pAccountComboBox);
                 }
                 /* Create account tool-button: */
@@ -607 +607 @@
 
                     /* Add into layout: */
-                    pSubLayout->addWidget(m_pAccountToolButton);
+                    pAccountLayout->addWidget(m_pAccountToolButton);
                 }
 
                 /* Add into layout: */
-                m_pCloudContainerLayout->addLayout(pSubLayout, 0, 1);
+                m_pCloudContainerLayout->addLayout(pAccountLayout, 0, 1);
             }
 
@@ -634 +634 @@
             }
 
-            /* Create account instance label: */
-            m_pAccountImageLabel = new QLabel(this);
-            if (m_pAccountImageLabel)
+            /* Create source image label: */
+            m_pSourceImageLabel = new QLabel(this);
+            if (m_pSourceImageLabel)
             {
                 /* Add into layout: */
-                m_pCloudContainerLayout->addWidget(m_pAccountImageLabel, 2, 0, Qt::AlignRight);
-            }
-            /* Create profile instances table: */
-            m_pAccountImageList = new QListWidget(this);
-            if (m_pAccountImageList)
-            {
-                m_pAccountImageLabel->setBuddy(m_pAccountImageLabel);
-                const QFontMetrics fm(m_pAccountImageList->font());
+                m_pCloudContainerLayout->addWidget(m_pSourceImageLabel, 2, 0, Qt::AlignRight);
+            }
+            /* Create source image list: */
+            m_pSourceImageList = new QListWidget(this);
+            if (m_pSourceImageList)
+            {
+                m_pSourceImageLabel->setBuddy(m_pSourceImageList);
+                const QFontMetrics fm(m_pSourceImageList->font());
                 const int iFontWidth = fm.width('x');
                 const int iTotalWidth = 50 * iFontWidth;
                 const int iFontHeight = fm.height();
                 const int iTotalHeight = 4 * iFontHeight;
-                m_pAccountImageList->setMinimumSize(QSize(iTotalWidth, iTotalHeight));
-                //m_pAccountImageList->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-                m_pAccountImageList->setAlternatingRowColors(true);
+                m_pSourceImageList->setMinimumSize(QSize(iTotalWidth, iTotalHeight));
+                //m_pSourceImageList->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+                m_pSourceImageList->setAlternatingRowColors(true);
 
                 /* Add into layout: */
-                m_pCloudContainerLayout->addWidget(m_pAccountImageList, 2, 1, 2, 1);
+                m_pCloudContainerLayout->addWidget(m_pSourceImageList, 2, 1, 2, 1);
             }
 
@@ -674 +674 @@
     connect(m_pAccountToolButton, &QIToolButton::clicked,
             this, &UIWizardNewCloudVMPageBasic1::sltHandleAccountButtonClick);
-    connect(m_pAccountImageList, &QListWidget::currentRowChanged,
+    connect(m_pSourceImageList, &QListWidget::currentRowChanged,
             this, &UIWizardNewCloudVMPageBasic1::completeChanged);
 
@@ -729 +729 @@
     /* Translate cloud stuff: */
     m_pAccountLabel->setText(UIWizardNewCloudVM::tr("&Account:"));
-    m_pAccountImageLabel->setText(UIWizardNewCloudVM::tr("&Images:"));
+    m_pSourceImageLabel->setText(UIWizardNewCloudVM::tr("&Source:"));
 
     /* Adjust label widths: */
@@ -735 +735 @@
     labels << m_pLocationLabel;
     labels << m_pAccountLabel;
-    labels << m_pAccountImageLabel;
+    labels << m_pSourceImageLabel;
     int iMaxWidth = 0;
     foreach (QWidget *pLabel, labels)
@@ -797 +797 @@
 
     /* Make image list focused by default: */
-    m_pAccountImageList->setFocus();
+    m_pSourceImageList->setFocus();
 
     /* Refresh required settings: */
     populateAccounts();
     populateAccountProperties();
-    populateAccountImages();
+    populateSourceImages();
     emit completeChanged();
 }
@@ -810 +810 @@
     /* Refresh required settings: */
     populateAccountProperties();
-    populateAccountImages();
+    populateSourceImages();
     emit completeChanged();
 }

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

@@ -71 +71 @@
     /** Populates account properties. */
     void populateAccountProperties();
-    /** Populates account images. */
-    void populateAccountImages();
+    /** Populates source images. */
+    void populateSourceImages();
     /** Populates form properties. */
     void populateFormProperties();
@@ -137 +137 @@
     /** Holds the account property table instance. */
     QTableWidget *m_pAccountPropertyTable;
-    /** Holds the account image label instance. */
-    QLabel       *m_pAccountImageLabel;
-    /** Holds the account image list instance. */
-    QListWidget  *m_pAccountImageList;
+    /** Holds the source image label instance. */
+    QLabel       *m_pSourceImageLabel;
+    /** Holds the source image list instance. */
+    QListWidget  *m_pSourceImageList;
 };
 

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

@@ -118 +118 @@
                     }
 
-                    /* Create profile instances table: */
-                    m_pAccountImageList = new QListWidget(m_pCntLocation);
-                    if (m_pAccountImageList)
+                    /* Create source image list: */
+                    m_pSourceImageList = new QListWidget(m_pCntLocation);
+                    if (m_pSourceImageList)
                     {
-                        const QFontMetrics fm(m_pAccountImageList->font());
+                        const QFontMetrics fm(m_pSourceImageList->font());
                         const int iFontWidth = fm.width('x');
                         const int iTotalWidth = 50 * iFontWidth;
                         const int iFontHeight = fm.height();
                         const int iTotalHeight = 4 * iFontHeight;
-                        m_pAccountImageList->setMinimumSize(QSize(iTotalWidth, iTotalHeight));
-                        //m_pAccountImageList->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-                        m_pAccountImageList->setAlternatingRowColors(true);
+                        m_pSourceImageList->setMinimumSize(QSize(iTotalWidth, iTotalHeight));
+                        //m_pSourceImageList->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+                        m_pSourceImageList->setAlternatingRowColors(true);
 
                         /* Add into layout: */
-                        m_pCloudContainerLayout->addWidget(m_pAccountImageList, 2, 0);
+                        m_pCloudContainerLayout->addWidget(m_pSourceImageList, 2, 0);
                     }
 
@@ -183 +183 @@
     connect(m_pAccountToolButton, &QIToolButton::clicked,
             this, &UIWizardNewCloudVMPageExpert::sltHandleAccountButtonClick);
-    connect(m_pAccountImageList, &QListWidget::currentRowChanged,
+    connect(m_pSourceImageList, &QListWidget::currentRowChanged,
             this, &UIWizardNewCloudVMPageExpert::sltHandleInstanceListChange);
 
@@ -316 +316 @@
 
     /* Make image list focused by default: */
-    m_pAccountImageList->setFocus();
+    m_pSourceImageList->setFocus();
 
     /* Refresh required settings: */
     populateAccounts();
     populateAccountProperties();
-    populateAccountImages();
+    populateSourceImages();
     populateFormProperties();
     refreshFormPropertiesTable();
@@ -331 +331 @@
     /* Refresh required settings: */
     populateAccountProperties();
-    populateAccountImages();
+    populateSourceImages();
     populateFormProperties();
     refreshFormPropertiesTable();