BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

kivy: improve send and receive layouts

This commit is contained in:
ThomasV 2015-10-14 16:52:10 +02:00
parent 3f473e6915
commit 0024980e2f
3 changed files with 100 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/kivy/main_window.py
View File

@ -792,11 +792,11 @@ class ElectrumWindow(App):
def amount_dialog(self, label, callback):
popup = Builder.load_file('gui/kivy/uix/ui_screens/amount.kv')
if label.text != 'Amount':
if label.text != label.default_text:
popup.ids.amount_label.text = label.text
def cb():
o = popup.ids.amount_label.text
label.text = o if o else 'Amount'
label.text = o if o else label.default_text
if callback:
callback()
popup.on_dismiss = cb

71
gui/kivy/uix/ui_screens/receive.kv
View File

@ -27,34 +27,51 @@ ReceiveScreen:
if self.collide_point(*args[1].pos):\
app.show_info_bubble(icon=self.ids.qrimage.texture, text='texture')
GridLayout:
id: grid
cols: 2
Label:
text: 'Address'
size_hint: 0.5, None
height: '38dp'
SendReceiveBlueBottom:
id: blue_bottom
size_hint: 1, None
height: self.minimum_height
AddressSelector:
id: address
size_hint: 0.5, None
height: '38dp'
Label:
text: 'Amount'
size_hint: 0.5, None
height: '38dp'
Button:
id: amount
text: ''
size_hint: 0.5, None
height: '38dp'
on_release: app.amount_dialog(amount, receive_screen.parent.update_qr)
Label:
text: 'Description'
size_hint: 0.5, None
height: '48dp'
TextInput:
text: ''
on_text: receive_screen.parent.update_qr
multiline: False
size_hint: 0.5, None
height: '38dp'
CardSeparator:
opacity: message_selection.opacity
color: blue_bottom.foreground_color
BoxLayout:
size_hint: 1, None
height: blue_bottom.item_height
Image:
source: 'atlas://gui/kivy/theming/light/bit_logo'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
Button:
id: amount
default_text: 'Amount (optional)'
text: self.default_text
text_size: (amount.width-15, None)
halign: 'left'
size_hint: 0.5, None
height: '38dp'
on_release: app.amount_dialog(amount, receive_screen.parent.update_qr)
background_color: 0, 0, 0, 0
CardSeparator:
opacity: message_selection.opacity
color: blue_bottom.foreground_color
BoxLayout:
id: message_selection
opacity: 1
size_hint: 1, None
height: blue_bottom.item_height
spacing: '5dp'
Image:
source: 'atlas://gui/kivy/theming/light/pen'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
TextInputSendBlue:
id: message_e
hint_text: 'Description (optional)'

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

@ -85,74 +85,62 @@ SendScreen:
state: 'normal'
source: 'atlas://gui/kivy/theming/light/nfc'
background_down: 'atlas://gui/kivy/theming/light/btn_send_nfc'
GridLayout:
id: grid
cols: 1
SendReceiveBlueBottom:
id: blue_bottom
size_hint: 1, None
height: self.minimum_height
SendReceiveBlueBottom:
id: blue_bottom
BoxLayout:
size_hint: 1, None
height: self.minimum_height
BoxLayout
size_hint: 1, None
height: blue_bottom.item_height
Image:
source: 'atlas://gui/kivy/theming/light/bit_logo'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
Button:
id: amount_e
text: 'Amount'
size_hint: 0.5, None
height: '38dp'
on_release: app.amount_dialog(amount_e, None)
background_color: .238, .585, .878, 0
CardSeparator
opacity: message_selection.opacity
color: blue_bottom.foreground_color
BoxLayout
size_hint: 1, None
height: blue_bottom.item_height
spacing: '5dp'
Image:
source: 'atlas://gui/kivy/theming/light/contact'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
TextInputSendBlue:
id: payto_e
hint_text: "Enter Contact or adress"
on_text_validate:
Factory.Animation(opacity=1,\
height=blue_bottom.item_height)\
.start(message_selection)
message_e.focus = True
CardSeparator
opacity: message_selection.opacity
color: blue_bottom.foreground_color
BoxLayout:
id: message_selection
opacity: 1
size_hint: 1, None
height: blue_bottom.item_height
spacing: '5dp'
Image:
source: 'atlas://gui/kivy/theming/light/pen'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
TextInputSendBlue:
id: message_e
hint_text: 'Enter description here'
#on_text_validate:
# anim = Factory.Animation(opacity=1, height=blue_bottom.item_height)
# anim.start(wallet_selection)
height: blue_bottom.item_height
spacing: '5dp'
Image:
source: 'atlas://gui/kivy/theming/light/contact'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
TextInputSendBlue:
id: payto_e
hint_text: "Recipient"
CardSeparator:
opacity: message_selection.opacity
color: blue_bottom.foreground_color
BoxLayout:
size_hint: 1, None
height: blue_bottom.item_height
Image:
source: 'atlas://gui/kivy/theming/light/bit_logo'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
Button:
id: amount_e
text: 'Amount'
text_size: (amount_e.width-15, None)
halign: 'left'
size_hint: 0.5, None
height: '38dp'
on_release: app.amount_dialog(amount_e, None)
background_color: .238, .585, .878, 0
CardSeparator:
opacity: message_selection.opacity
color: blue_bottom.foreground_color
BoxLayout:
id: message_selection
opacity: 1
size_hint: 1, None
height: blue_bottom.item_height
spacing: '5dp'
Image:
source: 'atlas://gui/kivy/theming/light/pen'
size_hint: None, None
size: '22dp', '22dp'
pos_hint: {'center_y': .5}
TextInputSendBlue:
id: message_e
hint_text: 'Optional description'
BoxLayout:
size_hint: 1, None
Button:
text: _('Clear')
size_hint_y: None
@ -163,6 +151,7 @@ SendScreen:
size_hint_y: None
height: '38dp'
on_release: send_screen.do_send()
Widget
Widget:
size_hint: 1, None