diff --git a/legacy/elementary/src/examples/efl_thread_6.c b/legacy/elementary/src/examples/efl_thread_6.c index 24b7c35e87..e5a4510d0b 100644 --- a/legacy/elementary/src/examples/efl_thread_6.c +++ b/legacy/elementary/src/examples/efl_thread_6.c @@ -120,21 +120,16 @@ anim(void *data) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *o, *bg; + Evas_Object *o; int i; - win = elm_win_add(NULL, "efl-thread-6", ELM_WIN_BASIC); - elm_win_title_set(win, "EFL Thread 6"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); + + win = elm_win_util_standard_add("efl-thread-6", "EFL Thread 6"); + elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 400, 400); evas_object_show(win); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - // queue up 64 mandel generation thread jobs for (i = 0; i < 64; i++) { diff --git a/legacy/elementary/src/examples/efl_thread_win32_1.c b/legacy/elementary/src/examples/efl_thread_win32_1.c index 7c8df4ddef..5cf4990329 100644 --- a/legacy/elementary/src/examples/efl_thread_win32_1.c +++ b/legacy/elementary/src/examples/efl_thread_win32_1.c @@ -53,20 +53,15 @@ my_thread_new(void) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *o, *bg; + Evas_Object *o; - win = elm_win_add(NULL, "efl-thread-1", ELM_WIN_BASIC); - elm_win_title_set(win, "EFL Thread 1"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); + + win = elm_win_util_standard_add("efl-thread-1", "EFL Thread 1"); + elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 400, 400); evas_object_show(win); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - o = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(o, 50, 80, 180, 255); evas_object_resize(o, 100, 100); diff --git a/legacy/elementary/src/examples/efl_thread_win32_2.c b/legacy/elementary/src/examples/efl_thread_win32_2.c index 81820eb195..b7084094b0 100644 --- a/legacy/elementary/src/examples/efl_thread_win32_2.c +++ b/legacy/elementary/src/examples/efl_thread_win32_2.c @@ -69,20 +69,15 @@ my_thread_mainloop_code(void *data) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *o, *bg; + Evas_Object *o; - win = elm_win_add(NULL, "efl-thread-2", ELM_WIN_BASIC); - elm_win_title_set(win, "EFL Thread 2"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); + + win = elm_win_util_standard_add("efl-thread-2", "EFL Thread 2"); + elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 400, 400); evas_object_show(win); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - o = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(o, 50, 80, 180, 255); evas_object_resize(o, 100, 100); diff --git a/legacy/elementary/src/examples/efl_thread_win32_3.c b/legacy/elementary/src/examples/efl_thread_win32_3.c index d1593a8c4c..c8133cbc74 100644 --- a/legacy/elementary/src/examples/efl_thread_win32_3.c +++ b/legacy/elementary/src/examples/efl_thread_win32_3.c @@ -71,20 +71,15 @@ my_thread_mainloop_code(void *data) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *o, *bg; + Evas_Object *o; - win = elm_win_add(NULL, "efl-thread-3", ELM_WIN_BASIC); - elm_win_title_set(win, "EFL Thread 3"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); + + win = elm_win_util_standard_add("efl-thread-3", "EFL Thread 3"); + elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 400, 400); evas_object_show(win); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - o = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(o, 50, 80, 180, 255); evas_object_resize(o, 100, 100); diff --git a/legacy/elementary/src/examples/efl_thread_win32_4.c b/legacy/elementary/src/examples/efl_thread_win32_4.c index 83a8876868..70299c939e 100644 --- a/legacy/elementary/src/examples/efl_thread_win32_4.c +++ b/legacy/elementary/src/examples/efl_thread_win32_4.c @@ -92,20 +92,15 @@ down(void *data, Evas *e, Evas_Object *obj, void *event_info) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *o, *bg; + Evas_Object *o; - win = elm_win_add(NULL, "efl-thread-4", ELM_WIN_BASIC); - elm_win_title_set(win, "EFL Thread 4"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); + + win = elm_win_util_standard_add("efl-thread-4", "EFL Thread 4"); + elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 400, 400); evas_object_show(win); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - o = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(o, 50, 80, 180, 255); evas_object_resize(o, 100, 100); diff --git a/legacy/elementary/src/examples/entry_example.c b/legacy/elementary/src/examples/entry_example.c index 027b7eecb7..b76eb41e36 100644 --- a/legacy/elementary/src/examples/entry_example.c +++ b/legacy/elementary/src/examples/entry_example.c @@ -489,23 +489,17 @@ _edit_tplclick_cb(void *data, Evas_Object *obj, void *event) EAPI_MAIN int elm_main(int argc, char *argv[]) { - Evas_Object *win, *bg, *box, *tb, *en, *o, *icon; + Evas_Object *win, *box, *tb, *en, *o, *icon; App_Data app; memset(&app, 0, sizeof(app)); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "entry-example", ELM_WIN_BASIC); - elm_win_title_set(win, "Emacs Lite"); + win = elm_win_util_standard_add("entry-example", "Emacs Lite"); elm_win_autodel_set(win, EINA_TRUE); evas_object_show(win); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - box = elm_box_add(win); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, box); diff --git a/legacy/elementary/src/examples/fileselector_button_example.c b/legacy/elementary/src/examples/fileselector_button_example.c index cfa98abcb9..359dcf09d1 100644 --- a/legacy/elementary/src/examples/fileselector_button_example.c +++ b/legacy/elementary/src/examples/fileselector_button_example.c @@ -81,19 +81,13 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *vbox, *hbox, *ic, *ck, *fs_bt, *en, *lb, *sep; + Evas_Object *win, *vbox, *hbox, *ic, *ck, *fs_bt, *en, *lb, *sep; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "fileselector-button", ELM_WIN_BASIC); - elm_win_title_set(win, "File Selector Button Example"); + win = elm_win_util_standard_add("fileselector-button", "File Selector Button Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - vbox = elm_box_add(win); elm_win_resize_object_add(win, vbox); evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/legacy/elementary/src/examples/fileselector_entry_example.c b/legacy/elementary/src/examples/fileselector_entry_example.c index 390b2a2f7f..a04354ff2c 100644 --- a/legacy/elementary/src/examples/fileselector_entry_example.c +++ b/legacy/elementary/src/examples/fileselector_entry_example.c @@ -79,19 +79,13 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *vbox, *hbox, *ic, *ck, *fs_entry, *sep; + Evas_Object *win, *vbox, *hbox, *ic, *ck, *fs_entry, *sep; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "fileselector-entry", ELM_WIN_BASIC); - elm_win_title_set(win, "File Selector Entry Example"); + win = elm_win_util_standard_add("fileselector-entry", "File Selector Entry Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - vbox = elm_box_add(win); elm_win_resize_object_add(win, vbox); evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/legacy/elementary/src/examples/fileselector_example.c b/legacy/elementary/src/examples/fileselector_example.c index e02e3f130b..b5cab2d53a 100644 --- a/legacy/elementary/src/examples/fileselector_example.c +++ b/legacy/elementary/src/examples/fileselector_example.c @@ -104,7 +104,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *fs, *bg, *vbox, *buttons_bx, *bt, *sep, *bx; + Evas_Object *win, *fs, *vbox, *buttons_bx, *bt, *sep, *bx; /* Set the locale according to the system pref. If you dont do so * the file selector will order the files list in a case sensitive @@ -115,15 +115,9 @@ elm_main(int argc, elm_need_ethumb(); /* let's have thumbnails of images on grid view */ elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); - elm_win_title_set(win, "File Selector Example"); + win = elm_win_util_standard_add("fileselector", "File Selector Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - bx = elm_box_add(win); elm_win_resize_object_add(win, bx); elm_box_horizontal_set(bx, EINA_TRUE); diff --git a/legacy/elementary/src/examples/flip_example_01.c b/legacy/elementary/src/examples/flip_example_01.c index 41a0ef61fa..73e762f32f 100644 --- a/legacy/elementary/src/examples/flip_example_01.c +++ b/legacy/elementary/src/examples/flip_example_01.c @@ -8,17 +8,12 @@ static void _change_interaction(void *data, Evas_Object *obj, void *event_info); EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *rect, *rect2, *flip, *radio, *radio2, *radio3; + Evas_Object *win, *rect, *rect2, *flip, *radio, *radio2, *radio3; - win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); - elm_win_title_set(win, "Flip"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("flip", "Flip"); + elm_win_autodel_set(win, EINA_TRUE); rect = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_resize(rect, 150, 150); diff --git a/legacy/elementary/src/examples/flipselector_example.c b/legacy/elementary/src/examples/flipselector_example.c index 895b43d134..79fa15a2c5 100644 --- a/legacy/elementary/src/examples/flipselector_example.c +++ b/legacy/elementary/src/examples/flipselector_example.c @@ -137,7 +137,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) { unsigned int i; - Evas_Object *win, *bg, *bx, *fp, *bt; + Evas_Object *win, *bx, *fp, *bt; static const char *lbl[] = { "Elementary", @@ -152,15 +152,9 @@ elm_main(int argc, char **argv) elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); - elm_win_title_set(win, "Flip Selector Example"); + win = elm_win_util_standard_add("flipselector", "Flip Selector Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); diff --git a/legacy/elementary/src/examples/frame_example_01.c b/legacy/elementary/src/examples/frame_example_01.c index ed862b91f8..c69780688a 100644 --- a/legacy/elementary/src/examples/frame_example_01.c +++ b/legacy/elementary/src/examples/frame_example_01.c @@ -6,18 +6,13 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg; + Evas_Object *win; Evas_Object *f1, *r1, *f2, *r2, *f3, *r3, *f4, *r4; - win = elm_win_add(NULL, "frame", ELM_WIN_BASIC); - elm_win_title_set(win, "Frame"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("frame", "Frame"); + elm_win_autodel_set(win, EINA_TRUE); r1 = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(r1, 255, 0, 0, 255); diff --git a/legacy/elementary/src/examples/general_funcs_example.c b/legacy/elementary/src/examples/general_funcs_example.c index 568e91aea6..77fa48a3e1 100644 --- a/legacy/elementary/src/examples/general_funcs_example.c +++ b/legacy/elementary/src/examples/general_funcs_example.c @@ -67,7 +67,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *box, *frame, *check, *b, *slider; + Evas_Object *win, *box, *frame, *check, *b, *slider; /* tell elm about our app so it can figure out where to get files */ elm_app_compile_bin_dir_set(BIN_DIR); @@ -80,8 +80,8 @@ elm_main(int argc, fprintf(stdout, "library directory is: %s\n", elm_app_lib_dir_get()); fprintf(stdout, "locale directory is: %s\n", elm_app_locale_dir_get()); - win = elm_win_add(NULL, "top-level-funcs-example", ELM_WIN_BASIC); - elm_win_title_set(win, "Elementary Top-level Functions Example"); + win = elm_win_util_standard_add("top-level-funcs-example", + "Elementary Top-level Functions Example"); /* by using this policy value, we avoid having to * evas_object_smart_callback_add(win, "delete,request", _on_exit, NULL), @@ -90,11 +90,6 @@ elm_main(int argc, elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - /* outer box */ box = elm_box_add(win); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/legacy/elementary/src/examples/gengrid_example.c b/legacy/elementary/src/examples/gengrid_example.c index ab8d64ee9e..6ec2e59698 100644 --- a/legacy/elementary/src/examples/gengrid_example.c +++ b/legacy/elementary/src/examples/gengrid_example.c @@ -415,8 +415,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *grid, *bx, *hbx_1, *hbx_2, *hbx_3, *bt, *ck, *sl, - *sp; + Evas_Object *win, *grid, *bx, *hbx_1, *hbx_2, *hbx_3, *bt, *ck, *sl, *sp; Eina_Bool bounce; double h, v; @@ -425,15 +424,9 @@ elm_main(int argc, elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); elm_app_info_set(elm_main, "elementary", "images"); - win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); - elm_win_title_set(win, "Generic Grid Example"); + win = elm_win_util_standard_add("gengrid", "Generic Grid Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); diff --git a/legacy/elementary/src/examples/glview_example_01.c b/legacy/elementary/src/examples/glview_example_01.c index 00af06d24f..3fa2c02033 100644 --- a/legacy/elementary/src/examples/glview_example_01.c +++ b/legacy/elementary/src/examples/glview_example_01.c @@ -244,7 +244,7 @@ _del(void *data, Evas *evas, Evas_Object *obj, void *event_info) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *bx, *bt, *gl; + Evas_Object *win, *bx, *bt, *gl; Ecore_Animator *ani; GLData *gld = NULL; @@ -254,15 +254,10 @@ elm_main(int argc, char **argv) // may use another transparently elm_config_preferred_engine_set("opengl_x11"); - win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC); - elm_win_title_set(win, "GLView Simple"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); + win = elm_win_util_standard_add("glview simple", "GLView Simple"); + elm_win_autodel_set(win, EINA_TRUE); bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/legacy/elementary/src/examples/hover_example_01.c b/legacy/elementary/src/examples/hover_example_01.c index e426200b3e..70b9def79e 100644 --- a/legacy/elementary/src/examples/hover_example_01.c +++ b/legacy/elementary/src/examples/hover_example_01.c @@ -18,17 +18,12 @@ _hide_hover(void *data, Evas_Object *obj, void *event_info) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *bt, *bt2, *rect, *rect2, *rect3, *hover; + Evas_Object *win, *bt, *bt2, *rect, *rect2, *rect3, *hover; - win = elm_win_add(NULL, "hover", ELM_WIN_BASIC); - elm_win_title_set(win, "Hover"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("hover", "Hover"); + elm_win_autodel_set(win, EINA_TRUE); rect = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(rect, 25, 25); diff --git a/legacy/elementary/src/examples/hoversel_example_01.c b/legacy/elementary/src/examples/hoversel_example_01.c index 3a00c4fdc6..c05d717d3f 100644 --- a/legacy/elementary/src/examples/hoversel_example_01.c +++ b/legacy/elementary/src/examples/hoversel_example_01.c @@ -12,21 +12,16 @@ static void _add_item(void *data, Evas_Object *obj, void *event_info); EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *rect, *hoversel; + Evas_Object *win, *rect, *hoversel; Elm_Object_Item *hoversel_it; - win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC); - elm_win_title_set(win, "Hoversel"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); + + win = elm_win_util_standard_add("hoversel", "Hoversel"); + elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 200, 300); evas_object_show(win); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - rect = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(rect, 255, 0, 0, 255); evas_object_show(rect); diff --git a/legacy/elementary/src/examples/icon_example_01.c b/legacy/elementary/src/examples/icon_example_01.c index 04ef3db867..01bbcca69a 100644 --- a/legacy/elementary/src/examples/icon_example_01.c +++ b/legacy/elementary/src/examples/icon_example_01.c @@ -6,19 +6,13 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *icon; + Evas_Object *win, *icon; const char *path, *group, *name; - win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); - elm_win_title_set(win, "Icon"); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_bg_color_set(bg, 255,255 ,255); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("icon", "Icon"); + elm_win_autodel_set(win, EINA_TRUE); icon = elm_icon_add(win); elm_icon_order_lookup_set(icon, ELM_ICON_LOOKUP_THEME_FDO); diff --git a/legacy/elementary/src/examples/image_example_01.c b/legacy/elementary/src/examples/image_example_01.c index e80148a61a..eeb672a014 100644 --- a/legacy/elementary/src/examples/image_example_01.c +++ b/legacy/elementary/src/examples/image_example_01.c @@ -6,20 +6,14 @@ int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *image; + Evas_Object *win, *image; char buf[PATH_MAX]; elm_app_info_set(elm_main, "elementary", "images/plant_01.jpg"); - win = elm_win_add(NULL, "image", ELM_WIN_BASIC); - elm_win_title_set(win, "Image"); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_bg_color_set(bg, 255,255 ,255); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("image", "Image"); + elm_win_autodel_set(win, EINA_TRUE); snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); diff --git a/legacy/elementary/src/examples/index_example_01.c b/legacy/elementary/src/examples/index_example_01.c index 43da2a0a33..1104fa643a 100644 --- a/legacy/elementary/src/examples/index_example_01.c +++ b/legacy/elementary/src/examples/index_example_01.c @@ -99,22 +99,16 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *hbox, *vbox, *bt, *sep; + Evas_Object *win, *hbox, *vbox, *bt, *sep; Elm_Object_Item *lit; unsigned int i; char curr = 0; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "index", ELM_WIN_BASIC); - elm_win_title_set(win, "Index Example"); + win = elm_win_util_standard_add("index", "Index Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - vbox = elm_box_add(win); elm_win_resize_object_add(win, vbox); evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/legacy/elementary/src/examples/index_example_02.c b/legacy/elementary/src/examples/index_example_02.c index 6db72fe619..aa40440cb8 100644 --- a/legacy/elementary/src/examples/index_example_02.c +++ b/legacy/elementary/src/examples/index_example_02.c @@ -83,7 +83,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *grid, *idx; + Evas_Object *win, *grid, *idx; Elm_Object_Item *gg_it; unsigned int i; @@ -92,15 +92,9 @@ elm_main(int argc, elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); elm_app_info_set(elm_main, "elementary", "images"); - win = elm_win_add(NULL, "index", ELM_WIN_BASIC); - elm_win_title_set(win, "Index Example"); + win = elm_win_util_standard_add("index", "Index Example"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - grid = elm_gengrid_add(win); elm_gengrid_item_size_set(grid, 150, 150); diff --git a/legacy/elementary/src/examples/inwin_example.c b/legacy/elementary/src/examples/inwin_example.c index df7f679fdf..5928cbd94a 100644 --- a/legacy/elementary/src/examples/inwin_example.c +++ b/legacy/elementary/src/examples/inwin_example.c @@ -111,22 +111,17 @@ _screenshot_hack_cb(void *data) EAPI_MAIN int elm_main(int argc, char *argv[]) { - Evas_Object *win, *bg, *box, *o; + Evas_Object *win, *box, *o; elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_add(NULL, "inwin-example", ELM_WIN_BASIC); - elm_win_title_set(win, "Inwin Example"); + win = elm_win_util_standard_add("inwin-example", "Inwin Example"); + elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 400, 400); evas_object_show(win); evas_object_smart_callback_add(win, "delete,request", _win_del_cb, NULL); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - box = elm_box_add(win); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, box); diff --git a/legacy/elementary/src/examples/label_example_01.c b/legacy/elementary/src/examples/label_example_01.c index cdd7acc2ea..81df1a465b 100644 --- a/legacy/elementary/src/examples/label_example_01.c +++ b/legacy/elementary/src/examples/label_example_01.c @@ -6,17 +6,12 @@ EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *label, *label2, *label3, *label4, *label5, *label6; + Evas_Object *win, *label, *label2, *label3, *label4, *label5, *label6; - win = elm_win_add(NULL, "label", ELM_WIN_BASIC); - elm_win_title_set(win, "Label"); - elm_win_autodel_set(win, EINA_TRUE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - bg = elm_bg_add(win); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("label", "Label"); + elm_win_autodel_set(win, EINA_TRUE); label = elm_label_add(win); elm_object_text_set(label, "Some long text for our label, that is long but " diff --git a/legacy/elementary/src/examples/layout_example_01.c b/legacy/elementary/src/examples/layout_example_01.c index 9d32bb2d70..a6bc7ea5c8 100644 --- a/legacy/elementary/src/examples/layout_example_01.c +++ b/legacy/elementary/src/examples/layout_example_01.c @@ -52,21 +52,16 @@ _swallow_btn_cb(void *data, Evas_Object *btn, void *event_info) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *icon, *icon2, *bt, *bt2, *layout; + Evas_Object *win, *icon, *icon2, *bt, *bt2, *layout; Evas_Object *clk; Evas_Object *item; char buf[PATH_MAX]; elm_app_info_set(elm_main, "elementary", "examples/layout_example.edj"); - win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_bg_color_set(bg, 255,255 ,255); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("layout", "Layout"); + elm_win_autodel_set(win, EINA_TRUE); // Adding layout and filling it with widgets layout = elm_layout_add(win); diff --git a/legacy/elementary/src/examples/layout_example_02.c b/legacy/elementary/src/examples/layout_example_02.c index 95cf0768d2..5b602241d3 100644 --- a/legacy/elementary/src/examples/layout_example_02.c +++ b/legacy/elementary/src/examples/layout_example_02.c @@ -38,21 +38,15 @@ _signal_cb(void *data, Evas_Object *o, const char *emission, const char *source) EAPI_MAIN int elm_main(int argc, char **argv) { - Evas_Object *win, *bg, *layout, *icon; + Evas_Object *win, *layout, *icon; struct _App app; app.current = 0; - win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); - elm_win_title_set(win, "Layout"); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_bg_color_set(bg, 255, 255, 255); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); + win = elm_win_util_standard_add("layout", "Layout"); + elm_win_autodel_set(win, EINA_TRUE); // Adding layout and filling it with widgets layout = elm_layout_add(win);