From 306d6d3ca9c9ad774d19135681a7f9805f77035f Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sun, 22 Feb 2015 14:06:29 -0500 Subject: Imported Upstream version 3.0.3 --- SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp') diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp index bc492df..fe61b95 100644 --- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp @@ -571,6 +571,10 @@ 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() @@ -831,11 +835,18 @@ QToolBar* MainWindow::getToolBar(int toolbar) const void MainWindow::openDb(const QString& path) { + Db* db = DBLIST->getByPath(path); + if (db) + { + notifyInfo(tr("Database passed in command line parameters (%1) was already on the list under name: %2").arg(path, db->getName())); + return; + } + QString name = DBLIST->quickAddDb(path, QHash()); if (!name.isNull()) { notifyInfo(tr("Database passed in command line parameters (%1) has been temporarily added to the list under name: %2").arg(path, name)); - Db* db = DBLIST->getByName(name); + db = DBLIST->getByName(name); db->open(); } else -- cgit v1.2.3