AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: small form-factor fixes

Browse Source
This commit is contained in:
Sander van Grieken
2022-11-14 18:22:05 +01:00
parent ce35e68514
commit 24524119f6
3 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/gui/qml/components/WalletDetails.qml
View File

@@ -252,12 +252,13 @@ Pane {
columns: 2
Label {
text: qsTr('Derivation prefix')
visible: Daemon.currentWallet.isDeterministic
visible: Daemon.currentWallet.derivationPrefix
color: Material.accentColor
}
Label {
Layout.fillWidth: true
text: Daemon.currentWallet.derivationPrefix
visible: Daemon.currentWallet.isDeterministic
visible: Daemon.currentWallet.derivationPrefix
}
Label {

18
electrum/gui/qml/components/wizard/WCConfirmSeed.qml
View File

@@ -22,10 +22,9 @@ WizardComponent {
clip:true
interactive: height < contentHeight
GridLayout {
ColumnLayout {
id: mainLayout
width: parent.width
columns: 1
InfoTextArea {
Layout.fillWidth: true
@@ -33,21 +32,22 @@ WizardComponent {
qsTr('If you lose your seed, your money will be permanently lost.') + ' ' +
qsTr('To make sure that you have properly saved your seed, please retype it here.')
}
Label { text: qsTr('Confirm your seed (re-enter)') }
Label {
text: qsTr('Confirm your seed (re-enter)')
}
SeedTextArea {
id: confirm
Layout.fillWidth: true
onTextChanged: {
checkValid()
}
onTextChanged: checkValid()
}
TextField {
id: customwordstext
Layout.fillWidth: true
placeholderText: qsTr('Enter your custom word(s)')
onTextChanged: {
checkValid()
}
onTextChanged: checkValid()
}
}
}

116
electrum/gui/qml/components/wizard/WCMultisig.qml
View File

@@ -29,70 +29,78 @@ WizardComponent {
wizard_data['multisig_cosigner_data'] = {}
}
ColumnLayout {
width: parent.width
Flickable {
anchors.fill: parent
contentHeight: rootLayout.height
clip:true
interactive: height < contentHeight
Label { text: qsTr('Multisig wallet') }
ColumnLayout {
id: rootLayout
width: parent.width
InfoTextArea {
Layout.preferredWidth: parent.width
text: qsTr('Choose the number of participants, and the number of signatures needed to unlock funds in your wallet.')
}
Label { text: qsTr('Multisig wallet') }
Piechart {
id: piechart
Layout.preferredWidth: parent.width * 1/2
Layout.alignment: Qt.AlignHCenter
Layout.preferredHeight: 200 // TODO
showLegend: false
innerOffset: 3
function updateSlices() {
var s = []
for (let i=0; i < participants; i++) {
var item = {
v: (1/participants),
color: i < signatures ? constants.colorPiechartSignature : constants.colorPiechartParticipant
InfoTextArea {
Layout.preferredWidth: parent.width
text: qsTr('Choose the number of participants, and the number of signatures needed to unlock funds in your wallet.')
}
Piechart {
id: piechart
Layout.preferredWidth: parent.width * 1/2
Layout.alignment: Qt.AlignHCenter
Layout.preferredHeight: 200 // TODO
showLegend: false
innerOffset: 3
function updateSlices() {
var s = []
for (let i=0; i < participants; i++) {
var item = {
v: (1/participants),
color: i < signatures ? constants.colorPiechartSignature : constants.colorPiechartParticipant
}
s.push(item)
}
s.push(item)
piechart.slices = s
}
piechart.slices = s
}
}
Label {
text: qsTr('Number of cosigners: %1').arg(participants)
}
Slider {
id: participants_slider
Layout.preferredWidth: parent.width * 4/5
Layout.alignment: Qt.AlignHCenter
snapMode: Slider.SnapAlways
stepSize: 1
from: 2
to: 15
onValueChanged: {
if (activeFocus)
participants = value
Label {
text: qsTr('Number of cosigners: %1').arg(participants)
}
}
Label {
text: qsTr('Number of signatures: %1').arg(signatures)
}
Slider {
id: participants_slider
Layout.preferredWidth: parent.width * 4/5
Layout.alignment: Qt.AlignHCenter
snapMode: Slider.SnapAlways
stepSize: 1
from: 2
to: 15
onValueChanged: {
if (activeFocus)
participants = value
}
}
Slider {
id: signatures_slider
Layout.preferredWidth: parent.width * 4/5
Layout.alignment: Qt.AlignHCenter
snapMode: Slider.SnapAlways
stepSize: 1
from: 1
to: participants
value: signatures
onValueChanged: {
if (activeFocus)
signatures = value
Label {
text: qsTr('Number of signatures: %1').arg(signatures)
}
Slider {
id: signatures_slider
Layout.preferredWidth: parent.width * 4/5
Layout.alignment: Qt.AlignHCenter
snapMode: Slider.SnapAlways
stepSize: 1
from: 1
to: participants
value: signatures
onValueChanged: {
if (activeFocus)
signatures = value
}
}
}
}