tMerge pull request #1529 from akshayaurora/overflow_action - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 7b87a7f7072851fd467df875f4ea067ee9607aa3
DIR parent d44aa250fafc4e547787990b9ebed755279339f0
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 30 Oct 2015 14:38:52 +0100
Merge pull request #1529 from akshayaurora/overflow_action
fix overflow_icon and use template for `ActionOvrButton`
Diffstat:
M gui/kivy/main.kv | 32 ++++++++++++++++----------------
R gui/kivy/uix/ui_screens/wallet.kv … | 0
2 files changed, 16 insertions(+), 16 deletions(-)
---
DIR diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
t@@ -298,7 +298,10 @@
text: _('Contacts')
slide: 3
-
+<ActionOvrButton@ActionButton>
+ on_release:
+ if self.parent: self.parent.parent.dismiss()
+ app.popup_dialog(self.text.lower())
BoxLayout:
t@@ -316,10 +319,12 @@ BoxLayout:
ActionView:
id: av
- ActionPrevious:
+ ActionPrevious:
app_icon: 'atlas://gui/kivy/theming/light/logo'
with_previous: False
on_release: app.on_back()
+ size_hint_x: None
+ width: ao.width
ActionButton:
id: action_status
t@@ -338,24 +343,19 @@ BoxLayout:
ActionOverflow:
id: ao
- size_hint: 1, 1
- ActionButton:
+ ActionOvrButton:
text: _('Network')
- on_press: ao._dropdown.dismiss()
- on_release: app.popup_dialog('network')
- ActionButton:
+ on_parent:
+ # when widget overflow drop down is shown, adjust the width
+ parent = args[1]
+ if parent: ao._dropdown.width = sp(200)
+ ActionOvrButton:
text: _('Settings')
- on_press: ao._dropdown.dismiss()
- on_release: app.popup_dialog('settings')
- ActionButton:
+ ActionOvrButton:
text: _('Wallets')
- on_press: ao._dropdown.dismiss()
- on_release: app.popup_dialog('wallet')
- ActionButton:
+ ActionOvrButton:
text: _('Plugins')
- on_press: ao._dropdown.dismiss()
- on_release: app.popup_dialog('plugins')
-
+
ScreenManager:
id: manager
ScreenTabs:
DIR diff --git a/gui/kivy/uix/ui_screens/wallet.kv b/gui/kivy/uix/ui_screens/wallets.kv