Skip to content

Commit f67817e

Browse files
committed
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.
1 parent 836966d commit f67817e

3 files changed

Lines changed: 11 additions & 24 deletions

File tree

‎src/MainWindow.cpp‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,28 +1687,20 @@ void MainWindow::loadExtensionsFromSettings()
16871687

16881688
void MainWindow::reloadSettings()
16891689
{
1690-
// Read settings
1691-
int prefetch_size = Settings::getSettingsValue("db", "prefetchsize").toInt();
1692-
int log_fontsize = Settings::getSettingsValue("log", "fontsize").toInt();
1693-
1694-
QFont logfont("Monospace");
1695-
logfont.setStyleHint(QFont::TypeWriter);
1696-
logfont.setPointSize(log_fontsize);
1697-
16981690
// Set data browser font
16991691
QFont dataBrowserFont(Settings::getSettingsValue("databrowser", "font").toString());
17001692
dataBrowserFont.setPointSize(Settings::getSettingsValue("databrowser", "fontsize").toInt());
17011693
ui->dataTable->setFont(dataBrowserFont);
17021694

17031695
// Set prefetch sizes for lazy population of table models
1704-
m_browseTableModel->setChunkSize(prefetch_size);
1705-
for(int i=0; i < ui->tabSqlAreas->count(); ++i)
1706-
{
1707-
SqlExecutionArea* sqlArea = qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->widget(i));
1708-
sqlArea->reloadSettings();
1709-
sqlArea->getModel()->setChunkSize(prefetch_size);
1710-
sqlArea->getResultView()->setFont(logfont);
1711-
}
1696+
m_browseTableModel->setChunkSize(Settings::getSettingsValue("db", "prefetchsize").toInt());
1697+
for(int i=0;i<ui->tabSqlAreas->count();++i)
1698+
qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->widget(i))->reloadSettings();
1699+
1700+
// Prepare log font
1701+
QFont logfont("Monospace");
1702+
logfont.setStyleHint(QFont::TypeWriter);
1703+
logfont.setPointSize(Settings::getSettingsValue("log", "fontsize").toInt());
17121704

17131705
// Set font for SQL logs and edit dialog
17141706
ui->editLogApplication->reloadSettings();

‎src/SqlExecutionArea.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@ ExtendedTableWidget *SqlExecutionArea::getTableResult()
7070
return ui->tableResult;
7171
}
7272

73-
74-
QTextEdit* SqlExecutionArea::getResultView()
75-
{
76-
return ui->editErrors;
77-
}
78-
7973
void SqlExecutionArea::enableSaveButton(bool enable)
8074
{
8175
ui->buttonSave->setEnabled(enable);
@@ -125,4 +119,7 @@ void SqlExecutionArea::reloadSettings()
125119
ui->splitter->setOrientation(Qt::Horizontal);
126120
else
127121
ui->splitter->setOrientation(Qt::Vertical);
122+
123+
// Set prefetch settings
124+
model->setChunkSize(Settings::getSettingsValue("db", "prefetchsize").toInt());
128125
}

‎src/SqlExecutionArea.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ class SqlTextEdit;
77
class SqliteTableModel;
88
class DBBrowserDB;
99
class QMenu;
10-
class QTextEdit;
1110
class ExtendedTableWidget;
1211

1312
namespace Ui {
@@ -29,7 +28,6 @@ class SqlExecutionArea : public QWidget
2928
void setFileName(const QString& filename) { sqlFileName = filename; }
3029

3130
SqliteTableModel* getModel() { return model; }
32-
QTextEdit* getResultView();
3331
SqlTextEdit* getEditor();
3432
ExtendedTableWidget *getTableResult();
3533

0 commit comments

Comments
 (0)