diff -r a24465cc7262 -r 6dd780cbc8c6 application/main.c --- a/application/main.c Sun Jan 15 15:08:07 2017 +0100 +++ b/application/main.c Sun Jan 22 11:16:21 2017 +0100 @@ -33,104 +33,42 @@ #include #include -UiInteger radio; -UiRange range; -UIWIDGET drawingarea; - void action_menu(UiEvent *event, void *data) { - printf("action_menu test: {%s}\n", data); - //printf("text: {%s}\n", ui_gettext(event->obj, "text")); - //fflush(stdout); - // - //char *file = ui_openfiledialog(event->obj); - ////printf("file: %s\n", file); - //fflush(stdout); - //free(file); + printf("action_menu\n"); } void action_button(UiEvent *event, void *data) { - //printf("radio: %d\n", ui_getval(radio)); -} - -void action_button2(UiEvent *event, void *data) { - ui_setval(radio, 1); -} - -UiTextLayout *text; - -void action_scroll(UiEvent *event, void *data) { - //ui_drawingarea_redraw(drawingarea); - printf("scroll\n"); + printf("action_button\n"); } -void draw(UiEvent *event, UiGraphics *g, void *data) { - int width = g->width; - int height = g->height; - //printf("rec[%d,%d]\n", width, height); - - ui_graphics_color(g, 64, 64, 64); - ui_draw_rect(g, 0, 0, width, height, TRUE); - - +void application_startup(UiEvent *event, void *data) { + UiObject *obj = ui_window("Test", NULL); + ui_textarea(obj, NULL); + ui_show(obj); } -/* - -void* model_getval(void *obj, int col) { - if(col == 0) { - return "folder"; - } else if(col == 2) { - return "test@localhost"; - } - return obj; -} - -UIMENU ctxmenu; -void click(UiEvent *event, void *data) { - UiMouseEvent *me = event->eventdata; - printf("click[%d](%d,%d)\n", me->type, me->x, me->y); - - if(me->button == 1) { - ui_contextmenu_popup(ctxmenu); - } - -} - -void window_close(UiEvent *event, void *data) { - printf("window close\n"); -} -*/ int main(int argc, char** argv) { ui_init("app1", argc, argv); + ui_onstartup(application_startup, NULL); - UiList *list = ui_list_new(); - ui_list_append(list, "Hello"); - ui_list_append(list, "World"); - ui_list_append(list, "Test"); - + // menu ui_menu("File"); - ui_menuitem("Hello", action_menu, "hello"); + ui_menuitem("Hello", action_menu, NULL); ui_submenu("Submenu1"); ui_submenu("Submenu2"); - ui_menuitem("item2", NULL, NULL); + ui_menuitem("item2", action_menu, NULL); + ui_submenu_end(); + ui_menuitem("item3", action_menu, NULL); ui_submenu_end(); - ui_menuitem("item3", NULL, NULL); - ui_submenu_end(); - ui_menuitem("item4", NULL, NULL); + ui_menuitem("item4", action_menu, NULL); + // toolbar ui_toolitem("button1", "Test", action_button, NULL); ui_toolitem("button2", "OK", action_button, NULL); - //ui_toolbar_combobox_str("combo", list, NULL, NULL); ui_toolbar_add_default("button1"); ui_toolbar_add_default("button2"); - //ui_toolbar_add_default("combo"); - UiObject *obj = ui_window("Test", NULL); - //ui_context_closefunc(obj->ctx, window_close, NULL); - ui_drawingarea(obj, draw, NULL); - - ui_show(obj); ui_main(); return (EXIT_SUCCESS);