electrum

commit bd34995d9d7f2e5728a81541cb61cdbd36587ad5
parent bd9e4cc6cfce8d9b56d0fee18f52cee8602a8548
Author: ThomasV <thomasv@electrum.org>
Date:   Tue, 16 Feb 2016 14:17:44 +0100

kivy: gui tweaks

Diffstat:
M
gui/kivy/main.kv
 | 
26
++++++++++++++++++++------
M
gui/kivy/theming/light/tab_btn_pressed.png
 | 
0

M
gui/kivy/uix/ui_screens/invoice.kv
 | 
2
+-

3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
@@ -24,6 +24,23 @@
 <ListItemButton>
     font_size: '12sp'
 
+<Carousel>:
+    canvas.before:
+        Color:
+            rgba: 0.1, 0.1, 0.1, 1
+        Rectangle:
+            size: self.size
+            pos: self.pos
+
+<ActionView>:
+    canvas.before:
+        Color:
+            rgba: 0.1, 0.1, 0.1, 1
+        Rectangle:
+            size: self.size
+            pos: self.pos
+
+
 # Custom Global Widgets
 
 <TopLabel@Label>
@@ -184,7 +201,7 @@
 
 
 <CleanHeader@TabbedPanelHeader>
-    border: 0, 0, 16, 0
+    border: 16, 0, 16, 0
     markup: False
     text_size: self.size
     halign: 'center'
@@ -280,12 +297,9 @@ BoxLayout:
                 id: action_status
                 important: True
                 size_hint: 1, 1
-                markup: True
-                mipmap: True
                 bold: True
-                markup: True
-                color: 1, 1, 1, 1
-                text: "[color=#777777]"+app.status+"[/color]"
+                color: 0.7, 0.7, 0.7, 1
+                text: app.status
                 font_size: '22dp'
                 minimum_width: '1dp'
                 on_release: app.popup_dialog('status')
diff --git a/gui/kivy/theming/light/tab_btn_pressed.png b/gui/kivy/theming/light/tab_btn_pressed.png
Binary files differ.
diff --git a/gui/kivy/uix/ui_screens/invoice.kv b/gui/kivy/uix/ui_screens/invoice.kv
@@ -38,7 +38,7 @@ Popup:
             TopLabel:
                 text: root.description
             TopLabel:
-                text: _('Status') if popup.amount or popup.is_invoice else _('Amount received')
+                text: (_('Status') if popup.amount or popup.is_invoice else _('Amount received')) if root.status else ''
             TopLabel:
                 text: root.status