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>"

3 files changed, 5 insertions, 3 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
index 590a2fd..c494702 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
@@ -104,7 +104,7 @@ void EditorWindow::init()
 
     connect(resultsModel, SIGNAL(executionSuccessful()), this, SLOT(executionSuccessful()));
     connect(resultsModel, SIGNAL(executionFailed(QString)), this, SLOT(executionFailed(QString)));
-    connect(resultsModel, SIGNAL(totalRowsAndPagesAvailable()), this, SLOT(totalRowsAndPagesAvailable()));
+    connect(resultsModel, SIGNAL(storeExecutionInHistory()), this, SLOT(storeExecutionInHistory()));
 
     // SQL history list
     ui->historyList->setModel(CFG->getSqlHistoryModel());
@@ -520,7 +520,7 @@ void EditorWindow::executionFailed(const QString &errorText)
     updateState();
 }
 
-void EditorWindow::totalRowsAndPagesAvailable()
+void EditorWindow::storeExecutionInHistory()
 {
     qint64 rowsReturned = resultsModel->getTotalRowsReturned();
     qint64 rowsAffected = resultsModel->getTotalRowsAffected();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
index 4666386..d952b1b 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
@@ -134,7 +134,7 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
         void dbChanged();
         void executionSuccessful();
         void executionFailed(const QString& errorText);
-        void totalRowsAndPagesAvailable();
+        void storeExecutionInHistory();
         void updateResultsDisplayMode();
         void prevDb();
         void nextDb();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp
index fdbbac2..77a4adc 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp
@@ -1406,6 +1406,7 @@ void TableWindow::updateIndexes()
     }
 
     ui->indexList->resizeColumnsToContents();
+    ui->indexList->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Stretch);
     updateIndexesState();
 }
 
@@ -1453,6 +1454,7 @@ void TableWindow::updateTriggers()
     }
 
     ui->triggerList->resizeColumnsToContents();
+    ui->triggerList->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Stretch);
     updateTriggersState();
 }