Changeset 88152 in vbox

Timestamp:

Mar 17, 2021 12:47:59 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515: New VM wizard: A bit of layout fixes for 2nd page and corresponding Name and Password editor used there.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIUserNamePasswordEditor.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic2.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIUserNamePasswordEditor.cpp

@@ -351 +351 @@
         return;
     pLabel->setAlignment(Qt::AlignRight);
-    pLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+    pLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 
     pLayout->addWidget(pLabel, iRow, 0, 1, 1);
@@ -371 +371 @@
     QGridLayout *pMainLayout = new QGridLayout;
     pMainLayout->setContentsMargins(0, 0, 0, 0);
+    pMainLayout->setColumnStretch(0, 0);
+    pMainLayout->setColumnStretch(1, 1);
     if (!pMainLayout)
         return;

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

@@ -133 +133 @@
         return m_pGAInstallationISOContainer;
 
+    /* Prepare GA Installation ISO container: */
     m_pGAInstallationISOContainer = new QGroupBox;
-    m_pGAInstallationISOContainer->setCheckable(true);
-    QGridLayout *pGAInstallationISOContainer = new QGridLayout(m_pGAInstallationISOContainer);
-    m_pGAISOPathLabel = new QLabel;
-    if (m_pGAISOPathLabel)
-        pGAInstallationISOContainer->addWidget(m_pGAISOPathLabel, 0, 1, 1, 1);
-
-    m_pGAISOFilePathSelector = new UIFilePathSelector;
-    {
-        m_pGAISOFilePathSelector->setResetEnabled(false);
-        m_pGAISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
-        m_pGAISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
-        m_pGAISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
-        m_pGAISOFilePathSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
-        pGAInstallationISOContainer->addWidget(m_pGAISOFilePathSelector, 0, 2, 1, 6);
-        if (m_pGAISOPathLabel)
-            m_pGAISOPathLabel->setBuddy(m_pGAISOFilePathSelector);
+    if (m_pGAInstallationISOContainer)
+    {
+        m_pGAInstallationISOContainer->setCheckable(true);
+
+        /* Prepare GA Installation ISO layout: */
+        QHBoxLayout *pGAInstallationISOLayout = new QHBoxLayout(m_pGAInstallationISOContainer);
+        if (pGAInstallationISOLayout)
+        {
+            /* Prepare GA ISO path label: */
+            m_pGAISOPathLabel = new QLabel;
+            if (m_pGAISOPathLabel)
+            {
+                m_pGAISOPathLabel->setAlignment(Qt::AlignRight);
+                m_pGAISOPathLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+                pGAInstallationISOLayout->addWidget(m_pGAISOPathLabel);
+            }
+            /* Prepare GA ISO path editor: */
+            m_pGAISOFilePathSelector = new UIFilePathSelector;
+            {
+                m_pGAISOFilePathSelector->setResetEnabled(false);
+                m_pGAISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
+                m_pGAISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
+                m_pGAISOFilePathSelector->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+                m_pGAISOFilePathSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
+                if (m_pGAISOPathLabel)
+                    m_pGAISOPathLabel->setBuddy(m_pGAISOFilePathSelector);
+
+                pGAInstallationISOLayout->addWidget(m_pGAISOFilePathSelector);
+            }
+        }
     }
 
@@ -186 +202 @@
     if (m_pGAInstallationISOContainer)
     {
-        m_pGAInstallationISOContainer->setTitle(UIWizardNewVM::tr("&Guest Additions"));
+        m_pGAInstallationISOContainer->setTitle(UIWizardNewVM::tr("&Guest additions"));
         m_pGAInstallationISOContainer->setToolTip(UIWizardNewVM::tr("<p>When checked the guest additions will be installed "
                                                            "after the OS install.</p>"));
@@ -250 +266 @@
     m_pAdditionalOptionsContainer = new QGroupBox;
     QGridLayout *pAdditionalOptionsContainerLayout = new QGridLayout(m_pAdditionalOptionsContainer);
+    pAdditionalOptionsContainerLayout->setColumnStretch(0, 0);
+    pAdditionalOptionsContainerLayout->setColumnStretch(1, 1);
+
+    m_pProductKeyLabel = new QLabel;
+    if (m_pProductKeyLabel)
+    {
+        m_pProductKeyLabel->setAlignment(Qt::AlignRight);
+        m_pProductKeyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+        pAdditionalOptionsContainerLayout->addWidget(m_pProductKeyLabel, 0, 0);
+    }
+    m_pProductKeyLineEdit = new QLineEdit;
+    if (m_pProductKeyLineEdit)
+    {
+        m_pProductKeyLineEdit->setInputMask(">NNNNN-NNNNN-NNNNN-NNNNN-NNNNN;#");
+        if (m_pProductKeyLabel)
+            m_pProductKeyLabel->setBuddy(m_pProductKeyLineEdit);
+        pAdditionalOptionsContainerLayout->addWidget(m_pProductKeyLineEdit, 0, 1, 1, 2);
+    }
+
+    m_pHostnameLabel = new QLabel;
+    if (m_pHostnameLabel)
+    {
+        m_pHostnameLabel->setAlignment(Qt::AlignRight);
+        m_pHostnameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+        pAdditionalOptionsContainerLayout->addWidget(m_pHostnameLabel, 1, 0);
+    }
+    m_pHostnameLineEdit = new QLineEdit;
+    if (m_pHostnameLineEdit)
+    {
+        if (m_pHostnameLabel)
+            m_pHostnameLabel->setBuddy(m_pHostnameLineEdit);
+        pAdditionalOptionsContainerLayout->addWidget(m_pHostnameLineEdit, 1, 1, 1, 2);
+    }
+
     m_pStartHeadlessCheckBox = new QCheckBox;
     if (m_pStartHeadlessCheckBox)
-        pAdditionalOptionsContainerLayout->addWidget(m_pStartHeadlessCheckBox, 0, 0, 1, 4);
-
-    m_pProductKeyLabel = new QLabel;
-    if (m_pProductKeyLabel)
-    {
-        m_pProductKeyLabel->setAlignment(Qt::AlignRight);
-        m_pProductKeyLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
-        pAdditionalOptionsContainerLayout->addWidget(m_pProductKeyLabel, 1, 0, 1, 1);
-    }
-    m_pProductKeyLineEdit = new QLineEdit;
-    if (m_pProductKeyLineEdit)
-    {
-        m_pProductKeyLineEdit->setInputMask(">NNNNN-NNNNN-NNNNN-NNNNN-NNNNN;#");
-        pAdditionalOptionsContainerLayout->addWidget(m_pProductKeyLineEdit, 1, 1, 1, 3);
-        if (m_pProductKeyLabel)
-            m_pProductKeyLabel->setBuddy(m_pProductKeyLineEdit);
-    }
-
-    m_pHostnameLabel = new QLabel;
-    if (m_pHostnameLabel)
-    {
-        m_pHostnameLabel->setAlignment(Qt::AlignRight);
-        m_pHostnameLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
-        pAdditionalOptionsContainerLayout->addWidget(m_pHostnameLabel, 2, 0, 1, 1);
-    }
-
-    m_pHostnameLineEdit = new QLineEdit;
-    if (m_pHostnameLineEdit)
-    {
-        pAdditionalOptionsContainerLayout->addWidget(m_pHostnameLineEdit, 2, 1, 1, 3);
-        if (m_pHostnameLabel)
-            m_pHostnameLabel->setBuddy(m_pHostnameLineEdit);
-    }
+        pAdditionalOptionsContainerLayout->addWidget(m_pStartHeadlessCheckBox, 2, 1);
 
     return m_pAdditionalOptionsContainer;