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

Timestamp:

Apr 8, 2016 3:54:41 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8249: Import Appliance Wizard: Dismiss import-appliance wizard if user rejects certificate and fix for issue with dialog's button-box events.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp

@@ -87 +87 @@
 
             pButtonBox->button(QDialogButtonBox::Yes)->setShortcut(Qt::Key_Enter);
-            connect(pButtonBox, SIGNAL(accepted()), this, SLOT(close()));
+            connect(pButtonBox, SIGNAL(accepted()), this, SLOT(accept()));
 
             //pButtonBox->button(QDialogButtonBox::No)->setShortcut(Qt::Key_Esc);
-            connect(pButtonBox, SIGNAL(rejected()), this, SLOT(close()));
+            connect(pButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
             /* Add button-box into layout: */
@@ -246 +246 @@
 
             /* Show viewer in modal mode: */
-            pDialog->exec();
-
-/** @todo
- *
- * Must dismiss the wizard if dialog was rejected!
- * Must dismiss the wizard if dialog was rejected!
- * Must dismiss the wizard if dialog was rejected!
- *
- * Someone with clue try figure out how.
- *
- */
+            int iResultCode = pDialog->exec();
 
             /* Leave if destroyed prematurely: */
             if (!pDialog)
-                return; /** @todo r=bird: what happened to this dialog in that case?? */
-
-            /* Delete viewer finally: */
-            delete pDialog;
-            pDialog = NULL;
+                return; /** @todo r=bird: what happened to this dialog in that case??, will check this case later. */
+            /* Delete viewer: */
+            if (pDialog)
+            {
+                delete pDialog;
+                pDialog = NULL;
+            }
+
+            /* Dismiss the entire import-appliance wizard if user rejects certificate: */
+            if (iResultCode == QDialog::Rejected)
+                wizard()->reject();
         }
     }