ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #925: Add ubuntu mono font

pull/927/head
jenkins 2022-11-28 15:36:20 +01:00
parent 18e8e1ba49 6496cc05e7
commit 6c34541643
6 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nymea-app/resources.qrc
View File

@ -109,6 +109,10 @@
<file>ui/fonts/Ubuntu-MI.ttf</file>
<file>ui/fonts/Ubuntu-R.ttf</file>
<file>ui/fonts/Ubuntu-RI.ttf</file>
<file>ui/fonts/UbuntuMono-Bold.ttf</file>
<file>ui/fonts/UbuntuMono-BoldItalic.ttf</file>
<file>ui/fonts/UbuntuMono-Italic.ttf</file>
<file>ui/fonts/UbuntuMono-Regular.ttf</file>
<file>qtquickcontrols2.conf</file>
<file>../LICENSE.GPL3</file>
<file>../LICENSE.CC-BY-SA-3.0</file>

BIN
nymea-app/ui/fonts/UbuntuMono-Bold.ttf Normal file
View File

Binary file not shown.

BIN
nymea-app/ui/fonts/UbuntuMono-BoldItalic.ttf Normal file
View File

Binary file not shown.

BIN
nymea-app/ui/fonts/UbuntuMono-Italic.ttf Normal file
View File

Binary file not shown.

BIN
nymea-app/ui/fonts/UbuntuMono-Regular.ttf Normal file
View File

Binary file not shown.

7
nymea-app/ui/system/zigbee/ZigbeeNodePage.qml
View File

@ -364,11 +364,12 @@ SettingsPageBase {
rightPadding: Style.margins
topPadding: Style.margins
bottomPadding: Style.margins
font.family: "Monospace"
font.family: "UbuntuMono"
font.pixelSize: Style.smallFont.pixelSize
text: {
var ret = root.node.manufacturer + "\n"
ret += root.node.model + "\n"
var ret = "Manufacturer: " + root.node.manufacturer + "\n"
ret += "Model: " + root.node.model + "\n"
ret += "RxOnWhileIdle: " + root.node.rxOnWhenIdle + "\n"
ret += "Basic cluster version: " + root.node.version + "\n"