tkivy: minor fixes - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit d530f8fe84e4d849b9a3334481a047f5d631e682
DIR parent 8ed443b4c8b2c7a4d8e152d82d19800e6e3d1d9b
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 19 Jan 2016 12:57:18 +0100
kivy: minor fixes
Diffstat:
M gui/kivy/main.kv | 7 +++++++
M gui/kivy/uix/dialogs/settings.py | 2 +-
M gui/kivy/uix/screens.py | 42 ++++---------------------------
3 files changed, 13 insertions(+), 38 deletions(-)
---
DIR diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
t@@ -7,6 +7,13 @@
<Button>
on_parent: self.MIN_STATE_TIME = 0.1
+<EmptyLabel@Label>
+ color: (0.8, 0.8, 0.8, 1)
+ size_hint_y: None
+ text_size: self.width, None
+ height: self.texture_size[1]
+
+
<VGridLayout@GridLayout>:
rows: 1
size_hint: 1, None
DIR diff --git a/gui/kivy/uix/dialogs/settings.py b/gui/kivy/uix/dialogs/settings.py
t@@ -54,7 +54,7 @@ Builder.load_string('''
<SettingsDialog@Popup>
id: settings
- title: _('Settings')
+ title: _('Electrum Settings')
BoxLayout:
orientation: 'vertical'
SettingsItem:
DIR diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py
t@@ -27,8 +27,10 @@ from context_menu import ContextMenu
from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED
-class CScreen(Factory.Screen):
+class EmptyLabel(Factory.Label):
+ pass
+class CScreen(Factory.Screen):
__events__ = ('on_activate', 'on_deactivate', 'on_enter', 'on_leave')
action_view = ObjectProperty(None)
loaded = False
t@@ -85,12 +87,7 @@ class CScreen(Factory.Screen):
self.add_widget(self.context_menu)
-class EmptyLabel(Label):
- def __init__(self, **kwargs):
- super(EmptyLabel, self).__init__(**kwargs)
- self.color=(0.8, 0.8, 0.8, 1)
- self.size_hint=(1, None)
- self.text_size=(400, None)
+
class HistoryScreen(CScreen):
t@@ -177,35 +174,6 @@ class HistoryScreen(CScreen):
-class ScreenAddress(CScreen):
- '''This is the dialog that shows a carousel of the currently available
- addresses.
- '''
-
- labels = DictProperty({})
- ''' A precached list of address labels.
- '''
-
- tab = ObjectProperty(None)
- ''' The tab associated With this Carousel
- '''
-
-
-class ScreenPassword(Factory.Screen):
-
- __events__ = ('on_release', 'on_deactivate', 'on_activate')
-
- def on_activate(self):
- app = App.get_running_app()
- action_bar = app.root.main_screen.ids.action_bar
- action_bar.add_widget(self._action_view)
-
- def on_deactivate(self):
- self.ids.password.text = ''
-
- def on_release(self, *args):
- pass
-
class SendScreen(CScreen):
t@@ -458,7 +426,7 @@ class RequestsScreen(CScreen):
requests_list.add_widget(ci)
if not _list:
- msg = _('This screen shows the list of payment requests you saved.')
+ msg = _('This screen shows the list of payment requests made by you.')
requests_list.add_widget(EmptyLabel(text=msg))
def do_show(self, obj):