AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy: set_paid for paid invoices

Browse Source
This commit is contained in:
ThomasV
2016-02-19 13:53:01 +01:00
parent cdbc564fb3
commit 41f6fec2ac
6 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/kivy/uix/screens.py
View File

@@ -235,6 +235,12 @@ class SendScreen(CScreen):
self.app.invoices.add(pr)
self.app.update_tab('invoices')
self.app.show_info(_("Invoice saved"))
if pr.is_pr():
self.screen.is_pr = True
self.payment_request = pr
else:
self.screen.is_pr = False
self.payment_request = None
def do_paste(self):
contents = unicode(self.app._clipboard.paste())
@@ -287,7 +293,7 @@ class SendScreen(CScreen):
def send_tx(self, tx, password):
def on_success(tx):
if tx.is_complete():
self.app.broadcast(tx)
self.app.broadcast(tx, self.payment_request)
else:
self.app.tx_dialog(tx)
def on_failure(error):

6
gui/kivy/uix/ui_screens/send.kv
View File

@@ -35,7 +35,7 @@ SendScreen:
disabled: True
shorten: True
CardSeparator:
opacity: message_selection.opacity
opacity: int(not root.is_pr)
color: blue_bottom.foreground_color
BoxLayout:
size_hint: 1, None
@@ -53,7 +53,7 @@ SendScreen:
disabled: root.is_pr
on_release: Clock.schedule_once(lambda dt: app.amount_dialog(s, True))
CardSeparator:
opacity: message_selection.opacity
opacity: int(not root.is_pr)
color: blue_bottom.foreground_color
BoxLayout:
id: message_selection
@@ -67,7 +67,7 @@ SendScreen:
pos_hint: {'center_y': .5}
BlueButton:
id: description
text: s.message if s.message else _('Description')
text: s.message if s.message else (_('No Description') if root.is_pr else _('Description'))
disabled: root.is_pr
on_release: Clock.schedule_once(lambda dt: app.description_dialog(s))
BoxLayout: