Changeset 88065 in vbox

Timestamp:

Mar 10, 2021 11:05:15 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950: New VM Wizard: Layout fix for QIRichTextLabel stuff; Wrappable labels should be a members of Basic page and should be inserted into a root layout; Besides that, I'd prefer to have no layout margins where possible.

Location:

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

Files:

• UIWizardNewVMPageBasic1.cpp (modified) (4 diffs)
• UIWizardNewVMPageBasic1.h (modified) (4 diffs)
• UIWizardNewVMPageBasic3.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic4.cpp (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

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

@@ -180 +180 @@
 UIWizardNewVMPage1::UIWizardNewVMPage1(const QString &strGroup)
     : m_pNameAndSystemEditor(0)
-    , m_pNameOSTypeLabel(0)
     , m_pISOFilePathSelector(0)
-    , m_pUnattendedLabel(0)
     , m_pISOPathSelectorLabel(0)
     , m_strGroup(strGroup)
@@ -235 +233 @@
 }
 
-QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets(bool fCreateLabels)
-{
-    QWidget *pContainer = new QWidget;
-    QGridLayout *pLayout = new QGridLayout(pContainer);
-
-    int iRow = 0;
-    if (fCreateLabels)
-    {
-        m_pNameOSTypeLabel = new QIRichTextLabel;
-        if (m_pNameOSTypeLabel)
-            pLayout->addWidget(m_pNameOSTypeLabel, iRow++, 0, 1, 6);
-    }
-
-    m_pNameAndSystemEditor = new UINameAndSystemEditor(0, true, true, true);
-    if (m_pNameAndSystemEditor)
-        pLayout->addWidget(m_pNameAndSystemEditor, iRow++, 0, 1, 6);
-
-    return pContainer;
+QWidget *UIWizardNewVMPage1::createNameOSTypeWidgets()
+{
+    /* Prepare Name and OS Type editor: */
+    m_pNameAndSystemEditor = new UINameAndSystemEditor(0,
+                                                       true /* fChooseName? */,
+                                                       true /* fChoosePath? */,
+                                                       true /* fChooseType? */);
+    return m_pNameAndSystemEditor;
 }
 
@@ -420 +408 @@
 }
 
+
 UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
     : UIWizardNewVMPage1(strGroup)
+    , m_pNameOSTypeLabel(0)
+    , m_pUnattendedLabel(0)
 {
     prepare();
@@ -428 +419 @@
 void UIWizardNewVMPageBasic1::prepare()
 {
+    /* Prepare page layout: */
     QVBoxLayout *pPageLayout = new QVBoxLayout(this);
-    pPageLayout->addWidget(createNameOSTypeWidgets(/* fCreateLabels */ true));
-
-    m_pUnattendedLabel = new QIRichTextLabel;
-    if (m_pUnattendedLabel)
-        pPageLayout->addWidget(m_pUnattendedLabel);
-
-    QHBoxLayout *pISOSelectorLayout = new QHBoxLayout;
-
-    m_pISOPathSelectorLabel = new QLabel;
-    pISOSelectorLayout->addWidget(m_pISOPathSelectorLabel);
-    m_pISOPathSelectorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
-
-    m_pISOFilePathSelector = new UIFilePathSelector;
-    if (m_pISOFilePathSelector)
-    {
-        m_pISOFilePathSelector->setResetEnabled(false);
-        m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
-        m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
-        m_pISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-        m_pISOFilePathSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
-        m_pISOPathSelectorLabel->setBuddy(m_pISOFilePathSelector);
-        pISOSelectorLayout->addWidget(m_pISOFilePathSelector);
-    }
-
-    pPageLayout->addLayout(pISOSelectorLayout);
-    pPageLayout->addStretch();
-
-
-
+    if (pPageLayout)
+    {
+        /* Prepare Name and OS Type label: */
+        m_pNameOSTypeLabel = new QIRichTextLabel(this);
+        if (m_pNameOSTypeLabel)
+            pPageLayout->addWidget(m_pNameOSTypeLabel);
+
+        /* Prepare Name and OS Type editor: */
+        pPageLayout->addWidget(createNameOSTypeWidgets());
+
+        /* Prepare Unattended description label: */
+        m_pUnattendedLabel = new QIRichTextLabel(this);
+        if (m_pUnattendedLabel)
+            pPageLayout->addWidget(m_pUnattendedLabel);
+
+        /* Prepare ISO Selector layout: */
+        QHBoxLayout *pISOSelectorLayout = new QHBoxLayout;
+        if (pISOSelectorLayout)
+        {
+            /* Prepare ISO Selector label: */
+            m_pISOPathSelectorLabel = new QLabel(this);
+            if (m_pISOPathSelectorLabel)
+            {
+                m_pISOPathSelectorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+                pISOSelectorLayout->addWidget(m_pISOPathSelectorLabel);
+            }
+            /* Prepare ISO Selector editor: */
+            m_pISOFilePathSelector = new UIFilePathSelector(this);
+            if (m_pISOFilePathSelector)
+            {
+                m_pISOFilePathSelector->setResetEnabled(false);
+                m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
+                m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
+                m_pISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+                m_pISOFilePathSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
+                m_pISOPathSelectorLabel->setBuddy(m_pISOFilePathSelector);
+
+                pISOSelectorLayout->addWidget(m_pISOFilePathSelector);
+            }
+
+            pPageLayout->addLayout(pISOSelectorLayout);
+        }
+
+        pPageLayout->addStretch();
+    }
 
     createConnections();

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

@@ -40 +40 @@
 class UIWizardNewVMPage1 : public UIWizardPageBase
 {
-
 protected:
 
@@ -76 +75 @@
     void composeMachineFilePath();
 
-    QWidget *createNameOSTypeWidgets(bool fCreateLabels);
-    int createNameOSTypeWidgets(QGridLayout *pLayout, bool fCreateLabels = true);
+    QWidget *createNameOSTypeWidgets();
     /** Colors the widgets red if they cause isComplete to fail. */
     void markWidgets() const;
@@ -91 +89 @@
     /** @name Widgets
      * @{ */
-       UINameAndSystemEditor *m_pNameAndSystemEditor;
-       QIRichTextLabel *m_pNameOSTypeLabel;
-       mutable UIFilePathSelector *m_pISOFilePathSelector;
-       QIRichTextLabel *m_pUnattendedLabel;
-       QLabel *m_pISOPathSelectorLabel;
+        UINameAndSystemEditor *m_pNameAndSystemEditor;
+        UIFilePathSelector    *m_pISOFilePathSelector;
+        QLabel                *m_pISOPathSelectorLabel;
     /** @} */
 
@@ -166 +162 @@
     /** Validation stuff. */
     virtual bool validatePage() /* override */;
+
+
+    /** @name Widgets
+     * @{ */
+        QIRichTextLabel *m_pNameOSTypeLabel;
+        QIRichTextLabel *m_pUnattendedLabel;
+    /** @} */
 };
 

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

@@ -77 +77 @@
     QWidget *pHardwareContainer = new QWidget;
     QGridLayout *pHardwareLayout = new QGridLayout(pHardwareContainer);
+    pHardwareLayout->setContentsMargins(0, 0, 0, 0);
 
     m_pBaseMemoryEditor = new UIBaseMemoryEditor(0, true);

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

@@ -109 +109 @@
     QWidget *pDiskContainer = new QWidget;
     QGridLayout *pDiskLayout = new QGridLayout(pDiskContainer);
+    pDiskLayout->setContentsMargins(0, 0, 0, 0);
     m_pDiskSourceButtonGroup = new QButtonGroup;
     m_pDiskEmpty = new QRadioButton;

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

@@ -59 +59 @@
     {
         m_pToolBox = new UIToolBox;
-        m_pToolBox->insertPage(ExpertToolboxItems_NameAndOSType, createNameOSTypeWidgets(/* fCreateLabels */ false), "");
+        m_pToolBox->insertPage(ExpertToolboxItems_NameAndOSType, createNameOSTypeWidgets(), "");
         m_pToolBox->insertPage(ExpertToolboxItems_Unattended, createUnattendedWidgets(), "", false);
         m_pToolBox->insertPage(ExpertToolboxItems_Hardware, createHardwareWidgets(), "");
@@ -345 +345 @@
     QWidget *pContainerWidget = new QWidget;
     QGridLayout *pLayout = new QGridLayout(pContainerWidget);
+    pLayout->setContentsMargins(0, 0, 0, 0);
     int iRow = 0;