Browse Source

kivy: simplify dropdown menu, cleanup

master
ThomasV 10 years ago
parent
commit
92e5218d5d
  1. 50
      gui/kivy/main.kv
  2. 12
      gui/kivy/uix/ui_screens/wallet.kv

50
gui/kivy/main.kv

@ -372,23 +372,18 @@
tab_height: '48dp' tab_height: '48dp'
#default_tab: send_tab #default_tab: send_tab
strip_border: 0, 0, 0, 0 strip_border: 0, 0, 0, 0
HistoryScreen: HistoryScreen:
id: history_screen id: history_screen
tab: history_tab tab: history_tab
SendScreen: SendScreen:
id: send_screen id: send_screen
tab: send_tab tab: send_tab
ReceiveScreen: ReceiveScreen:
id: receive_screen id: receive_screen
tab: receive_tab tab: receive_tab
ContactsScreen: ContactsScreen:
id: contacts_screen id: contacts_screen
tab: contacts_tab tab: contacts_tab
CleanHeader: CleanHeader:
id: history_tab id: history_tab
text: _('History') text: _('History')
@ -407,27 +402,6 @@
slide: 3 slide: 3
<ActionButton>:
border: 4, 0, 0, 0
#background_down: 'atlas://gui/kivy/theming/light/overflow_btn_dn'
<OverflowButton@ActionButton>
text_size: dp(50), None
last: False
halign: 'left'
valign: 'middle'
overflow: None
#background_normal:
# 'atlas://gui/kivy/theming/light/' +\
# ('action_button_group'\
# if (self.inside_group and not self.last) else 'tab_btn')
#on_press:
# ddn = self.overflow._dropdown
# Factory.Animation.cancel_all(ddn)
# anim = Factory.Animation(opacity=0, d=.25)
# anim.bind(on_complete=ddn.dismiss)
# anim.start(ddn)
BoxLayout: BoxLayout:
@ -466,30 +440,22 @@ BoxLayout:
minimum_width: '1dp' minimum_width: '1dp'
ActionOverflow: ActionOverflow:
id: action_overflow id: ao
width: '60dp' size_hint: 1, 1
OverflowButton: ActionButton:
text: _('Network') text: _('Network')
overflow: action_overflow on_press: ao._dropdown.dismiss()
on_release: app.popup_dialog('network') on_release: app.popup_dialog('network')
OverflowButton: ActionButton:
text: _('Wallet') text: _('Wallet')
overflow: action_overflow on_press: ao._dropdown.dismiss()
on_release: app.popup_dialog('wallet') on_release: app.popup_dialog('wallet')
OverflowButton: ActionButton:
text: _('Preferences') text: _('Preferences')
overflow: action_overflow on_press: ao._dropdown.dismiss()
on_release: app.popup_dialog('settings') on_release: app.popup_dialog('settings')
ScreenManager: ScreenManager:
id: manager id: manager
#tabs: Factory.ScreenTabs()
ScreenTabs: ScreenTabs:
id: tabs id: tabs
name: "tabs"
#on_current_screen:
#spnr.text = args[1].name
#idx = app.screen_names.index(args[1].name)
#if idx > -1: app.hierarchy.append(idx)
#args

12
gui/kivy/uix/ui_screens/wallet.kv

@ -6,9 +6,11 @@
text: _('Select your wallet') text: _('Select your wallet')
ElectrumScreen: Popup:
Label:
text: _('Wallet')
WalletSelector: #WalletSelector:
id: wallet_selection # id: wallet_selection
size_hint: 1, None # size_hint: 1, None
height: blue_bottom.item_height if app.expert_mode else 0 # height: blue_bottom.item_height

Loading…
Cancel
Save