From bd34995d9d7f2e5728a81541cb61cdbd36587ad5 Mon Sep 17 00:00:00 2001 From: ThomasV <thomasv@electrum.org> Date: Tue, 16 Feb 2016 14:17:44 +0100 Subject: [PATCH] kivy: gui tweaks --- gui/kivy/main.kv | 26 ++++++++++++++++----- gui/kivy/theming/light/tab_btn_pressed.png | Bin 3097 -> 2798 bytes 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 index 4fdc506d8..41f38a446 100644 --- 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 index 3f250fdf6b00b6d33c2b9343fde932c016e43a73..c3cdfb46ea41e80051ae7e99c25b8d4b8d819e77 100644 GIT binary patch delta 2746 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 AfdBvi delta 3048 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 diff --git a/gui/kivy/uix/ui_screens/invoice.kv b/gui/kivy/uix/ui_screens/invoice.kv index 8abb5140c..1cf6ab5fe 100644 --- 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