Changeset 88148 in vbox

Timestamp:

Mar 17, 2021 9:51:23 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143297

Message:

FE/Qt: bugref:9515: New VM wizard: A bit of layout fixes for 1st page and corresponding Name and OS Type editor used there.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UINameAndSystemEditor.cpp (modified) (13 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -286 +286 @@
 {
     if (m_pNameLabel)
-        m_pNameLabel->setText(tr("Name:"));
+        m_pNameLabel->setText(tr("&Name:"));
     if (m_pPathLabel)
-        m_pPathLabel->setText(tr("Folder:"));
+        m_pPathLabel->setText(tr("&Folder:"));
     if (m_pISOFileSelectorLabel)
-        m_pISOFileSelectorLabel->setText(tr("Installation ISO:"));
+        m_pISOFileSelectorLabel->setText(tr("&Image:"));
     if (m_pLabelFamily)
         m_pLabelFamily->setText(tr("&Type:"));
@@ -417 +417 @@
 void UINameAndSystemEditor::prepareWidgets()
 {
-    /* Create main-layout: */
+    /* Prepare main-layout: */
     m_pMainLayout = new QGridLayout(this);
     if (m_pMainLayout)
@@ -429 +429 @@
         if (m_fChooseName)
         {
-            /* Create name label: */
-            m_pNameLabel = new QLabel;
+            /* Prepare name label: */
+            m_pNameLabel = new QLabel(this);
             if (m_pNameLabel)
             {
@@ -436 +436 @@
                 m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 
-                /* Add into layout: */
-                m_pMainLayout->addWidget(m_pNameLabel, iRow, 0, 1, 1);
-            }
-            /* Create name editor: */
-            m_pNameLineEdit = new QILineEdit;
+                m_pMainLayout->addWidget(m_pNameLabel, iRow, 0);
+            }
+            /* Prepare name editor: */
+            m_pNameLineEdit = new QILineEdit(this);
             if (m_pNameLineEdit)
             {
-                /* Add into layout: */
+                m_pNameLabel->setBuddy(m_pNameLineEdit);
                 m_pMainLayout->addWidget(m_pNameLineEdit, iRow, 1, 1, 2);
             }
@@ -452 +451 @@
         if (m_fChoosePath)
         {
-            /* Create path label: */
-            m_pPathLabel = new QLabel;
+            /* Prepare path label: */
+            m_pPathLabel = new QLabel(this);
             if (m_pPathLabel)
             {
@@ -459 +458 @@
                 m_pPathLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 
-                /* Add into layout: */
-                m_pMainLayout->addWidget(m_pPathLabel, iRow, 0, 1, 1);
-            }
-            /* Create path selector: */
-            m_pPathSelector = new UIFilePathSelector;
+                m_pMainLayout->addWidget(m_pPathLabel, iRow, 0);
+            }
+            /* Prepare path selector: */
+            m_pPathSelector = new UIFilePathSelector(this);
             if (m_pPathSelector)
             {
+                m_pPathLabel->setBuddy(m_pPathSelector);
                 QString strDefaultMachineFolder = uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
                 m_pPathSelector->setPath(strDefaultMachineFolder);
                 m_pPathSelector->setDefaultPath(strDefaultMachineFolder);
 
-                /* Add into layout: */
                 m_pMainLayout->addWidget(m_pPathSelector, iRow, 1, 1, 2);
             }
@@ -479 +477 @@
         if (m_fChooseISOFile)
         {
+            /* Prepare ISO label: */
             m_pISOFileSelectorLabel = new QLabel(this);
-            m_pMainLayout->addWidget(m_pISOFileSelectorLabel, iRow, 0);
-
+            if (m_pISOFileSelectorLabel)
+            {
+                m_pISOFileSelectorLabel->setAlignment(Qt::AlignRight);
+                m_pISOFileSelectorLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+                m_pMainLayout->addWidget(m_pISOFileSelectorLabel, iRow, 0);
+            }
+            /* Prepare ISO selector: */
             m_pISOFileSelector = new UIFilePathSelector(this);
             if (m_pISOFileSelector)
@@ -488 +493 @@
                 m_pISOFileSelector->setMode(UIFilePathSelector::Mode_File_Open);
                 m_pISOFileSelector->setFileDialogFilters("*.iso *.ISO");
-                m_pISOFileSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+                m_pISOFileSelector->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
                 m_pISOFileSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
                 m_pISOFileSelectorLabel->setBuddy(m_pISOFileSelector);
+
                 m_pMainLayout->addWidget(m_pISOFileSelector, iRow, 1, 1, 2);
             }
+
             ++iRow;
         }
@@ -498 +505 @@
         if (m_fChooseType)
         {
-            /* Create VM OS family label: */
-            m_pLabelFamily = new QLabel;
+            /* Prepare VM OS family label: */
+            m_pLabelFamily = new QLabel(this);
             if (m_pLabelFamily)
             {
                 m_pLabelFamily->setAlignment(Qt::AlignRight);
                 m_pLabelFamily->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                /* Add into layout: */
+
                 m_pMainLayout->addWidget(m_pLabelFamily, iRow, 0);
             }
-
-            int iIconRow = iRow;
-
-            /* Create VM OS family combo: */
-            m_pComboFamily = new QComboBox;
+            /* Prepare VM OS family combo: */
+            m_pComboFamily = new QComboBox(this);
             if (m_pComboFamily)
             {
@@ -517 +521 @@
                 m_pLabelFamily->setBuddy(m_pComboFamily);
 
-                /* Add into layout: */
                 m_pMainLayout->addWidget(m_pComboFamily, iRow, 1);
             }
 
+            const int iIconRow = iRow;
             ++iRow;
 
-            /* Create VM OS type label: */
-            m_pLabelType = new QLabel;
+            /* Prepare VM OS type label: */
+            m_pLabelType = new QLabel(this);
             if (m_pLabelType)
             {
@@ -530 +534 @@
                 m_pLabelType->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 
-                /* Add into layout: */
                 m_pMainLayout->addWidget(m_pLabelType, iRow, 0);
             }
-            /* Create VM OS type combo: */
-            m_pComboType = new QComboBox;
+            /* Prepare VM OS type combo: */
+            m_pComboType = new QComboBox(this);
             if (m_pComboType)
             {
@@ -540 +543 @@
                 m_pLabelType->setBuddy(m_pComboType);
 
-                /* Add into layout: */
                 m_pMainLayout->addWidget(m_pComboType, iRow, 1);
             }
@@ -546 +548 @@
             ++iRow;
 
-            /* Create sub-layout: */
+            /* Prepare sub-layout: */
             QVBoxLayout *pLayoutIcon = new QVBoxLayout;
             if (pLayoutIcon)
             {
-                /* Create VM OS type icon: */
-                m_pIconType = new QLabel;
+                /* Prepare VM OS type icon: */
+                m_pIconType = new QLabel(this);
                 if (m_pIconType)
                 {
                     m_pIconType->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
-                    /* Add into layout: */
                     pLayoutIcon->addWidget(m_pIconType);
                 }

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

@@ -235 +235 @@
 QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets()
 {
+    /* Prepare container widget: */
     QWidget *pContainerWidget = new QWidget;
-    QVBoxLayout *pLayout = new QVBoxLayout(pContainerWidget);
-    pLayout->setContentsMargins(0, 0, 0, 0);
-
-    /* Prepare Name and OS Type editor: */
-    m_pNameAndSystemEditor = new UINameAndSystemEditor(0,
-                                                       true /* fChooseName? */,
-                                                       true /* fChoosePath? */,
-                                                       true /* fChooseType? */,
-                                                       true /* fChooseISOFile? */);
-    pLayout->addWidget(m_pNameAndSystemEditor);
-    m_pSkipUnattendedCheckBox = new QCheckBox;
-    pLayout->addWidget(m_pSkipUnattendedCheckBox);
+    if (pContainerWidget)
+    {
+        /* Prepare layout: */
+        QVBoxLayout *pLayout = new QVBoxLayout(pContainerWidget);
+        if (pLayout)
+        {
+            pLayout->setContentsMargins(0, 0, 0, 0);
+
+            /* Prepare Name and OS Type editor: */
+            m_pNameAndSystemEditor = new UINameAndSystemEditor(0,
+                                                               true /* fChooseName? */,
+                                                               true /* fChoosePath? */,
+                                                               true /* fChooseType? */,
+                                                               true /* fChooseISOFile? */);
+            if (m_pNameAndSystemEditor)
+                pLayout->addWidget(m_pNameAndSystemEditor);
+
+            /* Prepare Skip Unattended checkbox: */
+            m_pSkipUnattendedCheckBox = new QCheckBox;
+            if (m_pSkipUnattendedCheckBox)
+                pLayout->addWidget(m_pSkipUnattendedCheckBox);
+        }
+    }
+
+    /* Return container widget: */
     return pContainerWidget;
 }