ExportCsvDialog: Set table selection to current table in Browse Data tab

MKleusberg · rp- · commit 614504daacbb · 2014-04-28T20:53:04.000+02:00
When called while the Browse Data tab of the main window is selected
also select the current table or view in the ExportCsvDialog.

Sort the table names in the combobox of the ExportCsvDialog.

Conflicts:
	src/ExportCsvDialog.cpp
diff --git a/src/ExportCsvDialog.cpp b/src/ExportCsvDialog.cpp
@@ -8,7 +8,8 @@
 #include "PreferencesDialog.h"
 #include "sqlitetablemodel.h"
 
-ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, QWidget* parent, const QString& query)
+
+ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, QWidget* parent, const QString& query, const QString& selection)
     : QDialog(parent),
       ui(new Ui::ExportCsvDialog),
       pdb(db),
@@ -24,6 +25,13 @@ ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, QWidget* parent, const QString
         objectMap objects = pdb->getBrowsableObjects();
         for(objectMap::ConstIterator i=objects.begin();i!=objects.end();++i)
             ui->comboTable->addItem(QIcon(QString(":icons/%1").arg(i.value().gettype())), i.value().getname());
+
+        // Sort list of tables and select the table specified in the selection parameter or alternatively the first one
+        ui->comboTable->model()->sort(0);
+        if(selection.isEmpty())
+            ui->comboTable->setCurrentIndex(0);
+        else
+            ui->comboTable->setCurrentIndex(ui->comboTable->findText(selection));
     } else {
         // Hide table combo box
         ui->labelTable->setVisible(false);
diff --git a/src/ExportCsvDialog.h b/src/ExportCsvDialog.h
@@ -13,7 +13,7 @@ class ExportCsvDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit ExportCsvDialog(DBBrowserDB* db, QWidget* parent = 0, const QString& query = "");
+    explicit ExportCsvDialog(DBBrowserDB* db, QWidget* parent = 0, const QString& query = "", const QString& selection = "");
     ~ExportCsvDialog();
 
 private slots:
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -749,7 +749,13 @@ void MainWindow::importTableFromCSV()
 
 void MainWindow::exportTableToCSV()
 {
-    ExportCsvDialog dialog(&db, this);
+    // Get the current table name if we are in the Browse Data tab
+    QString current_table;
+    if(ui->mainTab->currentIndex() == 1)
+        current_table = ui->comboBrowseTable->currentText();
+
+    // Open dialog
+    ExportCsvDialog dialog(&db, this, "", current_table);
     dialog.exec();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,13 @@ void MainWindow::importTableFromCSV()`
`749`	`749`
`750`	`750`	`void MainWindow::exportTableToCSV()`
`751`	`751`	`{`
`752`		`- ExportCsvDialog dialog(&db, this);`
	`752`	`+ // Get the current table name if we are in the Browse Data tab`
	`753`	`+ QString current_table;`
	`754`	`+ if(ui->mainTab->currentIndex() == 1)`
	`755`	`+ current_table = ui->comboBrowseTable->currentText();`
	`756`	`+`
	`757`	`+ // Open dialog`
	`758`	`+ ExportCsvDialog dialog(&db, this, "", current_table);`
`753`	`759`	`dialog.exec();`
`754`	`760`	`}`
`755`	`761`