Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 11 insertions, 7 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
index 30fe07b..56ab6fe 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
@@ -375,6 +375,9 @@ void EditorWindow::createActions()
     attachActionInMenu(ui->sqlEdit->getAction(SqlEditor::SAVE_SQL_FILE), ui->sqlEdit->getAction(SqlEditor::SAVE_AS_SQL_FILE), ui->toolBar);
     ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::OPEN_SQL_FILE));
     ui->toolBar->addSeparator();
+    ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::FIND));
+    ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::REPLACE));
+    ui->toolBar->addSeparator();
     actionMap[CURRENT_DB] = ui->toolBar->addWidget(dbCombo);
     ui->toolBar->addSeparator();
     ui->toolBar->addAction(staticActions[RESULTS_IN_TAB]);
@@ -424,7 +427,7 @@ void EditorWindow::selectCurrentQuery(bool fallBackToPreviousIfNecessary)
     int pos = cursor.position();
     int queryStartPos;
     QString contents = ui->sqlEdit->toPlainText();
-    QString query = getQueryWithPosition(contents, pos, dialect, &queryStartPos);
+    QString query = getQueryWithPosition(contents, pos, &queryStartPos);
     TokenList tokens = Lexer::tokenize(query, dialect);
     tokens.trim();
     tokens.trimRight(Token::OPERATOR, ";");
@@ -435,7 +438,7 @@ void EditorWindow::selectCurrentQuery(bool fallBackToPreviousIfNecessary)
         pos = contents.lastIndexOf(";", pos - 1);
         if (pos > -1)
         {
-            query = getQueryWithPosition(contents, pos, dialect, &queryStartPos);
+            query = getQueryWithPosition(contents, pos, &queryStartPos);
             tokens = Lexer::tokenize(query, dialect);
             tokens.trim();
             tokens.trimRight(Token::OPERATOR, ";");
@@ -470,6 +473,7 @@ void EditorWindow::execQuery(bool explain)
     resultsModel->setDb(getCurrentDb());
     resultsModel->setExplainMode(explain);
     resultsModel->setQuery(sql);
+    resultsModel->setQueryCountLimitForSmartMode(queryLimitForSmartExecution);
     ui->dataView->refreshData();
     updateState();
 
@@ -623,7 +627,7 @@ void EditorWindow::exportResults()
     }
 
     QString query = lastSuccessfulQuery.isEmpty() ?  getQueryToExecute() : lastSuccessfulQuery;
-    QStringList queries = splitQueries(query, getCurrentDb()->getDialect(), false);
+    QStringList queries = splitQueries(query, getCurrentDb()->getDialect(), false, true);
     if (queries.size() == 0)
     {
         qWarning() << "No queries after split in EditorWindow::exportResults()";
@@ -662,12 +666,12 @@ int qHash(EditorWindow::ActionGroup actionGroup)
 }
 
 
-bool EditorWindow::isUncommited() const
+bool EditorWindow::isUncommitted() const
 {
-    return ui->dataView->isUncommited();
+    return ui->dataView->isUncommitted();
 }
 
-QString EditorWindow::getQuitUncommitedConfirmMessage() const
+QString EditorWindow::getQuitUncommittedConfirmMessage() const
 {
-    return tr("Editor window \"%1\" has uncommited data.").arg(getMdiWindow()->windowTitle());
+    return tr("Editor window \"%1\" has uncommitted data.").arg(getMdiWindow()->windowTitle());
 }