AaronFiore/electrum
1
0
Fork 0
Code Activity

add default request expiry to preferences/config

Browse Source
This commit is contained in:
Sander van Grieken
2022-09-27 12:25:21 +02:00
parent dd58328534
commit 5f9068d7b0
4 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/gui/qml/components/Preferences.qml
View File

@@ -148,6 +148,18 @@ Pane {
}
}
Label {
text: qsTr('Default request expiry')
Layout.fillWidth: false
}
RequestExpiryComboBox {
onCurrentValueChanged: {
if (activeFocus)
Config.requestExpiry = currentValue
}
}
Label {
text: qsTr('PIN')
}

19
electrum/gui/qml/components/ReceiveDetailsDialog.qml
View File

@@ -84,26 +84,9 @@ ElDialog {
Layout.fillWidth: false
}
ElComboBox {
RequestExpiryComboBox {
id: expires
Layout.columnSpan: 2
textRole: 'text'
valueRole: 'value'
model: ListModel {
id: expiresmodel
Component.onCompleted: {
// we need to fill the model like this, as ListElement can't evaluate script
expiresmodel.append({'text': qsTr('10 minutes'), 'value': 10*60})
expiresmodel.append({'text': qsTr('1 hour'), 'value': 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 month'), 'value': 31*24*60*60})
expiresmodel.append({'text': qsTr('Never'), 'value': 0})
expires.currentIndex = 0
}
}
}
Item { width: 1; height: 1; Layout.fillWidth: true }

36
electrum/gui/qml/components/controls/RequestExpiryComboBox.qml Normal file
View File

@@ -0,0 +1,36 @@
import QtQuick 2.6
import QtQuick.Controls 2.3
import org.electrum 1.0
ElComboBox {
id: expires
textRole: 'text'
valueRole: 'value'
model: ListModel {
id: expiresmodel
Component.onCompleted: {
// we need to fill the model like this, as ListElement can't evaluate script
expiresmodel.append({'text': qsTr('10 minutes'), 'value': 10*60})
expiresmodel.append({'text': qsTr('1 hour'), 'value': 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 month'), 'value': 31*24*60*60})
expiresmodel.append({'text': qsTr('Never'), 'value': 0})
expires.currentIndex = 0
for (let i=0; i < expiresmodel.count; i++) {
if (expiresmodel.get(i).value == Config.requestExpiry) {
expires.currentIndex = i
break
}
}
}
}
onCurrentValueChanged: {
if (activeFocus)
Config.requestExpiry = currentValue
}
}

13
electrum/gui/qml/qeconfig.py
View File

@@ -4,6 +4,7 @@ from decimal import Decimal
from electrum.logging import get_logger
from electrum.util import DECIMAL_POINT_DEFAULT, format_satoshis
from electrum.invoices import PR_DEFAULT_EXPIRATION_WHEN_CREATING
from .qetypes import QEAmount
from .auth import AuthMixin, auth_protect
@@ -81,6 +82,18 @@ class QEConfig(AuthMixin, QObject):
self.config.set_key('confirmed_only', not checked, True)
self.spendUnconfirmedChanged.emit()
requestExpiryChanged = pyqtSignal()
@pyqtProperty(int, notify=requestExpiryChanged)
def requestExpiry(self):
a = self.config.get('request_expiry', PR_DEFAULT_EXPIRATION_WHEN_CREATING)
self._logger.debug(f'request expiry {a}')
return a
@requestExpiry.setter
def requestExpiry(self, expiry):
self.config.set_key('request_expiry', expiry)
self.requestExpiryChanged.emit()
pinCodeChanged = pyqtSignal()
@pyqtProperty(str, notify=pinCodeChanged)
def pinCode(self):