Skip to content

qt: Implement application wide font management #3555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 14 commits into from
Jul 7, 2020
Merged

qt: Implement application wide font management #3555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
787740c
qt: Add Montserrat (picked in Dash Style Guide) as application font
xdustinface May 29, 2020
3f80233
qt: Use default montserrat instead of fixed pitch font in dash themes
xdustinface Jun 6, 2020
27bede7
qt: Removed all font related changes from .ui/.css files
xdustinface Jun 4, 2020
f94dfbe
qt: Set a proper font weight with GUIUtil::setFont where requried
xdustinface Jun 4, 2020
68a3250
qt: Use correct default font for size calculations
xdustinface Jun 12, 2020
2bbc6b8
qt: Load custom font in splashscreen
xdustinface Jun 4, 2020
2c7f8db
qt: Use default font in receive requests and transaction description
xdustinface Jun 11, 2020
19a93e9
qt: Add -font-weight-normal, -font-weight-bold and -font-scale arguments
xdustinface Jun 15, 2020
c0056c5
qt: Keep track of font updates
xdustinface Jun 8, 2020
687a0e6
qt: Move font-size settings from css to c++.
xdustinface Jun 15, 2020
85c353e
qt: Introduce GUIUtil::FontWeight as mapper for QFont::Weight
xdustinface Jun 16, 2020
175c3e0
qt: Introduce GUIUtil::FontFamily and make font family adjustable
xdustinface Jun 16, 2020
6e36764
qt: Add -font-family command line parameter
xdustinface Jun 30, 2020
172c283
qt: Make font related variables private in GUIUtil's namespace
xdustinface Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,26 @@ RES_CSS = \
qt/res/css/scrollbars.css \
Comment thread
xdustinface marked this conversation as resolved.
Outdated
qt/res/css/trad.css

RES_FONTS = \
qt/res/fonts/Montserrat/Montserrat-Black.otf \
qt/res/fonts/Montserrat/Montserrat-BlackItalic.otf \
qt/res/fonts/Montserrat/Montserrat-Bold.otf \
qt/res/fonts/Montserrat/Montserrat-BoldItalic.otf \
qt/res/fonts/Montserrat/Montserrat-ExtraBold.otf \
qt/res/fonts/Montserrat/Montserrat-ExtraBoldItalic.otf \
qt/res/fonts/Montserrat/Montserrat-ExtraLight.otf \
qt/res/fonts/Montserrat/Montserrat-ExtraLightItalic.otf \
qt/res/fonts/Montserrat/Montserrat-Italic.otf \
qt/res/fonts/Montserrat/Montserrat-Light.otf \
qt/res/fonts/Montserrat/Montserrat-LightItalic.otf \
qt/res/fonts/Montserrat/Montserrat-Medium.otf \
qt/res/fonts/Montserrat/Montserrat-MediumItalic.otf \
qt/res/fonts/Montserrat/Montserrat-Regular.otf \
qt/res/fonts/Montserrat/Montserrat-SemiBold.otf \
qt/res/fonts/Montserrat/Montserrat-SemiBoldItalic.otf \
qt/res/fonts/Montserrat/Montserrat-Thin.otf \
qt/res/fonts/Montserrat/Montserrat-ThinItalic.otf

RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)

BITCOIN_RC = qt/res/dash-qt-res.rc
Expand All @@ -367,7 +387,7 @@ qt_libdashqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
qt_libdashqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)

qt_libdashqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES)
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_FONTS) $(RES_MOVIES)

nodist_qt_libdashqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
$(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP)
Expand Down Expand Up @@ -430,7 +450,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
@rm $(@D)/temp_$(<F)

$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES) $(PROTOBUF_H)
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_FONTS) $(RES_MOVIES) $(PROTOBUF_H)
@test -f $(RCC)
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $(RCCFLAGS) -name dash $< | \
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
Expand Down
2 changes: 2 additions & 0 deletions src/qt/addressbookpage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
connect(ui->tableView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextualMenu(QPoint)));

connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(accept()));

GUIUtil::updateFonts();
}

AddressBookPage::~AddressBookPage()
Expand Down
5 changes: 5 additions & 0 deletions src/qt/askpassphrasedialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <qt/forms/ui_askpassphrasedialog.h>

#include <qt/guiconstants.h>
#include <qt/guiutil.h>
#include <qt/walletmodel.h>

#include <support/allocators/secure.h>
Expand All @@ -28,6 +29,10 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent) :
{
Comment thread
xdustinface marked this conversation as resolved.
Outdated
ui->setupUi(this);

GUIUtil::setFont({ui->capsLabel}, GUIUtil::FontWeight::Bold);

GUIUtil::updateFonts();

ui->passEdit1->setMinimumSize(ui->passEdit1->sizeHint());
ui->passEdit2->setMinimumSize(ui->passEdit2->sizeHint());
ui->passEdit3->setMinimumSize(ui->passEdit3->sizeHint());
Expand Down
9 changes: 5 additions & 4 deletions src/qt/bitcoingui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,9 @@ void BitcoinGUI::createActions()
connect(historyAction, SIGNAL(clicked()), this, SLOT(showNormalIfMinimized()));
connect(historyAction, SIGNAL(clicked()), this, SLOT(gotoHistoryPage()));

for (auto button : tabGroup->buttons()) {
GUIUtil::setFont({button}, GUIUtil::FontWeight::Normal, 16);
}
// Give the selected tab button a bolder font.
connect(tabGroup, SIGNAL(buttonToggled(QAbstractButton *, bool)), this, SLOT(highlightTabButton(QAbstractButton *, bool)));
#endif // ENABLE_WALLET
Expand Down Expand Up @@ -925,9 +928,7 @@ void BitcoinGUI::openClicked()

void BitcoinGUI::highlightTabButton(QAbstractButton *button, bool checked)
{
QFont font = button->font();
font.setBold(checked);
button->setFont(font);
GUIUtil::setFont({button}, checked ? GUIUtil::FontWeight::Bold : GUIUtil::FontWeight::Normal, 16);
}

void BitcoinGUI::gotoOverviewPage()
Expand Down Expand Up @@ -1616,7 +1617,7 @@ UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle *pl
setToolTip(tr("Unit to show amounts in. Click to select another unit."));
QList<BitcoinUnits::Unit> units = BitcoinUnits::availableUnits();
int max_width = 0;
const QFontMetrics fm(font());
const QFontMetrics fm(GUIUtil::getFontNormal());
for (const BitcoinUnits::Unit unit : units)
{
max_width = qMax(max_width, fm.width(BitcoinUnits::name(unit)));
Expand Down
11 changes: 11 additions & 0 deletions src/qt/coincontroldialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,17 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidge
/* Open CSS when configured */
this->setStyleSheet(GUIUtil::loadStyleSheet());

GUIUtil::setFont({ui->labelCoinControlQuantityText,
ui->labelCoinControlBytesText,
ui->labelCoinControlAmountText,
ui->labelCoinControlLowOutputText,
ui->labelCoinControlFeeText,
ui->labelCoinControlAfterFeeText,
ui->labelCoinControlChangeText
}, GUIUtil::FontWeight::Bold);

GUIUtil::updateFonts();

// context menu actions
QAction *copyAddressAction = new QAction(tr("Copy address"), this);
QAction *copyLabelAction = new QAction(tr("Copy label"), this);
Expand Down
48 changes: 48 additions & 0 deletions src/qt/dash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,9 @@ bool BitcoinCore::baseInitialize()
{
return false;
}
if (!GUIUtil::loadFonts()) {
return false;
}
return true;
}

Expand Down Expand Up @@ -691,6 +694,51 @@ int main(int argc, char *argv[])
// Load GUI settings from QSettings
app.createOptionsModel(gArgs.GetBoolArg("-resetguisettings", false));

// Validate/set font family
if (gArgs.IsArgSet("-font-family")) {
GUIUtil::FontFamily family;
QString strFamily = gArgs.GetArg("-font-family", GUIUtil::fontFamilyToString(GUIUtil::getFontFamilyDefault()).toStdString()).c_str();
try {
family = GUIUtil::fontFamilyFromString(strFamily);
} catch (const std::exception& e) {
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
QObject::tr("Error: Specified font-family invalid. Valid values: %1.").arg("SystemDefault, Montserrat"));
return EXIT_FAILURE;
}
GUIUtil::setFontFamily(family);
}
// Validate/set normal font weight
if (gArgs.IsArgSet("-font-weight-normal")) {
QFont::Weight weight;
if (!GUIUtil::weightFromArg(gArgs.GetArg("-font-weight-normal", GUIUtil::weightToArg(GUIUtil::getFontWeightNormal())), weight)) {
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
QObject::tr("Error: Specified font-weight-normal invalid. Valid range %1 to %2.").arg(0).arg(8));
return EXIT_FAILURE;
}
GUIUtil::setFontWeightNormal(weight);
}
// Validate/set bold font weight
if (gArgs.IsArgSet("-font-weight-bold")) {
QFont::Weight weight;
if (!GUIUtil::weightFromArg(gArgs.GetArg("-font-weight-bold", GUIUtil::weightToArg(GUIUtil::getFontWeightBold())), weight)) {
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
QObject::tr("Error: Specified font-weight-bold invalid. Valid range %1 to %2.").arg(0).arg(8));
return EXIT_FAILURE;
}
GUIUtil::setFontWeightBold(weight);
}
// Validate/set font scale
if (gArgs.IsArgSet("-font-scale")) {
const int nScaleMin = -100, nScaleMax = 100;
int nScale = gArgs.GetArg("-font-scale", GUIUtil::getFontScale());
if (nScale < nScaleMin || nScale > nScaleMax) {
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
QObject::tr("Error: Specified font-scale invalid. Valid range %1 to %2.").arg(nScaleMin).arg(nScaleMax));
return EXIT_FAILURE;
}
GUIUtil::setFontScale(nScale);
}

// Subscribe to global signals from core
uiInterface.InitMessage.connect(InitMessage);

Expand Down
20 changes: 20 additions & 0 deletions src/qt/dash.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,26 @@
<file alias="general">res/css/general.css</file>
<file alias="scrollbars">res/css/scrollbars.css</file>
</qresource>
<qresource prefix="/fonts">
<file alias="Montserrat-Black">res/fonts/Montserrat/Montserrat-Black.otf</file>
<file alias="Montserrat-BlackItalic">res/fonts/Montserrat/Montserrat-BlackItalic.otf</file>
<file alias="Montserrat-Bold">res/fonts/Montserrat/Montserrat-Bold.otf</file>
<file alias="Montserrat-BoldItalic">res/fonts/Montserrat/Montserrat-BoldItalic.otf</file>
<file alias="Montserrat-ExtraBold">res/fonts/Montserrat/Montserrat-ExtraBold.otf</file>
<file alias="Montserrat-ExtraBoldItalic">res/fonts/Montserrat/Montserrat-ExtraBoldItalic.otf</file>
<file alias="Montserrat-ExtraLight">res/fonts/Montserrat/Montserrat-ExtraLight.otf</file>
<file alias="Montserrat-ExtraLightItalic">res/fonts/Montserrat/Montserrat-ExtraLightItalic.otf</file>
<file alias="Montserrat-Italic">res/fonts/Montserrat/Montserrat-Italic.otf</file>
<file alias="Montserrat-Light">res/fonts/Montserrat/Montserrat-Light.otf</file>
<file alias="Montserrat-LightItalic">res/fonts/Montserrat/Montserrat-LightItalic.otf</file>
<file alias="Montserrat-Medium">res/fonts/Montserrat/Montserrat-Medium.otf</file>
<file alias="Montserrat-MediumItalic">res/fonts/Montserrat/Montserrat-MediumItalic.otf</file>
<file alias="Montserrat-Regular">res/fonts/Montserrat/Montserrat-Regular.otf</file>
<file alias="Montserrat-SemiBold">res/fonts/Montserrat/Montserrat-SemiBold.otf</file>
<file alias="Montserrat-SemiBoldItalic">res/fonts/Montserrat/Montserrat-SemiBoldItalic.otf</file>
<file alias="Montserrat-Thin">res/fonts/Montserrat/Montserrat-Thin.otf</file>
<file alias="Montserrat-ThinItalic">res/fonts/Montserrat/Montserrat-ThinItalic.otf</file>
</qresource>
<qresource prefix="/themes">
<file alias="Dark">res/css/dark.css</file>
<file alias="Light">res/css/light.css</file>
Expand Down
6 changes: 0 additions & 6 deletions src/qt/forms/askpassphrasedialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,6 @@
</item>
<item row="4" column="1">
<widget class="QLabel" name="capsLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string/>
</property>
Expand Down
42 changes: 0 additions & 42 deletions src/qt/forms/coincontroldialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlQuantityText">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Quantity:</string>
</property>
Expand All @@ -67,12 +61,6 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelCoinControlBytesText">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Bytes:</string>
</property>
Expand Down Expand Up @@ -112,12 +100,6 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlAmountText">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Amount:</string>
</property>
Expand All @@ -144,12 +126,6 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Dust:</string>
</property>
Expand Down Expand Up @@ -192,12 +168,6 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlFeeText">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Fee:</string>
</property>
Expand Down Expand Up @@ -237,12 +207,6 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCoinControlAfterFeeText">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>After Fee:</string>
</property>
Expand All @@ -269,12 +233,6 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Change:</string>
</property>
Expand Down
Loading