tkivy: simplify dropdown menu, cleanup - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 92e5218d5dc94d4b18573c4a058da7461e221346
DIR parent 4b8c2e5f877ea8ea24c772b1f0d42a0f73741342
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 7 Oct 2015 11:05:50 +0200
kivy: simplify dropdown menu, cleanup
Diffstat:
M gui/kivy/main.kv | 50 +++++--------------------------
M gui/kivy/uix/ui_screens/wallet.kv | 12 +++++++-----
2 files changed, 15 insertions(+), 47 deletions(-)
---
DIR diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
t@@ -372,23 +372,18 @@
tab_height: '48dp'
#default_tab: send_tab
strip_border: 0, 0, 0, 0
-
HistoryScreen:
id: history_screen
tab: history_tab
-
SendScreen:
id: send_screen
tab: send_tab
-
ReceiveScreen:
id: receive_screen
tab: receive_tab
-
ContactsScreen:
id: contacts_screen
tab: contacts_tab
-
CleanHeader:
id: history_tab
text: _('History')
t@@ -407,27 +402,6 @@
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:
t@@ -466,30 +440,22 @@ BoxLayout:
minimum_width: '1dp'
ActionOverflow:
- id: action_overflow
- width: '60dp'
- OverflowButton:
+ id: ao
+ size_hint: 1, 1
+ ActionButton:
text: _('Network')
- overflow: action_overflow
+ on_press: ao._dropdown.dismiss()
on_release: app.popup_dialog('network')
- OverflowButton:
+ ActionButton:
text: _('Wallet')
- overflow: action_overflow
+ on_press: ao._dropdown.dismiss()
on_release: app.popup_dialog('wallet')
- OverflowButton:
+ ActionButton:
text: _('Preferences')
- overflow: action_overflow
+ on_press: ao._dropdown.dismiss()
on_release: app.popup_dialog('settings')
ScreenManager:
id: manager
- #tabs: Factory.ScreenTabs()
ScreenTabs:
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
DIR diff --git a/gui/kivy/uix/ui_screens/wallet.kv b/gui/kivy/uix/ui_screens/wallet.kv
t@@ -6,9 +6,11 @@
text: _('Select your wallet')
-ElectrumScreen:
+Popup:
+ Label:
+ text: _('Wallet')
- WalletSelector:
- id: wallet_selection
- size_hint: 1, None
- height: blue_bottom.item_height if app.expert_mode else 0
+ #WalletSelector:
+ # id: wallet_selection
+ # size_hint: 1, None
+ # height: blue_bottom.item_height