diff --git a/electrum/gui/qml/components/Addresses.qml b/electrum/gui/qml/components/Addresses.qml index c2b57a79e..bfa45fb26 100644 --- a/electrum/gui/qml/components/Addresses.qml +++ b/electrum/gui/qml/components/Addresses.qml @@ -7,7 +7,6 @@ import org.electrum 1.0 Pane { id: rootItem - anchors.fill: parent property string title: Daemon.walletName + ' - ' + qsTr('Addresses') @@ -27,10 +26,14 @@ Pane { clip: true model: Daemon.currentWallet.addressModel + section.property: 'type' + section.criteria: ViewSection.FullString + section.delegate: sectionDelegate + delegate: AbstractButton { id: delegate width: ListView.view.width - height: 30 + height: delegateLayout.height background: Rectangle { color: model.held ? Qt.rgba(1,0,0,0.5) : @@ -45,44 +48,69 @@ Pane { visible: model.index > 0 } } + RowLayout { - x: 10 - spacing: 5 - width: parent.width - 20 - anchors.verticalCenter: parent.verticalCenter + id: delegateLayout + x: constants.paddingSmall + spacing: constants.paddingSmall + width: parent.width - 2*constants.paddingSmall Label { - font.pixelSize: 12 - text: model.type - } - Label { - font.pixelSize: 12 - font.family: "Courier" // TODO: use system monospace font + font.pixelSize: constants.fontSizeLarge + font.family: FixedFont text: model.address elide: Text.ElideMiddle - Layout.maximumWidth: delegate.width / 4 + Layout.maximumWidth: delegate.width / 3 } Label { - font.pixelSize: 12 + font.pixelSize: constants.fontSizeMedium text: model.label elide: Text.ElideRight - Layout.minimumWidth: delegate.width / 4 + Layout.minimumWidth: delegate.width / 3 Layout.fillWidth: true } Label { - font.pixelSize: 12 + font.pixelSize: constants.fontSizeMedium + font.family: FixedFont text: model.balance } Label { - font.pixelSize: 12 + font.pixelSize: constants.fontSizeMedium text: model.numtx } } } + + ScrollIndicator.vertical: ScrollIndicator { } } } } + Component { + id: sectionDelegate + Rectangle { + id: root + width: ListView.view.width + height: childrenRect.height + color: 'transparent' + + required property string section + + GridLayout { + Label { + topPadding: constants.paddingMedium + bottomPadding: constants.paddingMedium + text: root.section + ' ' + qsTr('addresses') + font.bold: true + font.pixelSize: constants.fontSizeLarge + } + ToolButton { + + } + } + } + } + Component.onCompleted: Daemon.currentWallet.addressModel.init_model() } diff --git a/electrum/gui/qml/components/History.qml b/electrum/gui/qml/components/History.qml index 538190325..8239a0275 100644 --- a/electrum/gui/qml/components/History.qml +++ b/electrum/gui/qml/components/History.qml @@ -60,6 +60,7 @@ Pane { } Label { id: valueLabel + font.family: FixedFont font.pixelSize: 15 text: Config.formatSats(model.bc_value) font.bold: true @@ -128,6 +129,8 @@ Pane { } // delegate + ScrollIndicator.vertical: ScrollIndicator { } + } } diff --git a/electrum/gui/qml/fonts/PTMono-Regular.ttf b/electrum/gui/qml/fonts/PTMono-Regular.ttf new file mode 100644 index 000000000..b1983838c Binary files /dev/null and b/electrum/gui/qml/fonts/PTMono-Regular.ttf differ diff --git a/electrum/gui/qml/fonts/PTMono-Regular.ttf.LICENSE b/electrum/gui/qml/fonts/PTMono-Regular.ttf.LICENSE new file mode 100644 index 000000000..f3a682b22 --- /dev/null +++ b/electrum/gui/qml/fonts/PTMono-Regular.ttf.LICENSE @@ -0,0 +1,94 @@ +Copyright (c) 2011, ParaType Ltd. (http://www.paratype.com/public), +with Reserved Font Names "PT Sans", "PT Serif", "PT Mono" and "ParaType". + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/electrum/gui/qml/qeapp.py b/electrum/gui/qml/qeapp.py index 0298edbcd..d97765340 100644 --- a/electrum/gui/qml/qeapp.py +++ b/electrum/gui/qml/qeapp.py @@ -1,7 +1,7 @@ import re from PyQt5.QtCore import pyqtSlot, QObject, QUrl, QLocale, qInstallMessageHandler -from PyQt5.QtGui import QGuiApplication +from PyQt5.QtGui import QGuiApplication, QFontDatabase from PyQt5.QtQml import qmlRegisterType, QQmlApplicationEngine #, QQmlComponent from electrum.logging import Logger, get_logger @@ -39,6 +39,13 @@ class ElectrumQmlApplication(QGuiApplication): self.qr_ip = QEQRImageProvider() self.engine.addImageProvider('qrgen', self.qr_ip) + # add a monospace font as we can't rely on device having one + if QFontDatabase.addApplicationFont('electrum/gui/qml/fonts/PTMono-Regular.ttf') < 0: + self.logger.warning('Could not load font PTMono-Regular.ttf') + self.fixedFont = 'Monospace' # hope for the best + else: + self.fixedFont = 'PT Mono' + self.context = self.engine.rootContext() self._singletons['config'] = QEConfig(config) self._singletons['network'] = QENetwork(daemon.network) @@ -48,6 +55,7 @@ class ElectrumQmlApplication(QGuiApplication): self.context.setContextProperty('Network', self._singletons['network']) self.context.setContextProperty('Daemon', self._singletons['daemon']) self.context.setContextProperty('QR', self._singletons['qr']) + self.context.setContextProperty('FixedFont', self.fixedFont) qInstallMessageHandler(self.message_handler)