diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
| commit | 6ce5ee411d1e6093b68b1b4eca5dc6c12b927a96 (patch) | |
| tree | 1a98416041b39765c1c42ffbeab6da9fd40e181b /SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp | |
| parent | 1fc9d1a4a1af320e39810cee21bed1201e2bddfd (diff) | |
| parent | 9618f0ebbf4b88045247c01ce8c8f58203508ebf (diff) | |
Merge tag 'upstream/3.0.6'
Upstream version 3.0.6
# gpg: Signature made Tue 12 May 2015 04:19:45 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>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp index c494702..30fe07b 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp @@ -24,6 +24,7 @@ #include <QStringListModel> #include <QActionGroup> #include <QMessageBox> +#include <themetuner.h> CFG_KEYS_DEFINE(EditorWindow) EditorWindow::ResultsDisplayMode EditorWindow::resultsDisplayMode; @@ -87,6 +88,12 @@ void EditorWindow::init() setFocusProxy(ui->sqlEdit); updateResultsDisplayMode(); + THEME_TUNER->manageCompactLayout({ + ui->query, + ui->results, + ui->history + }); + resultsModel = new SqlQueryModel(this); ui->dataView->init(resultsModel); @@ -365,6 +372,7 @@ void EditorWindow::createActions() createAction(CREATE_VIEW_FROM_QUERY, ICONS.VIEW_ADD, tr("Create view from query", "sql editor"), this, SLOT(createViewFromQuery()), ui->toolBar); ui->toolBar->addSeparator(); ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::SAVE_SQL_FILE)); + 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(); actionMap[CURRENT_DB] = ui->toolBar->addWidget(dbCombo); |