test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-29 18:48:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update demo data

Browse Source
This commit is contained in:
jim 2018-03-12 07:33:58 +08:00
parent d96c0ec537
commit 581f0d330b
7 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
demos/res/ui/dialog1.data
View File

@ -1,13 +1,13 @@
const unsigned char ui_dialog1[] = {
0x07,0x00,0x00,0x00,0xca,0x00,0x00,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x31,0x00,0x64,0x61,0x74,0x61,
0x07,0x00,0x00,0x00,0xc7,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,0xf0,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x00,0x69,0x63,
0x78,0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0xa0,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,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,0x0a,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0xa0,0x00,0x00,0x00,0x50,0x00,0x00,
0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,0x6b,0x00,0x74,0x65,0x78,0x74,0x00,0x47,0x6f,
0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0xc8,0x00,0x00,0x00,0xa0,0x00,0x00,0x00,0x50,
0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x61,0x6e,0x63,0x65,0x6c,0x00,0x74,
0x65,0x78,0x74,0x00,0x43,0x61,0x6e,0x63,0x65,0x6c,0x00,0x00,0x00,0x01,0x00,0x09,0x00,0x00,0x00,0x00,
0x00,0x0a,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0xc8,0x00,0x00,0x00,0x1e,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,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x00,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,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,0x6e,0x61,0x6d,
0x65,0x00,0x6f,0x6b,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,
0x6e,0x61,0x6d,0x65,0x00,0x63,0x61,0x6e,0x63,0x65,0x6c,0x00,0x74,0x65,0x78,0x74,0x00,0x4e,0x6f,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,};

4
demos/res/ui/dialog2.data
View File

@ -1,9 +1,9 @@
const unsigned char ui_dialog2[] = {
0x07,0x00,0x00,0x00,0xc9,0x00,0x00,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x32,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,0xf0,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x00,0x69,0x63,
0x78,0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0xa0,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,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,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0xc8,0x00,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,0x6e,0x61,0x6d,0x65,0x00,0x00,0x74,0x65,0x78,0x74,0x00,0x4c,0x46,0x54,0x4b,
0x20,0x69,0x73,0x20,0x63,0x6f,0x6f,0x6c,0x21,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,0x6e,0x61,0x6d,0x65,

43
demos/res/ui/window1.data
View File

@ -1,5 +1,5 @@
const unsigned char ui_window1[] = {
0x07,0x00,0x00,0x00,0xbe,0x02,0x00,0x00,0x77,0x69,0x6e,0x64,0x6f,0x77,0x31,0x00,0x64,0x61,0x74,0x61,
0x07,0x00,0x00,0x00,0xdb,0x02,0x00,0x00,0x77,0x69,0x6e,0x64,0x6f,0x77,0x31,0x00,0x64,0x61,0x74,0x61,
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x40,0x01,0x00,0x00,0xe0,0x01,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6d,0x61,0x69,
0x6e,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x28,
@ -16,23 +16,24 @@ const unsigned char ui_window1[] = {
0xc8,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,
0x00,0x00,0x74,0x65,0x78,0x74,0x00,0x52,0x69,0x67,0x68,0x74,0x00,0x00,0x00,0x01,0x00,0x0d,0x00,0x00,
0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0xa8,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,
0x61,0x6d,0x65,0x00,0x62,0x61,0x72,0x31,0x00,0x00,0x00,0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x04,
0x01,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x76,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,
0x62,0x61,0x72,0x32,0x00,0x76,0x65,0x72,0x74,0x69,0x63,0x61,0x6c,0x00,0x74,0x72,0x75,0x65,0x00,0x00,
0x00,0x01,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x96,0x00,0x00,0x00,0x50,0x00,0x00,
0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x31,0x00,0x74,0x65,0x78,0x74,0x00,0x42,0x6f,
0x6f,0x6b,0x00,0x00,0x00,0x01,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x96,0x00,0x00,
0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x32,0x00,0x74,0x65,0x78,
0x74,0x00,0x46,0x6f,0x6f,0x64,0x00,0x00,0x00,0x01,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0x00,
0x00,0xc8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x72,0x31,
0x00,0x74,0x65,0x78,0x74,0x00,0x42,0x6f,0x6f,0x6b,0x00,0x00,0x00,0x01,0x00,0x10,0x00,0x00,0x00,0x00,
0x00,0x64,0x00,0x00,0x00,0xc8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,
0x65,0x00,0x72,0x32,0x00,0x74,0x65,0x78,0x74,0x00,0x46,0x6f,0x6f,0x64,0x00,0x00,0x00,0x01,0x00,0x10,
0x00,0x00,0x00,0x00,0x00,0xbe,0x00,0x00,0x00,0xc8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,
0x00,0x6e,0x61,0x6d,0x65,0x00,0x72,0x33,0x00,0x74,0x65,0x78,0x74,0x00,0x50,0x65,0x6e,0x63,0x69,0x6c,
0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x04,0x01,0x00,0x00,0x28,
0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x00,0x74,
0x65,0x78,0x74,0x00,0x44,0x69,0x61,0x6c,0x6f,0x67,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x03,0x00,0x01,
0x00,0x0a,0x00,0x00,0x00,0x04,0x01,0x00,0x00,0x28,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,
0x65,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x32,0x00,0x74,0x65,0x78,0x74,0x00,0x44,0x69,0x61,0x6c,0x6f,
0x67,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};
0x61,0x6d,0x65,0x00,0x62,0x61,0x72,0x31,0x00,0x76,0x61,0x6c,0x75,0x65,0x00,0x34,0x30,0x00,0x00,0x00,
0x01,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x04,0x01,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,
0x76,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x62,0x61,0x72,0x32,0x00,0x76,0x61,0x6c,0x75,0x65,0x00,
0x32,0x30,0x00,0x76,0x65,0x72,0x74,0x69,0x63,0x61,0x6c,0x00,0x74,0x72,0x75,0x65,0x00,0x00,0x00,0x01,
0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x96,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,
0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x31,0x00,0x74,0x65,0x78,0x74,0x00,0x42,0x6f,0x6f,0x6b,
0x00,0x00,0x00,0x01,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x96,0x00,0x00,0x00,0x50,
0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x63,0x32,0x00,0x74,0x65,0x78,0x74,0x00,
0x46,0x6f,0x6f,0x64,0x00,0x00,0x00,0x01,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0xc8,
0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x72,0x31,0x00,0x74,
0x65,0x78,0x74,0x00,0x42,0x6f,0x6f,0x6b,0x00,0x00,0x00,0x01,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x64,
0x00,0x00,0x00,0xc8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,
0x72,0x32,0x00,0x74,0x65,0x78,0x74,0x00,0x46,0x6f,0x6f,0x64,0x00,0x00,0x00,0x01,0x00,0x10,0x00,0x00,
0x00,0x00,0x00,0xbe,0x00,0x00,0x00,0xc8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,
0x61,0x6d,0x65,0x00,0x72,0x33,0x00,0x74,0x65,0x78,0x74,0x00,0x50,0x65,0x6e,0x63,0x69,0x6c,0x00,0x76,
0x61,0x6c,0x75,0x65,0x00,0x74,0x72,0x75,0x65,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,
0x0a,0x00,0x00,0x00,0x04,0x01,0x00,0x00,0x28,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,
0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x00,0x74,0x65,0x78,0x74,0x00,0x44,0x69,0x61,0x6c,0x6f,0x67,0x00,
0x00,0x00,0x01,0x00,0x0a,0x00,0x03,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x04,0x01,0x00,0x00,0x28,0x00,
0x00,0x00,0x1e,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x64,0x69,0x61,0x6c,0x6f,0x67,0x32,0x00,0x74,
0x65,0x78,0x74,0x00,0x44,0x69,0x61,0x6c,0x6f,0x67,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};

6
src/base/check_button.c
View File

@ -153,7 +153,7 @@ static ret_t check_button_set_prop(widget_t* widget, const char* name, const val
return_value_if_fail(widget != NULL && name != NULL && v != NULL, RET_BAD_PARAMS);
if (strcmp(name, "value") == 0) {
return check_button_set_value(widget, value_int(v));
return check_button_set_value(widget, value_bool(v));
} else if (strcmp(name, "text") == 0) {
return check_button_set_text(widget, value_wstr(v));
}
@ -183,7 +183,7 @@ widget_t* check_button_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h)
widget_init(widget, parent, WIDGET_CHECK_BUTTON);
widget_move_resize(widget, x, y, w, h);
widget->vt = &s_check_button_vtable;
check_button_set_value(widget, FALSE);
check_button_set_value_only(widget, FALSE);
return widget;
}
@ -196,7 +196,7 @@ widget_t* check_button_create_radio(widget_t* parent, xy_t x, xy_t y, wh_t w, wh
check_button->radio = TRUE;
widget->type = WIDGET_RADIO_BUTTON;
widget->state = WIDGET_STATE_NORMAL;
check_button_set_value(widget, FALSE);
check_button_set_value_only(widget, FALSE);
return widget;
}

8
tools/ui_gen/dialog1.xml
View File

@ -1,5 +1,5 @@
<dialog name="" icon="info" x="10" y="120" w="300" h="240" text="Dialog">
<button name="ok" x="60" y="160" w="80" h="30" text="Go"/>
<button name="cancel" x="200" y="160" w="80" h="30" text="Cancel"/>
<label name="" x="10" y="80" w="200" h="30" text="Are you ready!"/>
<dialog name="" 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="ok" x="10" y="bottom:10" w="40%" h="30" text="Yes"/>
<button name="cancel" x="right:10" y="bottom:10" w="40%" h="30" text="No"/>
</dialog>

4
tools/ui_gen/dialog2.xml
View File

@ -1,5 +1,5 @@
<dialog name="" icon="info" x="10" y="120" w="300" h="240" text="Dialog">
<label name="" x="center" y="80" w="200" h="30" text="LFTK is cool!"/>
<dialog name="" icon="info" x="10" y="120" w="300" h="160" text="Dialog">
<label name="" x="center" y="middle:-20" w="200" h="30" text="LFTK is cool!"/>
<button name="ok" x="10" y="bottom:10" w="40%" h="30" text="Go"/>
<button name="cancel" x="right:10" y="bottom:10" w="40%" h="30" text="Cancel"/>
</dialog>

6
tools/ui_gen/window1.xml
View File

@ -5,13 +5,13 @@
<label name="" x="10" y="40" w="80" h="30" text="Left"/>
<label name="" x="100" y="40" w="80" h="30" text="Center"/>
<label name="" x="200" y="40" w="80" h="30" text="Right"/>
<progress_bar name="bar1" x="10" y="80" w="168" h="30"/>
<progress_bar name="bar2" x="260" y="80" w="30" h="118" vertical="true"/>
<progress_bar name="bar1" x="10" y="80" w="168" h="30" value="40"/>
<progress_bar name="bar2" x="260" y="80" w="30" h="118" value="20" vertical="true"/>
<check_button name="c1" x="10" y="150" w="80" h="30" text="Book"/>
<check_button name="c2" x="100" y="150" w="80" h="30" text="Food"/>
<radio_button name="r1" x="10" y="200" w="80" h="30" text="Book"/>
<radio_button name="r2" x="100" y="200" w="80" h="30" text="Food"/>
<radio_button name="r3" x="190" y="200" w="80" h="30" text="Pencil"/>
<radio_button name="r3" x="190" y="200" w="80" h="30" text="Pencil" value="true"/>
<button name="dialog" x="10" y="260" w="40%" h="30" text="Dialog"/>
<button name="dialog2" x="right:10" y="260" w="40%" h="30" text="Dialog2"/>