Changeset 41230 in vbox for trunk/src

Timestamp:

May 10, 2012 10:38:37 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 6123: VirtualBox wizards: Avoid superfluous warnings for an expert-mode.

Location:

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

Files:

• clonevd/UIWizardCloneVDPageExpert.cpp (modified) (1 diff)
• exportappliance/UIWizardExportAppPageExpert.cpp (modified) (2 diffs)
• newvd/UIWizardNewVDPageExpert.cpp (modified) (1 diff)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

@@ -277 +277 @@
     startProcessing();
 
-    /* Make sure such virtual-disk doesn't exists already: */
+    /* Make sure such virtual-disk doesn't exists: */
     QString strMediumPath(mediumPath());
-    if (fResult && QFileInfo(strMediumPath).exists())
-    {
+    fResult = !QFileInfo(strMediumPath).exists();
+    if (!fResult)
         msgCenter().sayCannotOverwriteHardDiskStorage(this, strMediumPath);
-        fResult = false;
-    }
 
     /* Try to copy virtual-disk: */

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

@@ -33 +33 @@
 #include "UIWizardExportAppDefs.h"
 #include "VBoxGlobal.h"
-#include "UIMessageCenter.h"
 #include "QILabelSeparator.h"
 #include "VBoxFilePathSelectorWidget.h"
@@ -267 +266 @@
     startProcessing();
 
-    /* Ask user about machines which are in save state currently: */
-    QStringList savedMachines;
-    QList<QListWidgetItem*> pItems = m_pVMSelector->selectedItems();
-    for (int i=0; i < pItems.size(); ++i)
-    {
-        if (static_cast<VMListWidgetItem*>(pItems.at(i))->isInSaveState())
-            savedMachines << pItems.at(i)->text();
-    }
-    if (!savedMachines.isEmpty())
-        fResult = msgCenter().confirmExportMachinesInSaveState(savedMachines, this);
-
     /* Try to export appliance: */
-    if (fResult)
-        fResult = qobject_cast<UIWizardExportApp*>(wizard())->exportAppliance();
+    fResult = qobject_cast<UIWizardExportApp*>(wizard())->exportAppliance();
 
     /* Unlock finish button: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

@@ -295 +295 @@
     startProcessing();
 
-    /* Make sure that virtual-disk doesn't exists: */
+    /* Make sure such virtual-disk doesn't exists: */
     QString strMediumPath(mediumPath());
-    if (fResult && QFileInfo(strMediumPath).exists())
-    {
+    fResult = !QFileInfo(strMediumPath).exists();
+    if (!fResult)
         msgCenter().sayCannotOverwriteHardDiskStorage(this, strMediumPath);
-        fResult = false;
-    }
 
     /* Try to create virtual-disk: */

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

@@ -32 +32 @@
 #include "UIWizardNewVM.h"
 #include "UIIconPool.h"
-#include "UIMessageCenter.h"
 #include "VBoxOSTypeSelectorWidget.h"
 #include "VBoxGuestRAMSlider.h"
@@ -295 +294 @@
         if (fResult)
         {
-            if (!m_pDiskCnt->isChecked())
-            {
-                /* Ask user about disk-less machine: */
-                fResult = msgCenter().confirmHardDisklessMachine(this);
-            }
-            else if (m_pDiskCreate->isChecked())
+            if (m_pDiskCnt->isChecked() && m_pDiskCreate->isChecked())
             {
                 /* Show the New Virtual Disk wizard if necessary: */