Changeset 79586 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 8, 2019 8:09:34 AM (6 years ago)

Author:

vboxsync

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

131883

Message:

FE/Qt: bugref:9484: Export Appliance wizard: Expert page: Adding radio-button options for 2 phase'd export, s.a. bugref:9489 (it's for r131837).

Location:

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

Files:

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

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

@@ -889 +889 @@
                         m_pSettingsLayout2->addWidget(m_pMachineLabel, 2, 0);
                     }
+                    /* Create Export Then Ask button: */
+                    m_pRadioExportThenAsk = new QRadioButton;
+                    if (m_pRadioExportThenAsk)
+                    {
+                        m_pRadioExportThenAsk->setEnabled(false);
+
+                        /* Add into layout: */
+                        m_pSettingsLayout2->addWidget(m_pRadioExportThenAsk, 2, 1);
+                    }
                     /* Create Ask Then Export button: */
                     m_pRadioAskThenExport = new QRadioButton;
@@ -895 +904 @@
                         /* Add into layout: */
                         m_pSettingsLayout2->addWidget(m_pRadioAskThenExport, 3, 1);
-                    }
-                    /* Create Export Then Ask button: */
-                    m_pRadioExportThenAsk = new QRadioButton;
-                    if (m_pRadioExportThenAsk)
-                    {
-                        m_pRadioExportThenAsk->setEnabled(false);
-
-                        /* Add into layout: */
-                        m_pSettingsLayout2->addWidget(m_pRadioExportThenAsk, 2, 1);
                     }
                     /* Create Do Not Ask button: */

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

@@ -234 +234 @@
     /** Holds the machine label instance. */
     QLabel       *m_pMachineLabel;
+    /** Holds the export then ask radio button instance. */
+    QRadioButton *m_pRadioExportThenAsk;
     /** Holds the ask then export radio button instance. */
     QRadioButton *m_pRadioAskThenExport;
-    /** Holds the export then ask radio button instance. */
-    QRadioButton *m_pRadioExportThenAsk;
     /** Holds the don't ask radio button instance. */
     QRadioButton *m_pRadioDoNotAsk;

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

@@ -359 +359 @@
                                 const int iTotalWidth = 50 * iFontWidth;
                                 const int iFontHeight = fm.height();
-                                const int iTotalHeight = 4 * iFontHeight;
+                                const int iTotalHeight = 8 * iFontHeight;
                                 m_pAccountPropertyTable->setMinimumSize(QSize(iTotalWidth, iTotalHeight));
                                 m_pAccountPropertyTable->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
@@ -369 +369 @@
                                 /* Add into layout: */
                                 m_pSettingsLayout2->addWidget(m_pAccountPropertyTable, 1, 1);
+                            }
+
+                            /* Create account label: */
+                            m_pMachineLabel = new QLabel;
+                            if (m_pMachineLabel)
+                            {
+                                m_pMachineLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+
+                                /* Add into layout: */
+                                m_pSettingsLayout2->addWidget(m_pMachineLabel, 2, 0);
+                            }
+                            /* Create Export Then Ask button: */
+                            m_pRadioExportThenAsk = new QRadioButton;
+                            if (m_pRadioExportThenAsk)
+                            {
+                                m_pRadioExportThenAsk->setEnabled(false);
+
+                                /* Add into layout: */
+                                m_pSettingsLayout2->addWidget(m_pRadioExportThenAsk, 2, 1);
+                            }
+                            /* Create Ask Then Export button: */
+                            m_pRadioAskThenExport = new QRadioButton;
+                            if (m_pRadioAskThenExport)
+                            {
+                                /* Add into layout: */
+                                m_pSettingsLayout2->addWidget(m_pRadioAskThenExport, 3, 1);
+                            }
+                            /* Create Do Not Ask button: */
+                            m_pRadioDoNotAsk = new QRadioButton;
+                            if (m_pRadioDoNotAsk)
+                            {
+                                m_pRadioDoNotAsk->setEnabled(false);
+
+                                /* Add into layout: */
+                                m_pSettingsLayout2->addWidget(m_pRadioDoNotAsk, 4, 1);
                             }
                         }
@@ -507 +542 @@
     m_pAccountLabel->setText(UIWizardExportApp::tr("&Account:"));
 
+    /* Translate option label: */
+    m_pMachineLabel->setText(UIWizardExportApp::tr("Machine Creation:"));
+    m_pRadioExportThenAsk->setText(UIWizardExportApp::tr("Ask me about it &after exporting disk as custom image"));
+    m_pRadioAskThenExport->setText(UIWizardExportApp::tr("Ask me about it &before exporting disk as custom image"));
+    m_pRadioDoNotAsk->setText(UIWizardExportApp::tr("Do &not ask me about it, leave custom image for future usage"));
+
     /* Adjust label widths: */
     QList<QWidget*> labels;
@@ -514 +555 @@
     labels << m_pAdditionalLabel;
     labels << m_pAccountLabel;
+    labels << m_pMachineLabel;
     int iMaxWidth = 0;
     foreach (QWidget *pLabel, labels)
@@ -540 +582 @@
     /* Translate page: */
     retranslateUi();
+
+    /* Choose default cloud export option: */
+    m_pRadioAskThenExport->setChecked(true);
 }