Changeset 78213 in vbox

Timestamp:

Apr 19, 2019 1:55:43 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: 1st basic page: File label and corresponding local layout fixes.

Location:

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

Files:

• UIWizardImportAppPageBasic1.cpp (modified) (7 diffs)
• UIWizardImportAppPageBasic1.h (modified) (1 diff)

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

@@ -52 +52 @@
     , m_pSourceComboBox(0)
     , m_pStackedLayout(0)
+    , m_pLocalContainerLayout(0)
+    , m_pFileLabel(0)
     , m_pFileSelector(0)
     , m_pCloudContainerLayout(0)
@@ -469 +471 @@
             {
                 /* Create local container layout: */
-                QVBoxLayout *pLocalContainerLayout = new QVBoxLayout(pLocalContainer);
-                if (pLocalContainerLayout)
+                m_pLocalContainerLayout = new QGridLayout(pLocalContainer);
+                if (m_pLocalContainerLayout)
                 {
-                    pLocalContainerLayout->setContentsMargins(0, 0, 0, 0);
-                    pLocalContainerLayout->setSpacing(0);
+                    m_pLocalContainerLayout->setContentsMargins(0, 0, 0, 0);
+                    m_pLocalContainerLayout->setColumnStretch(0, 0);
+                    m_pLocalContainerLayout->setColumnStretch(1, 1);
+                    m_pLocalContainerLayout->setRowStretch(2, 1);
+
+                    /* Create file label: */
+                    m_pFileLabel = new QLabel;
+                    if (m_pFileLabel)
+                    {
+                        /* Add into layout: */
+                        m_pLocalContainerLayout->addWidget(m_pFileLabel, 0, 0, Qt::AlignRight);
+                    }
 
                     /* Create file-path selector: */
@@ -479 +491 @@
                     if (m_pFileSelector)
                     {
+                        m_pFileLabel->setBuddy(m_pFileSelector);
                         m_pFileSelector->setHomeDir(vboxGlobal().documentsPath());
                         m_pFileSelector->setMode(UIEmptyFilePathSelector::Mode_File_Open);
@@ -485 +498 @@
 
                         /* Add into layout: */
-                        pLocalContainerLayout->addWidget(m_pFileSelector);
-                    }
-
-                    /* Add stretch: */
-                    pLocalContainerLayout->addStretch();
+                        m_pLocalContainerLayout->addWidget(m_pFileSelector, 0, 1);
+                    }
                 }
 
@@ -682 +692 @@
         }
 
-    /* Translate file selector: */
+    /* Translate local stuff: */
+    m_pFileLabel->setText(UIWizardImportApp::tr("&File:"));
     m_pFileSelector->setChooseButtonToolTip(UIWizardImportApp::tr("Choose a virtual appliance file to import..."));
     m_pFileSelector->setFileDialogTitle(UIWizardImportApp::tr("Please choose a virtual appliance file to import"));
     m_pFileSelector->setFileFilters(UIWizardImportApp::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf"));
 
-    /* Translate Account labels: */
+    /* Translate cloud stuff: */
     m_pAccountLabel->setText(UIWizardImportApp::tr("&Account:"));
     m_pAccountInstanceLabel->setText(UIWizardImportApp::tr("&Machines:"));
@@ -693 +704 @@
     /* Adjust label widths: */
     QList<QWidget*> labels;
+    labels << m_pFileLabel;
     labels << m_pSourceLabel;
     labels << m_pAccountLabel;
@@ -700 +712 @@
         iMaxWidth = qMax(iMaxWidth, pLabel->minimumSizeHint().width());
     m_pSourceLayout->setColumnMinimumWidth(0, iMaxWidth);
+    m_pLocalContainerLayout->setColumnMinimumWidth(0, iMaxWidth);
     m_pCloudContainerLayout->setColumnMinimumWidth(0, iMaxWidth);
 

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

@@ -126 +126 @@
     QStackedLayout *m_pStackedLayout;
 
+    /** Holds the local container layout instance. */
+    QGridLayout             *m_pLocalContainerLayout;
+    /** Holds the file label instance. */
+    QLabel                  *m_pFileLabel;
     /** Holds the file selector instance. */
     UIEmptyFilePathSelector *m_pFileSelector;