mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-21 22:42:04 +01:00
gui: Add Roboto Mono font
This commit is contained in:
parent
5bb64acd9d
commit
89e421918e
5 changed files with 25 additions and 2 deletions
|
@ -87,6 +87,10 @@ Files: src/qt/res/icons/proxy.png
|
||||||
Copyright: Cristian Mircea Messel
|
Copyright: Cristian Mircea Messel
|
||||||
License: public-domain
|
License: public-domain
|
||||||
|
|
||||||
|
Files: src/qt/fonts/RobotoMono-Bold.ttf
|
||||||
|
License: Apache-2.0
|
||||||
|
Comment: Site: https://fonts.google.com/specimen/Roboto+Mono
|
||||||
|
|
||||||
|
|
||||||
License: Expat
|
License: Expat
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a
|
Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
@ -144,3 +148,14 @@ Comment:
|
||||||
|
|
||||||
License: public-domain
|
License: public-domain
|
||||||
This work is in the public domain.
|
This work is in the public domain.
|
||||||
|
|
||||||
|
License: Apache-2.0
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
|
|
@ -164,6 +164,9 @@ BITCOIN_QT_H = \
|
||||||
qt/walletview.h \
|
qt/walletview.h \
|
||||||
qt/winshutdownmonitor.h
|
qt/winshutdownmonitor.h
|
||||||
|
|
||||||
|
RES_FONTS = \
|
||||||
|
qt/res/fonts/RobotoMono-Bold.ttf
|
||||||
|
|
||||||
RES_ICONS = \
|
RES_ICONS = \
|
||||||
qt/res/icons/add.png \
|
qt/res/icons/add.png \
|
||||||
qt/res/icons/address-book.png \
|
qt/res/icons/address-book.png \
|
||||||
|
@ -290,7 +293,7 @@ qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
|
||||||
qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
|
qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
|
||||||
|
|
||||||
qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
|
qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
|
||||||
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_ANIMATION)
|
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_FONTS) $(RES_ICONS) $(RES_ANIMATION)
|
||||||
if TARGET_DARWIN
|
if TARGET_DARWIN
|
||||||
qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
|
qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
|
||||||
endif
|
endif
|
||||||
|
@ -361,7 +364,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
|
||||||
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
|
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
|
||||||
@rm $(@D)/temp_$(<F)
|
@rm $(@D)/temp_$(<F)
|
||||||
|
|
||||||
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_ANIMATION)
|
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_FONTS) $(RES_ICONS) $(RES_ANIMATION)
|
||||||
@test -f $(RCC)
|
@test -f $(RCC)
|
||||||
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
|
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
|
||||||
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
|
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include <QFontDatabase>
|
||||||
#include <QLibraryInfo>
|
#include <QLibraryInfo>
|
||||||
#include <QLocale>
|
#include <QLocale>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
@ -475,6 +476,7 @@ int GuiMain(int argc, char* argv[])
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
BitcoinApplication app;
|
BitcoinApplication app;
|
||||||
|
QFontDatabase::addApplicationFont(":/fonts/monospace");
|
||||||
|
|
||||||
/// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these
|
/// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these
|
||||||
// Command-line options take precedence:
|
// Command-line options take precedence:
|
||||||
|
|
|
@ -83,4 +83,7 @@
|
||||||
<file alias="spinner-034">res/animation/spinner-034.png</file>
|
<file alias="spinner-034">res/animation/spinner-034.png</file>
|
||||||
<file alias="spinner-035">res/animation/spinner-035.png</file>
|
<file alias="spinner-035">res/animation/spinner-035.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
|
<qresource prefix="/fonts">
|
||||||
|
<file alias="monospace">res/fonts/RobotoMono-Bold.ttf</file>
|
||||||
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
BIN
src/qt/res/fonts/RobotoMono-Bold.ttf
Normal file
BIN
src/qt/res/fonts/RobotoMono-Bold.ttf
Normal file
Binary file not shown.
Loading…
Add table
Reference in a new issue