From a5b034d4a9c44f9bc1e83b01de82530f8fc63013 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sat, 4 Apr 2015 14:41:04 -0400 Subject: Imported Upstream version 3.0.4 --- SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp') 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 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(); } -- cgit v1.2.3