From f67817ee680671b6a365eab1b01d627395d6c4f5 Mon Sep 17 00:00:00 2001
From: Martin Kleusberg <mkleusberg@gmail.com>
Date: Thu, 16 Mar 2017 16:59:23 +0100
Subject: [PATCH] Simplify code for reloading settings

This simplifies the code for reloading the settings in the Execute SQL
area.

It might also fix a bug where setting a new font for the success/error
message at the bottom of each Execute SQL tab would be overwritten to
Monospace immediately after setting it.
---
 src/MainWindow.cpp       | 24 ++++++++----------------
 src/SqlExecutionArea.cpp |  9 +++------
 src/SqlExecutionArea.h   |  2 --
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index db07e0e5..a707e7ac 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1687,28 +1687,20 @@ void MainWindow::loadExtensionsFromSettings()
 
 void MainWindow::reloadSettings()
 {
-    // Read settings
-    int prefetch_size = Settings::getSettingsValue("db", "prefetchsize").toInt();
-    int log_fontsize = Settings::getSettingsValue("log", "fontsize").toInt();
-
-    QFont logfont("Monospace");
-    logfont.setStyleHint(QFont::TypeWriter);
-    logfont.setPointSize(log_fontsize);
-
     // Set data browser font
     QFont dataBrowserFont(Settings::getSettingsValue("databrowser", "font").toString());
     dataBrowserFont.setPointSize(Settings::getSettingsValue("databrowser", "fontsize").toInt());
     ui->dataTable->setFont(dataBrowserFont);
 
     // Set prefetch sizes for lazy population of table models
-    m_browseTableModel->setChunkSize(prefetch_size);
-    for(int i=0; i < ui->tabSqlAreas->count(); ++i)
-    {
-        SqlExecutionArea* sqlArea = qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->widget(i));
-        sqlArea->reloadSettings();
-        sqlArea->getModel()->setChunkSize(prefetch_size);
-        sqlArea->getResultView()->setFont(logfont);
-    }
+    m_browseTableModel->setChunkSize(Settings::getSettingsValue("db", "prefetchsize").toInt());
+    for(int i=0;i<ui->tabSqlAreas->count();++i)
+        qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->widget(i))->reloadSettings();
+
+    // Prepare log font
+    QFont logfont("Monospace");
+    logfont.setStyleHint(QFont::TypeWriter);
+    logfont.setPointSize(Settings::getSettingsValue("log", "fontsize").toInt());
 
     // Set font for SQL logs and edit dialog
     ui->editLogApplication->reloadSettings();
diff --git a/src/SqlExecutionArea.cpp b/src/SqlExecutionArea.cpp
index eb0a7a6f..b53ae06e 100644
--- a/src/SqlExecutionArea.cpp
+++ b/src/SqlExecutionArea.cpp
@@ -70,12 +70,6 @@ ExtendedTableWidget *SqlExecutionArea::getTableResult()
     return ui->tableResult;
 }
 
-
-QTextEdit* SqlExecutionArea::getResultView()
-{
-    return ui->editErrors;
-}
-
 void SqlExecutionArea::enableSaveButton(bool enable)
 {
     ui->buttonSave->setEnabled(enable);
@@ -125,4 +119,7 @@ void SqlExecutionArea::reloadSettings()
         ui->splitter->setOrientation(Qt::Horizontal);
     else
         ui->splitter->setOrientation(Qt::Vertical);
+
+    // Set prefetch settings
+    model->setChunkSize(Settings::getSettingsValue("db", "prefetchsize").toInt());
 }
diff --git a/src/SqlExecutionArea.h b/src/SqlExecutionArea.h
index b55a4c61..67c71b62 100644
--- a/src/SqlExecutionArea.h
+++ b/src/SqlExecutionArea.h
@@ -7,7 +7,6 @@ class SqlTextEdit;
 class SqliteTableModel;
 class DBBrowserDB;
 class QMenu;
-class QTextEdit;
 class ExtendedTableWidget;
 
 namespace Ui {
@@ -29,7 +28,6 @@ public:
     void setFileName(const QString& filename) { sqlFileName = filename; }
 
     SqliteTableModel* getModel() { return model; }
-    QTextEdit* getResultView();
     SqlTextEdit* getEditor();
     ExtendedTableWidget *getTableResult();