Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 8 insertions, 4 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
index fe61b95..373b21d 100644
--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
@@ -571,10 +571,6 @@ FormManager* MainWindow::getFormManager() const
 void MainWindow::setupDefShortcuts()
 {
     BIND_SHORTCUTS(MainWindow, Action);
-
-    QList<QKeySequence> bindings = QKeySequence::keyBindings(QKeySequence::Close);
-    if (bindings.size() > 0)
-        actionMap[Action::CLOSE_WINDOW]->setShortcut(bindings.first());
 }
 
 void MainWindow::openSqlEditorSlot()
@@ -627,6 +623,10 @@ void MainWindow::exportAnything()
     }
 
     ExportDialog dialog(this);
+    Db* db = DBTREE->getSelectedOpenDb();
+    if (db)
+        dialog.setPreselectedDb(db);
+
     dialog.exec();
 }
 
@@ -639,6 +639,10 @@ void MainWindow::importAnything()
     }
 
     ImportDialog dialog(this);
+    Db* db = DBTREE->getSelectedOpenDb();
+    if (db)
+        dialog.setDb(db);
+
     dialog.exec();
 }