From be13718942ec17a09c1b7f98f2208785eeae6d1e Mon Sep 17 00:00:00 2001 From: APTX Date: Tue, 4 Jun 2013 20:39:28 +0200 Subject: [PATCH] Better way of setting monospace fonts. --- localmylist-management/fonts.cpp | 12 ++++++++++++ localmylist-management/fonts.h | 8 ++++++++ localmylist-management/localmylist-management.pro | 6 ++++-- localmylist-management/renamesettingsdialog.cpp | 10 +++++----- localmylist-management/tabs/clientlogtab.cpp | 5 ++--- 5 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 localmylist-management/fonts.cpp create mode 100644 localmylist-management/fonts.h diff --git a/localmylist-management/fonts.cpp b/localmylist-management/fonts.cpp new file mode 100644 index 0000000..eac9657 --- /dev/null +++ b/localmylist-management/fonts.cpp @@ -0,0 +1,12 @@ +#include "fonts.h" + +QFont monospaceFont = []() -> QFont +{ +#ifdef Q_OS_WIN + QFont font("Lucida Console"); +#else + QFont font("Monospace"); +#endif + font.setStyleHint(QFont::Monospace); + return font; +}(); diff --git a/localmylist-management/fonts.h b/localmylist-management/fonts.h new file mode 100644 index 0000000..279ba06 --- /dev/null +++ b/localmylist-management/fonts.h @@ -0,0 +1,8 @@ +#ifndef FONTS_H +#define FONTS_H + +#include + +extern QFont monospaceFont; + +#endif // FONTS_H diff --git a/localmylist-management/localmylist-management.pro b/localmylist-management/localmylist-management.pro index d4b045d..0bd059b 100644 --- a/localmylist-management/localmylist-management.pro +++ b/localmylist-management/localmylist-management.pro @@ -27,7 +27,8 @@ SOURCES += main.cpp\ tabs/pendingrequesttab.cpp \ registertabs.cpp \ tabs/databaselogtab.cpp \ - tabs/clientlogtab.cpp + tabs/clientlogtab.cpp \ + fonts.cpp HEADERS += mainwindow.h \ databaseconnectiondialog.h \ @@ -45,7 +46,8 @@ HEADERS += mainwindow.h \ tabs/unknownfilestab.h \ tabs/pendingrequesttab.h \ tabs/databaselogtab.h \ - tabs/clientlogtab.h + tabs/clientlogtab.h \ + fonts.h FORMS += mainwindow.ui \ databaseconnectiondialog.ui \ diff --git a/localmylist-management/renamesettingsdialog.cpp b/localmylist-management/renamesettingsdialog.cpp index c2e2307..18389a1 100644 --- a/localmylist-management/renamesettingsdialog.cpp +++ b/localmylist-management/renamesettingsdialog.cpp @@ -8,6 +8,8 @@ #include #include +#include "fonts.h" + static const char *rulesStrAniAdd = "AT := [%ATr%, %ATe%, %ATk%]\n" "ET := [%ETe%, %ETr%, %ETk%]\n" @@ -93,11 +95,9 @@ RenameSettingsDialog::RenameSettingsDialog(QWidget *parent) : { ui->setupUi(this); - QFont f("Monospace"); - f.setStyleHint(QFont::Monospace); - ui->input->setFont(f); - ui->result->setFont(f); - ui->renameScript->setFont(f); + ui->input->setFont(monospaceFont); + ui->result->setFont(monospaceFont); + ui->renameScript->setFont(monospaceFont); environmentEngine = new RenameParser::RenameEngine; rulesEngine = new RenameParser::RenameEngine; diff --git a/localmylist-management/tabs/clientlogtab.cpp b/localmylist-management/tabs/clientlogtab.cpp index 526ccca..23b9496 100644 --- a/localmylist-management/tabs/clientlogtab.cpp +++ b/localmylist-management/tabs/clientlogtab.cpp @@ -4,6 +4,7 @@ #include #include "mylist.h" +#include "fonts.h" ClientLogTab::ClientLogTab(QWidget *parent) : AbstractTabBase(parent), @@ -12,9 +13,7 @@ ClientLogTab::ClientLogTab(QWidget *parent) : ui->setupUi(this); setLabel(name()); - QFont f("Monospace"); - f.setStyleHint(QFont::Monospace); - ui->textBox->setFont(f); + ui->textBox->setFont(monospaceFont); } ClientLogTab::~ClientLogTab() -- 2.52.0