From f4474badc5e4d12191491e18c0d226bcb583554b Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Sun, 10 Dec 2017 20:02:11 -0500 Subject: [PATCH] Added ability to change the font size. It mostly works. It's a little wonky sometimes but it will mostly change all fonts in the application to the size you set. --- main.cpp | 7 +++++++ mainsettingsdialog.cpp | 4 ++++ mainwindow.cpp | 4 ++++ ui/mainsettingsdialog.ui | 24 +++++++++++++++++++++++- 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index dac3ecc..688ff1d 100644 --- a/main.cpp +++ b/main.cpp @@ -6,6 +6,13 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); MainWindow w; + + QSettings settings; + int fontSize = settings.value("Main/FontSize", 9).toUInt(); + QFont sysFont = QFont(); //get default font + sysFont.setPointSize(fontSize); + a.setFont(sysFont); + w.show(); return a.exec(); diff --git a/mainsettingsdialog.cpp b/mainsettingsdialog.cpp index baf66af..8703855 100644 --- a/mainsettingsdialog.cpp +++ b/mainsettingsdialog.cpp @@ -29,6 +29,8 @@ MainSettingsDialog::MainSettingsDialog(QWidget *parent) : ui->spinPlaybackSpeed->setValue(settings->value("Playback/DefSpeed", 5).toInt()); ui->lineClockFormat->setText(settings->value("Main/TimeFormat", "MMM-dd HH:mm:ss.zzz").toString()); + ui->spinFontSize->setValue(settings->value("Main/FontSize", ui->cbDisplayHex->font().pointSize()).toUInt()); + bool secondsMode = settings->value("Main/TimeSeconds", false).toBool(); bool clockMode = settings->value("Main/TimeClock", false).toBool(); if (clockMode) @@ -87,6 +89,7 @@ void MainSettingsDialog::closeEvent(QCloseEvent *event) { Q_UNUSED(event); removeEventFilter(this); + updateSettings(); settings->sync(); } @@ -126,6 +129,7 @@ void MainSettingsDialog::updateSettings() settings->setValue("Main/UseFiltered", ui->cbUseFiltered->isChecked()); settings->setValue("Main/UseOpenGL", ui->cbUseOpenGL->isChecked()); settings->setValue("Main/TimeFormat", ui->lineClockFormat->text()); + settings->setValue("Main/FontSize", ui->spinFontSize->value()); settings->sync(); emit updatedSettings(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 6c0b47d..8b6c833 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -284,6 +284,10 @@ void MainWindow::readSettings() { ui->cbAutoScroll->setChecked(true); } + int fontSize = settings.value("Main/FontSize", 9).toUInt(); + QFont newFont = QFont(ui->canFramesView->font()); + newFont.setPointSize(fontSize); + ui->canFramesView->setFont(newFont); readUpdateableSettings(); } diff --git a/ui/mainsettingsdialog.ui b/ui/mainsettingsdialog.ui index 94199bd..c1e2fb8 100644 --- a/ui/mainsettingsdialog.ui +++ b/ui/mainsettingsdialog.ui @@ -7,7 +7,7 @@ 0 0 400 - 743 + 850 @@ -123,6 +123,28 @@ + + + + Font Size + + + + + + 7 + + + 15 + + + 9 + + + + + +