From 027cc49f47c9fe0cc26b230b30fe7d93c70656fb Mon Sep 17 00:00:00 2001 From: Peter Jensen Date: Tue, 26 Sep 2017 17:05:53 +0200 Subject: [PATCH] added icons to buttons --- assets/clear.png | Bin 0 -> 1197 bytes assets/confirm.png | Bin 0 -> 1168 bytes assets/lock.png | Bin 0 -> 1116 bytes assets/send.png | Bin 0 -> 1260 bytes src/apps/common/request_pin.py | 8 +++++--- src/trezor/res/clear.toig | Bin 0 -> 168 bytes src/trezor/res/confirm.toig | Bin 0 -> 142 bytes src/trezor/res/lock.toig | Bin 0 -> 102 bytes src/trezor/res/send.toig | Bin 0 -> 164 bytes src/trezor/ui/button.py | 4 ++-- src/trezor/ui/confirm.py | 7 ++++--- src/trezor/ui/style.py | 8 ++++++-- 12 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 assets/clear.png create mode 100644 assets/confirm.png create mode 100644 assets/lock.png create mode 100644 assets/send.png create mode 100644 src/trezor/res/clear.toig create mode 100644 src/trezor/res/confirm.toig create mode 100644 src/trezor/res/lock.toig create mode 100644 src/trezor/res/send.toig diff --git a/assets/clear.png b/assets/clear.png new file mode 100644 index 0000000000000000000000000000000000000000..dd5901dad10598eff7e57d0e33b175e9114c3d14 GIT binary patch literal 1197 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 WI2rOyOp3?=0000 str: @@ -26,9 +28,9 @@ async def request_pin_on_display(ctx: wire.Context, code: int=None) -> str: def onchange(): c = dialog.cancel if matrix.pin: - c.content = 'Clean' + c.content = DEFAULT_CANCEL else: - c.content = 'Cancel' + c.content = DEFAULT_LOCK c.taint() c.render() diff --git a/src/trezor/res/clear.toig b/src/trezor/res/clear.toig new file mode 100644 index 0000000000000000000000000000000000000000..e8914f062b7a751938f87e514f146c0a7e70ae49 GIT binary patch literal 168 zcmV;Z09XH1Pf2GU02Tn80000@&#?`{Fc1aMUnNFRc!Vs#OpL$?VS_+J%?8N^kyyY& zqN8F2s8AC4*mrU4EADi9_W2B~4$vr0A-Ch)Hebo?q%)jCSyQ>;O=>S}__I(Re6IPN zXY{j`Tg&hm#vkr-d}Lgb*7>&=eEZ=;!b(?@*n7mng&^Q~ W3}q)6_@fI~ddV^5?KOVv4*UV_ZcZQo literal 0 HcmV?d00001 diff --git a/src/trezor/res/confirm.toig b/src/trezor/res/confirm.toig new file mode 100644 index 0000000000000000000000000000000000000000..fdd2c5d6e315b9f0781897f7c99eea6978c627dc GIT binary patch literal 142 zcmV;90CE3RPf2GU02Tm(0000JU_b)mO~^ck{lAfUJpcb9bI&s$!TdW7gl*yLaE;t^nck{)d1AsN4+@F3$jQ(Oks| IF6XVCVq>{L|9=8LdB6YvAL7^k{{VjN z{|xYG|NsC069U>D@Y_DLv@^Bg*KYfNBVOD0|NpIkM?2&B|Nl4PbA0}Pr~x<}&jE~( zjrjcD4>UjkkKaKC9K;uNKm+~=;0Zdg0d{yo9%R6MJRuJ<0B^+g|Hq%|IPhx+8-Op~ S8QAe_XJCll%rFWD8vp=fbWiO7 literal 0 HcmV?d00001 diff --git a/src/trezor/ui/button.py b/src/trezor/ui/button.py index c8749ae0..4236f99e 100644 --- a/src/trezor/ui/button.py +++ b/src/trezor/ui/button.py @@ -58,7 +58,7 @@ class Button(Widget): s['border-color'], ui.BG, s['radius']) - display.bar_radius(ax + 1, ay + 1, aw - 2, ah - 2, + display.bar_radius(ax + 4, ay + 4, aw - 8, ah - 8, s['bg-color'], s['border-color'], s['radius']) @@ -70,7 +70,7 @@ class Button(Widget): s['bg-color']) else: - display.icon(ax, ay, self.content, + display.icon(tx - 15, ty - 20, self.content, s['fg-color'], s['bg-color']) diff --git a/src/trezor/ui/confirm.py b/src/trezor/ui/confirm.py index b529e0e6..1c69eb3d 100644 --- a/src/trezor/ui/confirm.py +++ b/src/trezor/ui/confirm.py @@ -1,17 +1,18 @@ from micropython import const from trezor import loop -from trezor import ui +from trezor import ui, res from trezor.ui import Widget from trezor.ui.button import Button, BTN_CLICKED, BTN_STARTED from trezor.ui.loader import Loader CONFIRMED = const(1) CANCELLED = const(2) - +DEFAULT_CONFIRM = res.load(ui.ICON_CONFIRM) +DEFAULT_CANCEL = res.load(ui.ICON_CLEAR) class ConfirmDialog(Widget): - def __init__(self, content, confirm='Confirm', cancel='Cancel'): + def __init__(self, content, confirm=DEFAULT_CONFIRM, cancel=DEFAULT_CANCEL): self.content = content if cancel is not None: self.confirm = Button((121, 240 - 48, 119, 48), confirm, diff --git a/src/trezor/ui/style.py b/src/trezor/ui/style.py index 11ad0f41..d6d895ab 100644 --- a/src/trezor/ui/style.py +++ b/src/trezor/ui/style.py @@ -48,6 +48,10 @@ FG = WHITE ICON_RESET = 'trezor/res/header_icons/reset.toig' ICON_WIPE = 'trezor/res/header_icons/wipe.toig' ICON_RECOVERY = 'trezor/res/header_icons/recovery.toig' +ICON_CLEAR = 'trezor/res/clear.toig' +ICON_CONFIRM = 'trezor/res/confirm.toig' +ICON_LOCK = 'trezor/res/lock.toig' +ICON_SEND = 'trezor/res/send.toig' # buttons BTN_DEFAULT = { @@ -75,7 +79,7 @@ BTN_CANCEL = { 'bg-color': RED, 'fg-color': FG, 'text-style': BOLD, - 'border-color': RED, + 'border-color': BG, 'radius': RADIUS, } BTN_CANCEL_ACTIVE = { @@ -89,7 +93,7 @@ BTN_CONFIRM = { 'bg-color': GREEN, 'fg-color': FG, 'text-style': BOLD, - 'border-color': GREEN, + 'border-color': BG, 'radius': RADIUS, } BTN_CONFIRM_ACTIVE = {