Try suggesting file names when saving some files

MKleusberg · MKleusberg · commit 910c15ae253f · 2016-01-27T23:02:30.000+01:00
When exporting tables, saving project files, etc. suggest default file names where appropriate. See issue sqlitebrowser#484.
diff --git a/src/ExportCsvDialog.cpp b/src/ExportCsvDialog.cpp
@@ -176,7 +176,8 @@ void ExportCsvDialog::accept()
             QString fileName = FileDialog::getSaveFileName(
                     this,
                     tr("Choose a filename to export data"),
-                    tr("Text files(*.csv *.txt)"));
+                    tr("Text files(*.csv *.txt)"),
+                    selectedItems.at(0)->text() + ".csv");
             if(fileName.isEmpty())
             {
                 close();
diff --git a/src/ExportSqlDialog.cpp b/src/ExportSqlDialog.cpp
@@ -56,17 +56,26 @@ ExportSqlDialog::~ExportSqlDialog()
 
 void ExportSqlDialog::accept()
 {
-    if(ui->listTables->selectedItems().isEmpty())
+    QList<QListWidgetItem*> selectedItems = ui->listTables->selectedItems();
+    if(selectedItems.isEmpty())
     {
         QMessageBox::warning(this, QApplication::applicationName(),
                              tr("Please select at least 1 table."));
         return;
     }
+
+    // Try to find a default file name
+    QString defaultFileName;
+    if(selectedItems.count() == 1)  // One table -> Suggest table name
+        defaultFileName = selectedItems.at(0)->text() + ".sql";
+    else if(selectedItems.count() == ui->listTables->count())   // All tables -> Suggest database name
+        defaultFileName = pdb->curDBFilename + ".sql";;
+
     QString fileName = FileDialog::getSaveFileName(
                 this,
                 tr("Choose a filename to export"),
-                tr("Text files(*.sql *.txt)"));
-
+                tr("Text files(*.sql *.txt)"),
+                defaultFileName);
     if(fileName.isEmpty())
         return;
 
diff --git a/src/FileDialog.cpp b/src/FileDialog.cpp
@@ -9,9 +9,13 @@ QString FileDialog::getOpenFileName(QWidget* parent, const QString& caption, con
     return result;
 }
 
-QString FileDialog::getSaveFileName(QWidget* parent, const QString& caption, const QString& filter, QString* selectedFilter, Options options)
+QString FileDialog::getSaveFileName(QWidget* parent, const QString& caption, const QString& filter, const QString& defaultFileName, QString* selectedFilter, Options options)
 {
-    QString result = QFileDialog::getSaveFileName(parent, caption, getFileDialogPath(), filter, selectedFilter, options);
+    QString dir = getFileDialogPath();
+    if(!defaultFileName.isEmpty())
+        dir += "/" + defaultFileName;
+
+    QString result = QFileDialog::getSaveFileName(parent, caption, defaultFileName, filter, selectedFilter, options);
     if(!result.isEmpty())
         setFileDialogPath(result);
     return result;
diff --git a/src/FileDialog.h b/src/FileDialog.h
@@ -10,7 +10,7 @@ class FileDialog : public QFileDialog
                                    const QString& filter = QString(), QString* selectedFilter = 0,
                                    Options options = 0);
     static QString getSaveFileName(QWidget* parent = 0, const QString& caption = QString(),
-                                   const QString& filter = QString(), QString* selectedFilter = 0,
+                                   const QString& filter = QString(), const QString& defaultFileName = QString(), QString* selectedFilter = 0,
                                    Options options = 0);
     static QString getExistingDirectory(QWidget* parent = 0, const QString& caption = QString(),
                                         Options options = 0);
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -2115,8 +2115,8 @@ void MainWindow::saveProject()
 {
     QString filename = FileDialog::getSaveFileName(this,
                                                     tr("Choose a filename to save under"),
-                                                    tr("DB Browser for SQLite project file (*.sqbpro)")
-                                                    );
+                                                    tr("DB Browser for SQLite project file (*.sqbpro)"),
+                                                    db.curDBFilename);
     if(!filename.isEmpty())
     {
         // Make sure the file has got a .sqbpro ending

Original file line number	Diff line number	Diff line change
`@@ -2115,8 +2115,8 @@ void MainWindow::saveProject()`
`2115`	`2115`	`{`
`2116`	`2116`	`QString filename = FileDialog::getSaveFileName(this,`
`2117`	`2117`	`tr("Choose a filename to save under"),`
`2118`		`- tr("DB Browser for SQLite project file (*.sqbpro)")`
`2119`		`- );`
	`2118`	`+ tr("DB Browser for SQLite project file (*.sqbpro)"),`
	`2119`	`+ db.curDBFilename);`
`2120`	`2120`	`if(!filename.isEmpty())`
`2121`	`2121`	`{`
`2122`	`2122`	`// Make sure the file has got a .sqbpro ending`