Browse Source

qml: don't show option Never for expiry combobox when in preferences

master
Sander van Grieken 3 years ago
parent
commit
adf23f602d
  1. 1
      electrum/gui/qml/components/Preferences.qml
  2. 3
      electrum/gui/qml/components/controls/RequestExpiryComboBox.qml

1
electrum/gui/qml/components/Preferences.qml

@ -247,6 +247,7 @@ Pane {
} }
RequestExpiryComboBox { RequestExpiryComboBox {
includeNever: false
onCurrentValueChanged: { onCurrentValueChanged: {
if (activeFocus) if (activeFocus)
Config.requestExpiry = currentValue Config.requestExpiry = currentValue

3
electrum/gui/qml/components/controls/RequestExpiryComboBox.qml

@ -6,6 +6,8 @@ import org.electrum 1.0
ElComboBox { ElComboBox {
id: expires id: expires
property bool includeNever: true
textRole: 'text' textRole: 'text'
valueRole: 'value' valueRole: 'value'
@ -18,6 +20,7 @@ ElComboBox {
expiresmodel.append({'text': qsTr('1 day'), 'value': 24*60*60}) expiresmodel.append({'text': qsTr('1 day'), 'value': 24*60*60})
expiresmodel.append({'text': qsTr('1 week'), 'value': 7*24*60*60}) expiresmodel.append({'text': qsTr('1 week'), 'value': 7*24*60*60})
expiresmodel.append({'text': qsTr('1 month'), 'value': 31*24*60*60}) expiresmodel.append({'text': qsTr('1 month'), 'value': 31*24*60*60})
if (includeNever)
expiresmodel.append({'text': qsTr('Never'), 'value': 0}) expiresmodel.append({'text': qsTr('Never'), 'value': 0})
expires.currentIndex = 0 expires.currentIndex = 0
for (let i=0; i < expiresmodel.count; i++) { for (let i=0; i < expiresmodel.count; i++) {

Loading…
Cancel
Save