Changeset 58607 in vbox

Timestamp:

Nov 6, 2015 2:40:24 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8104: LogWindow: Fix for logwindow fails to save over the existing file when user chooses replace option. It should fix ticketref:8034:

File:

• trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp (modified) (2 diffs)

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

@@ -32 +32 @@
 
 /* GUI includes: */
+# include "QIFileDialog.h"
+# include "QITabWidget.h"
+# include "UIExtraDataManager.h"
+# include "UIIconPool.h"
+# include "UIMessageCenter.h"
+# include "UISpecialControls.h"
 # include "UIVMLogViewer.h"
-# include "QITabWidget.h"
-# include "UIIconPool.h"
-# include "UISpecialControls.h"
 # include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
 # include "VBoxUtils.h"
-# include "UIExtraDataManager.h"
 
 /* COM includes: */
@@ -790 +791 @@
 {
     /* Prepare "save as" dialog: */
-    QFileInfo fileInfo(m_book.at(m_pViewerContainer->currentIndex()).first);
-    QDateTime dtInfo = fileInfo.lastModified();
-    QString strDtString = dtInfo.toString("yyyy-MM-dd-hh-mm-ss");
-    QString strDefaultFileName = QString("%1-%2.log").arg(m_machine.GetName()).arg(strDtString);
-    QString strDefaultFullName = QDir::toNativeSeparators(QDir::home().absolutePath() + "/" + strDefaultFileName);
-    QString strNewFileName = QFileDialog::getSaveFileName(this, tr("Save VirtualBox Log As"), strDefaultFullName);
-
-    /* Copy log into the file: */
+    const QFileInfo fileInfo(m_book.at(m_pViewerContainer->currentIndex()).first);
+    /* Prepare default filename: */
+    const QDateTime dtInfo = fileInfo.lastModified();
+    const QString strDtString = dtInfo.toString("yyyy-MM-dd-hh-mm-ss");
+    const QString strDefaultFileName = QString("%1-%2.log").arg(m_machine.GetName()).arg(strDtString);
+    const QString strDefaultFullName = QDir::toNativeSeparators(QDir::home().absolutePath() + "/" + strDefaultFileName);
+    /* Show "save as" dialog: */
+    const QString strNewFileName = QIFileDialog::getSaveFileName(strDefaultFullName,
+                                                                 "",
+                                                                 this,
+                                                                 tr("Save VirtualBox Log As"),
+                                                                 0 /* selected filter */,
+                                                                 true /* resolve symlinks */,
+                                                                 true /* confirm overwrite */);
+    /* Make sure file-name is not empty: */
     if (!strNewFileName.isEmpty())
+    {
+        /* Delete the previous file if already exists as user already confirmed: */
+        if (QFile::exists(strNewFileName))
+            QFile::remove(strNewFileName);
+        /* Copy log into the file: */
         QFile::copy(m_machine.QueryLogFilename(m_pViewerContainer->currentIndex()), strNewFileName);
+    }
 }