Changeset 91460 in vbox for trunk/src/VBox

Timestamp:

Sep 29, 2021 3:03:12 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: UIWizardExportApp: A bit of refactoring; Renaming m_pSettingsWidget to m_pSettingsWidget1 since there will be 2nd stacked-widget soon.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance

Files:

• UIWizardExportAppPageBasic2.cpp (modified) (5 diffs)
• UIWizardExportAppPageBasic2.h (modified) (1 diff)
• UIWizardExportAppPageExpert.cpp (modified) (5 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

@@ -561 +561 @@
     , m_pFormatComboBoxLabel(0)
     , m_pFormatComboBox(0)
-    , m_pSettingsWidget(0)
+    , m_pSettingsWidget1(0)
     , m_pSettingsLayout1(0)
     , m_pFileSelectorLabel(0)
@@ -624 +624 @@
             pMainLayout->addWidget(m_pLabelSettings);
 
-        /* Create settings layout: */
-        m_pSettingsWidget = new QStackedWidget(this);
-        if (m_pSettingsWidget)
+        /* Create settings widget 1: */
+        m_pSettingsWidget1 = new QStackedWidget(this);
+        if (m_pSettingsWidget1)
         {
             /* Create settings pane 1: */
-            QWidget *pSettingsPane1 = new QWidget(m_pSettingsWidget);
+            QWidget *pSettingsPane1 = new QWidget(m_pSettingsWidget1);
             if (pSettingsPane1)
             {
@@ -701 +701 @@
 
                 /* Add into layout: */
-                m_pSettingsWidget->addWidget(pSettingsPane1);
+                m_pSettingsWidget1->addWidget(pSettingsPane1);
             }
 
             /* Create settings pane 2: */
-            QWidget *pSettingsPane2 = new QWidget(m_pSettingsWidget);
+            QWidget *pSettingsPane2 = new QWidget(m_pSettingsWidget1);
             if (pSettingsPane2)
             {
@@ -795 +795 @@
 
                 /* Add into layout: */
-                m_pSettingsWidget->addWidget(pSettingsPane2);
+                m_pSettingsWidget1->addWidget(pSettingsPane2);
             }
 
             /* Add into layout: */
-            pMainLayout->addWidget(m_pSettingsWidget);
+            pMainLayout->addWidget(m_pSettingsWidget1);
         }
     }
@@ -1081 +1081 @@
 
     /* Refresh settings widget state: */
-    refreshStackedWidget(m_pSettingsWidget, wizard()->isFormatCloudOne());
+    refreshStackedWidget(m_pSettingsWidget1, wizard()->isFormatCloudOne());
 
     /* Update export settings: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h

@@ -220 +220 @@
     QIComboBox  *m_pFormatComboBox;
 
-    /** Holds the settings widget instance. */
-    QStackedWidget *m_pSettingsWidget;
+    /** Holds the settings widget 1 instance. */
+    QStackedWidget *m_pSettingsWidget1;
 
     /** Holds the settings layout 1. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp

@@ -72 +72 @@
     , m_pFormatComboBoxLabel(0)
     , m_pFormatComboBox(0)
-    , m_pSettingsWidget(0)
+    , m_pSettingsWidget1(0)
     , m_pSettingsLayout1(0)
     , m_pFileSelectorLabel(0)
@@ -222 +222 @@
 
                 /* Create settings widget: */
-                m_pSettingsWidget = new QStackedWidget;
-                if (m_pSettingsWidget)
+                m_pSettingsWidget1 = new QStackedWidget;
+                if (m_pSettingsWidget1)
                 {
                     /* Create settings pane 1: */
-                    QWidget *pSettingsPane1 = new QWidget(m_pSettingsWidget);
+                    QWidget *pSettingsPane1 = new QWidget(m_pSettingsWidget1);
                     if (pSettingsPane1)
                     {
@@ -315 +315 @@
 
                         /* Add into layout: */
-                        m_pSettingsWidget->addWidget(pSettingsPane1);
+                        m_pSettingsWidget1->addWidget(pSettingsPane1);
                     }
 
                     /* Create settings pane 2: */
-                    QWidget *pSettingsPane2 = new QWidget(m_pSettingsWidget);
+                    QWidget *pSettingsPane2 = new QWidget(m_pSettingsWidget1);
                     if (pSettingsPane2)
                     {
@@ -404 +404 @@
 
                         /* Add into layout: */
-                        m_pSettingsWidget->addWidget(pSettingsPane2);
+                        m_pSettingsWidget1->addWidget(pSettingsPane2);
                     }
 
                     /* Add into layout: */
-                    pSettingsCntLayout->addWidget(m_pSettingsWidget);
+                    pSettingsCntLayout->addWidget(m_pSettingsWidget1);
                 }
             }
@@ -737 +737 @@
 
     /* Refresh settings widget state: */
-    refreshStackedWidget(m_pSettingsWidget, wizard()->isFormatCloudOne());
+    refreshStackedWidget(m_pSettingsWidget1, wizard()->isFormatCloudOne());
     refreshStackedLayout(m_pSettingsLayout, wizard()->isFormatCloudOne());
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h

@@ -164 +164 @@
     QIComboBox  *m_pFormatComboBox;
 
-    /** Holds the settings widget instance. */
-    QStackedWidget *m_pSettingsWidget;
+    /** Holds the settings widget 1 instance. */
+    QStackedWidget *m_pSettingsWidget1;
 
     /** Holds the settings layout 1. */