diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 9a024967..e5d8ab4f 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1295,15 +1295,25 @@ void MainWindow::loadExtensionsFromSettings() void MainWindow::reloadSettings() { + // Read settings + int prefetch_size = PreferencesDialog::getSettingsValue("db", "prefetchsize").toInt(); + int edit_fontsize = PreferencesDialog::getSettingsValue("editor", "fontsize").toInt(); + int log_fontsize = PreferencesDialog::getSettingsValue("log", "fontsize").toInt(); + + QFont logfont("Monospace"); + logfont.setStyleHint(QFont::TypeWriter); + logfont.setPointSize(log_fontsize); + // Set prefetch sizes for lazy population of table models - m_browseTableModel->setChunkSize(PreferencesDialog::getSettingsValue("db", "prefetchsize").toInt()); + m_browseTableModel->setChunkSize(prefetch_size); for(int i=0; i < ui->tabSqlAreas->count(); ++i) { SqlExecutionArea* sqlArea = qobject_cast(ui->tabSqlAreas->widget(i)); - sqlArea->getModel()->setChunkSize(PreferencesDialog::getSettingsValue("db", "prefetchsize").toInt()); + sqlArea->getModel()->setChunkSize(prefetch_size); + sqlArea->getResultView()->setFont(logfont); QFont font = sqlArea->getEditor()->font(); - font.setPointSize(PreferencesDialog::getSettingsValue("editor", "fontsize").toInt()); + font.setPointSize(edit_fontsize); sqlArea->getEditor()->setFont(font); } @@ -1311,11 +1321,8 @@ void MainWindow::reloadSettings() createSyntaxHighlighters(); // Set font for SQL logs - QFont font("Monospace"); - font.setStyleHint(QFont::TypeWriter); - font.setPointSize(PreferencesDialog::getSettingsValue("log", "fontsize").toInt()); - ui->editLogApplication->setFont(font); - ui->editLogUser->setFont(font); + ui->editLogApplication->setFont(logfont); + ui->editLogUser->setFont(logfont); // Load extensions loadExtensionsFromSettings(); diff --git a/src/SqlExecutionArea.cpp b/src/SqlExecutionArea.cpp index 0742be2f..58561f6b 100644 --- a/src/SqlExecutionArea.cpp +++ b/src/SqlExecutionArea.cpp @@ -20,6 +20,12 @@ SqlExecutionArea::SqlExecutionArea(QWidget* parent, DBBrowserDB* _db) : // Create UI ui->setupUi(this); + // Set font + QFont logfont("Monospace"); + logfont.setStyleHint(QFont::TypeWriter); + logfont.setPointSize(PreferencesDialog::getSettingsValue("log", "fontsize").toInt()); + ui->editErrors->setFont(logfont); + // Create syntax highlighter highlighter = new SQLiteSyntaxHighlighter(ui->editEditor->document()); @@ -72,6 +78,11 @@ SqlTextEdit* SqlExecutionArea::getEditor() return ui->editEditor; } +QTextEdit* SqlExecutionArea::getResultView() +{ + return ui->editErrors; +} + void SqlExecutionArea::enableSaveButton(bool enable) { ui->buttonSave->setEnabled(enable); diff --git a/src/SqlExecutionArea.h b/src/SqlExecutionArea.h index 2c672b70..86081fb1 100644 --- a/src/SqlExecutionArea.h +++ b/src/SqlExecutionArea.h @@ -26,6 +26,7 @@ public: QString getSelectedSql() const; SqliteTableModel* getModel() { return model; } + QTextEdit* getResultView(); SqlTextEdit* getEditor(); public slots: