eelke/pgLab
1
0
Fork 0
Code Issues 29 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix several fonts.

Browse source
This commit is contained in:
eelke 2026-10-22 19:17:46 +02:00
parent 960967c8a6
commit 714e29d2cb
4 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pglab/BackupDialog.cpp
View file

@ -2,6 +2,7 @@
#include "BackupFormatModel.h" #include "BackupFormatModel.h"
#include "PgDumpOutputHighlighter.h" #include "PgDumpOutputHighlighter.h"
#include "UserConfiguration.h"
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
#include <QProcess> #include <QProcess>
@ -51,10 +52,7 @@ QPlainTextEdit* createStdOutput(QWidget *parent)
brush3.setStyle(Qt::SolidPattern); brush3.setStyle(Qt::SolidPattern);
palette.setBrush(QPalette::Disabled, QPalette::Base, brush3); palette.setBrush(QPalette::Disabled, QPalette::Base, brush3);
stdOutput->setPalette(palette); stdOutput->setPalette(palette);
QFont font; stdOutput->setFont(UserConfiguration::instance()->codeFont());
font.setFamily(QString::fromUtf8("Source Code Pro"));
font.setPointSize(10);
stdOutput->setFont(font);
stdOutput->setLineWrapMode(QPlainTextEdit::NoWrap); stdOutput->setLineWrapMode(QPlainTextEdit::NoWrap);
stdOutput->setReadOnly(true); stdOutput->setReadOnly(true);

17
pglab/UserConfiguration.cpp
View file

@ -1,5 +1,7 @@
#include "UserConfiguration.h" #include "UserConfiguration.h"
#include <QFont> #include <QFont>
#include <QFontDatabase>
#include <QFontInfo>
UserConfiguration* UserConfiguration::instance() UserConfiguration* UserConfiguration::instance()
{ {
@ -14,11 +16,18 @@ UserConfiguration::UserConfiguration()
QFont UserConfiguration::codeFont() const QFont UserConfiguration::codeFont() const
{ {
QString family = m_settings.value("fonts/code/family", QString("Source Code Pro")).toString(); QString family = m_settings.value("fonts/code/family").toString();
int size = m_settings.value("fonts/code/size", 10).toInt(); QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont);
QFont font; font.setStyleHint(QFont::Monospace);
font.setFamily(family);
font.setFixedPitch(true); font.setFixedPitch(true);
if (!family.isEmpty())
font.setFamily(family);
else if (!QFontInfo(font).fixedPitch())
font.setFamilies({ "Source Code Pro", "Consolas", "Courier New", "monospace" });
bool ok = false;
int size = m_settings.value("fonts/code/size").toInt(&ok);
if (ok && size > 0)
font.setPointSize(size); font.setPointSize(size);
return font; return font;
} }

5
pglab/querytool/QueryTool.cpp
View file

@ -43,9 +43,10 @@ QueryTool::QueryTool(IDatabaseWindow *context, std::shared_ptr<SqlDocument> docu
connect(&m_dbConnection, &ASyncDBConnection::onStateChanged, this, &QueryTool::connectionStateChanged); connect(&m_dbConnection, &ASyncDBConnection::onStateChanged, this, &QueryTool::connectionStateChanged);
connect(&m_dbConnection, &ASyncDBConnection::onNotice, this, &QueryTool::receiveNotice); connect(&m_dbConnection, &ASyncDBConnection::onNotice, this, &QueryTool::receiveNotice);
ui->queryEdit->setFont(UserConfiguration::instance()->codeFont()); const QFont codeFont = UserConfiguration::instance()->codeFont();
m_document->textDocument()->setDefaultFont(codeFont);
ui->queryEdit->setDocument(m_document->textDocument()); ui->queryEdit->setDocument(m_document->textDocument());
ui->queryEdit->setFont(codeFont);
m_document->addEditor(this); m_document->addEditor(this);
auto types = m_catalog->types(); auto types = m_catalog->types();
if (types) { if (types) {

1
pglab/tuplesresultwidget.cpp
View file

@ -21,7 +21,6 @@ TuplesResultWidget::TuplesResultWidget(QWidget *parent) :
m_grid = new DataGridWidget(this); m_grid = new DataGridWidget(this);
ui->verticalLayout->insertWidget(0, m_grid); ui->verticalLayout->insertWidget(0, m_grid);
m_grid->view()->setFont(QFont("Source Sans Pro", 10));
m_grid->view()->setAlternatingRowColors(true); m_grid->view()->setAlternatingRowColors(true);
m_grid->view()->setWordWrap(false); m_grid->view()->setWordWrap(false);
m_grid->view()->verticalHeader()->setDefaultSectionSize(21); m_grid->view()->verticalHeader()->setDefaultSectionSize(21);