Changeset 88155 in vbox

Timestamp:

Mar 17, 2021 2:29:01 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515: New VM wizard: A bit of layout fixes for 4th page.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVMPageBasic4.cpp (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic4.cpp

@@ -204 +204 @@
 {
     QWidget *pWidget = new QWidget;
-    QVBoxLayout *pLayout = new QVBoxLayout(pWidget);
-    pLayout->setContentsMargins(0, 0, 0, 0);
-
-    QHBoxLayout *pSizeLayout = new QHBoxLayout;
-    pSizeLayout->setContentsMargins(0, 0, 0, 0);
-    /* Hard disk size relate widgets: */
-    m_pMediumSizeEditor = new UIMediumSizeEditor;
-    m_pMediumSizeEditorLabel = new QLabel;
-    if (m_pMediumSizeEditorLabel)
-    {
-        pSizeLayout->addWidget(m_pMediumSizeEditorLabel);
-        m_pMediumSizeEditorLabel->setBuddy(m_pMediumSizeEditor);
-    }
-    pSizeLayout->addWidget(m_pMediumSizeEditor);
-    pLayout->addLayout(pSizeLayout);
-    /* Hard disk variant (dynamic vs. fixed) widgets: */
-    pLayout->addWidget(createMediumVariantWidgets(false /* bool fWithLabels */));
+    if (pWidget)
+    {
+        QVBoxLayout *pLayout = new QVBoxLayout(pWidget);
+        if (pLayout)
+        {
+            pLayout->setContentsMargins(0, 0, 0, 0);
+
+            /* Prepare size layout: */
+            QGridLayout *pSizeLayout = new QGridLayout;
+            if (pSizeLayout)
+            {
+                pSizeLayout->setContentsMargins(0, 0, 0, 0);
+
+                /* Prepare Hard disk size label: */
+                m_pMediumSizeEditorLabel = new QLabel(pWidget);
+                if (m_pMediumSizeEditorLabel)
+                {
+                    m_pMediumSizeEditorLabel->setAlignment(Qt::AlignRight);
+                    m_pMediumSizeEditorLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+                    pSizeLayout->addWidget(m_pMediumSizeEditorLabel, 0, 0, Qt::AlignBottom);
+                }
+                /* Prepare Hard disk size editor: */
+                m_pMediumSizeEditor = new UIMediumSizeEditor(pWidget);
+                if (m_pMediumSizeEditor)
+                {
+                    m_pMediumSizeEditorLabel->setBuddy(m_pMediumSizeEditor);
+                    pSizeLayout->addWidget(m_pMediumSizeEditor, 0, 1, 2, 1);
+                }
+
+                pLayout->addLayout(pSizeLayout);
+            }
+
+            /* Hard disk variant (dynamic vs. fixed) widgets: */
+            pLayout->addWidget(createMediumVariantWidgets(false /* bool fWithLabels */));
+        }
+    }
 
     return pWidget;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -382 +382 @@
     /* Disk file size widgets: */
     m_pMediumSizeEditorLabel = new QLabel;
-    m_pMediumSizeEditorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+    m_pMediumSizeEditorLabel->setAlignment(Qt::AlignRight);
+    m_pMediumSizeEditorLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     m_pMediumSizeEditor = new UIMediumSizeEditor;
     m_pMediumSizeEditorLabel->setBuddy(m_pMediumSizeEditor);
@@ -401 +402 @@
     pDiskContainerLayout->addWidget(m_pLocationOpenButton, 0, 3, 1, 1);
 
-    pDiskContainerLayout->addWidget(m_pMediumSizeEditorLabel, 1, 0, 1, 1);
+    pDiskContainerLayout->addWidget(m_pMediumSizeEditorLabel, 1, 0, 1, 1, Qt::AlignBottom);
     pDiskContainerLayout->addWidget(m_pMediumSizeEditor, 1, 1, 2, 3);