window support its own theme file

This commit is contained in:
xianjimli 2018-06-15 19:12:34 +08:00
parent d89166d325
commit a08aa840f9
27 changed files with 260 additions and 174 deletions

View File

@ -137,6 +137,10 @@ bin\demo1
## 最新动态
* 2018/06/15
* 每个窗口支持独立的主题文件。
* 修改F429上图片显示不正常的BUG。
* 2018/06/14
* LCD FrameBuffer模式支持屏幕90度旋转。
* 统一图片操作的硬件和软件实现方式。

View File

@ -34,10 +34,13 @@
widget_t* preview_ui(const char* filename) {
uint32_t size = 0;
char name[NAME_LEN + 1];
ui_builder_t* builder = NULL;
uint8_t* content = (uint8_t*)fs_read_file(filename, &size);
ui_loader_t* loader = strstr(filename, ".bin") != NULL ? default_ui_loader() : xml_ui_loader();
ui_builder_t* builder = ui_builder_default();
filename_to_name(filename, name, NAME_LEN);
builder = ui_builder_default(name);
printf("preview %s\n", filename);
return_value_if_fail(content != NULL, NULL);
ui_loader_load(loader, content, size, builder);

View File

@ -361,4 +361,4 @@ const unsigned char image_bricks[] = {
0xcd,0xbb,0xcc,0xbb,0xed,0xbb,0x0d,0xc4,0x0d,0xbc,0x0d,0xc4,0x0d,0xc4,0x0d,0xc4,0xed,0xc3,0x0d,0xc4,
0x0d,0xc4,0x0d,0xc4,0x0e,0xcc,0x11,0xd5,0xb0,0xc4,0xad,0xbb,0xac,0xbb,0xec,0xc3,0xec,0xc3,0xcc,0xbb,
0xcc,0xbb,0xcc,0xc3,0xcc,0xc3,0xed,0xc3,0xed,0xc3,0xcc,0xbb,0xcc,0xbb,0xd2,0xc4,0x00,0x00,0x00,0x00,
0x12,0x5a,0x2b,0xad,};/*7244*/
0x00,0x00,0x00,0x00,};/*7244*/

View File

@ -181,4 +181,4 @@ const unsigned char image_green_btn_p[] = {
0x4e,0xab,0x82,0xff,0x4e,0xab,0x82,0xff,0x4e,0xab,0x82,0xff,0x4e,0xab,0x82,0xff,0x4e,0xab,0x82,0xff,
0x4e,0xab,0x82,0xff,0x5d,0xb1,0x8c,0xff,0x7d,0xbf,0xa1,0xd7,0x9a,0xcd,0xb6,0x97,0xdb,0xed,0xe5,0x37,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,};/*3644*/
0x78,0x2c,0xf3,0x7a,};/*3644*/

View File

@ -116,4 +116,4 @@ const unsigned char image_info[] = {
0x12,0x96,0xdb,0xb4,0x11,0x96,0xdb,0xe9,0x12,0x96,0xdb,0xff,0x12,0x96,0xdb,0xff,0x11,0x96,0xdb,0xe9,
0x12,0x96,0xdb,0xb4,0x11,0x96,0xdb,0x78,0x0d,0x91,0xdb,0x0c,0x00,0x00,0x00,0x00,0x10,0x97,0xdf,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2348*/
0x00,0x00,0x00,0x00,0xb0,0x16,0xd0,0xf2,};/*2348*/

View File

@ -116,4 +116,4 @@ const unsigned char image_left_off[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2348*/
0x00,0x00,0x00,0x00,0x90,0x23,0x40,0x8b,};/*2348*/

View File

@ -2,4 +2,4 @@ const unsigned char strings_en_US[] = {
0x06,0x00,0x00,0x01,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x65,0x6e,0x5f,0x55,0x53,0x00,0x64,0x61,
0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x1c,0x00,0x00,0x00,0x23,0x00,0x00,0x00,
0x2a,0x00,0x00,0x00,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x61,0x6e,0x63,
0x65,0x6c,0x00,0x43,0x61,0x6e,0x63,0x65,0x6c,0x00,0x6f,0x6b,0x00,0x4f,0x4b,0x00,0x00,0x00,0x05,0x00,};/*80*/
0x65,0x6c,0x00,0x43,0x61,0x6e,0x63,0x65,0x6c,0x00,0x6f,0x6b,0x00,0x4f,0x4b,0x00,0x00,0x00,0x00,0x00,};/*80*/

View File

@ -1,131 +1,117 @@
const unsigned char theme_default[] = {
0x03,0x00,0x00,0x01,0xf8,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x00,
0x64,0x61,0x74,0x61,0x00,0x00,0x00,0x00,0xfd,0xfc,0xfb,0xfa,0x00,0x00,0x00,0x00,0x39,0x00,0x00,0x00,
0x01,0x00,0x02,0x00,0xd4,0x01,0x00,0x00,0x01,0x01,0x02,0x00,0xe4,0x01,0x00,0x00,0x01,0x02,0x02,0x00,
0xff,0x01,0x00,0x00,0x01,0x00,0x0a,0x00,0x15,0x02,0x00,0x00,0x02,0x00,0x0a,0x00,0x35,0x02,0x00,0x00,
0x03,0x00,0x0a,0x00,0x55,0x02,0x00,0x00,0x04,0x00,0x0a,0x00,0x75,0x02,0x00,0x00,0x02,0x0a,0x0a,0x00,
0x95,0x02,0x00,0x00,0x01,0x01,0x0a,0x00,0xb5,0x02,0x00,0x00,0x02,0x01,0x0a,0x00,0xdd,0x02,0x00,0x00,
0x03,0x01,0x0a,0x00,0x05,0x03,0x00,0x00,0x01,0x02,0x0a,0x00,0x2d,0x03,0x00,0x00,0x02,0x02,0x0a,0x00,
0x53,0x03,0x00,0x00,0x03,0x02,0x0a,0x00,0x79,0x03,0x00,0x00,0x01,0x00,0x0c,0x00,0x9f,0x03,0x00,0x00,
0x05,0x00,0x0c,0x00,0xcf,0x03,0x00,0x00,0x04,0x00,0x0c,0x00,0xff,0x03,0x00,0x00,0x09,0x00,0x0c,0x00,
0x2f,0x04,0x00,0x00,0x08,0x00,0x0c,0x00,0x5f,0x04,0x00,0x00,0x01,0x00,0x09,0x00,0x8f,0x04,0x00,0x00,
0x01,0x01,0x09,0x00,0x9f,0x04,0x00,0x00,0x01,0x02,0x09,0x00,0xaf,0x04,0x00,0x00,0x01,0x03,0x09,0x00,
0xd7,0x04,0x00,0x00,0x01,0x04,0x09,0x00,0xf7,0x04,0x00,0x00,0x01,0x05,0x09,0x00,0x1f,0x05,0x00,0x00,
0x01,0x00,0x0d,0x00,0x4e,0x05,0x00,0x00,0x01,0x01,0x0d,0x00,0x76,0x05,0x00,0x00,0x01,0x02,0x0d,0x00,
0xaa,0x05,0x00,0x00,0x01,0x00,0x13,0x00,0xf2,0x05,0x00,0x00,0x02,0x00,0x13,0x00,0x12,0x06,0x00,0x00,
0x03,0x00,0x13,0x00,0x32,0x06,0x00,0x00,0x01,0x01,0x13,0x00,0x52,0x06,0x00,0x00,0x02,0x01,0x13,0x00,
0x86,0x06,0x00,0x00,0x03,0x01,0x13,0x00,0xbc,0x06,0x00,0x00,0x01,0x02,0x13,0x00,0xf2,0x06,0x00,0x00,
0x02,0x02,0x13,0x00,0x3a,0x07,0x00,0x00,0x03,0x02,0x13,0x00,0x84,0x07,0x00,0x00,0x01,0x00,0x0e,0x00,
0xce,0x07,0x00,0x00,0x01,0x01,0x0e,0x00,0xd6,0x07,0x00,0x00,0x06,0x00,0x0f,0x00,0xee,0x07,0x00,0x00,
0x07,0x00,0x0f,0x00,0x12,0x08,0x00,0x00,0x06,0x01,0x0f,0x00,0x38,0x08,0x00,0x00,0x07,0x01,0x0f,0x00,
0x5c,0x08,0x00,0x00,0x06,0x00,0x10,0x00,0x7e,0x08,0x00,0x00,0x07,0x00,0x10,0x00,0xa8,0x08,0x00,0x00,
0x06,0x02,0x10,0x00,0xd4,0x08,0x00,0x00,0x07,0x02,0x10,0x00,0xe8,0x08,0x00,0x00,0x06,0x03,0x10,0x00,
0xfd,0x08,0x00,0x00,0x07,0x03,0x10,0x00,0x13,0x09,0x00,0x00,0x06,0x04,0x10,0x00,0x2a,0x09,0x00,0x00,
0x07,0x04,0x10,0x00,0x3f,0x09,0x00,0x00,0x01,0x01,0x0b,0x00,0x55,0x09,0x00,0x00,0x01,0x00,0x04,0x00,
0x6d,0x09,0x00,0x00,0x01,0x00,0x11,0x00,0x7d,0x09,0x00,0x00,0x01,0x01,0x11,0x00,0x9e,0x09,0x00,0x00,
0x01,0x00,0x12,0x00,0xd0,0x09,0x00,0x00,0x01,0x01,0x12,0x00,0xe0,0x09,0x00,0x00,0x01,0x00,0x00,0x00,
0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,
0x05,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x62,0x72,0x69,0x63,0x6b,0x73,0x00,0x00,
0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x62,0x67,0x38,0x30,0x30,0x78,0x34,0x38,0x30,
0x00,0x03,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,
0xff,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0a,0x00,0x00,
0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0xc0,0xc0,0xc0,
0x03,0x00,0x00,0x01,0xde,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x00,
0x64,0x61,0x74,0x61,0x00,0x00,0x00,0x00,0xfd,0xfc,0xfb,0xfa,0x00,0x00,0x00,0x00,0x33,0x00,0x00,0x00,
0x01,0x00,0x02,0x00,0xa4,0x01,0x00,0x00,0x01,0x01,0x02,0x00,0xb4,0x01,0x00,0x00,0x01,0x02,0x02,0x00,
0xcf,0x01,0x00,0x00,0x01,0x00,0x0a,0x00,0xe5,0x01,0x00,0x00,0x02,0x00,0x0a,0x00,0x05,0x02,0x00,0x00,
0x03,0x00,0x0a,0x00,0x25,0x02,0x00,0x00,0x04,0x00,0x0a,0x00,0x45,0x02,0x00,0x00,0x02,0x0a,0x0a,0x00,
0x65,0x02,0x00,0x00,0x01,0x00,0x0c,0x00,0x85,0x02,0x00,0x00,0x05,0x00,0x0c,0x00,0xb5,0x02,0x00,0x00,
0x04,0x00,0x0c,0x00,0xe5,0x02,0x00,0x00,0x09,0x00,0x0c,0x00,0x15,0x03,0x00,0x00,0x08,0x00,0x0c,0x00,
0x45,0x03,0x00,0x00,0x01,0x00,0x09,0x00,0x75,0x03,0x00,0x00,0x01,0x01,0x09,0x00,0x85,0x03,0x00,0x00,
0x01,0x02,0x09,0x00,0x95,0x03,0x00,0x00,0x01,0x03,0x09,0x00,0xbd,0x03,0x00,0x00,0x01,0x04,0x09,0x00,
0xdd,0x03,0x00,0x00,0x01,0x05,0x09,0x00,0x05,0x04,0x00,0x00,0x01,0x00,0x0d,0x00,0x34,0x04,0x00,0x00,
0x01,0x01,0x0d,0x00,0x5c,0x04,0x00,0x00,0x01,0x02,0x0d,0x00,0x90,0x04,0x00,0x00,0x01,0x00,0x13,0x00,
0xd8,0x04,0x00,0x00,0x02,0x00,0x13,0x00,0xf8,0x04,0x00,0x00,0x03,0x00,0x13,0x00,0x18,0x05,0x00,0x00,
0x01,0x01,0x13,0x00,0x38,0x05,0x00,0x00,0x02,0x01,0x13,0x00,0x6c,0x05,0x00,0x00,0x03,0x01,0x13,0x00,
0xa2,0x05,0x00,0x00,0x01,0x02,0x13,0x00,0xd8,0x05,0x00,0x00,0x02,0x02,0x13,0x00,0x20,0x06,0x00,0x00,
0x03,0x02,0x13,0x00,0x6a,0x06,0x00,0x00,0x01,0x00,0x0e,0x00,0xb4,0x06,0x00,0x00,0x01,0x01,0x0e,0x00,
0xbc,0x06,0x00,0x00,0x06,0x00,0x0f,0x00,0xd4,0x06,0x00,0x00,0x07,0x00,0x0f,0x00,0xf8,0x06,0x00,0x00,
0x06,0x01,0x0f,0x00,0x1e,0x07,0x00,0x00,0x07,0x01,0x0f,0x00,0x42,0x07,0x00,0x00,0x06,0x00,0x10,0x00,
0x64,0x07,0x00,0x00,0x07,0x00,0x10,0x00,0x8e,0x07,0x00,0x00,0x06,0x02,0x10,0x00,0xba,0x07,0x00,0x00,
0x07,0x02,0x10,0x00,0xce,0x07,0x00,0x00,0x06,0x03,0x10,0x00,0xe3,0x07,0x00,0x00,0x07,0x03,0x10,0x00,
0xf9,0x07,0x00,0x00,0x06,0x04,0x10,0x00,0x10,0x08,0x00,0x00,0x07,0x04,0x10,0x00,0x25,0x08,0x00,0x00,
0x01,0x01,0x0b,0x00,0x3b,0x08,0x00,0x00,0x01,0x00,0x04,0x00,0x53,0x08,0x00,0x00,0x01,0x00,0x11,0x00,
0x63,0x08,0x00,0x00,0x01,0x01,0x11,0x00,0x84,0x08,0x00,0x00,0x01,0x00,0x12,0x00,0xb6,0x08,0x00,0x00,
0x01,0x01,0x12,0x00,0xc6,0x08,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,
0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
0x0b,0x00,0x00,0x00,0x62,0x72,0x69,0x63,0x6b,0x73,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0b,
0x00,0x00,0x00,0x62,0x67,0x38,0x30,0x30,0x78,0x34,0x38,0x30,0x00,0x03,0x00,0x00,0x00,0x0a,0x00,0x00,
0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,
0xff,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,
0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0xe0,0xe0,0xe0,0xff,0x00,0x00,0x00,0x00,0x03,0x00,0x00,
0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0xd0,0xd0,0xd0,0xff,0x01,0x00,0x00,
0x00,0xbe,0xbe,0xbe,0xff,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,
0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0xc0,0xc0,0xc0,0xff,0x00,0x00,0x00,
0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xff,
0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x67,0x72,0x65,0x65,0x6e,0x5f,0x62,0x74,0x6e,0x5f,0x6e,
0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xff,
0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x67,0x72,0x65,0x65,0x6e,0x5f,0x62,0x74,0x6e,0x5f,0x70,
0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xff,
0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x67,0x72,0x65,0x65,0x6e,0x5f,0x62,0x74,0x6e,0x5f,0x6f,
0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xff,
0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x72,0x65,0x64,0x5f,0x62,0x74,0x6e,0x5f,0x6e,0x00,0x02,
0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x01,
0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x72,0x65,0x64,0x5f,0x62,0x74,0x6e,0x5f,0x70,0x00,0x02,0x00,0x00,
0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x00,
0x00,0x0b,0x00,0x00,0x00,0x72,0x65,0x64,0x5f,0x62,0x74,0x6e,0x5f,0x6f,0x00,0x05,0x00,0x00,0x00,0x0a,
0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x08,0x00,0x00,0x00,0x02,
0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x00,
0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x06,0x00,0x00,0x00,0x00,
0x00,0x00,0xff,0x08,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x01,
0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,
0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0xd0,0xd0,0xd0,0xff,0x08,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x10,
0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xbe,0xbe,0xbe,0xff,0x00,0x00,0x00,0x00,0x05,
0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0xff,0x00,0x00,0xff,0x08,
0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,
0xf0,0xf0,0xff,0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,
0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x08,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x04,
0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x06,
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,
0x80,0x00,0xff,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0xff,0x00,0x00,0xff,0x08,
0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x10,0x00,0x00,0x00,0x04,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x80,0x00,0xff,0x08,
0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x00,0x00,0x00,0x00,0x04,
0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x08,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0a,
0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x10,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,
0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x80,0x00,0xff,0x08,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0a,
0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x04,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x03,
0x00,0x00,0x00,0x61,0x70,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x06,0x00,
0x00,0x00,0xff,0xd7,0x00,0xff,0x02,0x00,0x00,0x00,0xc0,0xc0,0xc0,0xff,0x0a,0x00,0x00,0x00,0xa0,0xa0,
0xa0,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,
0x69,0x64,0x65,0x72,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x66,
0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x00,0x02,0x00,
0x00,0x00,0x0c,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x03,0x00,
0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x00,
0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,
0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x00,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xa0,0xa0,
0xa0,0xff,0x02,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0a,0x00,0x00,0x00,0xff,0xd7,0x00,0xff,0x00,0x00,
0x00,0x00,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x02,0x00,0x00,0x00,0x00,0x00,
0xff,0xff,0x0a,0x00,0x00,0x00,0xff,0xa7,0x00,0xff,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x01,0x00,
0x00,0x00,0xa0,0xa0,0xa0,0xff,0x02,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0a,0x00,0x00,0x00,0xff,0xe7,
0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,
0x69,0x64,0x65,0x72,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x66,
0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x00,0x00,0x00,
0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x62,0x67,0x00,
0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,
0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x5f,0x70,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,
0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,
0x69,0x64,0x65,0x72,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,
0x72,0x61,0x67,0x5f,0x6f,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x0f,0x00,
0x00,0x00,0x0a,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,
0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66,
0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x00,0x02,0x00,
0x00,0x00,0x0c,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x03,0x00,
0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x00,
0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,
0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x5f,0x70,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,
0x0a,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,
0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,
0x65,0x72,0x5f,0x76,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,
0x72,0x61,0x67,0x5f,0x6f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,
0x00,0x00,0xf0,0xf0,0xf0,0xff,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x00,0x00,0x00,0x00,0x02,0x00,
0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,
0x00,0x00,0x0d,0x00,0x00,0x00,0x63,0x68,0x65,0x63,0x6b,0x65,0x64,0x00,0x02,0x00,0x00,0x00,0x01,0x00,
0x00,0x00,0xf0,0xf0,0xf0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0x0d,0x00,
0x00,0x00,0x75,0x6e,0x63,0x68,0x65,0x63,0x6b,0x65,0x64,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0xc0,0xc0,0xc0,0xff,0x00,0x00,0x00,0x00,0x03,0x00,0x00,
0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,
0x00,0xe0,0xe0,0xe0,0xff,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,
0xff,0x06,0x00,0x00,0x00,0xd0,0xd0,0xd0,0xff,0x01,0x00,0x00,0x00,0xbe,0xbe,0xbe,0xff,0x00,0x00,0x00,
0x00,0x03,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,
0xff,0x01,0x00,0x00,0x00,0xc0,0xc0,0xc0,0xff,0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x0a,0x00,0x00,
0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x08,0x00,0x00,0x00,0x02,0x00,0x00,
0x00,0x10,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x00,0x00,0x00,
0x00,0x05,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,
0xff,0x08,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x00,
0x00,0xf0,0xf0,0xf0,0xff,0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,
0xff,0x06,0x00,0x00,0x00,0xd0,0xd0,0xd0,0xff,0x08,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x10,0x00,0x00,
0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xbe,0xbe,0xbe,0xff,0x00,0x00,0x00,0x00,0x05,0x00,0x00,
0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,0x00,0xff,0x00,0x00,0xff,0x08,0x00,0x00,
0x00,0x02,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,
0xff,0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x06,0x00,0x00,
0x00,0xa0,0xa0,0xa0,0xff,0x08,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x04,0x00,0x00,
0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x06,0x00,0x00,
0x00,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x80,0x00,
0xff,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0xff,0x00,0x00,0xff,0x08,0x00,0x00,
0x00,0x02,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x10,0x00,0x00,0x00,0x04,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x80,0x00,0xff,0x08,0x00,0x00,
0x00,0x01,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x00,0x00,0x00,0x00,0x04,0x00,0x00,
0x00,0x06,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x08,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0a,0x00,0x00,
0x00,0xa0,0xa0,0xa0,0xff,0x10,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,
0x00,0x06,0x00,0x00,0x00,0x00,0x80,0x00,0xff,0x08,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0a,0x00,0x00,
0x00,0xa0,0xa0,0xa0,0xff,0x04,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x03,0x00,0x00,
0x00,0x61,0x70,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x06,0x00,0x00,0x00,
0xff,0xd7,0x00,0xff,0x02,0x00,0x00,0x00,0xc0,0xc0,0xc0,0xff,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,
0x65,0x72,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x66,0x67,0x00,
0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x00,0x02,0x00,0x00,0x00,
0x0c,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x03,0x00,0x00,0x00,
0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,
0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,
0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x00,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,
0x02,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0a,0x00,0x00,0x00,0xff,0xd7,0x00,0xff,0x00,0x00,0x00,0x00,
0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x02,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
0x0a,0x00,0x00,0x00,0xff,0xa7,0x00,0xff,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
0xa0,0xa0,0xa0,0xff,0x02,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0a,0x00,0x00,0x00,0xff,0xe7,0x00,0xff,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,
0x65,0x72,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x66,0x67,0x00,
0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x00,0x00,0x00,0x00,0x00,
0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x62,0x67,0x00,0x0e,0x00,
0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,
0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x5f,0x70,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,
0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,
0x65,0x72,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,
0x67,0x5f,0x6f,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,
0x0a,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,
0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66,0x67,0x00,
0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x00,0x02,0x00,0x00,0x00,
0x0c,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x03,0x00,0x00,0x00,
0x0b,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,
0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,
0x65,0x72,0x5f,0x64,0x72,0x61,0x67,0x5f,0x70,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x0a,0x00,
0x00,0x00,0x0f,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x73,0x6c,
0x69,0x64,0x65,0x72,0x5f,0x76,0x5f,0x62,0x67,0x00,0x0e,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,
0x5f,0x76,0x5f,0x66,0x67,0x00,0x0d,0x00,0x00,0x00,0x73,0x6c,0x69,0x64,0x65,0x72,0x5f,0x64,0x72,0x61,
0x67,0x5f,0x6f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
0xf0,0xf0,0xf0,0xff,0x0a,0x00,0x00,0x00,0xa0,0xa0,0xa0,0xff,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,
0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,
0x0d,0x00,0x00,0x00,0x63,0x68,0x65,0x63,0x6b,0x65,0x64,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
0xf0,0xf0,0xf0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,
0x75,0x6e,0x6d,0x75,0x74,0x65,0x64,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,
0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x6d,0x75,0x74,0x65,
0x75,0x6e,0x63,0x68,0x65,0x63,0x6b,0x65,0x64,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,
0xf0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x75,0x6e,
0x6d,0x75,0x74,0x65,0x64,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x06,0x00,
0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x6d,0x75,0x74,0x65,0x64,0x00,
0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x72,0x61,0x64,0x69,0x6f,0x5f,0x63,0x68,0x65,0x63,0x6b,0x65,
0x64,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x06,0x00,0x00,0x00,0x00,0x00,
0x00,0xff,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x72,0x61,0x64,0x69,0x6f,0x5f,0x63,0x68,0x65,0x63,
0x6b,0x65,0x64,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xf0,0xf0,0xf0,0xff,0x06,0x00,0x00,0x00,
0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x72,0x61,0x64,0x69,0x6f,0x5f,0x75,0x6e,
0x63,0x68,0x65,0x63,0x6b,0x65,0x64,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,
0x6c,0x65,0x66,0x74,0x5f,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,
0x6c,0x65,0x66,0x74,0x5f,0x6f,0x66,0x66,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,
0x00,0x6d,0x69,0x64,0x64,0x6c,0x65,0x5f,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0d,
0x00,0x00,0x00,0x6d,0x69,0x64,0x64,0x6c,0x65,0x5f,0x6f,0x66,0x66,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
0x00,0x00,0x0d,0x00,0x00,0x00,0x72,0x69,0x67,0x68,0x74,0x5f,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x01,
0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x72,0x69,0x67,0x68,0x74,0x5f,0x6f,0x66,0x66,0x00,0x02,0x00,0x00,
0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0xe0,0xe0,0xe0,0xff,0x00,0x00,0x00,
0x00,0x01,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x60,0x60,0x60,0xff,0x00,0x00,0x00,0x00,0x02,0x00,0x00,
0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0xa9,0xa9,0xa0,0xff,0x01,0x00,0x00,
0x00,0x0d,0x00,0x00,0x00,0x69,0x6e,0x66,0x6f,0x00,0x02,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,
0x00,0xff,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x69,0x6e,
0x66,0x6f,0x00,0x0b,0x00,0x00,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,0x74,0x69,0x74,0x6c,0x65,0x00,
0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0xed,0xed,0xed,0xff,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,
0x01,0x00,0x00,0x00,0xed,0xed,0xed,0xff,0x0a,0x00,0x00,0x00,0xbe,0xbe,0xbe,0xff,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,};/*2584*/
0x00,0xff,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x72,0x61,0x64,0x69,0x6f,0x5f,0x75,0x6e,0x63,0x68,
0x65,0x63,0x6b,0x65,0x64,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x6c,0x65,
0x66,0x74,0x5f,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x6c,0x65,
0x66,0x74,0x5f,0x6f,0x66,0x66,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x6d,
0x69,0x64,0x64,0x6c,0x65,0x5f,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x0d,0x00,0x00,
0x00,0x6d,0x69,0x64,0x64,0x6c,0x65,0x5f,0x6f,0x66,0x66,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,
0x0d,0x00,0x00,0x00,0x72,0x69,0x67,0x68,0x74,0x5f,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,
0x00,0x0d,0x00,0x00,0x00,0x72,0x69,0x67,0x68,0x74,0x5f,0x6f,0x66,0x66,0x00,0x02,0x00,0x00,0x00,0x0a,
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0xe0,0xe0,0xe0,0xff,0x00,0x00,0x00,0x00,0x01,
0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x60,0x60,0x60,0xff,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x06,
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x00,0xa9,0xa9,0xa0,0xff,0x01,0x00,0x00,0x00,0x0d,
0x00,0x00,0x00,0x69,0x6e,0x66,0x6f,0x00,0x02,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x69,0x6e,0x66,0x6f,
0x00,0x0b,0x00,0x00,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x5f,0x74,0x69,0x74,0x6c,0x65,0x00,0x01,0x00,
0x00,0x00,0x01,0x00,0x00,0x00,0xed,0xed,0xed,0xff,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,
0x00,0x00,0xed,0xed,0xed,0xff,0x0a,0x00,0x00,0x00,0xbe,0xbe,0xbe,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,};/*2302*/

View File

@ -0,0 +1,18 @@
const unsigned char theme_dialog1[] = {
0x03,0x00,0x00,0x01,0x26,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x31,0x00,
0x64,0x61,0x74,0x61,0x00,0x00,0x00,0x00,0xfd,0xfc,0xfb,0xfa,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,
0x01,0x01,0x0a,0x00,0x3c,0x00,0x00,0x00,0x02,0x01,0x0a,0x00,0x64,0x00,0x00,0x00,0x03,0x01,0x0a,0x00,
0x8c,0x00,0x00,0x00,0x01,0x02,0x0a,0x00,0xb4,0x00,0x00,0x00,0x02,0x02,0x0a,0x00,0xda,0x00,0x00,0x00,
0x03,0x02,0x0a,0x00,0x00,0x01,0x00,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,
0x06,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x67,0x72,0x65,0x65,
0x6e,0x5f,0x62,0x74,0x6e,0x5f,0x6e,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,
0x06,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x67,0x72,0x65,0x65,
0x6e,0x5f,0x62,0x74,0x6e,0x5f,0x70,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,
0x06,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x67,0x72,0x65,0x65,
0x6e,0x5f,0x62,0x74,0x6e,0x5f,0x6f,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,
0x06,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x72,0x65,0x64,0x5f,
0x62,0x74,0x6e,0x5f,0x6e,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x06,0x00,
0x00,0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x72,0x65,0x64,0x5f,0x62,0x74,
0x6e,0x5f,0x70,0x00,0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x06,0x00,0x00,0x00,
0x00,0x00,0xff,0xff,0x01,0x00,0x00,0x00,0x0b,0x00,0x00,0x00,0x72,0x65,0x64,0x5f,0x62,0x74,0x6e,0x5f,
0x6f,0x00,0x20,0x20,0x20,0x20,};/*326*/

View File

@ -6,4 +6,4 @@ const unsigned char ui_animator[] = {
0x30,0x20,0x68,0x33,0x30,0x20,0x35,0x20,0x31,0x30,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,
0x0a,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x19,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x6e,0x61,0x6d,0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,0x73,
0x65,0x00,0x00,0x00,0x00,0x72,0xd1,0xf1,0xb5,};/*149*/
0x65,0x00,0x00,0x00,0x00,0x67,0x40,0x2a,0xf5,};/*149*/

View File

@ -1,18 +1,18 @@
const unsigned char ui_dialog1[] = {
0x04,0x00,0x01,0x01,0x21,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x31,0x00,
0x04,0x00,0x01,0x01,0x28,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x31,0x00,
0x64,0x61,0x74,0x61,0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x01,0x00,0x04,0x00,0x00,0x00,0x00,0x00,
0x0a,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x6e,0x61,0x6d,0x65,0x00,0x00,0x61,0x6e,0x69,0x6d,0x5f,0x68,0x69,0x6e,0x74,0x00,0x63,0x65,0x6e,0x74,
0x65,0x72,0x5f,0x73,0x63,0x61,0x6c,0x65,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x31,0x3a,0x64,0x65,0x66,
0x61,0x75,0x6c,0x74,0x31,0x00,0x69,0x63,0x6f,0x6e,0x00,0x69,0x6e,0x66,0x6f,0x00,0x74,0x65,0x78,0x74,
0x00,0x44,0x69,0x61,0x6c,0x6f,0x67,0x00,0x00,0x01,0x00,0x09,0x00,0x02,0x02,0x00,0x00,0x00,0x00,0x00,
0x00,0xec,0xff,0xff,0xff,0xc8,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,
0x65,0x00,0x00,0x74,0x65,0x78,0x74,0x00,0x41,0x72,0x65,0x20,0x79,0x6f,0x75,0x20,0x72,0x65,0x61,0x64,
0x79,0x3f,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x03,0x01,0x00,0x0a,0x00,0x00,0x00,0x0a,0x00,0x00,
0x00,0x28,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x71,0x75,
0x69,0x74,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x31,0x3a,0x67,0x72,0x65,0x65,0x6e,0x5f,0x62,0x74,0x6e,
0x00,0x74,0x65,0x78,0x74,0x00,0x59,0x65,0x73,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x03,0x03,0x01,0x00,
0x6e,0x61,0x6d,0x65,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x31,0x00,0x61,0x6e,0x69,0x6d,0x5f,0x68,0x69,
0x6e,0x74,0x00,0x63,0x65,0x6e,0x74,0x65,0x72,0x5f,0x73,0x63,0x61,0x6c,0x65,0x00,0x73,0x74,0x79,0x6c,
0x65,0x00,0x31,0x3a,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x31,0x00,0x69,0x63,0x6f,0x6e,0x00,0x69,0x6e,
0x66,0x6f,0x00,0x74,0x65,0x78,0x74,0x00,0x44,0x69,0x61,0x6c,0x6f,0x67,0x00,0x00,0x01,0x00,0x09,0x00,
0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0xec,0xff,0xff,0xff,0xc8,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x00,0x74,0x65,0x78,0x74,0x00,0x41,0x72,0x65,0x20,0x79,
0x6f,0x75,0x20,0x72,0x65,0x61,0x64,0x79,0x3f,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x03,0x01,0x00,
0x0a,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x6e,0x61,0x6d,0x65,0x00,0x71,0x75,0x69,0x74,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x32,0x3a,0x72,0x65,
0x64,0x5f,0x62,0x74,0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x4e,0x6f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,};/*321*/
0x6e,0x61,0x6d,0x65,0x00,0x71,0x75,0x69,0x74,0x00,0x73,0x74,0x79,0x6c,0x65,0x00,0x31,0x3a,0x67,0x72,
0x65,0x65,0x6e,0x5f,0x62,0x74,0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x59,0x65,0x73,0x00,0x00,0x00,0x01,
0x00,0x0a,0x00,0x03,0x03,0x01,0x00,0x0a,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x1e,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x71,0x75,0x69,0x74,0x00,0x73,0x74,0x79,
0x6c,0x65,0x00,0x32,0x3a,0x72,0x65,0x64,0x5f,0x62,0x74,0x6e,0x00,0x74,0x65,0x78,0x74,0x00,0x4e,0x6f,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*328*/

Binary file not shown.

View File

@ -25,20 +25,6 @@
</style>
</button>
<button bg_image_draw_type="3patch_x" text_color="blue">
<style name="1:green_btn" >
<normal bg_image="green_btn_n" />
<pressed bg_image="green_btn_p" />
<over bg_image="green_btn_o" />
</style>
<style name="2:red_btn">
<normal bg_image="red_btn_n" />
<pressed bg_image="red_btn_p" />
<over bg_image="red_btn_o" />
</style>
</button>
<edit>
<style name="default" border_color="#a0a0a0" text_color="black" text_align_h="left" margin="4">
<normal bg_color="#f0f0f0" />

Binary file not shown.

View File

@ -0,0 +1,14 @@
<button bg_image_draw_type="3patch_x" text_color="blue">
<style name="1:green_btn" >
<normal bg_image="green_btn_n" />
<pressed bg_image="green_btn_p" />
<over bg_image="green_btn_o" />
</style>
<style name="2:red_btn">
<normal bg_image="red_btn_n" />
<pressed bg_image="red_btn_p" />
<over bg_image="red_btn_o" />
</style>
</button>

Binary file not shown.

View File

@ -1,4 +1,4 @@
<dialog name="" anim_hint="center_scale" style="1:default1" icon="info" x="10" y="120" w="300" h="160" text="Dialog">
<dialog name="dialog1" anim_hint="center_scale" style="1:default1" icon="info" x="10" y="120" w="300" h="160" text="Dialog">
<label name="" x="center" y="middle:-20" w="200" h="30" text="Are you ready?"/>
<button name="quit" style="1:green_btn" x="10" y="bottom:10" w="40%" h="30" text="Yes"/>
<button name="quit" style="2:red_btn" x="right:10" y="bottom:10" w="40%" h="30" text="No"/>

View File

@ -4,6 +4,7 @@
#include "res/inc/strings/en_US.data"
#include "res/inc/strings/zh_CN.data"
#include "res/inc/theme/default.data"
#include "res/inc/theme/dialog1.data"
#include "res/inc/ui/animation.data"
#include "res/inc/ui/animator.data"
#include "res/inc/ui/auto_play.data"
@ -147,6 +148,7 @@ ret_t resource_init(void) {
resource_manager_add(rm, strings_en_US);
resource_manager_add(rm, strings_zh_CN);
resource_manager_add(rm, theme_default);
resource_manager_add(rm, theme_dialog1);
resource_manager_add(rm, ui_animation);
resource_manager_add(rm, ui_animator);
resource_manager_add(rm, ui_auto_play);

View File

@ -330,3 +330,29 @@ int tk_snprintf(char* str, size_t size, const char* format, ...) {
return ret;
}
ret_t filename_to_name(const char* filename, char* str, uint32_t size) {
char* p = NULL;
const char* name = filename;
return_value_if_fail(filename != NULL && str != NULL, RET_BAD_PARAMS);
name = strrchr(filename, '/');
if (name == NULL) {
name = strrchr(filename, '\\');
}
if (name == NULL) {
name = filename;
} else {
name += 1;
}
strncpy(str, name, size);
str[size - 1] = '\0';
p = strchr(str, '.');
if (p != NULL) {
*p = '\0';
}
return RET_OK;
}

View File

@ -39,6 +39,7 @@ uint32_t* tk_memcpy32(uint32_t* dst, uint32_t* src, uint32_t size);
void* tk_pixel_copy(void* dst, const void* src, uint32_t size, uint8_t bpp);
int tk_snprintf(char* str, size_t size, const char* format, ...);
ret_t filename_to_name(const char* filename, char* str, uint32_t size);
#define str_fast_equal(s1, s2) (*(s1) == *(s2) && strcmp((s1), (s2)) == 0)
#define fequal(f1, f2) (fabs((f1) - (f2)) < 0.00001)

36
src/base/widget.c Executable file → Normal file
View File

@ -1031,6 +1031,38 @@ ret_t widget_invalidate(widget_t* widget, rect_t* r) {
}
}
const void* widget_get_window_theme(widget_t* widget) {
widget_t* win = widget_get_window(widget);
return_value_if_fail(win != NULL, NULL);
if (win->name.size) {
const char* name = win->name.str;
const resource_info_t* res =
resource_manager_ref(resource_manager(), RESOURCE_TYPE_THEME, name);
if (res != NULL) {
return res->data;
}
}
return NULL;
}
static const void* widget_get_style_data(widget_t* widget, uint8_t state) {
theme_t t;
const void* data = NULL;
t.data = (const uint8_t*)widget_get_window_theme(widget);
if (t.data != NULL) {
data = theme_find_style(&t, widget->type, widget->style_type, state);
}
if (data == NULL) {
data = theme_find_style(theme(), widget->type, widget->style_type, state);
}
return data;
}
ret_t widget_update_style(widget_t* widget) {
uint8_t state = 0;
return_value_if_fail(widget != NULL, RET_BAD_PARAMS);
@ -1040,7 +1072,7 @@ ret_t widget_update_style(widget_t* widget) {
state = WIDGET_STATE_DISABLE;
}
widget->style.data = theme_find_style(theme(), widget->type, widget->style_type, state);
widget->style.data = widget_get_style_data(widget, state);
return RET_OK;
}
@ -1071,7 +1103,7 @@ widget_t* widget_init(widget_t* widget, widget_t* parent, uint8_t type) {
widget->vt = widget_vtable_default();
}
if (type != WIDGET_WINDOW_MANAGER) {
if (parent != NULL) {
widget_update_style(widget);
}

View File

@ -52,6 +52,7 @@ struct _ui_builder_t {
ui_builder_on_end_t on_end;
widget_t* root;
widget_t* widget;
const char* name;
};
ret_t ui_builder_on_widget_start(ui_builder_t* b, const widget_desc_t* desc);

View File

@ -118,6 +118,10 @@ static ret_t ui_builder_default_on_widget_start(ui_builder_t* b, const widget_de
b->widget = widget;
if (b->root == NULL) {
b->root = widget;
if (widget && widget->name.size == 0) {
widget_set_name(widget, b->name);
}
widget_update_style(widget);
}
log_debug("%d %d %d %d %d\n", (int)(type), (int)(x), (int)(y), (int)(w), (int)(h));
@ -161,7 +165,7 @@ static ret_t ui_builder_default_on_end(ui_builder_t* b) {
static ui_builder_t s_ui_builder;
ui_builder_t* ui_builder_default() {
ui_builder_t* ui_builder_default(const char* name) {
memset(&s_ui_builder, 0x00, sizeof(ui_builder_t));
s_ui_builder.on_widget_start = ui_builder_default_on_widget_start;
@ -169,13 +173,14 @@ ui_builder_t* ui_builder_default() {
s_ui_builder.on_widget_prop_end = ui_builder_default_on_widget_prop_end;
s_ui_builder.on_widget_end = ui_builder_default_on_widget_end;
s_ui_builder.on_end = ui_builder_default_on_end;
s_ui_builder.name = name;
return &s_ui_builder;
}
widget_t* window_open(const char* name) {
ui_loader_t* loader = default_ui_loader();
ui_builder_t* builder = ui_builder_default();
ui_builder_t* builder = ui_builder_default(name);
const resource_info_t* ui = resource_manager_ref(resource_manager(), RESOURCE_TYPE_UI, name);
return_value_if_fail(ui != NULL, NULL);

View File

@ -26,7 +26,7 @@
BEGIN_C_DECLS
ui_builder_t* ui_builder_default(void);
ui_builder_t* ui_builder_default(const char* name);
widget_t* window_open(const char* name);
widget_t* dialog_open(const char* name);

View File

@ -19,7 +19,7 @@ TEST(UILoader, basic) {
widget_t* cancel = NULL;
widget_desc_t desc;
ui_loader_t* loader = default_ui_loader();
ui_builder_t* builder = ui_builder_default();
ui_builder_t* builder = ui_builder_default("");
ui_builder_t* writer = ui_builder_writer(wbuffer_init(&wbuffer, data, sizeof(data)));
memset(&desc, 0x00, sizeof(desc));
@ -71,7 +71,7 @@ TEST(UILoader, ext) {
widget_t* cancel = NULL;
widget_desc_t desc;
ui_loader_t* loader = default_ui_loader();
ui_builder_t* builder = ui_builder_default();
ui_builder_t* builder = ui_builder_default("");
ui_builder_t* writer = ui_builder_writer(wbuffer_init(&wbuffer, data, sizeof(data)));
memset(&desc, 0x00, sizeof(desc));

View File

@ -8,7 +8,7 @@ TEST(UILoaderXML, basic) {
widget_t* ok = NULL;
widget_t* cancel = NULL;
ui_loader_t* loader = xml_ui_loader();
ui_builder_t* builder = ui_builder_default();
ui_builder_t* builder = ui_builder_default("");
const char* str =
"<dialog x=\"0\" y=\"0\" w=\"400\" h=\"300\">\
<button x=\"0\" y=\"0\" w=\"80\" h=\"30\" name=\"ok\" text=\"ok\" />\
@ -42,7 +42,7 @@ TEST(UILoaderXML, attr) {
widget_t* b3 = NULL;
widget_t* b4 = NULL;
ui_loader_t* loader = xml_ui_loader();
ui_builder_t* builder = ui_builder_default();
ui_builder_t* builder = ui_builder_default("");
const char* str =
"<dialog margin=\"0\" x=\"0\" y=\"0\" w=\"400\" h=\"300\">\
<button name=\"b1\" x=\"10\" y=\"10\" w=\"80\" h=\"20\" />\

View File

@ -89,12 +89,20 @@ def xml_to_ui_bin(raw, bin):
os.system(toExe('xml_to_ui') + ' ' + raw + ' ' + bin + ' bin')
def gen_all():
themegen('theme/theme.xml', 'theme/default.data');
themegen_bin('theme/theme.xml', 'theme/default.bin');
strgen('strings/strings.xml', 'strings');
strgen_bin('strings/strings.xml', 'strings');
resgen('fonts/default.ttf', 'fonts/default.res');
fontgen('fonts/default.ttf', 'fonts/text.txt', 'fonts/default.data', 20);
for f in glob.glob(joinPath(INPUT_DIR, 'theme/*.xml')):
inc=copy.copy(f);
raw=copy.copy(f);
bin=copy.copy(f);
inc=inc.replace('.xml', '.data')
inc=inc.replace(INPUT_DIR, OUTPUT_DIR)
themegen(raw, inc)
bin=bin.replace('.xml', '.bin')
themegen_bin(raw, bin)
for f in glob.glob(joinPath(INPUT_DIR, 'images/'+DPI+'/*.*')):
inc=copy.copy(f);