diff options
author | Hung-Te Lin <hungte@chromium.org> | 2012-08-13 18:26:16 +0800 |
---|---|---|
committer | Gerrit <chrome-bot@google.com> | 2012-08-13 17:25:13 -0700 |
commit | b57b8c3deae3dad870d8785fed46daabbdf35ea9 (patch) | |
tree | 278ac73368379c79d8665e0fc374613f05e504ba | |
parent | 9ea8e0d390cccff2057acc71dcc3807e3709c2fb (diff) | |
download | vboot-b57b8c3deae3dad870d8785fed46daabbdf35ea9.tar.gz |
newbitmaps: Add ToNorm confirm screen resource.
According to new flow, we need "confirm" screens for TONORM.
Also simplified default_source folder, with better hints and using PNG image
source. image/assets/* are files from issue page.
BUG=chrome-os-partner:11078
TEST=make # x86 and arm bitmaps both works.
Change-Id: I3701d6ed5a944305e12a01c1841a197d3e18a8cd
Reviewed-on: https://gerrit.chromium.org/gerrit/29983
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
54 files changed, 124 insertions, 190 deletions
@@ -2,8 +2,9 @@ /build-au /build-main ID +scripts/newbitmaps/default_source/*.bmp scripts/newbitmaps/images/out_* scripts/newbitmaps/lib/*.pyc scripts/newbitmaps/strings/font +scripts/newbitmaps/strings/font scripts/newbitmaps/strings/localized_text/*/*.png -scripts/newbitmaps/strings/*.png diff --git a/scripts/newbitmaps/default_source/DEV.bmp b/scripts/newbitmaps/default_source/DEV.bmp Binary files differdeleted file mode 100644 index 0c12ac6c..00000000 --- a/scripts/newbitmaps/default_source/DEV.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/FONTS.bmp b/scripts/newbitmaps/default_source/FONTS.bmp Binary files differdeleted file mode 100644 index b2832fd8..00000000 --- a/scripts/newbitmaps/default_source/FONTS.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/INSERT.bmp b/scripts/newbitmaps/default_source/INSERT.bmp Binary files differdeleted file mode 100644 index 40483ced..00000000 --- a/scripts/newbitmaps/default_source/INSERT.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/Makefile b/scripts/newbitmaps/default_source/Makefile new file mode 100644 index 00000000..9548654d --- /dev/null +++ b/scripts/newbitmaps/default_source/Makefile @@ -0,0 +1,17 @@ +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +OUTPUT=bmpblock.bin + +all: + for X in *.png; do \ + python -c "import Image; \ + Image.open('$$X').convert('P').save('$${X/png/bmp}')"; \ + done + bmpblk_utility -c config.yaml $(OUTPUT) + +clean: + rm -rf $(OUTPUT) *.bmp + +.PHONY: all clean diff --git a/scripts/newbitmaps/default_source/REMOVE.bmp b/scripts/newbitmaps/default_source/REMOVE.bmp Binary files differdeleted file mode 100644 index 76691baa..00000000 --- a/scripts/newbitmaps/default_source/REMOVE.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/TODEV.bmp b/scripts/newbitmaps/default_source/TODEV.bmp Binary files differdeleted file mode 100644 index dd4ff241..00000000 --- a/scripts/newbitmaps/default_source/TODEV.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/TONORM.bmp b/scripts/newbitmaps/default_source/TONORM.bmp Binary files differdeleted file mode 100644 index 06054d41..00000000 --- a/scripts/newbitmaps/default_source/TONORM.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/UNOFFICIAL.bmp b/scripts/newbitmaps/default_source/UNOFFICIAL.bmp Binary files differdeleted file mode 100644 index 9a1beae5..00000000 --- a/scripts/newbitmaps/default_source/UNOFFICIAL.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/WAIT.bmp b/scripts/newbitmaps/default_source/WAIT.bmp Binary files differdeleted file mode 100644 index 5598edfe..00000000 --- a/scripts/newbitmaps/default_source/WAIT.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/YUCK.bmp b/scripts/newbitmaps/default_source/YUCK.bmp Binary files differdeleted file mode 100644 index 9d0cf3a4..00000000 --- a/scripts/newbitmaps/default_source/YUCK.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/bmpblock.bin b/scripts/newbitmaps/default_source/bmpblock.bin Binary files differindex 3785fb00..28ee67dd 100644 --- a/scripts/newbitmaps/default_source/bmpblock.bin +++ b/scripts/newbitmaps/default_source/bmpblock.bin diff --git a/scripts/newbitmaps/default_source/config.yaml b/scripts/newbitmaps/default_source/config.yaml index 00babb8d..8aa45155 100644 --- a/scripts/newbitmaps/default_source/config.yaml +++ b/scripts/newbitmaps/default_source/config.yaml @@ -6,176 +6,67 @@ bmpblock: 2.0 compression: 2 images: - $HWID: FONTS.bmp # 0x0 4092/58196 tag=1 fmt=2 - UNOFFICIAL: UNOFFICIAL.bmp # 640x480 4595/308278 tag=0 fmt=1 - de_dev: de_dev.bmp # 432x39 4193/17926 tag=0 fmt=1 - de_insert: de_insert.bmp # 371x39 3685/15586 tag=0 fmt=1 - de_remove: de_remove.bmp # 514x21 2975/11914 tag=0 fmt=1 - de_yuck: de_yuck.bmp # 526x21 3276/12166 tag=0 fmt=1 - DEV: DEV.bmp # 336x188 5830/64242 tag=0 fmt=1 - es_dev: es_dev.bmp # 371x39 4049/15586 tag=0 fmt=1 - es_insert: es_insert.bmp # 316x39 3447/13402 tag=0 fmt=1 - es_remove: es_remove.bmp # 463x21 2655/10822 tag=0 fmt=1 - es_yuck: es_yuck.bmp # 500x21 2832/11578 tag=0 fmt=1 - fr_dev: fr_dev.bmp # 513x39 5162/21202 tag=0 fmt=1 - fr_insert: fr_insert.bmp # 364x39 4072/15274 tag=0 fmt=1 - fr_remove: fr_remove.bmp # 658x21 3490/14938 tag=0 fmt=1 - fr_yuck: fr_yuck.bmp # 663x21 3612/15022 tag=0 fmt=1 - INSERT: INSERT.bmp # 515x169 7135/88250 tag=0 fmt=1 - it_dev: it_dev.bmp # 336x39 3512/14182 tag=0 fmt=1 - it_insert: it_insert.bmp # 312x39 3116/13246 tag=0 fmt=1 - it_remove: it_remove.bmp # 394x21 2273/9394 tag=0 fmt=1 - it_yuck: it_yuck.bmp # 458x21 2476/10738 tag=0 fmt=1 - REMOVE: REMOVE.bmp # 503x112 5862/57526 tag=0 fmt=1 - YUCK: YUCK.bmp # 400x219 6240/88650 tag=0 fmt=1 - zh_CH_dev: zh_CH_dev.bmp # 385x47 6863/19314 tag=0 fmt=1 - zh_CH_insert: zh_CH_insert.bmp # 363x47 5706/18186 tag=0 fmt=1 - zh_CH_remove: zh_CH_remove.bmp # 477x23 4989/12118 tag=0 fmt=1 - zh_CH_yuck: zh_CH_yuck.bmp # 588x23 5357/14602 tag=0 fmt=1 - TODEV: TODEV.bmp - TONORM: TONORM.bmp - WAIT: WAIT.bmp + $HWID: font.bin + UNOFFICIAL: unofficial.bmp + EN_LAN: en_language.bmp + GB_LAN: gb_language.bmp + DEV: dev.bmp + INSERT: insert.bmp + REMOVE: remove.bmp + YUCK: yuck.bmp + TODEV: todev.bmp + TONORM: tonorm.bmp + WAIT: wait.bmp + TONORM_CONFIRM: tonorm_confirm.bmp screens: scr_en_dev: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [304, 292, DEV] # tag=0 fmt=1 c=2 5830/64242 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 + - [0, 0, UNOFFICIAL] + - [200, 250, DEV] + - [500, 175, EN_LAN] + - [100, 175, $HWID] + scr_gb_dev: + - [0, 0, UNOFFICIAL] + - [200, 250, DEV] + - [500, 175, GB_LAN] + - [100, 175, $HWID] + scr_en_insert: + - [0, 0, UNOFFICIAL] + - [125, 311, INSERT] + - [500, 175, EN_LAN] + - [100, 175, $HWID] + scr_gb_insert: + - [0, 0, UNOFFICIAL] + - [125, 311, INSERT] + - [500, 175, GB_LAN] + - [100, 175, $HWID] scr_en_remove: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [137, 368, REMOVE] # tag=0 fmt=1 c=2 5862/57526 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 + - [0, 0, UNOFFICIAL] + - [137, 368, REMOVE] + - [100, 175, $HWID] scr_en_yuck: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [240, 261, YUCK] # tag=0 fmt=1 c=2 6240/88650 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_en_insert: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [125, 311, INSERT] # tag=0 fmt=1 c=2 7135/88250 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_zh_dev: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [304, 292, DEV] # tag=0 fmt=1 c=2 5830/64242 - - [100, 100, zh_CH_dev] # tag=0 fmt=1 c=2 6863/19314 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_zh_remove: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [137, 368, REMOVE] # tag=0 fmt=1 c=2 5862/57526 - - [100, 100, zh_CH_remove] # tag=0 fmt=1 c=2 4989/12118 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_zh_yuck: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [240, 261, YUCK] # tag=0 fmt=1 c=2 6240/88650 - - [100, 100, zh_CH_yuck] # tag=0 fmt=1 c=2 5357/14602 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_zh_insert: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [125, 311, INSERT] # tag=0 fmt=1 c=2 7135/88250 - - [100, 100, zh_CH_insert] # tag=0 fmt=1 c=2 5706/18186 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_fr_dev: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [304, 292, DEV] # tag=0 fmt=1 c=2 5830/64242 - - [100, 100, fr_dev] # tag=0 fmt=1 c=2 5162/21202 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_fr_remove: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [137, 368, REMOVE] # tag=0 fmt=1 c=2 5862/57526 - - [100, 100, fr_remove] # tag=0 fmt=1 c=2 3490/14938 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_fr_yuck: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [240, 261, YUCK] # tag=0 fmt=1 c=2 6240/88650 - - [100, 100, fr_yuck] # tag=0 fmt=1 c=2 3612/15022 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_fr_insert: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [125, 311, INSERT] # tag=0 fmt=1 c=2 7135/88250 - - [100, 100, fr_insert] # tag=0 fmt=1 c=2 4072/15274 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_es_dev: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [304, 292, DEV] # tag=0 fmt=1 c=2 5830/64242 - - [100, 100, es_dev] # tag=0 fmt=1 c=2 4049/15586 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_es_remove: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [137, 368, REMOVE] # tag=0 fmt=1 c=2 5862/57526 - - [100, 100, es_remove] # tag=0 fmt=1 c=2 2655/10822 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_es_yuck: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [240, 261, YUCK] # tag=0 fmt=1 c=2 6240/88650 - - [100, 100, es_yuck] # tag=0 fmt=1 c=2 2832/11578 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_es_insert: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [125, 311, INSERT] # tag=0 fmt=1 c=2 7135/88250 - - [100, 100, es_insert] # tag=0 fmt=1 c=2 3447/13402 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_it_dev: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [304, 292, DEV] # tag=0 fmt=1 c=2 5830/64242 - - [100, 100, it_dev] # tag=0 fmt=1 c=2 3512/14182 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_it_remove: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [137, 368, REMOVE] # tag=0 fmt=1 c=2 5862/57526 - - [100, 100, it_remove] # tag=0 fmt=1 c=2 2273/9394 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_it_yuck: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [240, 261, YUCK] # tag=0 fmt=1 c=2 6240/88650 - - [100, 100, it_yuck] # tag=0 fmt=1 c=2 2476/10738 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_it_insert: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [125, 311, INSERT] # tag=0 fmt=1 c=2 7135/88250 - - [100, 100, it_insert] # tag=0 fmt=1 c=2 3116/13246 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_de_dev: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [304, 292, DEV] # tag=0 fmt=1 c=2 5830/64242 - - [100, 100, de_dev] # tag=0 fmt=1 c=2 4193/17926 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_de_remove: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [137, 368, REMOVE] # tag=0 fmt=1 c=2 5862/57526 - - [100, 100, de_remove] # tag=0 fmt=1 c=2 2975/11914 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_de_yuck: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [240, 261, YUCK] # tag=0 fmt=1 c=2 6240/88650 - - [100, 100, de_yuck] # tag=0 fmt=1 c=2 3276/12166 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 - scr_de_insert: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - - [125, 311, INSERT] # tag=0 fmt=1 c=2 7135/88250 - - [100, 100, de_insert] # tag=0 fmt=1 c=2 3685/15586 - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 + - [0, 0, UNOFFICIAL] + - [240, 261, YUCK] + - [100, 175, $HWID] scr_en_todev: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 + - [0, 0, UNOFFICIAL] - [305, 348, TODEV] - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 + - [100, 175, $HWID] scr_en_tonorm: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 + - [0, 0, UNOFFICIAL] - [221, 372, TONORM] - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 + - [100, 175, $HWID] scr_en_wait: - - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 + - [0, 0, UNOFFICIAL] - [221, 372, WAIT] - - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 + - [100, 175, $HWID] + scr_en_tonorm_confirm: + - [0, 0, UNOFFICIAL] + - [221, 372, TONORM_CONFIRM] + - [100, 175, $HWID] localizations: - - [ scr_en_dev, scr_en_remove, scr_en_yuck, scr_en_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] - - [ scr_zh_dev, scr_zh_remove, scr_zh_yuck, scr_zh_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] - - [ scr_fr_dev, scr_fr_remove, scr_fr_yuck, scr_fr_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] - - [ scr_es_dev, scr_es_remove, scr_es_yuck, scr_es_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] - - [ scr_it_dev, scr_it_remove, scr_it_yuck, scr_it_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] - - [ scr_de_dev, scr_de_remove, scr_de_yuck, scr_de_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] + - [ scr_en_dev, scr_en_remove, scr_en_yuck, scr_en_insert, scr_en_todev, scr_en_tonorm, scr_en_wait, scr_en_tonorm_confirm ] + - [ scr_gb_dev, scr_en_remove, scr_en_yuck, scr_gb_insert, scr_en_todev, scr_en_tonorm, scr_en_wait, scr_en_tonorm_confirm ] locale_index: - en - - zh_TW - - fr - - es - - it - - de + - en_GB diff --git a/scripts/newbitmaps/default_source/de_dev.bmp b/scripts/newbitmaps/default_source/de_dev.bmp Binary files differdeleted file mode 100644 index 6b377e05..00000000 --- a/scripts/newbitmaps/default_source/de_dev.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/de_insert.bmp b/scripts/newbitmaps/default_source/de_insert.bmp Binary files differdeleted file mode 100644 index 40e2aa79..00000000 --- a/scripts/newbitmaps/default_source/de_insert.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/de_remove.bmp b/scripts/newbitmaps/default_source/de_remove.bmp Binary files differdeleted file mode 100644 index d83f0bd5..00000000 --- a/scripts/newbitmaps/default_source/de_remove.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/de_yuck.bmp b/scripts/newbitmaps/default_source/de_yuck.bmp Binary files differdeleted file mode 100644 index 51fedd48..00000000 --- a/scripts/newbitmaps/default_source/de_yuck.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/dev.png b/scripts/newbitmaps/default_source/dev.png Binary files differnew file mode 100644 index 00000000..aadf4194 --- /dev/null +++ b/scripts/newbitmaps/default_source/dev.png diff --git a/scripts/newbitmaps/default_source/en_language.png b/scripts/newbitmaps/default_source/en_language.png Binary files differnew file mode 100644 index 00000000..d61fc79a --- /dev/null +++ b/scripts/newbitmaps/default_source/en_language.png diff --git a/scripts/newbitmaps/default_source/es_dev.bmp b/scripts/newbitmaps/default_source/es_dev.bmp Binary files differdeleted file mode 100644 index 45e47994..00000000 --- a/scripts/newbitmaps/default_source/es_dev.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/es_insert.bmp b/scripts/newbitmaps/default_source/es_insert.bmp Binary files differdeleted file mode 100644 index 59049f96..00000000 --- a/scripts/newbitmaps/default_source/es_insert.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/es_remove.bmp b/scripts/newbitmaps/default_source/es_remove.bmp Binary files differdeleted file mode 100644 index 3390f7da..00000000 --- a/scripts/newbitmaps/default_source/es_remove.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/es_yuck.bmp b/scripts/newbitmaps/default_source/es_yuck.bmp Binary files differdeleted file mode 100644 index 8223e363..00000000 --- a/scripts/newbitmaps/default_source/es_yuck.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/font.bin b/scripts/newbitmaps/default_source/font.bin Binary files differnew file mode 100644 index 00000000..6b0e37ac --- /dev/null +++ b/scripts/newbitmaps/default_source/font.bin diff --git a/scripts/newbitmaps/default_source/fr_dev.bmp b/scripts/newbitmaps/default_source/fr_dev.bmp Binary files differdeleted file mode 100644 index 81fd2ae3..00000000 --- a/scripts/newbitmaps/default_source/fr_dev.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/fr_insert.bmp b/scripts/newbitmaps/default_source/fr_insert.bmp Binary files differdeleted file mode 100644 index bce4f0a3..00000000 --- a/scripts/newbitmaps/default_source/fr_insert.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/fr_remove.bmp b/scripts/newbitmaps/default_source/fr_remove.bmp Binary files differdeleted file mode 100644 index 6a1ce4f0..00000000 --- a/scripts/newbitmaps/default_source/fr_remove.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/fr_yuck.bmp b/scripts/newbitmaps/default_source/fr_yuck.bmp Binary files differdeleted file mode 100644 index 12c612c3..00000000 --- a/scripts/newbitmaps/default_source/fr_yuck.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/gb_language.png b/scripts/newbitmaps/default_source/gb_language.png Binary files differnew file mode 100644 index 00000000..14a08928 --- /dev/null +++ b/scripts/newbitmaps/default_source/gb_language.png diff --git a/scripts/newbitmaps/default_source/insert.png b/scripts/newbitmaps/default_source/insert.png Binary files differnew file mode 100644 index 00000000..37727d1c --- /dev/null +++ b/scripts/newbitmaps/default_source/insert.png diff --git a/scripts/newbitmaps/default_source/it_dev.bmp b/scripts/newbitmaps/default_source/it_dev.bmp Binary files differdeleted file mode 100644 index 86976609..00000000 --- a/scripts/newbitmaps/default_source/it_dev.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/it_insert.bmp b/scripts/newbitmaps/default_source/it_insert.bmp Binary files differdeleted file mode 100644 index 29c0d970..00000000 --- a/scripts/newbitmaps/default_source/it_insert.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/it_remove.bmp b/scripts/newbitmaps/default_source/it_remove.bmp Binary files differdeleted file mode 100644 index ed68a2b1..00000000 --- a/scripts/newbitmaps/default_source/it_remove.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/it_yuck.bmp b/scripts/newbitmaps/default_source/it_yuck.bmp Binary files differdeleted file mode 100644 index 609e593a..00000000 --- a/scripts/newbitmaps/default_source/it_yuck.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/remove.png b/scripts/newbitmaps/default_source/remove.png Binary files differnew file mode 100644 index 00000000..f2e66fc0 --- /dev/null +++ b/scripts/newbitmaps/default_source/remove.png diff --git a/scripts/newbitmaps/default_source/todev.png b/scripts/newbitmaps/default_source/todev.png Binary files differnew file mode 100644 index 00000000..a1600414 --- /dev/null +++ b/scripts/newbitmaps/default_source/todev.png diff --git a/scripts/newbitmaps/default_source/tonorm.png b/scripts/newbitmaps/default_source/tonorm.png Binary files differnew file mode 100644 index 00000000..36d5715c --- /dev/null +++ b/scripts/newbitmaps/default_source/tonorm.png diff --git a/scripts/newbitmaps/default_source/tonorm_confirm.png b/scripts/newbitmaps/default_source/tonorm_confirm.png Binary files differnew file mode 100644 index 00000000..e2050ce2 --- /dev/null +++ b/scripts/newbitmaps/default_source/tonorm_confirm.png diff --git a/scripts/newbitmaps/default_source/unofficial.png b/scripts/newbitmaps/default_source/unofficial.png Binary files differnew file mode 100644 index 00000000..8218800d --- /dev/null +++ b/scripts/newbitmaps/default_source/unofficial.png diff --git a/scripts/newbitmaps/default_source/wait.png b/scripts/newbitmaps/default_source/wait.png Binary files differnew file mode 100644 index 00000000..2b6b00a1 --- /dev/null +++ b/scripts/newbitmaps/default_source/wait.png diff --git a/scripts/newbitmaps/default_source/yuck.png b/scripts/newbitmaps/default_source/yuck.png Binary files differnew file mode 100644 index 00000000..87e5a8e9 --- /dev/null +++ b/scripts/newbitmaps/default_source/yuck.png diff --git a/scripts/newbitmaps/default_source/zh_CH_dev.bmp b/scripts/newbitmaps/default_source/zh_CH_dev.bmp Binary files differdeleted file mode 100644 index f191a516..00000000 --- a/scripts/newbitmaps/default_source/zh_CH_dev.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/zh_CH_insert.bmp b/scripts/newbitmaps/default_source/zh_CH_insert.bmp Binary files differdeleted file mode 100644 index bf39f6e2..00000000 --- a/scripts/newbitmaps/default_source/zh_CH_insert.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/zh_CH_remove.bmp b/scripts/newbitmaps/default_source/zh_CH_remove.bmp Binary files differdeleted file mode 100644 index c769abea..00000000 --- a/scripts/newbitmaps/default_source/zh_CH_remove.bmp +++ /dev/null diff --git a/scripts/newbitmaps/default_source/zh_CH_yuck.bmp b/scripts/newbitmaps/default_source/zh_CH_yuck.bmp Binary files differdeleted file mode 100644 index 0d42493e..00000000 --- a/scripts/newbitmaps/default_source/zh_CH_yuck.bmp +++ /dev/null diff --git a/scripts/newbitmaps/images/assets/BadSD.png b/scripts/newbitmaps/images/assets/BadSD.png Binary files differnew file mode 100644 index 00000000..0dd0e660 --- /dev/null +++ b/scripts/newbitmaps/images/assets/BadSD.png diff --git a/scripts/newbitmaps/images/assets/BadUSB.png b/scripts/newbitmaps/images/assets/BadUSB.png Binary files differnew file mode 100644 index 00000000..82d0728b --- /dev/null +++ b/scripts/newbitmaps/images/assets/BadUSB.png diff --git a/scripts/newbitmaps/images/assets/RemoveDevices.png b/scripts/newbitmaps/images/assets/RemoveDevices.png Binary files differnew file mode 100644 index 00000000..cbd85552 --- /dev/null +++ b/scripts/newbitmaps/images/assets/RemoveDevices.png diff --git a/scripts/newbitmaps/images/assets/VerificationOff.png b/scripts/newbitmaps/images/assets/VerificationOff.png Binary files differnew file mode 100644 index 00000000..7b5124d3 --- /dev/null +++ b/scripts/newbitmaps/images/assets/VerificationOff.png diff --git a/scripts/newbitmaps/images/assets/VerificationOn.png b/scripts/newbitmaps/images/assets/VerificationOn.png Binary files differnew file mode 100644 index 00000000..85102d4d --- /dev/null +++ b/scripts/newbitmaps/images/assets/VerificationOn.png diff --git a/scripts/newbitmaps/images/assets/Warning.png b/scripts/newbitmaps/images/assets/Warning.png Binary files differnew file mode 100644 index 00000000..caabacd5 --- /dev/null +++ b/scripts/newbitmaps/images/assets/Warning.png diff --git a/scripts/newbitmaps/images/build_images b/scripts/newbitmaps/images/build_images index 6c54a2cb..6f61983c 100755 --- a/scripts/newbitmaps/images/build_images +++ b/scripts/newbitmaps/images/build_images @@ -89,7 +89,7 @@ main() { # Prepare images in current folder # TODO(hungte) Deprecate arrow*.bmp by markup ◀ and ▶, and # Url.bmp by <span foreground="blue">http://</span>. - for X in $(ls *.bmp *.png); do + for X in $(ls *.bmp *.png assets/*.png); do if [ "$X" = "$BACKGROUND_IMAGE" ]; then convert_to_bmp3 "$X" "$output" "$background_scale_param" else diff --git a/scripts/newbitmaps/images/gradient.png b/scripts/newbitmaps/images/gradient.png Binary files differdeleted file mode 100644 index 269c818a..00000000 --- a/scripts/newbitmaps/images/gradient.png +++ /dev/null diff --git a/scripts/newbitmaps/images/make_default_yaml b/scripts/newbitmaps/images/make_default_yaml index a93c39c7..38260167 100755 --- a/scripts/newbitmaps/images/make_default_yaml +++ b/scripts/newbitmaps/images/make_default_yaml @@ -274,8 +274,28 @@ add_footer_without_url() { for hwid_bmp in hwid_unknown.bmp; do echo "$yaml_file" + # Global variables matching the yaml definitions + arrow_left='arrow_left.bmp' + arrow_right='arrow_right.bmp' + chrome_logo='chrome_logo.bmp' + divider_btm='divider_btm.bmp' + divider_top='divider_top.bmp' + insert_graphic='Insert_graphic.bmp' + remove_graphic='Remove_graphic.bmp' + url='Url.bmp' + white_bg='Background_white.bmp' + + asset_BadSD='BadSD.bmp' + asset_BadUSB='BadUSB.bmp' + asset_RemoveDevices='RemoveDevices.bmp' + asset_VerificationOff='VerificationOff.bmp' + asset_VerificationOn='VerificationOn.bmp' + asset_Warning='Warning.bmp' + + hwid=$hwid_bmp + # List the images. The major difference is the HWID. - cat >"$yaml_file" <<'EOF1' + cat >"$yaml_file" <<EOF1 bmpblock: 2.0 compression: 2 @@ -283,39 +303,29 @@ compression: 2 images: # We must specify a font blob to use to render the HWID - $HWID: hwid_fonts.bin + \$HWID: hwid_fonts.bin # This URL never changes - url: Url.bmp + url: $(eval echo \$url) # Various UI elements - arrow_left: arrow_left.bmp - arrow_right: arrow_right.bmp - chrome_logo: chrome_logo.bmp - devmode_graphic: Devmode_graphic.bmp - divider_btm: divider_btm.bmp - divider_top: divider_top.bmp - remove_graphic: Remove_graphic.bmp - insert_graphic: Insert_graphic.bmp - white_bg: Background_white.bmp - yuck_graphic: Yuck_graphic.bmp + arrow_left: $(eval echo \$arrow_left) + arrow_right: $(eval echo \$arrow_right) + chrome_logo: $(eval echo \$chrome_logo) + divider_btm: $(eval echo \$divider_btm) + divider_top: $(eval echo \$divider_top) + remove_graphic: $(eval echo \$remove_graphic) + insert_graphic: $(eval echo \$insert_graphic) + white_bg: $(eval echo \$white_bg) + + asset_VerificationOn: $(eval echo \$asset_VerificationOn) + asset_VerificationOff: $(eval echo \$asset_VerificationOff) + asset_BadSD: $(eval echo \$asset_BadSD) + asset_BadUSB: $(eval echo \$asset_BadUSB) # The following strings must be approved by the localization people EOF1 - # Global variables matching the yaml definitions - arrow_left='arrow_left.bmp' - arrow_right='arrow_right.bmp' - chrome_logo='chrome_logo.bmp' - devmode_graphic='Devmode_graphic.bmp' - divider_btm='divider_btm.bmp' - divider_top='divider_top.bmp' - hwid=$hwid_bmp - insert_graphic='Insert_graphic.bmp' - remove_graphic='Remove_graphic.bmp' - url='Url.bmp' - white_bg='Background_white.bmp' - yuck_graphic='Yuck_graphic.bmp' # Enumerate the bitmaps for each locale-specific string. for lc in $locales; do @@ -331,6 +341,7 @@ EOF1 eval "${lc}_help_right_text=${localedir}/$lc/for_help_right.bmp" eval "${lc}_todev_text=${localedir}/$lc/todev.bmp" eval "${lc}_tonorm_text=${localedir}/$lc/tonorm.bmp" + eval "${lc}_tonorm_confirm_text=${localedir}/$lc/tonorm_confirmation.bmp" eval "${lc}_back_help_text=${localedir}/$lc/back_help.bmp" eval "${lc}_update_text=${localedir}/$lc/update.bmp" @@ -348,6 +359,8 @@ EOF1 ${lc}_back_help_text: $(eval echo \$${lc}_back_help_text) ${lc}_update_text: $(eval echo \$${lc}_update_text) + ${lc}_tonorm_confirm_text: $(eval echo \$${lc}_tonorm_confirm_text) + EOF2 done @@ -364,7 +377,7 @@ EOF2 add_right_below "white_bg" add_header ${lc} set_centered_y_percent "white_bg" 40 - add_centered "devmode_graphic" + add_centered "asset_VerificationOff" set_centered_y_percent "white_bg" 50 add_centered_below "${lc}_devmode_text" add_footer_without_url ${lc} @@ -388,7 +401,7 @@ EOF2 set_centered_y_percent "white_bg" 25 add_centered_below "${lc}_yuck_text" set_centered_y_percent "white_bg" 50 - add_centered "yuck_graphic" + add_centered "asset_BadSD" "asset_BadUSB" add_footer_with_url ${lc} # Insert Screen @@ -419,7 +432,7 @@ EOF2 add_right_below "white_bg" add_header ${lc} set_centered_y_percent "white_bg" 30 - add_centered "devmode_graphic" + add_centered "asset_VerificationOff" add_centered_below "${lc}_tonorm_text" set_centered_y_percent "white_bg" 70 add_centered "${lc}_back_help_text" @@ -434,6 +447,17 @@ EOF2 add_centered "${lc}_update_text" add_footer_with_url ${lc} + # ToNormalConfirm Screen + echo " ${lc}_tonorm_confirm:" >> "$yaml_file" + reset_pos + add_right_below "white_bg" + add_header ${lc} + set_centered_y_percent "white_bg" 30 + add_centered "asset_VerificationOn" + set_centered_y_percent "white_bg" 40 + add_centered_below "${lc}_tonorm_confirm_text" + add_footer_with_url ${lc} + done # Finally list the localizations. @@ -453,6 +477,7 @@ EOF2 screen_list="${lc}_devel, ${lc}_remove, ${lc}_yuck, ${lc}_insert" # todev/tonorm/update are supported only by newer firmware. screen_list="${screen_list}, ${lc}_todev, ${lc}_tonorm, ${lc}_update" + screen_list="${screen_list}, ${lc}_tonorm_confirm" echo " - [ $screen_list ]" >>"$yaml_file" done |