From 189299f354c248913603428b8529a4374b780673 Mon Sep 17 00:00:00 2001
From: dogmaphobic <dogmaphobic@users.noreply.github.com>
Date: Mon, 2 Feb 2015 15:37:13 -0500
Subject: [PATCH] Appending required extension when it is not the one used
 (when in strict mode). Added a dialog asking the user about overwritting an
 existing file.

---
 src/QGCFileDialog.cc | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/QGCFileDialog.cc b/src/QGCFileDialog.cc
index cd5ffae02..32c4d6649 100644
--- a/src/QGCFileDialog.cc
+++ b/src/QGCFileDialog.cc
@@ -130,7 +130,6 @@ QString QGCFileDialog::getSaveFileName(QWidget* parent,
                         if (_validateExtension(filter, userSuffix)) {
                             return result;
                         }
-#if 0                   //-- If we ever want to propose replacing the extension, we can guess the replacement below
                         //-- Do we have a default extension?
                         QString localDefaultSuffix;
                         if (!defaultSuffix) {
@@ -139,23 +138,30 @@ QString QGCFileDialog::getSaveFileName(QWidget* parent,
                             defaultSuffix = &localDefaultSuffix;
                         }
                         Q_ASSERT(defaultSuffix->isEmpty() == false);
-                        QString proposed = fi.completeBaseName();
-                        proposed += ".";
-                        proposed += *defaultSuffix;
-#endif
-                        //-- Ask user what to do
-                        QMessageBox msgBox(
-                            QMessageBox::Critical,
-                            tr("Invalid File Extension."),
-                            tr("The given extension (.%1) is not a valid extension for this type of file.").arg(userSuffix),
-                            QMessageBox::Cancel,
-                            parent);
-                        msgBox.setDefaultButton(QMessageBox::Cancel);
-                        msgBox.setWindowModality(Qt::ApplicationModal);
-                        QPushButton *retryButton = msgBox.addButton(tr("Retry"), QMessageBox::ActionRole);
-                        msgBox.exec();
-                        if (msgBox.clickedButton() == retryButton) {
-                            continue;
+                        //-- Forcefully append our desired extension
+                        result += ".";
+                        result += *defaultSuffix;
+                        //-- Check and see if this new file already exists
+                        fi.setFile(result);
+                        if (fi.exists()) {
+                            //-- Ask user what to do
+                            QMessageBox msgBox(
+                                QMessageBox::Warning,
+                                tr("File Exists"),
+                                tr("%1 already exists.\nDo you want to replace it?").arg(fi.fileName()),
+                                QMessageBox::Cancel,
+                                parent);
+                            msgBox.addButton(QMessageBox::Retry);
+                            QPushButton *overwriteButton = msgBox.addButton(tr("Replace"), QMessageBox::ActionRole);
+                            msgBox.setDefaultButton(QMessageBox::Retry);
+                            msgBox.setWindowModality(Qt::ApplicationModal);
+                            if (msgBox.exec() == QMessageBox::Retry) {
+                                continue;
+                            } else if (msgBox.clickedButton() == overwriteButton) {
+                                return result;
+                            }
+                        } else {
+                            return result;
                         }
                     }
                 }
-- 
2.22.0