Browse Source

UI here and there

patch-4
Sander van Grieken 3 years ago
parent
commit
201669d178
  1. 6
      electrum/gui/qml/components/Addresses.qml
  2. 10
      electrum/gui/qml/components/Receive.qml
  3. 2
      electrum/gui/qml/components/main.qml

6
electrum/gui/qml/components/Addresses.qml

@ -82,8 +82,10 @@ Pane {
Layout.preferredHeight: constants.iconSizeMedium
color: model.held
? Qt.rgba(1,0.93,0,0.75)
: model.numtx > 0 && model.balance == 0
? Qt.rgba(0.75,0.75,0.75,1)
: model.numtx > 0
? model.balance == 0
? Qt.rgba(0.5,0.5,0.5,1)
: Qt.rgba(0.75,0.75,0.75,1)
: model.type == 'receive'
? Qt.rgba(0,1,0,0.5)
: Qt.rgba(1,0.93,0,0.75)

10
electrum/gui/qml/components/Receive.qml

@ -94,6 +94,7 @@ Pane {
RowLayout {
Layout.columnSpan: 4
Layout.alignment: Qt.AlignHCenter
visible: false
CheckBox {
id: cb_onchain
text: qsTr('Onchain')
@ -282,15 +283,6 @@ Pane {
}
add: Transition {
NumberAnimation { properties: 'y'; from: -50; duration: 300 }
NumberAnimation { properties: 'opacity'; from: 0; to: 1.0; duration: 700 }
}
addDisplaced: Transition {
NumberAnimation { properties: 'y'; duration: 100 }
NumberAnimation { properties: 'opacity'; to: 1.0; duration: 700 * (1-from) }
}
remove: Transition {
NumberAnimation { properties: 'scale'; to: 0; duration: 400 }
NumberAnimation { properties: 'opacity'; to: 0; duration: 300 }

2
electrum/gui/qml/components/main.qml

@ -106,7 +106,7 @@ ApplicationWindow
ToolButton {
id: menuButton
enabled: stack.currentItem.menu !== undefined && stack.currentItem.menu.count > 0
enabled: stack.currentItem && stack.currentItem.menu ? stack.currentItem.menu.count > 0 : false
text: enabled ? qsTr("≡") : ''
font.pixelSize: constants.fontSizeXLarge
onClicked: {

Loading…
Cancel
Save