arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 15:38:11 +00:00
Code Issues Releases Wiki Activity

added clear input pin button

Browse Source
This commit is contained in:
chren 2016-06-08 18:06:10 +02:00 committed by Pavol Rusnak
parent c6ed52a7c9
commit 1e4556d736
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/close-button.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
assets/close-button.toig Normal file
View File

Binary file not shown.

BIN
src/trezor/res/close-button.toig Normal file
View File

Binary file not shown.

29
src/trezor/ui/button.py
View File

@ -1,5 +1,5 @@
from . import display, in_area, rotate_coords from . import display, in_area, rotate_coords
from trezor import ui, loop from trezor import ui, loop, res
DEFAULT_BUTTON = { DEFAULT_BUTTON = {
@ -41,6 +41,19 @@ CONFIRM_BUTTON_ACTIVE = {
'border-color': ui.GREEN, 'border-color': ui.GREEN,
} }
CLEAR_BUTTON = {
'bg-color': ui.BLACK,
'fg-color': ui.WHITE,
'text-style': ui.NORMAL,
'border-color': ui.BLACK,
}
CLEAR_BUTTON_ACTIVE = {
'bg-color': ui.BLACK,
'fg-color': ui.WHITE,
'text-style': ui.NORMAL,
'border-color': ui.BLACK,
}
BTN_CLICKED = const(1) BTN_CLICKED = const(1)
BTN_STARTED = const(1) BTN_STARTED = const(1)
@ -68,10 +81,16 @@ class Button():
ty = ay + ah // 2 + 8 ty = ay + ah // 2 + 8
display.bar(ax, ay, aw, ah, style['border-color']) display.bar(ax, ay, aw, ah, style['border-color'])
display.bar(ax + 1, ay + 1, aw - 2, ah - 2, style['bg-color']) display.bar(ax + 1, ay + 1, aw - 2, ah - 2, style['bg-color'])
display.text_center(tx, ty, self.text, # How to do this smarter way?
style['text-style'], if self.text == 'CLEAR':
style['fg-color'], ui.display.icon(ax, ay, res.load('trezor/res/close-button.toig'),
style['bg-color']) ui.blend(ui.BLACK, ui.WHITE, 0.95),
ui.BLACK)
else:
display.text_center(tx, ty, self.text,
style['text-style'],
style['fg-color'],
style['bg-color'])
self.state = state self.state = state
def send(self, event, pos): def send(self, event, pos):

4
src/trezor/ui/pin.py
View File

@ -5,6 +5,7 @@ from .button import Button, BTN_CLICKED
from .button import CONFIRM_BUTTON, CONFIRM_BUTTON_ACTIVE from .button import CONFIRM_BUTTON, CONFIRM_BUTTON_ACTIVE
from .button import CANCEL_BUTTON, CANCEL_BUTTON_ACTIVE from .button import CANCEL_BUTTON, CANCEL_BUTTON_ACTIVE
def digit_area(i): def digit_area(i):
width = const(80) width = const(80)
height = const(48) height = const(48)
@ -24,7 +25,7 @@ class PinMatrix():
def __init__(self, label='Enter PIN', pin=''): def __init__(self, label='Enter PIN', pin=''):
self.label = label self.label = label
self.pin = pin self.pin = pin
self.clear_button = Button((240 - 48, 0, 48, 42), 'X') self.clear_button = Button((240 - 35, 5, 30, 30), 'CLEAR')
self.buttons = [Button(digit_area(i), str(d)) self.buttons = [Button(digit_area(i), str(d))
for i, d in enumerate(generate_digits())] for i, d in enumerate(generate_digits())]
@ -58,6 +59,7 @@ class PinMatrix():
if self.clear_button.send(event, pos) == BTN_CLICKED: if self.clear_button.send(event, pos) == BTN_CLICKED:
self.pin = '' self.pin = ''
self.label = 'Enter PIN' self.label = 'Enter PIN'
display.bar(240 - 48, 0, 48, 42, ui.BLACK)
for btn in self.buttons: for btn in self.buttons: