AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: FeePicker: hide "Target" line in "Manual" mode

Browse Source 
instead use font colors to hint which textedit is being used for target
This commit is contained in:
SomberNight
2026-01-12 18:19:51 +00:00
parent f387300ab2
commit 65f245f475
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/gui/qml/components/controls/FeePicker.qml
View File

@@ -74,14 +74,14 @@ Item {
Layout.preferredWidth: 1 Layout.preferredWidth: 1
text: targetLabel text: targetLabel
color: Material.accentColor color: Material.accentColor
visible: showPicker visible: showPicker && !manualFeeEntry
} }
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: 2 Layout.preferredWidth: 2
text: finalizer.target text: finalizer.target
visible: showPicker visible: showPicker && !manualFeeEntry
} }
RowLayout { RowLayout {
@@ -122,6 +122,7 @@ Item {
} }
Label { Label {
Layout.fillWidth: true
Layout.preferredWidth: 1 Layout.preferredWidth: 1
text: qsTr('Rate') text: qsTr('Rate')
color: Material.accentColor color: Material.accentColor
@@ -139,6 +140,7 @@ Item {
id: rate id: rate
Layout.fillWidth: true Layout.fillWidth: true
text: finalizer.userFeerate text: finalizer.userFeerate
color: finalizer.isUserFeerateLast ? Material.foreground : Material.accentColor
inputMethodHints: Qt.ImhDigitsOnly inputMethodHints: Qt.ImhDigitsOnly
validator: RegularExpressionValidator { validator: RegularExpressionValidator {
regularExpression: /^[0-9]*\.[0-9]?$/ regularExpression: /^[0-9]*\.[0-9]?$/
@@ -158,6 +160,7 @@ Item {
id: absolute id: absolute
Layout.fillWidth: true Layout.fillWidth: true
text: finalizer.userFee text: finalizer.userFee
color: finalizer.isUserFeerateLast ? Material.accentColor : Material.foreground
inputMethodHints: Qt.ImhDigitsOnly inputMethodHints: Qt.ImhDigitsOnly
validator: RegularExpressionValidator { validator: RegularExpressionValidator {
regularExpression: /^[0-9]*$/ regularExpression: /^[0-9]*$/
@@ -175,6 +178,7 @@ Item {
} }
Label { Label {
Layout.fillWidth: true
Layout.preferredWidth: 1 Layout.preferredWidth: 1
visible: showPicker && manualFeeEntry visible: showPicker && manualFeeEntry
color: Material.accentColor color: Material.accentColor

14
electrum/gui/qml/qetxfinalizer.py
View File

@@ -158,6 +158,7 @@ class TxFeeSlider(FeeSlider):
self._feeRate = '' self._feeRate = ''
self._userFee = '' self._userFee = ''
self._userFeerate = '' self._userFeerate = ''
self._is_user_feerate_last = True
self._rbf = False self._rbf = False
self._tx = None # type: Optional[PartialTransaction] self._tx = None # type: Optional[PartialTransaction]
self._inputs = [] self._inputs = []
@@ -201,6 +202,7 @@ class TxFeeSlider(FeeSlider):
user_fee = int(userFee) if userFee else 0 user_fee = int(userFee) if userFee else 0
self._fee_policy = FeePolicy(f'fixed:{user_fee}') self._fee_policy = FeePolicy(f'fixed:{user_fee}')
self.userFeeChanged.emit() self.userFeeChanged.emit()
self.isUserFeerateLast = False
self.update() self.update()
userFeerateChanged = pyqtSignal() userFeerateChanged = pyqtSignal()
@@ -217,8 +219,20 @@ class TxFeeSlider(FeeSlider):
user_feerate = int(as_decimal * 1000) user_feerate = int(as_decimal * 1000)
self._fee_policy = FeePolicy(f'feerate:{user_feerate}') self._fee_policy = FeePolicy(f'feerate:{user_feerate}')
self.userFeerateChanged.emit() self.userFeerateChanged.emit()
self.isUserFeerateLast = True
self.update() self.update()
isUserFeerateLastChanged = pyqtSignal()
@pyqtProperty(bool, notify=isUserFeerateLastChanged)
def isUserFeerateLast(self):
return self._is_user_feerate_last
@isUserFeerateLast.setter
def isUserFeerateLast(self, isUserFeerateLast):
if self._is_user_feerate_last != isUserFeerateLast:
self._is_user_feerate_last = isUserFeerateLast
self.isUserFeerateLastChanged.emit()
rbfChanged = pyqtSignal() rbfChanged = pyqtSignal()
@pyqtProperty(bool, notify=rbfChanged) @pyqtProperty(bool, notify=rbfChanged)
def rbf(self): def rbf(self):