AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: followup 22fa84a0, use fixed font, use camelcase for QML properties

Browse Source
This commit is contained in:
Sander van Grieken
2023-04-25 12:46:30 +02:00
parent 664544886a
commit 96fd339a52
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/gui/qml/components/ReceiveDialog.qml
View File

@@ -85,7 +85,7 @@ ElDialog {
QRImage { QRImage {
qrdata: _bolt11 qrdata: _bolt11
render: _render_qr render: _render_qr
enable_toggle_text: true enableToggleText: true
} }
} }
Component { Component {
@@ -93,7 +93,7 @@ ElDialog {
QRImage { QRImage {
qrdata: _bip21uri qrdata: _bip21uri
render: _render_qr render: _render_qr
enable_toggle_text: true enableToggleText: true
} }
} }
Component { Component {
@@ -101,7 +101,7 @@ ElDialog {
QRImage { QRImage {
qrdata: _address qrdata: _address
render: _render_qr render: _render_qr
enable_toggle_text: true enableToggleText: true
} }
} }
} }

30
electrum/gui/qml/components/controls/QRImage.qml
View File

@@ -5,35 +5,35 @@ Item {
id: root id: root
property string qrdata property string qrdata
property bool render: true // init to false, then set true if render needs delay property bool render: true // init to false, then set true if render needs delay
property var qrprops: QRIP.getDimensions(qrdata) property bool enableToggleText: false // if true, clicking the QR code shows the encoded text
property bool isTextState: false // internal state, if the above is enabled
property bool enable_toggle_text: false // if true, clicking the QR code shows the encoded text property var _qrprops: QRIP.getDimensions(qrdata)
property bool is_in_text_state: false // internal state, if the above is enabled
width: r.width width: r.width
height: r.height height: r.height
Rectangle { Rectangle {
id: r id: r
width: qrprops.modules * qrprops.box_size width: _qrprops.modules * _qrprops.box_size
height: width height: width
color: 'white' color: 'white'
} }
Image { Image {
source: qrdata && render ? 'image://qrgen/' + qrdata : '' source: qrdata && render ? 'image://qrgen/' + qrdata : ''
visible: !is_in_text_state visible: !isTextState
Rectangle { Rectangle {
visible: root.render && qrprops.valid visible: root.render && _qrprops.valid
color: 'white' color: 'white'
x: (parent.width - width) / 2 x: (parent.width - width) / 2
y: (parent.height - height) / 2 y: (parent.height - height) / 2
width: qrprops.icon_modules * qrprops.box_size width: _qrprops.icon_modules * _qrprops.box_size
height: qrprops.icon_modules * qrprops.box_size height: _qrprops.icon_modules * _qrprops.box_size
Image { Image {
visible: qrprops.valid visible: _qrprops.valid
source: '../../../icons/electrum.png' source: '../../../icons/electrum.png'
x: 1 x: 1
y: 1 y: 1
@@ -43,14 +43,14 @@ Item {
} }
} }
Label { Label {
visible: !qrprops.valid visible: !_qrprops.valid
text: qsTr('Data too big for QR') text: qsTr('Data too big for QR')
anchors.centerIn: parent anchors.centerIn: parent
} }
} }
Label { Label {
visible: is_in_text_state visible: isTextState
text: qrdata text: qrdata
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
elide: Text.ElideRight elide: Text.ElideRight
@@ -58,6 +58,10 @@ Item {
horizontalAlignment: Qt.AlignHCenter horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter verticalAlignment: Qt.AlignVCenter
color: 'black' color: 'black'
font.family: FixedFont
font.pixelSize: text.length < 64
? constants.fontSizeXLarge
: constants.fontSizeMedium
width: r.width width: r.width
height: r.height height: r.height
} }
@@ -65,8 +69,8 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
if (enable_toggle_text) { if (enableToggleText) {
root.is_in_text_state = !root.is_in_text_state root.isTextState = !root.isTextState
} }
} }
} }