Browse Source

small fixes

master
Sander van Grieken 4 years ago
parent
commit
2b691c9216
  1. 3
      electrum/gui/qml/components/WalletMainView.qml
  2. 2
      electrum/gui/qml/components/Wallets.qml
  3. 4
      electrum/gui/qml/qefx.py
  4. 6
      electrum/gui/qml/qewallet.py

3
electrum/gui/qml/components/WalletMainView.qml

@ -81,13 +81,16 @@ Item {
currentIndex: swipeview.currentIndex currentIndex: swipeview.currentIndex
TabButton { TabButton {
text: qsTr('Receive') text: qsTr('Receive')
font.pixelSize: constants.fontSizeLarge
} }
TabButton { TabButton {
text: qsTr('History') text: qsTr('History')
font.pixelSize: constants.fontSizeLarge
} }
TabButton { TabButton {
enabled: !Daemon.currentWallet.isWatchOnly enabled: !Daemon.currentWallet.isWatchOnly
text: qsTr('Send') text: qsTr('Send')
font.pixelSize: constants.fontSizeLarge
} }
Component.onCompleted: tabbar.setCurrentIndex(1) Component.onCompleted: tabbar.setCurrentIndex(1)
} }

2
electrum/gui/qml/components/Wallets.qml

@ -10,7 +10,7 @@ import "controls"
Pane { Pane {
id: rootItem id: rootItem
property string title: 'Wallets' property string title: qsTr('Wallets')
ColumnLayout { ColumnLayout {
id: layout id: layout

4
electrum/gui/qml/qefx.py

@ -99,8 +99,8 @@ class QEFX(QObject):
else: else:
try: try:
sd = Decimal(satoshis) sd = Decimal(satoshis)
if sd == 0: #if sd == 0:
return '' #return ''
except: except:
return '' return ''
if plain: if plain:

6
electrum/gui/qml/qewallet.py

@ -225,15 +225,15 @@ class QEWallet(QObject):
balanceChanged = pyqtSignal() balanceChanged = pyqtSignal()
@pyqtProperty(int, notify=balanceChanged) @pyqtProperty('quint64', notify=balanceChanged)
def frozenBalance(self): def frozenBalance(self):
return self.wallet.get_frozen_balance() return self.wallet.get_frozen_balance()
@pyqtProperty(int, notify=balanceChanged) @pyqtProperty('quint64', notify=balanceChanged)
def unconfirmedBalance(self): def unconfirmedBalance(self):
return self.wallet.get_balance()[1] return self.wallet.get_balance()[1]
@pyqtProperty(int, notify=balanceChanged) @pyqtProperty('quint64', notify=balanceChanged)
def confirmedBalance(self): def confirmedBalance(self):
c, u, x = self.wallet.get_balance() c, u, x = self.wallet.get_balance()
self._logger.info('balance: ' + str(c) + ' ' + str(u) + ' ' + str(x) + ' ') self._logger.info('balance: ' + str(c) + ' ' + str(u) + ' ' + str(x) + ' ')

Loading…
Cancel
Save