Changeset 93219 in vbox

Timestamp:

Jan 13, 2022 10:44:20 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: UIWizardAddCloudVM: Reworking expert page to be based on UIToolBox; This is required to save horizontal space and to have watermark.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm

Files:

• UIWizardAddCloudVMPageExpert.cpp (modified) (7 diffs)
• UIWizardAddCloudVMPageExpert.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageExpert.cpp

@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QGroupBox>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QListWidget>
 #include <QTableWidget>
+#include <QVBoxLayout>
 
 /* GUI includes: */
@@ -28 +28 @@
 #include "UICloudNetworkingStuff.h"
 #include "UIIconPool.h"
+#include "UIToolBox.h"
 #include "UIVirtualBoxEventHandler.h"
 #include "UIVirtualBoxManager.h"
@@ -38 +39 @@
 
 UIWizardAddCloudVMPageExpert::UIWizardAddCloudVMPageExpert()
-    : m_pCntProvider(0)
-    , m_pProviderLayout(0)
+    : m_pToolBox(0)
     , m_pProviderLabel(0)
     , m_pProviderComboBox(0)
-    , m_pOptionsLayout(0)
     , m_pProfileLabel(0)
     , m_pProfileComboBox(0)
@@ -50 +49 @@
 {
     /* Prepare main layout: */
-    QHBoxLayout *pLayoutMain = new QHBoxLayout(this);
+    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
     if (pLayoutMain)
     {
-        /* Prepare provider container: */
-        m_pCntProvider = new QGroupBox(this);
-        if (m_pCntProvider)
+        /* Prepare tool-box: */
+        m_pToolBox = new UIToolBox(this);
+        if (m_pToolBox)
         {
-            /* Prepare provider layout: */
-            m_pProviderLayout = new QGridLayout(m_pCntProvider);
-            if (m_pProviderLayout)
+            /* Prepare location widget: */
+            QWidget *pWidgetLocation = new QWidget(m_pToolBox);
+            if (pWidgetLocation)
             {
-                /* Prepare provider selector: */
-                m_pProviderComboBox = new QIComboBox(m_pCntProvider);
-                if (m_pProviderComboBox)
-                    m_pProviderLayout->addWidget(m_pProviderComboBox, 0, 0);
-
-                /* Prepare options layout: */
-                m_pOptionsLayout = new QGridLayout;
-                if (m_pOptionsLayout)
+                /* Prepare location layout: */
+                QVBoxLayout *pLayoutLocation = new QVBoxLayout(pWidgetLocation);
+                if (pLayoutLocation)
                 {
-                    m_pOptionsLayout->setContentsMargins(0, 0, 0, 0);
-                    m_pOptionsLayout->setRowStretch(1, 1);
-
-                    /* Prepare sub-layout: */
-                    QHBoxLayout *pSubLayout = new QHBoxLayout;
-                    if (pSubLayout)
+                    pLayoutLocation->setContentsMargins(0, 0, 0, 0);
+
+                    /* Prepare provider combo-box: */
+                    m_pProviderComboBox = new QIComboBox(pWidgetLocation);
+                    if (m_pProviderComboBox)
+                        pLayoutLocation->addWidget(m_pProviderComboBox);
+
+                    /* Prepare profile layout: */
+                    QHBoxLayout *pLayoutProfile = new QHBoxLayout;
+                    if (pLayoutProfile)
                     {
-                        pSubLayout->setContentsMargins(0, 0, 0, 0);
-                        pSubLayout->setSpacing(1);
+                        pLayoutProfile->setContentsMargins(0, 0, 0, 0);
+                        pLayoutProfile->setSpacing(1);
 
                         /* Prepare profile combo-box: */
-                        m_pProfileComboBox = new QIComboBox(m_pCntProvider);
+                        m_pProfileComboBox = new QIComboBox(pWidgetLocation);
                         if (m_pProfileComboBox)
-                            pSubLayout->addWidget(m_pProfileComboBox);
+                            pLayoutProfile->addWidget(m_pProfileComboBox);
 
                         /* Prepare profile tool-button: */
-                        m_pProfileToolButton = new QIToolButton(m_pCntProvider);
+                        m_pProfileToolButton = new QIToolButton(pWidgetLocation);
                         if (m_pProfileToolButton)
                         {
                             m_pProfileToolButton->setIcon(UIIconPool::iconSet(":/cloud_profile_manager_16px.png",
                                                                               ":/cloud_profile_manager_disabled_16px.png"));
-                            pSubLayout->addWidget(m_pProfileToolButton);
+                            pLayoutProfile->addWidget(m_pProfileToolButton);
                         }
 
                         /* Add into layout: */
-                        m_pOptionsLayout->addLayout(pSubLayout, 0, 0);
+                        pLayoutLocation->addLayout(pLayoutProfile);
                     }
+                }
+
+                /* Add into tool-box: */
+                m_pToolBox->insertPage(0, pWidgetLocation, QString());
+            }
+
+            /* Prepare source widget: */
+            QWidget *pWidgetSource = new QWidget(m_pToolBox);
+            if (pWidgetSource)
+            {
+                /* Prepare source layout: */
+                QVBoxLayout *pLayoutSource = new QVBoxLayout(pWidgetSource);
+                if (pLayoutSource)
+                {
+                    pLayoutSource->setContentsMargins(0, 0, 0, 0);
 
                     /* Prepare source instances table: */
-                    m_pSourceInstanceList = new QListWidget(m_pCntProvider);
+                    m_pSourceInstanceList = new QListWidget(pWidgetSource);
                     if (m_pSourceInstanceList)
                     {
@@ -114 +127 @@
 
                         /* Add into layout: */
-                        m_pOptionsLayout->addWidget(m_pSourceInstanceList, 1, 0);
+                        pLayoutSource->addWidget(m_pSourceInstanceList, 1, 0);
                     }
-
-                    /* Add into layout: */
-                    m_pProviderLayout->addLayout(m_pOptionsLayout, 1, 0);
                 }
+
+                /* Add into tool-box: */
+                m_pToolBox->insertPage(1, pWidgetSource, QString());
             }
 
             /* Add into layout: */
-            pLayoutMain->addWidget(m_pCntProvider);
+            pLayoutMain->addWidget(m_pToolBox);
         }
     }
@@ -149 +162 @@
 void UIWizardAddCloudVMPageExpert::retranslateUi()
 {
-    /* Translate source container: */
-    m_pCntProvider->setTitle(UIWizardAddCloudVM::tr("Source"));
+    /* Translate tool-box: */
+    if (m_pToolBox)
+    {
+        m_pToolBox->setPageTitle(0, UIWizardAddCloudVM::tr("Location"));
+        m_pToolBox->setPageTitle(1, UIWizardAddCloudVM::tr("Source"));
+    }
 
     /* Translate profile stuff: */
-    m_pProfileToolButton->setToolTip(UIWizardAddCloudVM::tr("Open Cloud Profile Manager..."));
+    if (m_pProfileToolButton)
+        m_pProfileToolButton->setToolTip(UIWizardAddCloudVM::tr("Open Cloud Profile Manager..."));
 
     /* Translate received values of Source combo-box.
      * We are enumerating starting from 0 for simplicity: */
-    for (int i = 0; i < m_pProviderComboBox->count(); ++i)
-    {
-        m_pProviderComboBox->setItemText(i, m_pProviderComboBox->itemData(i, ProviderData_Name).toString());
-        m_pProviderComboBox->setItemData(i, UIWizardAddCloudVM::tr("Add VM from cloud service provider."), Qt::ToolTipRole);
-    }
+    if (m_pProviderComboBox)
+        for (int i = 0; i < m_pProviderComboBox->count(); ++i)
+        {
+            m_pProviderComboBox->setItemText(i, m_pProviderComboBox->itemData(i, ProviderData_Name).toString());
+            m_pProviderComboBox->setItemData(i, UIWizardAddCloudVM::tr("Add VM from cloud service provider."), Qt::ToolTipRole);
+        }
 
     /* Update tool-tips: */
@@ -169 +188 @@
 void UIWizardAddCloudVMPageExpert::initializePage()
 {
+    /* Choose 1st tool to be chosen initially: */
+    m_pToolBox->setCurrentPage(0);
     /* Populate providers: */
     populateProviders(m_pProviderComboBox, wizard()->notificationCenter());

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageExpert.h

@@ -26 +26 @@
 
 /* Forward declarations: */
-class QGroupBox;
+class UIToolBox;
 class UIWizardAddCloudVM;
 
@@ -72 +72 @@
 private:
 
-    /** Holds the provider container instance. */
-    QGroupBox *m_pCntProvider;
+    /** Holds the tool-box instance. */
+    UIToolBox *m_pToolBox;
 
-    /** Holds the provider layout instance. */
-    QGridLayout *m_pProviderLayout;
     /** Holds the provider type label instance. */
     QLabel      *m_pProviderLabel;
@@ -82 +80 @@
     QIComboBox  *m_pProviderComboBox;
 
-    /** Holds the options layout instance. */
-    QGridLayout  *m_pOptionsLayout;
     /** Holds the profile label instance. */
     QLabel       *m_pProfileLabel;
@@ -90 +86 @@
     /** Holds the profile management tool-button instance. */
     QIToolButton *m_pProfileToolButton;
+
     /** Holds the source instance label instance. */
     QLabel       *m_pSourceInstanceLabel;