儲存庫 vbox 的更動 18402

時間撮記:

2009-3-27 下午02:52:23 (16 年 以前)

作者:

vboxsync

訊息:

FE/Qt4-OVF: remove files before export

位置:

trunk/src/VBox/Frontends/VirtualBox

檔案:

• include/VBoxProblemReporter.h (修改) (2 筆差異)
• src/VBoxExportApplianceWzd.cpp (修改) (1 筆差異)
• src/VBoxProblemReporter.cpp (修改) (1 筆差異)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -138 +138 @@
     {
         return messageOkCancel (aParent, aType, aMessage, QString::null,
-                                aAutoConfirmId, aOkText, aCancelText);
-    }
+                                aAutoConfirmId, aOkText, aCancelText); }
 
     bool showModalProgressDialog (CProgress &aProgress, const QString &aTitle,
@@ -148 +147 @@
     /* Generic problem handlers */
     bool askForOverridingFileIfExists (const QString& path, QWidget *aParent = NULL) const;
-    bool askForOverridingFilesIfExists (const QStringList& aPaths, QWidget *aParent /* = NULL */) const;
+    bool askForOverridingFilesIfExists (const QStringList& aPaths, QWidget *aParent = NULL) const;
+
+    void cannotDeleteFile (const QString& path, QWidget *aParent = NULL) const;
 
     /* Special problem handlers */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxExportApplianceWzd.cpp

@@ -157 +157 @@
     if (!vboxProblem().askForOverridingFilesIfExists (files, this))
         return;
+    /* Ok all is confirmed so delete all the files which exists */
+    foreach (const QString &file, files)
+    {
+        QFile f (file);
+        if (f.exists())
+            if (!f.remove())
+            {
+                vboxProblem().cannotDeleteFile (file, this);
+                return;
+            }
+    }
     /* Export the VMs, on success we are finished */
     if (exportVMs(*appliance))

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -323 +323 @@
         return true;
 }
+
+void VBoxProblemReporter::cannotDeleteFile (const QString& path, QWidget *aParent /* = NULL */) const
+{
+    message (aParent, Error,
+             tr ("Failed to remove the file <b>%1</b>.<br /><br />Please try to remove that file yourself & try again.")
+             .arg (path));
+}
+
 // Special Problem handlers
 /////////////////////////////////////////////////////////////////////////////