Changeset 78081 in vbox

Timestamp:

Apr 10, 2019 11:45:17 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st basic page: A bit of layout fixes and overall cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance

Files:

• UIWizardImportAppPageBasic1.cpp (modified) (8 diffs)
• UIWizardImportAppPageBasic1.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -39 +39 @@
 UIWizardImportAppPage1::UIWizardImportAppPage1(bool fImportFromOCIByDefault)
     : m_fImportFromOCIByDefault(fImportFromOCIByDefault)
+    , m_pSourceLayout(0)
     , m_pSourceLabel(0)
     , m_pSourceComboBox(0)
     , m_pStackedLayout(0)
     , m_pFileSelector(0)
+    , m_pCloudContainerLayout(0)
 {
 }
@@ -137 +139 @@
 }
 
+QUuid UIWizardImportAppPage1::sourceId() const
+{
+    const int iIndex = m_pSourceComboBox->currentIndex();
+    return m_pSourceComboBox->itemData(iIndex, SourceData_ID).toUuid();
+}
+
 
 /*********************************************************************************************************************************
@@ -159 +167 @@
 
         /* Create source layout: */
-        QHBoxLayout *pSourceLayout = new QHBoxLayout;
-        if (pSourceLayout)
+        m_pSourceLayout = new QGridLayout;
+        if (m_pSourceLayout)
         {
             /* Create source label: */
@@ -168 +176 @@
                 m_pSourceLabel->hide();
                 m_pSourceLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
-                m_pSourceLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                m_pSourceLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
 
                 /* Add into layout: */
-                pSourceLayout->addWidget(m_pSourceLabel);
+                m_pSourceLayout->addWidget(m_pSourceLabel, 0, 0);
             }
 
@@ -180 +188 @@
                 m_pSourceLabel->setBuddy(m_pSourceComboBox);
                 m_pSourceComboBox->hide();
-                connect(m_pSourceComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
-                        this, &UIWizardImportAppPageBasic1::sltHandleSourceChange);
 
                 /* Add into layout: */
-                pSourceLayout->addWidget(m_pSourceComboBox);
+                m_pSourceLayout->addWidget(m_pSourceComboBox, 0, 1);
             }
 
             /* Add into layout: */
-            pMainLayout->addLayout(pSourceLayout);
+            pMainLayout->addLayout(m_pSourceLayout);
         }
 
@@ -232 +238 @@
             {
                 /* Create cloud container layout: */
-                QVBoxLayout *pCloudContainerLayout = new QVBoxLayout(pCloudContainer);
-                if (pCloudContainerLayout)
+                m_pCloudContainerLayout = new QGridLayout(pCloudContainer);
+                if (m_pCloudContainerLayout)
                 {
-                    pCloudContainerLayout->setContentsMargins(0, 0, 0, 0);
-                    pCloudContainerLayout->setSpacing(0);
-
-                    /* Add stretch: */
-                    pCloudContainerLayout->addStretch();
+                    m_pCloudContainerLayout->setContentsMargins(0, 0, 0, 0);
+
                 }
 
@@ -258 +261 @@
 
     /* Setup connections: */
-    connect(m_pFileSelector, &UIEmptyFilePathSelector::pathChanged, this, &UIWizardImportAppPageBasic1::completeChanged);
+    connect(m_pSourceComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
+            this, &UIWizardImportAppPageBasic1::sltHandleSourceChange);
+    connect(m_pFileSelector, &UIEmptyFilePathSelector::pathChanged,
+            this, &UIWizardImportAppPageBasic1::completeChanged);
 
     /* Register fields: */
@@ -294 +300 @@
     m_pFileSelector->setFileFilters(UIWizardImportApp::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf"));
 
+    /* Adjust label widths: */
+    QList<QWidget*> labels;
+    labels << m_pSourceLabel;
+    int iMaxWidth = 0;
+    foreach (QWidget *pLabel, labels)
+        iMaxWidth = qMax(iMaxWidth, pLabel->minimumSizeHint().width());
+    m_pSourceLayout->setColumnMinimumWidth(0, iMaxWidth);
+    m_pCloudContainerLayout->setColumnMinimumWidth(0, iMaxWidth);
+
     /* Update page appearance: */
     updatePageAppearance();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.h

@@ -72 +72 @@
     bool isSourceCloudOne(int iIndex = -1) const;
 
+    /** Returns source ID. */
+    QUuid sourceId() const;
+
     /** Holds whether default source should be Import from OCI. */
     bool  m_fImportFromOCIByDefault;
@@ -82 +85 @@
     CCloudProfile          m_comCloudProfile;
 
+    /** Holds the source layout instance. */
+    QGridLayout *m_pSourceLayout;
     /** Holds the source type label instance. */
-    QLabel     *m_pSourceLabel;
+    QLabel      *m_pSourceLabel;
     /** Holds the source type combo-box instance. */
-    QIComboBox *m_pSourceComboBox;
+    QIComboBox  *m_pSourceComboBox;
 
     /** Holds the stacked layout instance. */
@@ -92 +97 @@
     /** Holds the file selector instance. */
     UIEmptyFilePathSelector *m_pFileSelector;
+
+    /** Holds the cloud container layout instance. */
+    QGridLayout *m_pCloudContainerLayout;
 };