summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2012-04-02 06:20:28 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2012-04-02 06:20:28 +0000
commit3085f124435df774eb52ffdeebfc7f611beeee47 (patch)
tree49be23d780ea7e8f59be26fc00a72e78d6aa239c /src/bin
parentf309fe2e6286e44e62b272ba25726bf32053be68 (diff)
elm bin: Use convenient utility function elm_win_util_standard_add()
instead of elm_win_add() + elm_bg_add(). This is for normal style (ELM_WIN_BASIC) window. SVN revision: 69848
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/config.c18
-rw-r--r--src/bin/test.c6
-rw-r--r--src/bin/test_3d.c10
-rw-r--r--src/bin/test_actionslider.c10
-rw-r--r--src/bin/test_box.c39
-rw-r--r--src/bin/test_bubble.c10
-rw-r--r--src/bin/test_button.c10
-rw-r--r--src/bin/test_calendar.c20
-rw-r--r--src/bin/test_clock.c30
-rw-r--r--src/bin/test_cnp.c10
-rw-r--r--src/bin/test_colorselector.c10
-rw-r--r--src/bin/test_conform.c20
-rw-r--r--src/bin/test_ctxpopup.c10
-rw-r--r--src/bin/test_cursor.c30
-rw-r--r--src/bin/test_datetime.c10
-rw-r--r--src/bin/test_dayselector.c11
-rw-r--r--src/bin/test_diskselector.c11
-rw-r--r--src/bin/test_eio.c10
-rw-r--r--src/bin/test_entry.c70
-rw-r--r--src/bin/test_entry_anchor2.c10
-rw-r--r--src/bin/test_factory.c10
-rw-r--r--src/bin/test_fileselector.c10
-rw-r--r--src/bin/test_fileselector_button.c10
-rw-r--r--src/bin/test_fileselector_entry.c10
-rw-r--r--src/bin/test_flip.c30
-rw-r--r--src/bin/test_flip_page.c10
-rw-r--r--src/bin/test_flipselector.c10
-rw-r--r--src/bin/test_floating.c10
-rw-r--r--src/bin/test_focus.c12
-rw-r--r--src/bin/test_focus2.c10
-rw-r--r--src/bin/test_focus3.c10
-rw-r--r--src/bin/test_gengrid.c30
-rw-r--r--src/bin/test_gesture_layer2.c10
-rw-r--r--src/bin/test_glview.c13
-rw-r--r--src/bin/test_glview_simple.c12
-rw-r--r--src/bin/test_grid.c9
-rw-r--r--src/bin/test_hoversel.c10
-rw-r--r--src/bin/test_icon_desktops.c10
-rw-r--r--src/bin/test_index.c20
-rw-r--r--src/bin/test_inwin.c20
-rw-r--r--src/bin/test_label.c10
-rw-r--r--src/bin/test_layout.c10
-rw-r--r--src/bin/test_map.c20
-rw-r--r--src/bin/test_menu.c11
-rw-r--r--src/bin/test_multibuttonentry.c10
-rw-r--r--src/bin/test_notify.c10
-rw-r--r--src/bin/test_panel.c10
-rw-r--r--src/bin/test_panes.c2
-rw-r--r--src/bin/test_photo.c10
-rw-r--r--src/bin/test_photocam.c10
-rw-r--r--src/bin/test_popup.c10
-rw-r--r--src/bin/test_progressbar.c10
-rw-r--r--src/bin/test_radio.c10
-rw-r--r--src/bin/test_scaling.c10
-rw-r--r--src/bin/test_scroller.c20
-rw-r--r--src/bin/test_segment_control.c10
-rw-r--r--src/bin/test_separator.c10
-rw-r--r--src/bin/test_slider.c10
-rw-r--r--src/bin/test_slideshow.c10
-rw-r--r--src/bin/test_spinner.c10
-rw-r--r--src/bin/test_store.c11
-rw-r--r--src/bin/test_table.c70
-rw-r--r--src/bin/test_thumb.c10
-rw-r--r--src/bin/test_toolbar.c80
-rw-r--r--src/bin/test_tooltip.c22
-rw-r--r--src/bin/test_transit.c90
-rw-r--r--src/bin/test_weather.c10
-rw-r--r--src/bin/test_web.c34
-rw-r--r--src/bin/test_win_socket.c10
69 files changed, 243 insertions, 928 deletions
diff --git a/src/bin/config.c b/src/bin/config.c
index 6334c36a5..fdf6be54c 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -86,8 +86,6 @@ struct _Fonts_Data
86 } \ 86 } \
87 while (0) 87 while (0)
88 88
89static Evas_Object *main_win = NULL;
90
91static int quiet = 0; 89static int quiet = 0;
92static int interactive = 1; 90static int interactive = 1;
93 91
@@ -3022,22 +3020,14 @@ _status_config_full(Evas_Object *win,
3022} 3020}
3023 3021
3024static void 3022static void
3025status_win(void) 3023win_create(void)
3026{ 3024{
3027 Evas_Object *win, *bg, *bx0; 3025 Evas_Object *win, *bx0;
3028
3029 win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
3030 main_win = win;
3031 elm_win_title_set(win, "Elementary Config");
3032 3026
3027 win = elm_win_util_standard_add("main", "Elementary Config");
3033 ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED, _config_all_changed, 3028 ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED, _config_all_changed,
3034 win); 3029 win);
3035
3036 evas_object_smart_callback_add(win, "delete,request", config_exit, NULL); 3030 evas_object_smart_callback_add(win, "delete,request", config_exit, NULL);
3037 bg = elm_bg_add(win);
3038 evas_object_size_hint_weight_set(bg, 1.0, 1.0);
3039 elm_win_resize_object_add(win, bg);
3040 evas_object_show(bg);
3041 3031
3042 bx0 = elm_box_add(win); 3032 bx0 = elm_box_add(win);
3043 evas_object_size_hint_weight_set(bx0, 1.0, 1.0); 3033 evas_object_size_hint_weight_set(bx0, 1.0, 1.0);
@@ -3115,7 +3105,7 @@ elm_main(int argc,
3115#ifdef ELM_EFREET 3105#ifdef ELM_EFREET
3116 elm_need_efreet(); 3106 elm_need_efreet();
3117#endif 3107#endif
3118 status_win(); /* create main window */ 3108 win_create(); /* create main window */
3119 if (!interactive) 3109 if (!interactive)
3120 ecore_timer_add(2.0, _exit_timer, NULL); 3110 ecore_timer_add(2.0, _exit_timer, NULL);
3121 } 3111 }
diff --git a/src/bin/test.c b/src/bin/test.c
index 6653b57e8..c6f6199d3 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -252,7 +252,11 @@ my_win_main(char *autorun, Eina_Bool test_win_only)
252 * is no parent. "main" is the name of the window - used by the window 252 * is no parent. "main" is the name of the window - used by the window
253 * manager for identifying the window uniquely amongst all the windows 253 * manager for identifying the window uniquely amongst all the windows
254 * within this application (and all instances of the application). The 254 * within this application (and all instances of the application). The
255 * type is a basic window (the final parameter) */ 255 * type is a basic window (the final parameter).
256 * You can call elm_win_util_standard_add() instead. This is a convenient API
257 * for window and bg creation. You don't need to create bg object manually.
258 * You can also set the title of the window at the same time.
259 * ex) win = elm_win_util_standard_add("main", "Elementary Tests"); */
256 win = elm_win_add(NULL, "main", ELM_WIN_BASIC); 260 win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
257 /* Set the title of the window - This is in the titlebar. */ 261 /* Set the title of the window - This is in the titlebar. */
258 elm_win_title_set(win, "Elementary Tests"); 262 elm_win_title_set(win, "Elementary Tests");
diff --git a/src/bin/test_3d.c b/src/bin/test_3d.c
index 8c11e9526..6a960fbaa 100644
--- a/src/bin/test_3d.c
+++ b/src/bin/test_3d.c
@@ -240,17 +240,11 @@ _ch_z0(void *data, Evas_Object *obj, void *event_info __UNUSED__)
240void 240void
241test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 241test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
242{ 242{
243 Evas_Object *win, *bg, *bx, *sl; 243 Evas_Object *win, *bx, *sl;
244 244
245 win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC); 245 win = elm_win_util_standard_add("box-vert", "Box Vert");
246 elm_win_title_set(win, "Box Vert");
247 elm_win_autodel_set(win, EINA_TRUE); 246 elm_win_autodel_set(win, EINA_TRUE);
248 247
249 bg = elm_bg_add(win);
250 elm_win_resize_object_add(win, bg);
251 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
252 evas_object_show(bg);
253
254 cube = _cube_new(evas_object_evas_get(win), 240, 240, 240); 248 cube = _cube_new(evas_object_evas_get(win), 240, 240, 240);
255 249
256 bx = elm_box_add(win); 250 bx = elm_box_add(win);
diff --git a/src/bin/test_actionslider.c b/src/bin/test_actionslider.c
index b6a3e6f8d..f3b645425 100644
--- a/src/bin/test_actionslider.c
+++ b/src/bin/test_actionslider.c
@@ -89,17 +89,11 @@ _magnet_enable_disable_cb(void *data __UNUSED__, Evas_Object *obj, void *event_i
89void 89void
90test_actionslider(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) 90test_actionslider(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__)
91{ 91{
92 Evas_Object *win, *bg, *bx, *as; 92 Evas_Object *win, *bx, *as;
93 93
94 win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC); 94 win = elm_win_util_standard_add("actionslider", "Actionslider");
95 elm_win_title_set(win, "Actionslider");
96 elm_win_autodel_set(win, EINA_TRUE); 95 elm_win_autodel_set(win, EINA_TRUE);
97 96
98 bg = elm_bg_add(win);
99 elm_win_resize_object_add(win, bg);
100 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, 0);
101 evas_object_show(bg);
102
103 bx = elm_box_add(win); 97 bx = elm_box_add(win);
104 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0); 98 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0);
105 elm_win_resize_object_add(win, bx); 99 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_box.c b/src/bin/test_box.c
index 0f9698b73..1b191f9f5 100644
--- a/src/bin/test_box.c
+++ b/src/bin/test_box.c
@@ -129,20 +129,14 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
129void 129void
130test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 130test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
131{ 131{
132 Evas_Object *win, *bg, *bx, *ic, *bxx, *bt; 132 Evas_Object *win, *bx, *ic, *bxx, *bt;
133 char buf[PATH_MAX]; 133 char buf[PATH_MAX];
134 api_data *api = calloc(1, sizeof(api_data)); 134 api_data *api = calloc(1, sizeof(api_data));
135 135
136 win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC); 136 win = elm_win_util_standard_add("box-vert", "Box Vert");
137 elm_win_title_set(win, "Box Vert");
138 elm_win_autodel_set(win, EINA_TRUE); 137 elm_win_autodel_set(win, EINA_TRUE);
139 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 138 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
140 139
141 bg = elm_bg_add(win);
142 elm_win_resize_object_add(win, bg);
143 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
144 evas_object_show(bg);
145
146 bxx = elm_box_add(win); 140 bxx = elm_box_add(win);
147 elm_win_resize_object_add(win, bxx); 141 elm_win_resize_object_add(win, bxx);
148 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 142 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -201,17 +195,11 @@ _del_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
201void 195void
202test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 196test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
203{ 197{
204 Evas_Object *win, *bg, *bx, *bt; 198 Evas_Object *win, *bx, *bt;
205 199
206 win = elm_win_add(NULL, "box-vert2", ELM_WIN_BASIC); 200 win = elm_win_util_standard_add("box-vert2", "Box Vert 2");
207 elm_win_title_set(win, "Box Vert 2");
208 elm_win_autodel_set(win, EINA_TRUE); 201 elm_win_autodel_set(win, EINA_TRUE);
209 202
210 bg = elm_bg_add(win);
211 elm_win_resize_object_add(win, bg);
212 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
213 evas_object_show(bg);
214
215 bx = elm_box_add(win); 203 bx = elm_box_add(win);
216 elm_win_resize_object_add(win, bx); 204 elm_win_resize_object_add(win, bx);
217 elm_box_padding_set(bx, 10, 10); 205 elm_box_padding_set(bx, 10, 10);
@@ -264,18 +252,13 @@ test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
264void 252void
265test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 253test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
266{ 254{
267 Evas_Object *win, *bg, *bx, *ic, *bxx, *bt; 255 Evas_Object *win, *bx, *ic, *bxx, *bt;
268 char buf[PATH_MAX]; 256 char buf[PATH_MAX];
269 api_data *api = calloc(1, sizeof(api_data)); 257 api_data *api = calloc(1, sizeof(api_data));
270 258
271 win = elm_win_add(NULL, "box-horiz", ELM_WIN_BASIC); 259 win = elm_win_util_standard_add("box-horiz", "Box Horiz");
272 elm_win_title_set(win, "Box Horiz");
273 elm_win_autodel_set(win, EINA_TRUE); 260 elm_win_autodel_set(win, EINA_TRUE);
274 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 261 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
275 bg = elm_bg_add(win);
276 elm_win_resize_object_add(win, bg);
277 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
278 evas_object_show(bg);
279 262
280 bxx = elm_box_add(win); 263 bxx = elm_box_add(win);
281 elm_win_resize_object_add(win, bxx); 264 elm_win_resize_object_add(win, bxx);
@@ -655,18 +638,12 @@ _win_del(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
655void 638void
656test_box_transition(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 639test_box_transition(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
657{ 640{
658 Evas_Object *win, *bg, *bx, *bt; 641 Evas_Object *win, *bx, *bt;
659 Transitions_Data *tdata; 642 Transitions_Data *tdata;
660 643
661 win = elm_win_add(NULL, "box-transition", ELM_WIN_BASIC); 644 win = elm_win_util_standard_add("box-transition", "Box Transition");
662 elm_win_title_set(win, "Box Transition");
663 elm_win_autodel_set(win, EINA_TRUE); 645 elm_win_autodel_set(win, EINA_TRUE);
664 646
665 bg = elm_bg_add(win);
666 elm_win_resize_object_add(win, bg);
667 evas_object_size_hint_weight_set(bg, 1.0, 1.0);
668 evas_object_show(bg);
669
670 bx = elm_box_add(win); 647 bx = elm_box_add(win);
671 elm_win_resize_object_add(win, bx); 648 elm_win_resize_object_add(win, bx);
672 evas_object_size_hint_weight_set(bx, 1.0, 1.0); 649 evas_object_size_hint_weight_set(bx, 1.0, 1.0);
diff --git a/src/bin/test_bubble.c b/src/bin/test_bubble.c
index fb64e37a6..01b5ad6d2 100644
--- a/src/bin/test_bubble.c
+++ b/src/bin/test_bubble.c
@@ -105,21 +105,15 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
105void 105void
106test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 106test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
107{ 107{
108 Evas_Object *win, *bg, *bx, *ic, *bb, *ct, *bxx, *bt; 108 Evas_Object *win, *bx, *ic, *bb, *ct, *bxx, *bt;
109 char buf[PATH_MAX]; 109 char buf[PATH_MAX];
110 api_data *api = calloc(1, sizeof(api_data)); 110 api_data *api = calloc(1, sizeof(api_data));
111 111
112 win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC); 112 win = elm_win_util_standard_add("bubble", "Bubble");
113 api->win = win; 113 api->win = win;
114 elm_win_title_set(win, "Bubble");
115 elm_win_autodel_set(win, EINA_TRUE); 114 elm_win_autodel_set(win, EINA_TRUE);
116 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 115 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
117 116
118 bg = elm_bg_add(win);
119 elm_win_resize_object_add(win, bg);
120 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
121 evas_object_show(bg);
122
123 bxx = elm_box_add(win); 117 bxx = elm_box_add(win);
124 elm_win_resize_object_add(win, bxx); 118 elm_win_resize_object_add(win, bxx);
125 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 119 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_button.c b/src/bin/test_button.c
index d332482f9..be5d655fd 100644
--- a/src/bin/test_button.c
+++ b/src/bin/test_button.c
@@ -34,18 +34,12 @@ _bt_unpressed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
34void 34void
35test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 35test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
36{ 36{
37 Evas_Object *win, *bg, *scr, *bx, *ic, *bt; 37 Evas_Object *win, *scr, *bx, *ic, *bt;
38 char buf[PATH_MAX]; 38 char buf[PATH_MAX];
39 39
40 win = elm_win_add(NULL, "buttons", ELM_WIN_BASIC); 40 win = elm_win_util_standard_add("buttons", "Buttons");
41 elm_win_title_set(win, "Buttons");
42 elm_win_autodel_set(win, EINA_TRUE); 41 elm_win_autodel_set(win, EINA_TRUE);
43 42
44 bg = elm_bg_add(win);
45 elm_win_resize_object_add(win, bg);
46 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
47 evas_object_show(bg);
48
49 scr = elm_scroller_add(win); 43 scr = elm_scroller_add(win);
50 elm_scroller_bounce_set(scr, EINA_FALSE, EINA_TRUE); 44 elm_scroller_bounce_set(scr, EINA_FALSE, EINA_TRUE);
51 elm_scroller_policy_set(scr, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); 45 elm_scroller_policy_set(scr, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
diff --git a/src/bin/test_calendar.c b/src/bin/test_calendar.c
index ba10f3a1e..71107fd92 100644
--- a/src/bin/test_calendar.c
+++ b/src/bin/test_calendar.c
@@ -117,19 +117,13 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
117void 117void
118test_calendar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 118test_calendar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
119{ 119{
120 Evas_Object *win, *bg, *cal, *bx, *bxx, *bt; 120 Evas_Object *win, *cal, *bx, *bxx, *bt;
121 api_data *api = calloc(1, sizeof(api_data)); 121 api_data *api = calloc(1, sizeof(api_data));
122 122
123 win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC); 123 win = elm_win_util_standard_add("calendar", "Calendar");
124 elm_win_title_set(win, "Calendar");
125 elm_win_autodel_set(win, EINA_TRUE); 124 elm_win_autodel_set(win, EINA_TRUE);
126 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 125 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
127 126
128 bg = elm_bg_add(win);
129 elm_win_resize_object_add(win, bg);
130 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
131 evas_object_show(bg);
132
133 bxx = elm_box_add(win); 127 bxx = elm_box_add(win);
134 elm_win_resize_object_add(win, bxx); 128 elm_win_resize_object_add(win, bxx);
135 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 129 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -213,7 +207,7 @@ _format_month_year(struct tm *stm)
213void 207void
214test_calendar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 208test_calendar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
215{ 209{
216 Evas_Object *win, *bg, *bx, *bxh, *cal, *cal2, *cal3, *en; 210 Evas_Object *win, *bx, *bxh, *cal, *cal2, *cal3, *en;
217 Elm_Calendar_Mark *mark; 211 Elm_Calendar_Mark *mark;
218 struct tm selected_time; 212 struct tm selected_time;
219 time_t current_time; 213 time_t current_time;
@@ -223,15 +217,9 @@ test_calendar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
223 "Thursday", "Friday", "Saturday" 217 "Thursday", "Friday", "Saturday"
224 }; 218 };
225 219
226 win = elm_win_add(NULL, "calendar2", ELM_WIN_BASIC); 220 win = elm_win_util_standard_add("calendar2", "Calendar 2");
227 elm_win_title_set(win, "Calendar 2");
228 elm_win_autodel_set(win, EINA_TRUE); 221 elm_win_autodel_set(win, EINA_TRUE);
229 222
230 bg = elm_bg_add(win);
231 elm_win_resize_object_add(win, bg);
232 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
233 evas_object_show(bg);
234
235 bx = elm_box_add(win); 223 bx = elm_box_add(win);
236 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 224 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
237 elm_win_resize_object_add(win, bx); 225 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_clock.c b/src/bin/test_clock.c
index b71ac932d..6e28d2162 100644
--- a/src/bin/test_clock.c
+++ b/src/bin/test_clock.c
@@ -96,20 +96,14 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
96void 96void
97test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 97test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
98{ 98{
99 Evas_Object *win, *bg, *bx, *ck, *bt, *bxx; 99 Evas_Object *win, *bx, *ck, *bt, *bxx;
100 unsigned int digedit; 100 unsigned int digedit;
101 api_data *api = calloc(1, sizeof(api_data)); 101 api_data *api = calloc(1, sizeof(api_data));
102 102
103 win = elm_win_add(NULL, "clock", ELM_WIN_BASIC); 103 win = elm_win_util_standard_add("clock", "Clock");
104 elm_win_title_set(win, "Clock");
105 elm_win_autodel_set(win, EINA_TRUE); 104 elm_win_autodel_set(win, EINA_TRUE);
106 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 105 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
107 106
108 bg = elm_bg_add(win);
109 elm_win_resize_object_add(win, bg);
110 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
111 evas_object_show(bg);
112
113 bxx = elm_box_add(win); 107 bxx = elm_box_add(win);
114 elm_win_resize_object_add(win, bxx); 108 elm_win_resize_object_add(win, bxx);
115 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 109 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -211,19 +205,13 @@ _hmode_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__)
211void 205void
212test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 206test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
213{ 207{
214 Evas_Object *win, *bg, *bx, *hbx, *ck, *bt, *bxx; 208 Evas_Object *win, *bx, *hbx, *ck, *bt, *bxx;
215 api_data *api = calloc(1, sizeof(api_data)); 209 api_data *api = calloc(1, sizeof(api_data));
216 210
217 win = elm_win_add(NULL, "clock2", ELM_WIN_BASIC); 211 win = elm_win_util_standard_add("clock2", "Clock 2");
218 elm_win_title_set(win, "Clock 2");
219 elm_win_autodel_set(win, EINA_TRUE); 212 elm_win_autodel_set(win, EINA_TRUE);
220 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 213 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
221 214
222 bg = elm_bg_add(win);
223 elm_win_resize_object_add(win, bg);
224 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
225 evas_object_show(bg);
226
227 bxx = elm_box_add(win); 215 bxx = elm_box_add(win);
228 elm_win_resize_object_add(win, bxx); 216 elm_win_resize_object_add(win, bxx);
229 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 217 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -276,17 +264,11 @@ test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
276void 264void
277test_clock3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 265test_clock3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
278{ 266{
279 Evas_Object *win, *bg, *bx, *ck, *lb; 267 Evas_Object *win, *bx, *ck, *lb;
280 268
281 win = elm_win_add(NULL, "clock3", ELM_WIN_BASIC); 269 win = elm_win_util_standard_add("clock3", "Clock 3");
282 elm_win_title_set(win, "Clock 3");
283 elm_win_autodel_set(win, EINA_TRUE); 270 elm_win_autodel_set(win, EINA_TRUE);
284 271
285 bg = elm_bg_add(win);
286 elm_win_resize_object_add(win, bg);
287 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
288 evas_object_show(bg);
289
290 bx = elm_box_add(win); 272 bx = elm_box_add(win);
291 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 273 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
292 elm_win_resize_object_add(win, bx); 274 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_cnp.c b/src/bin/test_cnp.c
index 4790ee089..31aad2de7 100644
--- a/src/bin/test_cnp.c
+++ b/src/bin/test_cnp.c
@@ -38,17 +38,11 @@ _bt_clear_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
38void 38void
39test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 39test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
40{ 40{
41 Evas_Object *win, *bg, *gd, *bt, *en, *lb; 41 Evas_Object *win, *gd, *bt, *en, *lb;
42 42
43 win = elm_win_add(NULL, "CopyPaste", ELM_WIN_BASIC); 43 win = elm_win_util_standard_add("copypaste", "CopyPaste");
44 elm_win_title_set(win, "CopyPaste");
45 elm_win_autodel_set(win, EINA_TRUE); 44 elm_win_autodel_set(win, EINA_TRUE);
46 45
47 bg = elm_bg_add(win);
48 elm_win_resize_object_add(win, bg);
49 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
50 evas_object_show(bg);
51
52 gd = elm_grid_add(win); 46 gd = elm_grid_add(win);
53 elm_grid_size_set(gd, 100, 100); 47 elm_grid_size_set(gd, 100, 100);
54 elm_win_resize_object_add(win, gd); 48 elm_win_resize_object_add(win, gd);
diff --git a/src/bin/test_colorselector.c b/src/bin/test_colorselector.c
index 67fa2196b..187861053 100644
--- a/src/bin/test_colorselector.c
+++ b/src/bin/test_colorselector.c
@@ -75,18 +75,12 @@ void
75test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, 75test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
76 void *event_info __UNUSED__) 76 void *event_info __UNUSED__)
77{ 77{
78 Evas_Object *win, *bg, *bx, *bx2, *cs, *fr, *re, *bt; 78 Evas_Object *win, *bx, *bx2, *cs, *fr, *re, *bt;
79 int r, g, b, a; 79 int r, g, b, a;
80 80
81 win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC); 81 win = elm_win_util_standard_add("colorselector", "ColorSelector");
82 elm_win_title_set(win, "Color Selector");
83 elm_win_autodel_set(win, EINA_TRUE); 82 elm_win_autodel_set(win, EINA_TRUE);
84 83
85 bg = elm_bg_add(win);
86 elm_win_resize_object_add(win, bg);
87 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
88 evas_object_show(bg);
89
90 bx = elm_box_add(win); 84 bx = elm_box_add(win);
91 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 85 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
92 elm_win_resize_object_add(win, bx); 86 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_conform.c b/src/bin/test_conform.c
index 3ff3f5c54..925a1aa22 100644
--- a/src/bin/test_conform.c
+++ b/src/bin/test_conform.c
@@ -7,18 +7,12 @@
7void 7void
8test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 8test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
9{ 9{
10 Evas_Object *win, *bg, *conform, *btn, *bx, *en; 10 Evas_Object *win, *conform, *btn, *bx, *en;
11 11
12 win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC); 12 win = elm_win_util_standard_add("conformant", "Conformant");
13 elm_win_title_set(win, "Conformant");
14 elm_win_autodel_set(win, EINA_TRUE); 13 elm_win_autodel_set(win, EINA_TRUE);
15 elm_win_conformant_set(win, EINA_TRUE); 14 elm_win_conformant_set(win, EINA_TRUE);
16 15
17 bg = elm_bg_add(win);
18 elm_win_resize_object_add(win, bg);
19 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
20 evas_object_show(bg);
21
22 conform = elm_conformant_add(win); 16 conform = elm_conformant_add(win);
23 elm_win_resize_object_add(win, conform); 17 elm_win_resize_object_add(win, conform);
24 evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 18 evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -96,18 +90,12 @@ popobj(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
96void 90void
97test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 91test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
98{ 92{
99 Evas_Object *win, *bg, *conform, *btn, *bx, *en, *pg; 93 Evas_Object *win, *conform, *btn, *bx, *en, *pg;
100 94
101 win = elm_win_add(NULL, "conformant2", ELM_WIN_BASIC); 95 win = elm_win_util_standard_add("conformant2", "Conformant 2");
102 elm_win_title_set(win, "Conformant 2");
103 elm_win_autodel_set(win, EINA_TRUE); 96 elm_win_autodel_set(win, EINA_TRUE);
104 elm_win_conformant_set(win, EINA_TRUE); 97 elm_win_conformant_set(win, EINA_TRUE);
105 98
106 bg = elm_bg_add(win);
107 elm_win_resize_object_add(win, bg);
108 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
109 evas_object_show(bg);
110
111 bx = elm_box_add(win); 99 bx = elm_box_add(win);
112 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 100 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
113 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); 101 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_ctxpopup.c b/src/bin/test_ctxpopup.c
index bd52cc9c8..94b91328d 100644
--- a/src/bin/test_ctxpopup.c
+++ b/src/bin/test_ctxpopup.c
@@ -288,17 +288,11 @@ static void _list_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, vo
288void 288void
289test_ctxpopup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 289test_ctxpopup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
290{ 290{
291 Evas_Object *win, *bg, *list; 291 Evas_Object *win, *list;
292 292
293 win = elm_win_add(NULL, "Contextual Popup", ELM_WIN_BASIC); 293 win = elm_win_util_standard_add("contextual-popup", "Contextual Popup");
294 elm_win_title_set(win, "Contextual Popup");
295 elm_win_autodel_set(win, EINA_TRUE); 294 elm_win_autodel_set(win, EINA_TRUE);
296 295
297 bg = elm_bg_add(win);
298 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
299 elm_win_resize_object_add(win, bg);
300 evas_object_show(bg);
301
302 list = elm_list_add(win); 296 list = elm_list_add(win);
303 elm_win_resize_object_add(win, list); 297 elm_win_resize_object_add(win, list);
304 evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 298 evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c
index 859d01075..0150b4416 100644
--- a/src/bin/test_cursor.c
+++ b/src/bin/test_cursor.c
@@ -165,7 +165,7 @@ test_cursor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
165void 165void
166test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 166test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
167{ 167{
168 Evas_Object *win, *bg, *bx, *o, *grid, *gl; 168 Evas_Object *win, *bx, *o, *grid, *gl;
169 Elm_Object_Item *glit1, *glit2, *glit3; 169 Elm_Object_Item *glit1, *glit2, *glit3;
170 Elm_Object_Item *tb_it; 170 Elm_Object_Item *tb_it;
171 Elm_Object_Item *lit; 171 Elm_Object_Item *lit;
@@ -185,15 +185,9 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
185 "wood_01.jpg", 185 "wood_01.jpg",
186 }; 186 };
187 187
188 win = elm_win_add(NULL, "cursor2", ELM_WIN_BASIC); 188 win = elm_win_util_standard_add("cursor2", "Cursor 2");
189 elm_win_title_set(win, "Cursor 2");
190 elm_win_autodel_set(win, EINA_TRUE); 189 elm_win_autodel_set(win, EINA_TRUE);
191 190
192 bg = elm_bg_add(win);
193 elm_win_resize_object_add(win, bg);
194 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
195 evas_object_show(bg);
196
197 bx = elm_box_add(win); 191 bx = elm_box_add(win);
198 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 192 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
199 elm_win_resize_object_add(win, bx); 193 elm_win_resize_object_add(win, bx);
@@ -289,22 +283,16 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
289void 283void
290test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 284test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
291{ 285{
292 Evas_Object *win, *bg, *bx, *o; 286 Evas_Object *win, *bx, *o;
293 Elm_Object_Item *lit; 287 Elm_Object_Item *lit;
294 char buf[PATH_MAX]; 288 char buf[PATH_MAX];
295 289
296 win = elm_win_add(NULL, "cursor3", ELM_WIN_BASIC); 290 win = elm_win_util_standard_add("cursor3", "Cursor 3");
297 elm_win_title_set(win, "Cursor 3");
298 elm_win_autodel_set(win, EINA_TRUE); 291 elm_win_autodel_set(win, EINA_TRUE);
299 292
300 snprintf(buf, sizeof(buf), "%s/objects/cursors.edj", elm_app_data_dir_get()); 293 snprintf(buf, sizeof(buf), "%s/objects/cursors.edj", elm_app_data_dir_get());
301 elm_theme_extension_add(NULL, buf); 294 elm_theme_extension_add(NULL, buf);
302 295
303 bg = elm_bg_add(win);
304 elm_win_resize_object_add(win, bg);
305 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
306 evas_object_show(bg);
307
308 bx = elm_box_add(win); 296 bx = elm_box_add(win);
309 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 297 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
310 elm_win_resize_object_add(win, bx); 298 elm_win_resize_object_add(win, bx);
@@ -400,20 +388,14 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
400void 388void
401test_cursor4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 389test_cursor4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
402{ 390{
403 Evas_Object *win, *bg, *bx, *ly, *bt; 391 Evas_Object *win, *bx, *ly, *bt;
404 char buf[PATH_MAX]; 392 char buf[PATH_MAX];
405 393
406 win = elm_win_add(NULL, "cursor layout", ELM_WIN_BASIC); 394 win = elm_win_util_standard_add("cursor layout", "Cursor Layout");
407 elm_win_title_set(win, "Cursor Layout");
408 elm_win_autodel_set(win, EINA_TRUE); 395 elm_win_autodel_set(win, EINA_TRUE);
409 396
410 snprintf(buf, sizeof(buf), "%s/objects/cursors.edj", elm_app_data_dir_get()); 397 snprintf(buf, sizeof(buf), "%s/objects/cursors.edj", elm_app_data_dir_get());
411 398
412 bg = elm_bg_add(win);
413 elm_win_resize_object_add(win, bg);
414 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
415 evas_object_show(bg);
416
417 bx = elm_box_add(win); 399 bx = elm_box_add(win);
418 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 400 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
419 elm_win_resize_object_add(win, bx); 401 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_datetime.c b/src/bin/test_datetime.c
index 1d50c79cb..ffc8608b9 100644
--- a/src/bin/test_datetime.c
+++ b/src/bin/test_datetime.c
@@ -15,19 +15,13 @@ _changed_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
15void 15void
16test_datetime(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 16test_datetime(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
17{ 17{
18 Evas_Object *win, *bg, *bx, *datetime; 18 Evas_Object *win, *bx, *datetime;
19 time_t t; 19 time_t t;
20 struct tm time1; 20 struct tm time1;
21 21
22 win = elm_win_add(NULL, "Datetime", ELM_WIN_BASIC); 22 win = elm_win_util_standard_add("datetime", "DateTime");
23 elm_win_title_set(win, "Datetime");
24 elm_win_autodel_set(win, 1); 23 elm_win_autodel_set(win, 1);
25 24
26 bg = elm_bg_add(win);
27 elm_win_resize_object_add(win, bg);
28 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
29 evas_object_show(bg);
30
31 bx = elm_box_add(win); 25 bx = elm_box_add(win);
32 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 26 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
33 elm_win_resize_object_add(win, bx); 27 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_dayselector.c b/src/bin/test_dayselector.c
index c87ddd626..7d5fc5541 100644
--- a/src/bin/test_dayselector.c
+++ b/src/bin/test_dayselector.c
@@ -43,18 +43,11 @@ static void _changed_cb(void* data __UNUSED__, Evas_Object* obj, void* event_inf
43void 43void
44test_dayselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 44test_dayselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
45{ 45{
46 Evas_Object *win, *bg, *bx, *dayselector, *sunday; 46 Evas_Object *win, *bx, *dayselector, *sunday;
47 47
48 win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC); 48 win = elm_win_util_standard_add("dayselector", "Day Selector");
49 elm_win_title_set(win, "Day Selector");
50 elm_win_autodel_set(win, EINA_TRUE); 49 elm_win_autodel_set(win, EINA_TRUE);
51 50
52 bg = elm_bg_add(win);
53 elm_win_resize_object_add(win, bg);
54 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
55 evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
56 evas_object_show(bg);
57
58 bx = elm_box_add(win); 51 bx = elm_box_add(win);
59 elm_win_resize_object_add(win, bx); 52 elm_win_resize_object_add(win, bx);
60 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 53 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_diskselector.c b/src/bin/test_diskselector.c
index 45d909955..d62dee485 100644
--- a/src/bin/test_diskselector.c
+++ b/src/bin/test_diskselector.c
@@ -202,7 +202,7 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
202void 202void
203test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 203test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
204{ 204{
205 Evas_Object *win, *bg, *bx, *disk, *ic, *bxx, *bt; 205 Evas_Object *win, *bx, *disk, *ic, *bxx, *bt;
206 Elm_Object_Item *ds_it; 206 Elm_Object_Item *ds_it;
207 char buf[PATH_MAX]; 207 char buf[PATH_MAX];
208 api_data *api = calloc(1, sizeof(api_data)); 208 api_data *api = calloc(1, sizeof(api_data));
@@ -216,17 +216,10 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
216 }; 216 };
217 char date[3]; 217 char date[3];
218 218
219 win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC); 219 win = elm_win_util_standard_add("diskselector", "Disk Selector");
220 elm_win_title_set(win, "Disk Selector");
221 elm_win_autodel_set(win, EINA_TRUE); 220 elm_win_autodel_set(win, EINA_TRUE);
222 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 221 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
223 222
224 bg = elm_bg_add(win);
225 elm_win_resize_object_add(win, bg);
226 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
227 evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
228 evas_object_show(bg);
229
230 bxx = elm_box_add(win); 223 bxx = elm_box_add(win);
231 elm_win_resize_object_add(win, bxx); 224 elm_win_resize_object_add(win, bxx);
232 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 225 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_eio.c b/src/bin/test_eio.c
index 9aa9cd453..7e26a4cab 100644
--- a/src/bin/test_eio.c
+++ b/src/bin/test_eio.c
@@ -126,7 +126,7 @@ _test_eio_clear(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
126void 126void
127test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 127test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
128{ 128{
129 Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_bt, *gl; 129 Evas_Object *win, *vbox, *hbox, *ic, *bt, *fs_bt, *gl;
130 130
131 it_eio.item_style = "default"; 131 it_eio.item_style = "default";
132 it_eio.func.text_get = _gl_text_get; 132 it_eio.func.text_get = _gl_text_get;
@@ -134,15 +134,9 @@ test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
134 it_eio.func.state_get = _gl_state_get; 134 it_eio.func.state_get = _gl_state_get;
135 it_eio.func.del = _gl_del; 135 it_eio.func.del = _gl_del;
136 136
137 win = elm_win_add(NULL, "fileselector-button", ELM_WIN_BASIC); 137 win = elm_win_util_standard_add("fileselector-button", "File Selector Button");
138 elm_win_title_set(win, "File Selector Button");
139 elm_win_autodel_set(win, EINA_TRUE); 138 elm_win_autodel_set(win, EINA_TRUE);
140 139
141 bg = elm_bg_add(win);
142 elm_win_resize_object_add(win, bg);
143 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
144 evas_object_show(bg);
145
146 vbox = elm_box_add(win); 140 vbox = elm_box_add(win);
147 elm_win_resize_object_add(win, vbox); 141 elm_win_resize_object_add(win, vbox);
148 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 142 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index 3de91135c..a07011dc8 100644
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -77,18 +77,12 @@ my_entry_bt_6(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
77void 77void
78test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 78test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
79{ 79{
80 Evas_Object *win, *bg, *bx, *bx2, *bt, *en; 80 Evas_Object *win, *bx, *bx2, *bt, *en;
81 char buf[4096]; 81 char buf[4096];
82 82
83 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 83 win = elm_win_util_standard_add("entry", "Entry");
84 elm_win_title_set(win, "Entry");
85 elm_win_autodel_set(win, EINA_TRUE); 84 elm_win_autodel_set(win, EINA_TRUE);
86 85
87 bg = elm_bg_add(win);
88 elm_win_resize_object_add(win, bg);
89 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
90 evas_object_show(bg);
91
92 bx = elm_box_add(win); 86 bx = elm_box_add(win);
93 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 87 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
94 elm_win_resize_object_add(win, bx); 88 elm_win_resize_object_add(win, bx);
@@ -275,19 +269,13 @@ scrolled_anchor_test(void *data, Evas_Object *obj __UNUSED__, void *event_info _
275void 269void
276test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 270test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
277{ 271{
278 Evas_Object *win, *bg, *bx, *bx2, *bt, *en, *en_p, *sp; 272 Evas_Object *win, *bx, *bx2, *bt, *en, *en_p, *sp;
279 static Elm_Entry_Filter_Accept_Set digits_filter_data, digits_filter_data2; 273 static Elm_Entry_Filter_Accept_Set digits_filter_data, digits_filter_data2;
280 static Elm_Entry_Filter_Limit_Size limit_filter_data, limit_filter_data2; 274 static Elm_Entry_Filter_Limit_Size limit_filter_data, limit_filter_data2;
281 275
282 win = elm_win_add(NULL, "entry-scrolled", ELM_WIN_BASIC); 276 win = elm_win_util_standard_add("entry-scrolled", "Entry Scrolled");
283 elm_win_title_set(win, "Entry Scrolled");
284 elm_win_autodel_set(win, EINA_TRUE); 277 elm_win_autodel_set(win, EINA_TRUE);
285 278
286 bg = elm_bg_add(win);
287 elm_win_resize_object_add(win, bg);
288 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
289 evas_object_show(bg);
290
291 bx = elm_box_add(win); 279 bx = elm_box_add(win);
292 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 280 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
293 elm_win_resize_object_add(win, bx); 281 elm_win_resize_object_add(win, bx);
@@ -717,17 +705,11 @@ my_ent_bt_pas(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
717void 705void
718test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 706test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
719{ 707{
720 Evas_Object *win, *bg, *bx, *bx2, *bt, *en; 708 Evas_Object *win, *bx, *bx2, *bt, *en;
721 709
722 win = elm_win_add(NULL, "entry3", ELM_WIN_BASIC); 710 win = elm_win_util_standard_add("entry3", "Entry 3");
723 elm_win_title_set(win, "Entry 3");
724 elm_win_autodel_set(win, EINA_TRUE); 711 elm_win_autodel_set(win, EINA_TRUE);
725 712
726 bg = elm_bg_add(win);
727 elm_win_resize_object_add(win, bg);
728 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
729 evas_object_show(bg);
730
731 bx = elm_box_add(win); 713 bx = elm_box_add(win);
732 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 714 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
733 elm_win_resize_object_add(win, bx); 715 elm_win_resize_object_add(win, bx);
@@ -1279,18 +1261,12 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1279void 1261void
1280test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 1262test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
1281{ 1263{
1282 Evas_Object *win, *bg, *ly, *en; 1264 Evas_Object *win, *ly, *en;
1283 char buf[PATH_MAX]; 1265 char buf[PATH_MAX];
1284 1266
1285 win = elm_win_add(NULL, "entry4", ELM_WIN_BASIC); 1267 win = elm_win_util_standard_add("entry4", "Entry 4");
1286 elm_win_title_set(win, "Entry 4");
1287 elm_win_autodel_set(win, EINA_TRUE); 1268 elm_win_autodel_set(win, EINA_TRUE);
1288 1269
1289 bg = elm_bg_add(win);
1290 elm_win_resize_object_add(win, bg);
1291 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1292 evas_object_show(bg);
1293
1294 ly = elm_layout_add(win); 1270 ly = elm_layout_add(win);
1295 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); 1271 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
1296 elm_layout_file_set(ly, buf, "layout"); 1272 elm_layout_file_set(ly, buf, "layout");
@@ -1348,17 +1324,11 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1348void 1324void
1349test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 1325test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
1350{ 1326{
1351 Evas_Object *win, *bg, *bx, *bx2, *bt, *en; 1327 Evas_Object *win, *bx, *bx2, *bt, *en;
1352 1328
1353 win = elm_win_add(NULL, "entry5", ELM_WIN_BASIC); 1329 win = elm_win_util_standard_add("entry5", "Entry 5");
1354 elm_win_title_set(win, "Entry 5");
1355 elm_win_autodel_set(win, EINA_TRUE); 1330 elm_win_autodel_set(win, EINA_TRUE);
1356 1331
1357 bg = elm_bg_add(win);
1358 elm_win_resize_object_add(win, bg);
1359 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1360 evas_object_show(bg);
1361
1362 bx = elm_box_add(win); 1332 bx = elm_box_add(win);
1363 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1333 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1364 elm_win_resize_object_add(win, bx); 1334 elm_win_resize_object_add(win, bx);
@@ -1644,17 +1614,11 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1644void 1614void
1645test_entry6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 1615test_entry6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
1646{ 1616{
1647 Evas_Object *win, *bg, *bx, *en; 1617 Evas_Object *win, *bx, *en;
1648 1618
1649 win = elm_win_add(NULL, "entry6", ELM_WIN_BASIC); 1619 win = elm_win_util_standard_add("entry6", "Entry 6");
1650 elm_win_title_set(win, "Entry 6");
1651 elm_win_autodel_set(win, EINA_TRUE); 1620 elm_win_autodel_set(win, EINA_TRUE);
1652 1621
1653 bg = elm_bg_add(win);
1654 elm_win_resize_object_add(win, bg);
1655 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1656 evas_object_show(bg);
1657
1658 bx = elm_box_add(win); 1622 bx = elm_box_add(win);
1659 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1623 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1660 elm_win_resize_object_add(win, bx); 1624 elm_win_resize_object_add(win, bx);
@@ -2166,17 +2130,11 @@ auto_save_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
2166void 2130void
2167test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 2131test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
2168{ 2132{
2169 Evas_Object *win, *bg, *bx, *bx2, *bt, *np, *ch; 2133 Evas_Object *win, *bx, *bx2, *bt, *np, *ch;
2170 2134
2171 win = elm_win_add(NULL, "entry-notepad", ELM_WIN_BASIC); 2135 win = elm_win_util_standard_add("entry-notepad", "Entry Notepad");
2172 elm_win_title_set(win, "Entry Notepad");
2173 elm_win_autodel_set(win, EINA_TRUE); 2136 elm_win_autodel_set(win, EINA_TRUE);
2174 2137
2175 bg = elm_bg_add(win);
2176 elm_win_resize_object_add(win, bg);
2177 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2178 evas_object_show(bg);
2179
2180 bx = elm_box_add(win); 2138 bx = elm_box_add(win);
2181 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 2139 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2182 elm_win_resize_object_add(win, bx); 2140 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_entry_anchor2.c b/src/bin/test_entry_anchor2.c
index c8ca7564f..eb1762b55 100644
--- a/src/bin/test_entry_anchor2.c
+++ b/src/bin/test_entry_anchor2.c
@@ -73,17 +73,11 @@ my_anchorview_anchor(void *data, Evas_Object *obj, void *event_info)
73void 73void
74test_entry_anchor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 74test_entry_anchor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
75{ 75{
76 Evas_Object *win, *bg, *av; 76 Evas_Object *win, *av;
77 77
78 win = elm_win_add(NULL, "entry_anchor", ELM_WIN_BASIC); 78 win = elm_win_util_standard_add("entry_anchor", "Anchorview");
79 elm_win_title_set(win, "Anchorview");
80 elm_win_autodel_set(win, EINA_TRUE); 79 elm_win_autodel_set(win, EINA_TRUE);
81 80
82 bg = elm_bg_add(win);
83 elm_win_resize_object_add(win, bg);
84 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
85 evas_object_show(bg);
86
87 av = elm_entry_add(win); 81 av = elm_entry_add(win);
88 elm_entry_anchor_hover_style_set(av, "popout"); 82 elm_entry_anchor_hover_style_set(av, "popout");
89 elm_entry_anchor_hover_parent_set(av, win); 83 elm_entry_anchor_hover_parent_set(av, win);
diff --git a/src/bin/test_factory.c b/src/bin/test_factory.c
index 63a434270..83fcd78cb 100644
--- a/src/bin/test_factory.c
+++ b/src/bin/test_factory.c
@@ -134,18 +134,12 @@ fac_realize1(void *data, Evas_Object *obj, void *event_info __UNUSED__)
134void 134void
135test_factory(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 135test_factory(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
136{ 136{
137 Evas_Object *win, *bg, *bx, *sc, *fc; 137 Evas_Object *win, *bx, *sc, *fc;
138 int i; 138 int i;
139 139
140 win = elm_win_add(NULL, "factory", ELM_WIN_BASIC); 140 win = elm_win_util_standard_add("factory", "Factory");
141 elm_win_title_set(win, "Factory");
142 elm_win_autodel_set(win, EINA_TRUE); 141 elm_win_autodel_set(win, EINA_TRUE);
143 142
144 bg = elm_bg_add(win);
145 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
146 elm_win_resize_object_add(win, bg);
147 evas_object_show(bg);
148
149 bx = elm_box_add(win); 143 bx = elm_box_add(win);
150#ifdef HOMOG 144#ifdef HOMOG
151 elm_box_homogeneous_set(bx, EINA_TRUE); 145 elm_box_homogeneous_set(bx, EINA_TRUE);
diff --git a/src/bin/test_fileselector.c b/src/bin/test_fileselector.c
index 2cbdee21c..0b2ce2190 100644
--- a/src/bin/test_fileselector.c
+++ b/src/bin/test_fileselector.c
@@ -119,7 +119,7 @@ test_fileselector(void *data __UNUSED__,
119 Evas_Object *obj __UNUSED__, 119 Evas_Object *obj __UNUSED__,
120 void *event_info __UNUSED__) 120 void *event_info __UNUSED__)
121{ 121{
122 Evas_Object *win, *fs, *bg, *vbox, *hbox, *bt, *sep; 122 Evas_Object *win, *fs, *vbox, *hbox, *bt, *sep;
123 123
124 /* Set the locale according to the system pref. 124 /* Set the locale according to the system pref.
125 * If you dont do so the file selector will order the files list in 125 * If you dont do so the file selector will order the files list in
@@ -129,15 +129,9 @@ test_fileselector(void *data __UNUSED__,
129 129
130 elm_need_ethumb(); 130 elm_need_ethumb();
131 131
132 win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); 132 win = elm_win_util_standard_add("fileselector", "File Selector");
133 elm_win_title_set(win, "File Selector");
134 elm_win_autodel_set(win, EINA_TRUE); 133 elm_win_autodel_set(win, EINA_TRUE);
135 134
136 bg = elm_bg_add(win);
137 elm_win_resize_object_add(win, bg);
138 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
139 evas_object_show(bg);
140
141 vbox = elm_box_add(win); 135 vbox = elm_box_add(win);
142 elm_win_resize_object_add(win, vbox); 136 elm_win_resize_object_add(win, vbox);
143 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 137 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_fileselector_button.c b/src/bin/test_fileselector_button.c
index e87a7164f..969983ab9 100644
--- a/src/bin/test_fileselector_button.c
+++ b/src/bin/test_fileselector_button.c
@@ -155,19 +155,13 @@ test_fileselector_button(void *data __UNUSED__,
155 Evas_Object *obj __UNUSED__, 155 Evas_Object *obj __UNUSED__,
156 void *event_info __UNUSED__) 156 void *event_info __UNUSED__)
157{ 157{
158 Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_bt, *en, *lb, *bxx; 158 Evas_Object *win, *vbox, *hbox, *ic, *bt, *fs_bt, *en, *lb, *bxx;
159 api_data *api = calloc(1, sizeof(api_data)); 159 api_data *api = calloc(1, sizeof(api_data));
160 160
161 win = elm_win_add(NULL, "fileselector-button", ELM_WIN_BASIC); 161 win = elm_win_util_standard_add("fileselector-button", "File Selector Button");
162 elm_win_title_set(win, "File Selector Button");
163 elm_win_autodel_set(win, EINA_TRUE); 162 elm_win_autodel_set(win, EINA_TRUE);
164 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 163 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
165 164
166 bg = elm_bg_add(win);
167 elm_win_resize_object_add(win, bg);
168 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
169 evas_object_show(bg);
170
171 bxx = elm_box_add(win); 165 bxx = elm_box_add(win);
172 elm_win_resize_object_add(win, bxx); 166 elm_win_resize_object_add(win, bxx);
173 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 167 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_fileselector_entry.c b/src/bin/test_fileselector_entry.c
index 48357d71b..98ab423bc 100644
--- a/src/bin/test_fileselector_entry.c
+++ b/src/bin/test_fileselector_entry.c
@@ -160,19 +160,13 @@ test_fileselector_entry(void *data __UNUSED__,
160 Evas_Object *obj __UNUSED__, 160 Evas_Object *obj __UNUSED__,
161 void *event_info __UNUSED__) 161 void *event_info __UNUSED__)
162{ 162{
163 Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_en, *en, *lb, *bxx; 163 Evas_Object *win, *vbox, *hbox, *ic, *bt, *fs_en, *en, *lb, *bxx;
164 api_data *api = calloc(1, sizeof(api_data)); 164 api_data *api = calloc(1, sizeof(api_data));
165 165
166 win = elm_win_add(NULL, "fileselector-entry", ELM_WIN_BASIC); 166 win = elm_win_util_standard_add("fileselector-entry", "File Selector Entry");
167 elm_win_title_set(win, "File Selector Entry");
168 elm_win_autodel_set(win, EINA_TRUE); 167 elm_win_autodel_set(win, EINA_TRUE);
169 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 168 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
170 169
171 bg = elm_bg_add(win);
172 elm_win_resize_object_add(win, bg);
173 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
174 evas_object_show(bg);
175
176 bxx = elm_box_add(win); 170 bxx = elm_box_add(win);
177 elm_win_resize_object_add(win, bxx); 171 elm_win_resize_object_add(win, bxx);
178 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 172 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_flip.c b/src/bin/test_flip.c
index f5b32ed7a..20d4e49ef 100644
--- a/src/bin/test_flip.c
+++ b/src/bin/test_flip.c
@@ -63,19 +63,13 @@ my_fl_8(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
63void 63void
64test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 64test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
65{ 65{
66 Evas_Object *win, *bg, *bx, *bx2, *fl, *o, *bt, *ly; 66 Evas_Object *win, *bx, *bx2, *fl, *o, *bt, *ly;
67 char buf[PATH_MAX]; 67 char buf[PATH_MAX];
68 68
69 win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); 69 win = elm_win_util_standard_add("flip", "Flip");
70 elm_win_title_set(win, "Flip");
71 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 70 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
72 elm_win_autodel_set(win, EINA_TRUE); 71 elm_win_autodel_set(win, EINA_TRUE);
73 72
74 bg = elm_bg_add(win);
75 elm_win_resize_object_add(win, bg);
76 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
77 evas_object_show(bg);
78
79 bx = elm_box_add(win); 73 bx = elm_box_add(win);
80 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 74 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
81 elm_win_resize_object_add(win, bx); 75 elm_win_resize_object_add(win, bx);
@@ -373,18 +367,12 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
373void 367void
374test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 368test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
375{ 369{
376 Evas_Object *win, *bg, *bx, *bx2, *fl, *fl_f, *fl_b, *o, *bt, *fr; 370 Evas_Object *win, *bx, *bx2, *fl, *fl_f, *fl_b, *o, *bt, *fr;
377 char buf[PATH_MAX]; 371 char buf[PATH_MAX];
378 372
379 win = elm_win_add(NULL, "flip3", ELM_WIN_BASIC); 373 win = elm_win_util_standard_add("flip3", "Flip Flip");
380 elm_win_title_set(win, "Flip Flip");
381 elm_win_autodel_set(win, EINA_TRUE); 374 elm_win_autodel_set(win, EINA_TRUE);
382 375
383 bg = elm_bg_add(win);
384 elm_win_resize_object_add(win, bg);
385 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
386 evas_object_show(bg);
387
388 bx = elm_box_add(win); 376 bx = elm_box_add(win);
389 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 377 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
390 elm_win_resize_object_add(win, bx); 378 elm_win_resize_object_add(win, bx);
@@ -511,18 +499,12 @@ my_fl_ch(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
511void 499void
512test_flip4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 500test_flip4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
513{ 501{
514 Evas_Object *win, *bg, *bx, *fl, *im, *li, *bt, *rd, *rdg; 502 Evas_Object *win, *bx, *fl, *im, *li, *bt, *rd, *rdg;
515 char buf[PATH_MAX]; 503 char buf[PATH_MAX];
516 504
517 win = elm_win_add(NULL, "flip4", ELM_WIN_BASIC); 505 win = elm_win_util_standard_add("flip-interactive", "Flip Interactive");
518 elm_win_title_set(win, "Flip Interactive");
519 elm_win_autodel_set(win, EINA_TRUE); 506 elm_win_autodel_set(win, EINA_TRUE);
520 507
521 bg = elm_bg_add(win);
522 elm_win_resize_object_add(win, bg);
523 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
524 evas_object_show(bg);
525
526 bx = elm_box_add(win); 508 bx = elm_box_add(win);
527 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 509 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
528 elm_win_resize_object_add(win, bx); 510 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_flip_page.c b/src/bin/test_flip_page.c
index 6715e79e0..20cafb3f6 100644
--- a/src/bin/test_flip_page.c
+++ b/src/bin/test_flip_page.c
@@ -835,19 +835,13 @@ im_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
835void 835void
836test_flip_page(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 836test_flip_page(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
837{ 837{
838 Evas_Object *win, *bg, *im, *im2, *rc; 838 Evas_Object *win, *im, *im2, *rc;
839 char buf[PATH_MAX]; 839 char buf[PATH_MAX];
840 840
841 win = elm_win_add(NULL, "flip_page", ELM_WIN_BASIC); 841 win = elm_win_util_standard_add("flip-page", "Flip Page");
842 elm_win_title_set(win, "Flip Page");
843 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 842 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
844 elm_win_autodel_set(win, EINA_TRUE); 843 elm_win_autodel_set(win, EINA_TRUE);
845 844
846 bg = elm_bg_add(win);
847 elm_win_resize_object_add(win, bg);
848 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
849 evas_object_show(bg);
850
851 im2 = evas_object_image_filled_add(evas_object_evas_get(win)); 845 im2 = evas_object_image_filled_add(evas_object_evas_get(win));
852 snprintf(buf, sizeof(buf), "%s/images/%s", 846 snprintf(buf, sizeof(buf), "%s/images/%s",
853 elm_app_data_dir_get(), "sky_04.jpg"); 847 elm_app_data_dir_get(), "sky_04.jpg");
diff --git a/src/bin/test_flipselector.c b/src/bin/test_flipselector.c
index 8126ab16e..100588dc9 100644
--- a/src/bin/test_flipselector.c
+++ b/src/bin/test_flipselector.c
@@ -82,7 +82,7 @@ test_flipselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
82{ 82{
83 char buf[8]; 83 char buf[8];
84 unsigned int i; 84 unsigned int i;
85 Evas_Object *win, *bg, *bx, *fp, *bt, *bx2, *sl; 85 Evas_Object *win, *bx, *fp, *bt, *bx2, *sl;
86 static const char *lbl[] = { 86 static const char *lbl[] = {
87 "Elementary", 87 "Elementary",
88 "Evas", 88 "Evas",
@@ -94,15 +94,9 @@ test_flipselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
94 "Edbus" 94 "Edbus"
95 }; 95 };
96 96
97 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); 97 win = elm_win_util_standard_add("flipselector", "Flip Selector");
98 elm_win_title_set(win, "Flip Selector");
99 elm_win_autodel_set(win, EINA_TRUE); 98 elm_win_autodel_set(win, EINA_TRUE);
100 99
101 bg = elm_bg_add(win);
102 elm_win_resize_object_add(win, bg);
103 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
104 evas_object_show(bg);
105
106 bx = elm_box_add(win); 100 bx = elm_box_add(win);
107 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 101 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
108 elm_win_resize_object_add(win, bx); 102 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_floating.c b/src/bin/test_floating.c
index 211425ca8..2e3ac9429 100644
--- a/src/bin/test_floating.c
+++ b/src/bin/test_floating.c
@@ -65,19 +65,13 @@ _del(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event
65void 65void
66test_floating(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 66test_floating(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
67{ 67{
68 Evas_Object *win, *bg, *gl; 68 Evas_Object *win, *gl;
69 int i; 69 int i;
70 Ecore_Animator *ani; 70 Ecore_Animator *ani;
71 71
72 win = elm_win_add(NULL, "floating", ELM_WIN_BASIC); 72 win = elm_win_util_standard_add("floating", "Floating");
73 elm_win_title_set(win, "Floating");
74 elm_win_autodel_set(win, EINA_TRUE); 73 elm_win_autodel_set(win, EINA_TRUE);
75 74
76 bg = elm_bg_add(win);
77 elm_win_resize_object_add(win, bg);
78 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
79 evas_object_show(bg);
80
81 gl = elm_genlist_add(win); 75 gl = elm_genlist_add(win);
82 evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 76 evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
83 evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); 77 evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index e52a84ecc..af30f3098 100644
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -57,23 +57,13 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
57 Evas_Object *win; 57 Evas_Object *win;
58 unsigned int i, j; 58 unsigned int i, j;
59 59
60 win = elm_win_add(NULL, "focus", ELM_WIN_BASIC); 60 win = elm_win_util_standard_add("focus", "Focus");
61 elm_win_title_set(win, "Focus");
62 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 61 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
63 evas_object_resize(win, 800, 600); 62 evas_object_resize(win, 800, 600);
64 elm_object_event_callback_add(win, _event, NULL); 63 elm_object_event_callback_add(win, _event, NULL);
65 elm_win_autodel_set(win, EINA_TRUE); 64 elm_win_autodel_set(win, EINA_TRUE);
66 my_show(win); 65 my_show(win);
67 66
68 {
69 Evas_Object *bg;
70 bg = elm_bg_add(win);
71 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
72 EVAS_HINT_EXPAND);
73 elm_win_resize_object_add(win, bg);
74 my_show(bg);
75 }
76
77 Evas_Object *mainbx = elm_box_add(win); 67 Evas_Object *mainbx = elm_box_add(win);
78 elm_box_horizontal_set(mainbx, EINA_TRUE); 68 elm_box_horizontal_set(mainbx, EINA_TRUE);
79 elm_win_resize_object_add(win, mainbx); 69 elm_win_resize_object_add(win, mainbx);
diff --git a/src/bin/test_focus2.c b/src/bin/test_focus2.c
index 443733842..81042bdc7 100644
--- a/src/bin/test_focus2.c
+++ b/src/bin/test_focus2.c
@@ -48,11 +48,10 @@ _focus_layout_part(void *data, Evas_Object *o __UNUSED__, void *event_info __UNU
48void 48void
49test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 49test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
50{ 50{
51 Evas_Object *win, *bg, *bx, *ly, *bt, *en, *bt1; 51 Evas_Object *win, *bx, *ly, *bt, *en, *bt1;
52 char buf[PATH_MAX]; 52 char buf[PATH_MAX];
53 53
54 win = elm_win_add(NULL, "focus2", ELM_WIN_BASIC); 54 win = elm_win_util_standard_add("focus2", "Focus 2");
55 elm_win_title_set(win, "Focus2");
56 elm_win_autodel_set(win, EINA_TRUE); 55 elm_win_autodel_set(win, EINA_TRUE);
57 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 56 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
58 57
@@ -63,11 +62,6 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
63 (evas_object_evas_get(win), EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, 62 (evas_object_evas_get(win), EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT,
64 _focus_out, NULL); 63 _focus_out, NULL);
65 64
66 bg = elm_bg_add(win);
67 elm_win_resize_object_add(win, bg);
68 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
69 evas_object_show(bg);
70
71 bx = elm_box_add(win); 65 bx = elm_box_add(win);
72 elm_win_resize_object_add(win, bx); 66 elm_win_resize_object_add(win, bx);
73 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 67 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c
index 36fe8ff8f..71a5a8a11 100644
--- a/src/bin/test_focus3.c
+++ b/src/bin/test_focus3.c
@@ -53,19 +53,13 @@ _hide(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNU
53void 53void
54test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 54test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
55{ 55{
56 Evas_Object *win, *bg, *bx, *bt, *en; 56 Evas_Object *win, *bx, *bt, *en;
57 57
58 win = elm_win_add(NULL, "focus3", ELM_WIN_BASIC); 58 win = elm_win_util_standard_add("focus3", "Focus 3");
59 elm_win_title_set(win, "Focus 3");
60 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 59 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
61 evas_object_resize(win, 320, 480); 60 evas_object_resize(win, 320, 480);
62 elm_win_autodel_set(win, EINA_TRUE); 61 elm_win_autodel_set(win, EINA_TRUE);
63 62
64 bg = elm_bg_add(win);
65 elm_win_resize_object_add(win, bg);
66 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
67 evas_object_show(bg);
68
69 bx = elm_box_add(win); 63 bx = elm_box_add(win);
70 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 64 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
71 elm_win_resize_object_add(win, bx); 65 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index 20e03147c..b17c8f971 100644
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -469,19 +469,13 @@ cursor_bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
469void 469void
470test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 470test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
471{ 471{
472 Evas_Object *win, *bg, *bt, *content_box, *bxx, *bx, *tg; 472 Evas_Object *win, *bt, *content_box, *bxx, *bx, *tg;
473 api_data *api = calloc(1, sizeof(api_data)); 473 api_data *api = calloc(1, sizeof(api_data));
474 474
475 win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); 475 win = elm_win_util_standard_add("gengrid", "GenGrid");
476 elm_win_title_set(win, "GenGrid");
477 elm_win_autodel_set(win, EINA_TRUE); 476 elm_win_autodel_set(win, EINA_TRUE);
478 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 477 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
479 478
480 bg = elm_bg_add(win);
481 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
482 elm_win_resize_object_add(win, bg);
483 evas_object_show(bg);
484
485 bxx = elm_box_add(win); 479 bxx = elm_box_add(win);
486 api->box = bxx; 480 api->box = bxx;
487 elm_win_resize_object_add(win, bxx); 481 elm_win_resize_object_add(win, bxx);
@@ -686,17 +680,11 @@ _size_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__)
686void 680void
687test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 681test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
688{ 682{
689 Evas_Object *win, *bg, *grid, *bx, *hbx, *bt, *ck; 683 Evas_Object *win, *grid, *bx, *hbx, *bt, *ck;
690 684
691 win = elm_win_add(NULL, "gengrid2", ELM_WIN_BASIC); 685 win = elm_win_util_standard_add("gengrid2", "GenGrid 2");
692 elm_win_title_set(win, "GenGrid2");
693 elm_win_autodel_set(win, EINA_TRUE); 686 elm_win_autodel_set(win, EINA_TRUE);
694 687
695 bg = elm_bg_add(win);
696 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
697 elm_win_resize_object_add(win, bg);
698 evas_object_show(bg);
699
700 bx = elm_box_add(win); 688 bx = elm_box_add(win);
701 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 689 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
702 elm_win_resize_object_add(win, bx); 690 elm_win_resize_object_add(win, bx);
@@ -788,20 +776,14 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
788void 776void
789test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 777test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
790{ 778{
791 Evas_Object *win, *bg, *grid; 779 Evas_Object *win, *grid;
792 static Testitem ti[144]; 780 static Testitem ti[144];
793 int i, n; 781 int i, n;
794 char buf[PATH_MAX]; 782 char buf[PATH_MAX];
795 783
796 win = elm_win_add(NULL, "gengrid_group", ELM_WIN_BASIC); 784 win = elm_win_util_standard_add("gengrid_group", "GenGrid Group");
797 elm_win_title_set(win, "GenGrid Group");
798 elm_win_autodel_set(win, EINA_TRUE); 785 elm_win_autodel_set(win, EINA_TRUE);
799 786
800 bg = elm_bg_add(win);
801 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
802 elm_win_resize_object_add(win, bg);
803 evas_object_show(bg);
804
805 grid = elm_gengrid_add(win); 787 grid = elm_gengrid_add(win);
806 elm_gengrid_item_size_set(grid, 150, 150); 788 elm_gengrid_item_size_set(grid, 150, 150);
807 elm_gengrid_group_item_size_set(grid, 31, 31); 789 elm_gengrid_group_item_size_set(grid, 31, 31);
diff --git a/src/bin/test_gesture_layer2.c b/src/bin/test_gesture_layer2.c
index e61883c05..487c84ede 100644
--- a/src/bin/test_gesture_layer2.c
+++ b/src/bin/test_gesture_layer2.c
@@ -523,22 +523,16 @@ void
523test_gesture_layer2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, 523test_gesture_layer2(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
524 void *event_info __UNUSED__) 524 void *event_info __UNUSED__)
525{ 525{
526 Evas_Object *win, *bg, *tb, *lb, *bx; 526 Evas_Object *win, *tb, *lb, *bx;
527 Evas_Object *r; /* Gesture layer transparent object */ 527 Evas_Object *r; /* Gesture layer transparent object */
528 Evas_Object *g; /* The Gesture Layer object */ 528 Evas_Object *g; /* The Gesture Layer object */
529 529
530 infra_data *infra = _infra_data_alloc(); 530 infra_data *infra = _infra_data_alloc();
531 531
532 win = elm_win_add(NULL, "table", ELM_WIN_BASIC); 532 win = elm_win_util_standard_add("table", "Table");
533 elm_win_title_set(win, "Table");
534 elm_win_autodel_set(win, EINA_TRUE); 533 elm_win_autodel_set(win, EINA_TRUE);
535 evas_object_smart_callback_add(win, "delete,request", my_win_del, infra); 534 evas_object_smart_callback_add(win, "delete,request", my_win_del, infra);
536 535
537 bg = elm_bg_add(win);
538 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
539 elm_win_resize_object_add(win, bg);
540 evas_object_show(bg);
541
542 /* START - Building icons table */ 536 /* START - Building icons table */
543 bx = elm_box_add(win); 537 bx = elm_box_add(win);
544 tb = elm_table_add(win); 538 tb = elm_table_add(win);
diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c
index 325d487b5..f8f276727 100644
--- a/src/bin/test_glview.c
+++ b/src/bin/test_glview.c
@@ -558,7 +558,7 @@ _mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *eve
558void 558void
559test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 559test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
560{ 560{
561 Evas_Object *win, *bg, *bx, *bt, *gl; 561 Evas_Object *win, *bx, *bt, *gl;
562 Ecore_Animator *ani; 562 Ecore_Animator *ani;
563 GLData *gld = NULL; 563 GLData *gld = NULL;
564 564
@@ -569,18 +569,11 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
569 // new window - do the usual and give it a name, title and delete handler 569 // new window - do the usual and give it a name, title and delete handler
570 // Set the engine to opengl_x11 570 // Set the engine to opengl_x11
571 elm_config_preferred_engine_set("opengl_x11"); 571 elm_config_preferred_engine_set("opengl_x11");
572 win = elm_win_add(NULL, "glview", ELM_WIN_BASIC); 572 win = elm_win_util_standard_add("glview", "GLView");
573 // Set preferred engine back to default from config 573 // Set preferred engine back to default from config
574 elm_config_preferred_engine_set(NULL); 574 elm_config_preferred_engine_set(NULL);
575
576 elm_win_title_set(win, "GLView");
577 elm_win_autodel_set(win, EINA_TRUE);
578 575
579 // add a standard bg 576 elm_win_autodel_set(win, EINA_TRUE);
580 bg = elm_bg_add(win);
581 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
582 elm_win_resize_object_add(win, bg);
583 evas_object_show(bg);
584 577
585 bx = elm_box_add(win); 578 bx = elm_box_add(win);
586 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 579 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_glview_simple.c b/src/bin/test_glview_simple.c
index f75e39842..fc21ef43c 100644
--- a/src/bin/test_glview_simple.c
+++ b/src/bin/test_glview_simple.c
@@ -232,7 +232,7 @@ _del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event
232void 232void
233test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 233test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
234{ 234{
235 Evas_Object *win, *bg, *bx, *bt, *gl; 235 Evas_Object *win, *bx, *bt, *gl;
236 Ecore_Animator *ani; 236 Ecore_Animator *ani;
237 GLData *gld = NULL; 237 GLData *gld = NULL;
238 238
@@ -240,17 +240,11 @@ test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
240 240
241 // Set the engine to opengl_x11 241 // Set the engine to opengl_x11
242 elm_config_preferred_engine_set("opengl_x11"); 242 elm_config_preferred_engine_set("opengl_x11");
243 win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC); 243 win = elm_win_util_standard_add("glview simple", "GLView Simple");
244 // Set preferred engine back to default from config 244 // Set preferred engine back to default from config
245 elm_config_preferred_engine_set(NULL); 245 elm_config_preferred_engine_set(NULL);
246
247 elm_win_title_set(win, "GLView Simple");
248 elm_win_autodel_set(win, EINA_TRUE);
249 246
250 bg = elm_bg_add(win); 247 elm_win_autodel_set(win, EINA_TRUE);
251 elm_win_resize_object_add(win, bg);
252 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
253 evas_object_show(bg);
254 248
255 bx = elm_box_add(win); 249 bx = elm_box_add(win);
256 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 250 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_grid.c b/src/bin/test_grid.c
index cb7c535cc..f08c06049 100644
--- a/src/bin/test_grid.c
+++ b/src/bin/test_grid.c
@@ -96,17 +96,12 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
96void 96void
97test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 97test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
98{ 98{
99 Evas_Object *win, *bg, *gd, *bt, *rc, *en; 99 Evas_Object *win, *gd, *bt, *rc, *en;
100 100
101 win = elm_win_add(NULL, "grid", ELM_WIN_BASIC); 101 win = elm_win_util_standard_add("grid", "Grid");
102 elm_win_title_set(win, "Grid");
103 elm_win_autodel_set(win, EINA_TRUE); 102 elm_win_autodel_set(win, EINA_TRUE);
104 api_data *api = calloc(1, sizeof(api_data)); 103 api_data *api = calloc(1, sizeof(api_data));
105 104
106 bg = elm_bg_add(win);
107 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
108 elm_win_resize_object_add(win, bg);
109 evas_object_show(bg);
110 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 105 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
111 106
112 gd = elm_grid_add(win); 107 gd = elm_grid_add(win);
diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c
index 1fc6b76c3..d86c3cf8b 100644
--- a/src/bin/test_hoversel.c
+++ b/src/bin/test_hoversel.c
@@ -93,20 +93,14 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
93void 93void
94test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 94test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
95{ 95{
96 Evas_Object *win, *bg, *bx, *bt, *ic, *bxx; 96 Evas_Object *win, *bx, *bt, *ic, *bxx;
97 char buf[PATH_MAX]; 97 char buf[PATH_MAX];
98 api_data *api = calloc(1, sizeof(api_data)); 98 api_data *api = calloc(1, sizeof(api_data));
99 99
100 win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC); 100 win = elm_win_util_standard_add("hoversel", "HoverSel");
101 elm_win_title_set(win, "Hoversel");
102 elm_win_autodel_set(win, EINA_TRUE); 101 elm_win_autodel_set(win, EINA_TRUE);
103 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 102 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
104 103
105 bg = elm_bg_add(win);
106 elm_win_resize_object_add(win, bg);
107 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
108 evas_object_show(bg);
109
110 bxx = elm_box_add(win); 104 bxx = elm_box_add(win);
111 elm_win_resize_object_add(win, bxx); 105 elm_win_resize_object_add(win, bxx);
112 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 106 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_icon_desktops.c b/src/bin/test_icon_desktops.c
index d719362fe..aed269a59 100644
--- a/src/bin/test_icon_desktops.c
+++ b/src/bin/test_icon_desktops.c
@@ -59,20 +59,14 @@ desktop_sel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
59void 59void
60test_icon_desktops(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 60test_icon_desktops(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
61{ 61{
62 Evas_Object *win, *bg, *gl; 62 Evas_Object *win, *gl;
63#ifdef ELM_EFREET 63#ifdef ELM_EFREET
64 Eina_List *desktops; 64 Eina_List *desktops;
65#endif 65#endif
66 66
67 win = elm_win_add(NULL, "icon-desktops", ELM_WIN_BASIC); 67 win = elm_win_util_standard_add("icon-desktops", "Icon Desktops");
68 elm_win_title_set(win, "Icon Desktops");
69 elm_win_autodel_set(win, EINA_TRUE); 68 elm_win_autodel_set(win, EINA_TRUE);
70 69
71 bg = elm_bg_add(win);
72 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
73 elm_win_resize_object_add(win, bg);
74 evas_object_show(bg);
75
76 it_desk.item_style = "default"; 70 it_desk.item_style = "default";
77 it_desk.func.text_get = desk_gl_text_get; 71 it_desk.func.text_get = desk_gl_text_get;
78 it_desk.func.content_get = desk_gl_content_get; 72 it_desk.func.content_get = desk_gl_content_get;
diff --git a/src/bin/test_index.c b/src/bin/test_index.c
index f369b6a8f..0e3928a1e 100644
--- a/src/bin/test_index.c
+++ b/src/bin/test_index.c
@@ -162,21 +162,15 @@ id_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
162void 162void
163test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 163test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
164{ 164{
165 Evas_Object *win, *bg, *bxx, *gl, *id, *bt; 165 Evas_Object *win, *bxx, *gl, *id, *bt;
166 Elm_Object_Item *glit; 166 Elm_Object_Item *glit;
167 int i, j; 167 int i, j;
168 api_data *api = calloc(1, sizeof(api_data)); 168 api_data *api = calloc(1, sizeof(api_data));
169 169
170 win = elm_win_add(NULL, "index", ELM_WIN_BASIC); 170 win = elm_win_util_standard_add("index", "Index");
171 elm_win_title_set(win, "Index");
172 elm_win_autodel_set(win, EINA_TRUE); 171 elm_win_autodel_set(win, EINA_TRUE);
173 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 172 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
174 173
175 bg = elm_bg_add(win);
176 elm_win_resize_object_add(win, bg);
177 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
178 evas_object_show(bg);
179
180 bxx = elm_box_add(win); 174 bxx = elm_box_add(win);
181 elm_win_resize_object_add(win, bxx); 175 elm_win_resize_object_add(win, bxx);
182 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 176 evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -335,21 +329,15 @@ test_index2_id_changed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void
335void 329void
336test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 330test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
337{ 331{
338 Evas_Object *win, *bg, *box, *bt; 332 Evas_Object *win, *box, *bt;
339 Test_Index2_Elements *gui; 333 Test_Index2_Elements *gui;
340 334
341 gui = malloc(sizeof(*gui)); 335 gui = malloc(sizeof(*gui));
342 336
343 win = elm_win_add(NULL, "sorted-index-list", ELM_WIN_BASIC); 337 win = elm_win_util_standard_add("sorted-index-list", "Sorted Index and List");
344 elm_win_title_set(win, "Sorted Index and List");
345 evas_object_smart_callback_add(win, "delete,request", test_index2_del, gui); 338 evas_object_smart_callback_add(win, "delete,request", test_index2_del, gui);
346 elm_win_autodel_set(win, EINA_TRUE); 339 elm_win_autodel_set(win, EINA_TRUE);
347 340
348 bg = elm_bg_add(win);
349 elm_win_resize_object_add(win, bg);
350 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
351 evas_object_show(bg);
352
353 box = elm_box_add(win); 341 box = elm_box_add(win);
354 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 342 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
355 elm_win_resize_object_add(win, box); 343 elm_win_resize_object_add(win, box);
diff --git a/src/bin/test_inwin.c b/src/bin/test_inwin.c
index 2558bf5d5..14ab16849 100644
--- a/src/bin/test_inwin.c
+++ b/src/bin/test_inwin.c
@@ -61,19 +61,13 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
61void 61void
62test_inwin(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 62test_inwin(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
63{ 63{
64 Evas_Object *win, *bg, *inwin, *lb, *bxx, *bt; 64 Evas_Object *win, *inwin, *lb, *bxx, *bt;
65 api_data *api = calloc(1, sizeof(api_data)); 65 api_data *api = calloc(1, sizeof(api_data));
66 66
67 win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); 67 win = elm_win_util_standard_add("inwin", "InWin");
68 elm_win_title_set(win, "Inwin");
69 elm_win_autodel_set(win, EINA_TRUE); 68 elm_win_autodel_set(win, EINA_TRUE);
70 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 69 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
71 70
72 bg = elm_bg_add(win);
73 elm_win_resize_object_add(win, bg);
74 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
75 evas_object_show(bg);
76
77 inwin = elm_win_inwin_add(win); 71 inwin = elm_win_inwin_add(win);
78 api->inwin = inwin; 72 api->inwin = inwin;
79 evas_object_show(inwin); 73 evas_object_show(inwin);
@@ -107,17 +101,11 @@ test_inwin(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
107void 101void
108test_inwin2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 102test_inwin2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
109{ 103{
110 Evas_Object *win, *bg, *inwin, *lb; 104 Evas_Object *win, *inwin, *lb;
111 105
112 win = elm_win_add(NULL, "inwin2", ELM_WIN_BASIC); 106 win = elm_win_util_standard_add("inwin2", "InWin 2");
113 elm_win_title_set(win, "Inwin 2");
114 elm_win_autodel_set(win, EINA_TRUE); 107 elm_win_autodel_set(win, EINA_TRUE);
115 108
116 bg = elm_bg_add(win);
117 elm_win_resize_object_add(win, bg);
118 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
119 evas_object_show(bg);
120
121 inwin = elm_win_inwin_add(win); 109 inwin = elm_win_inwin_add(win);
122 elm_object_style_set(inwin, "minimal_vertical"); 110 elm_object_style_set(inwin, "minimal_vertical");
123 evas_object_show(inwin); 111 evas_object_show(inwin);
diff --git a/src/bin/test_label.c b/src/bin/test_label.c
index 82d28abaf..b21740708 100644
--- a/src/bin/test_label.c
+++ b/src/bin/test_label.c
@@ -15,17 +15,11 @@ enum _slide_style
15void 15void
16test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 16test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
17{ 17{
18 Evas_Object *win, *bg, *bx, *lb; 18 Evas_Object *win, *bx, *lb;
19 19
20 win = elm_win_add(NULL, "label", ELM_WIN_BASIC); 20 win = elm_win_util_standard_add("label", "Label");
21 elm_win_title_set(win, "Label");
22 elm_win_autodel_set(win, EINA_TRUE); 21 elm_win_autodel_set(win, EINA_TRUE);
23 22
24 bg = elm_bg_add(win);
25 elm_win_resize_object_add(win, bg);
26 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
27 evas_object_show(bg);
28
29 bx = elm_box_add(win); 23 bx = elm_box_add(win);
30 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 24 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
31 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); 25 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_layout.c b/src/bin/test_layout.c
index 736a70080..90826cbe8 100644
--- a/src/bin/test_layout.c
+++ b/src/bin/test_layout.c
@@ -37,18 +37,12 @@ _clicked_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
37void 37void
38test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 38test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
39{ 39{
40 Evas_Object *win, *bg, *box, *ly, *bt; 40 Evas_Object *win, *box, *ly, *bt;
41 char buf[PATH_MAX]; 41 char buf[PATH_MAX];
42 42
43 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 43 win = elm_win_util_standard_add("layout", "Layout");
44 elm_win_title_set(win, "Layout");
45 elm_win_autodel_set(win, EINA_TRUE); 44 elm_win_autodel_set(win, EINA_TRUE);
46 45
47 bg = elm_bg_add(win);
48 elm_win_resize_object_add(win, bg);
49 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
50 evas_object_show(bg);
51
52 box = elm_box_add(win); 46 box = elm_box_add(win);
53 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 47 evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
54 evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); 48 evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index df09cb368..d136e8310 100644
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -501,18 +501,12 @@ _zoom_manual(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED_
501static void 501static void
502_track_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 502_track_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
503{ 503{
504 Evas_Object *fs, *bg, *vbox, *hbox, *sep; 504 Evas_Object *fs, *vbox, *hbox, *sep;
505 char *path = NULL; 505 char *path = NULL;
506 506
507 fs_win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); 507 fs_win = elm_win_util_standard_add("fileselector", "File Selector");
508 elm_win_title_set(fs_win, "File Selector");
509 elm_win_autodel_set(fs_win, 1); 508 elm_win_autodel_set(fs_win, 1);
510 509
511 bg = elm_bg_add(fs_win);
512 elm_win_resize_object_add(fs_win, bg);
513 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
514 evas_object_show(bg);
515
516 vbox = elm_box_add(fs_win); 510 vbox = elm_box_add(fs_win);
517 elm_win_resize_object_add(fs_win, vbox); 511 elm_win_resize_object_add(fs_win, vbox);
518 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 512 evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -970,21 +964,15 @@ _del_map(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
970void 964void
971test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 965test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
972{ 966{
973 Evas_Object *win, *bg, *map; 967 Evas_Object *win, *map;
974 int idx = 0; 968 int idx = 0;
975 const char **tile_srcs; 969 const char **tile_srcs;
976 const char **route_srcs; 970 const char **route_srcs;
977 const char **name_srcs; 971 const char **name_srcs;
978 972
979 win = elm_win_add(NULL, "map", ELM_WIN_BASIC); 973 win = elm_win_util_standard_add("map", "Map");
980 elm_win_title_set(win, "Map");
981 elm_win_autodel_set(win, EINA_TRUE); 974 elm_win_autodel_set(win, EINA_TRUE);
982 975
983 bg = elm_bg_add(win);
984 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
985 elm_win_resize_object_add(win, bg);
986 evas_object_show(bg);
987
988 map = elm_map_add(win); 976 map = elm_map_add(win);
989 if (map) 977 if (map)
990 { 978 {
diff --git a/src/bin/test_menu.c b/src/bin/test_menu.c
index 753f22d71..cc940d7cf 100644
--- a/src/bin/test_menu.c
+++ b/src/bin/test_menu.c
@@ -4,7 +4,7 @@
4#include <Elementary.h> 4#include <Elementary.h>
5#ifndef ELM_LIB_QUICKLAUNCH 5#ifndef ELM_LIB_QUICKLAUNCH
6 6
7static Evas_Object *win, *bg, *menu, *rect; 7static Evas_Object *menu;
8 8
9static void 9static void
10_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) 10_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
@@ -97,17 +97,12 @@ _populate_1(Evas_Object *obj, Elm_Object_Item *menu_it)
97void 97void
98test_menu(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 98test_menu(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
99{ 99{
100 Evas_Object *win, *rect;
100 Elm_Object_Item *menu_it; 101 Elm_Object_Item *menu_it;
101 102
102 win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); 103 win = elm_win_util_standard_add("menu", "Menu");
103 elm_win_title_set(win, "Menu");
104 elm_win_autodel_set(win, EINA_TRUE); 104 elm_win_autodel_set(win, EINA_TRUE);
105 105
106 bg = elm_bg_add(win);
107 elm_win_resize_object_add(win, bg);
108 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
109 evas_object_show(bg);
110
111 rect = evas_object_rectangle_add(evas_object_evas_get(win)); 106 rect = evas_object_rectangle_add(evas_object_evas_get(win));
112 elm_win_resize_object_add(win, rect); 107 elm_win_resize_object_add(win, rect);
113 evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 108 evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_multibuttonentry.c b/src/bin/test_multibuttonentry.c
index d530ae999..d5d983cc1 100644
--- a/src/bin/test_multibuttonentry.c
+++ b/src/bin/test_multibuttonentry.c
@@ -199,19 +199,13 @@ test_multibuttonentry(void *data __UNUSED__,
199 Evas_Object *obj __UNUSED__, 199 Evas_Object *obj __UNUSED__,
200 void *event_info __UNUSED__) 200 void *event_info __UNUSED__)
201{ 201{
202 Evas_Object *win, *bg, *sc, *bx; 202 Evas_Object *win, *sc, *bx;
203 Evas_Object *ly; 203 Evas_Object *ly;
204 char buf[PATH_MAX]; 204 char buf[PATH_MAX];
205 205
206 win = elm_win_add(NULL, "Multibuttonentry", ELM_WIN_BASIC); 206 win = elm_win_util_standard_add("multibuttonentry", "MultiButtonEntry");
207 elm_win_title_set(win, "Multibuttonentry");
208 elm_win_autodel_set(win, EINA_TRUE); 207 elm_win_autodel_set(win, EINA_TRUE);
209 208
210 bg = elm_bg_add(win);
211 elm_win_resize_object_add(win, bg);
212 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
213 evas_object_show(bg);
214
215 ly = elm_layout_add(win); 209 ly = elm_layout_add(win);
216 snprintf(buf, sizeof(buf), "%s/objects/multibuttonentry.edj", elm_app_data_dir_get()); 210 snprintf(buf, sizeof(buf), "%s/objects/multibuttonentry.edj", elm_app_data_dir_get());
217 elm_layout_file_set(ly, buf, "multibuttonentry_test"); 211 elm_layout_file_set(ly, buf, "multibuttonentry_test");
diff --git a/src/bin/test_notify.c b/src/bin/test_notify.c
index 16cbc6433..dcb387adc 100644
--- a/src/bin/test_notify.c
+++ b/src/bin/test_notify.c
@@ -40,17 +40,11 @@ _notify_block(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
40void 40void
41test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 41test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
42{ 42{
43 Evas_Object *win, *bg, *bx, *tb, *notify, *bt, *lb; 43 Evas_Object *win, *bx, *tb, *notify, *bt, *lb;
44 44
45 win = elm_win_add(NULL, "notify", ELM_WIN_BASIC); 45 win = elm_win_util_standard_add("notify", "Notify");
46 elm_win_title_set(win, "Notify");
47 elm_win_autodel_set(win, EINA_TRUE); 46 elm_win_autodel_set(win, EINA_TRUE);
48 47
49 bg = elm_bg_add(win);
50 elm_win_resize_object_add(win, bg);
51 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
52 evas_object_show(bg);
53
54 tb = elm_table_add(win); 48 tb = elm_table_add(win);
55 elm_win_resize_object_add(win, tb); 49 elm_win_resize_object_add(win, tb);
56 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 50 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_panel.c b/src/bin/test_panel.c
index 4e47e4ca4..ee88b8c1a 100644
--- a/src/bin/test_panel.c
+++ b/src/bin/test_panel.c
@@ -154,18 +154,12 @@ _dir_has_subs(const char *path)
154void 154void
155test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 155test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
156{ 156{
157 Evas_Object *win, *bg, *panel, *bx, *vbx, *toolbar; 157 Evas_Object *win, *panel, *bx, *vbx, *toolbar;
158 Evas_Object *list; 158 Evas_Object *list;
159 159
160 win = elm_win_add(NULL, "panel", ELM_WIN_BASIC); 160 win = elm_win_util_standard_add("panel", "Panel");
161 elm_win_title_set(win, "Panel");
162 elm_win_autodel_set(win, EINA_TRUE); 161 elm_win_autodel_set(win, EINA_TRUE);
163 162
164 bg = elm_bg_add(win);
165 elm_win_resize_object_add(win, bg);
166 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
167 evas_object_show(bg);
168
169 vbx = elm_box_add(win); 163 vbx = elm_box_add(win);
170 elm_win_resize_object_add(win, vbx); 164 elm_win_resize_object_add(win, vbx);
171 evas_object_size_hint_weight_set(vbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 165 evas_object_size_hint_weight_set(vbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_panes.c b/src/bin/test_panes.c
index ec95bc614..bf8d091ea 100644
--- a/src/bin/test_panes.c
+++ b/src/bin/test_panes.c
@@ -49,8 +49,8 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
49 elm_win_autodel_set(win, EINA_TRUE); 49 elm_win_autodel_set(win, EINA_TRUE);
50 50
51 bg = elm_bg_add(win); 51 bg = elm_bg_add(win);
52 elm_win_resize_object_add(win, bg);
53 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 52 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
53 elm_win_resize_object_add(win, bg);
54 elm_win_focus_highlight_enabled_set(win, EINA_TRUE); 54 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
55 evas_object_show(bg); 55 evas_object_show(bg);
56 56
diff --git a/src/bin/test_photo.c b/src/bin/test_photo.c
index 5276737d0..5346b2e31 100644
--- a/src/bin/test_photo.c
+++ b/src/bin/test_photo.c
@@ -11,7 +11,7 @@ static void drag_start_cb(void *mydata, Evas_Object *obj, void *evdata);
11void 11void
12test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 12test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
13{ 13{
14 Evas_Object *win, *bg, *sc, *tb, *ph; 14 Evas_Object *win, *sc, *tb, *ph;
15 int i, j, n; 15 int i, j, n;
16 char buf[PATH_MAX]; 16 char buf[PATH_MAX];
17 const char *img[9] = 17 const char *img[9] =
@@ -29,15 +29,9 @@ test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
29 29
30 elm_need_ethumb(); 30 elm_need_ethumb();
31 31
32 win = elm_win_add(NULL, "photo", ELM_WIN_BASIC); 32 win = elm_win_util_standard_add("photo", "Photo");
33 elm_win_title_set(win, "Photo");
34 elm_win_autodel_set(win, EINA_TRUE); 33 elm_win_autodel_set(win, EINA_TRUE);
35 34
36 bg = elm_bg_add(win);
37 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
38 elm_win_resize_object_add(win, bg);
39 evas_object_show(bg);
40
41 tb = elm_table_add(win); 35 tb = elm_table_add(win);
42 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 36 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
43 37
diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c
index c431a4f0f..75431eee1 100644
--- a/src/bin/test_photocam.c
+++ b/src/bin/test_photocam.c
@@ -222,7 +222,7 @@ _photocam_move_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
222void 222void
223test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 223test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
224{ 224{
225 Evas_Object *win, *bg, *ph, *tb2, *bt, *box; 225 Evas_Object *win, *ph, *tb2, *bt, *box;
226 // these were just testing - use the "select photo" browser to select one 226 // these were just testing - use the "select photo" browser to select one
227 const char *img[5] = 227 const char *img[5] =
228 { 228 {
@@ -233,15 +233,9 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
233 "/home/raster/t5.jpg" // 466 mpixel 233 "/home/raster/t5.jpg" // 466 mpixel
234 }; 234 };
235 235
236 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); 236 win = elm_win_util_standard_add("photocam", "PhotoCam");
237 elm_win_title_set(win, "Photocam");
238 elm_win_autodel_set(win, EINA_TRUE); 237 elm_win_autodel_set(win, EINA_TRUE);
239 238
240 bg = elm_bg_add(win);
241 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
242 elm_win_resize_object_add(win, bg);
243 evas_object_show(bg);
244
245 ph = elm_photocam_add(win); 239 ph = elm_photocam_add(win);
246 evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 240 evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
247 elm_win_resize_object_add(win, ph); 241 elm_win_resize_object_add(win, ph);
diff --git a/src/bin/test_popup.c b/src/bin/test_popup.c
index b4effe714..54ee314a9 100644
--- a/src/bin/test_popup.c
+++ b/src/bin/test_popup.c
@@ -271,17 +271,11 @@ void
271test_popup(void *data __UNUSED__, Evas_Object *obj __UNUSED__, 271test_popup(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
272 void *event_info __UNUSED__) 272 void *event_info __UNUSED__)
273{ 273{
274 Evas_Object *win, *bg, *list; 274 Evas_Object *win, *list;
275 275
276 win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); 276 win = elm_win_util_standard_add("popup", "Popup");
277 elm_win_title_set(win, "popup");
278 elm_win_autodel_set(win, EINA_TRUE); 277 elm_win_autodel_set(win, EINA_TRUE);
279 278
280 bg = elm_bg_add(win);
281 elm_win_resize_object_add(win, bg);
282 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
283 evas_object_show(bg);
284
285 list = elm_list_add(win); 279 list = elm_list_add(win);
286 elm_win_resize_object_add(win, list); 280 elm_win_resize_object_add(win, list);
287 elm_list_mode_set(list, ELM_LIST_LIMIT); 281 elm_list_mode_set(list, ELM_LIST_LIMIT);
diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c
index f459ff1f4..6eed552a3 100644
--- a/src/bin/test_progressbar.c
+++ b/src/bin/test_progressbar.c
@@ -71,19 +71,13 @@ my_progressbar_destroy(void *data __UNUSED__, Evas_Object *obj, void *event_info
71void 71void
72test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 72test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
73{ 73{
74 Evas_Object *win, *bg, *pb, *bx, *hbx, *bt, *bt_bx, *ic1, *ic2; 74 Evas_Object *win, *pb, *bx, *hbx, *bt, *bt_bx, *ic1, *ic2;
75 char buf[PATH_MAX]; 75 char buf[PATH_MAX];
76 76
77 win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); 77 win = elm_win_util_standard_add("progressbar", "Progressbar");
78 elm_win_title_set(win, "Progressbar");
79 evas_object_smart_callback_add(win, "delete,request", 78 evas_object_smart_callback_add(win, "delete,request",
80 my_progressbar_destroy, NULL); 79 my_progressbar_destroy, NULL);
81 80
82 bg = elm_bg_add(win);
83 elm_win_resize_object_add(win, bg);
84 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
85 evas_object_show(bg);
86
87 bx = elm_box_add(win); 81 bx = elm_box_add(win);
88 elm_win_resize_object_add(win, bx); 82 elm_win_resize_object_add(win, bx);
89 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 83 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_radio.c b/src/bin/test_radio.c
index 67c61d0a9..1c822eabd 100644
--- a/src/bin/test_radio.c
+++ b/src/bin/test_radio.c
@@ -6,18 +6,12 @@
6void 6void
7test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bg, *bx, *ic, *rd, *rdg; 9 Evas_Object *win, *bx, *ic, *rd, *rdg;
10 char buf[PATH_MAX]; 10 char buf[PATH_MAX];
11 11
12 win = elm_win_add(NULL, "radios", ELM_WIN_BASIC); 12 win = elm_win_util_standard_add("radios", "Radios");
13 elm_win_title_set(win, "Radios");
14 elm_win_autodel_set(win, EINA_TRUE); 13 elm_win_autodel_set(win, EINA_TRUE);
15 14
16 bg = elm_bg_add(win);
17 elm_win_resize_object_add(win, bg);
18 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
19 evas_object_show(bg);
20
21 bx = elm_box_add(win); 15 bx = elm_box_add(win);
22 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 16 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
23 elm_win_resize_object_add(win, bx); 17 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_scaling.c b/src/bin/test_scaling.c
index 494f91d4c..9e5f26e6b 100644
--- a/src/bin/test_scaling.c
+++ b/src/bin/test_scaling.c
@@ -6,17 +6,11 @@
6void 6void
7test_scaling(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_scaling(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bg, *bx, *bt; 9 Evas_Object *win, *bx, *bt;
10 10
11 win = elm_win_add(NULL, "scaling", ELM_WIN_BASIC); 11 win = elm_win_util_standard_add("scaling", "Scaling");
12 elm_win_title_set(win, "Scaling");
13 elm_win_autodel_set(win, EINA_TRUE); 12 elm_win_autodel_set(win, EINA_TRUE);
14 13
15 bg = elm_bg_add(win);
16 elm_win_resize_object_add(win, bg);
17 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
18 evas_object_show(bg);
19
20 bx = elm_box_add(win); 14 bx = elm_box_add(win);
21 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 15 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
22 elm_win_resize_object_add(win, bx); 16 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index a838e261a..295bd6d2e 100644
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -30,7 +30,7 @@ my_bt_go_900_900(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
30void 30void
31test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 31test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
32{ 32{
33 Evas_Object *win, *bg2, *tb, *tb2, *bg, *sc, *bt; 33 Evas_Object *win, *bg2, *tb, *tb2, *sc, *bt;
34 int i, j, n; 34 int i, j, n;
35 char buf[PATH_MAX]; 35 char buf[PATH_MAX];
36 const char *img[9] = 36 const char *img[9] =
@@ -46,15 +46,9 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
46 "wood_01.jpg" 46 "wood_01.jpg"
47 }; 47 };
48 48
49 win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC); 49 win = elm_win_util_standard_add("scroller", "Scroller");
50 elm_win_title_set(win, "Scroller");
51 elm_win_autodel_set(win, EINA_TRUE); 50 elm_win_autodel_set(win, EINA_TRUE);
52 51
53 bg = elm_bg_add(win);
54 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
55 elm_win_resize_object_add(win, bg);
56 evas_object_show(bg);
57
58 tb = elm_table_add(win); 52 tb = elm_table_add(win);
59 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 53 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
60 54
@@ -138,18 +132,12 @@ click_through(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED
138void 132void
139test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 133test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
140{ 134{
141 Evas_Object *win, *bt, *bx, *bx2, *bg, *sc, *tb, *tb2, *rc; 135 Evas_Object *win, *bt, *bx, *bx2, *sc, *tb, *tb2, *rc;
142 int i, j; 136 int i, j;
143 137
144 win = elm_win_add(NULL, "scroller2", ELM_WIN_BASIC); 138 win = elm_win_util_standard_add("scroller2", "Scroller 2");
145 elm_win_title_set(win, "Scroller 2");
146 elm_win_autodel_set(win, EINA_TRUE); 139 elm_win_autodel_set(win, EINA_TRUE);
147 140
148 bg = elm_bg_add(win);
149 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
150 elm_win_resize_object_add(win, bg);
151 evas_object_show(bg);
152
153 bx = elm_box_add(win); 141 bx = elm_box_add(win);
154 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0); 142 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0);
155 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, 0.0); 143 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, 0.0);
diff --git a/src/bin/test_segment_control.c b/src/bin/test_segment_control.c
index ea84de1f0..48ae35b0f 100644
--- a/src/bin/test_segment_control.c
+++ b/src/bin/test_segment_control.c
@@ -7,7 +7,7 @@
7void 7void
8test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 8test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
9{ 9{
10 Evas_Object *win, *bg, *ic, *ic1, *ic2, *ic3, *ic4, *ic5; 10 Evas_Object *win, *ic, *ic1, *ic2, *ic3, *ic4, *ic5;
11 Elm_Object_Item *seg_it; 11 Elm_Object_Item *seg_it;
12 12
13 Evas_Object * in_layout; 13 Evas_Object * in_layout;
@@ -20,15 +20,9 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
20 char buf5[PATH_MAX]; 20 char buf5[PATH_MAX];
21 char buf6[PATH_MAX]; 21 char buf6[PATH_MAX];
22 22
23 win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC); 23 win = elm_win_util_standard_add("segmentcontrol", "Segment Control");
24 elm_win_title_set(win, "Segment Control");
25 elm_win_autodel_set(win, EINA_TRUE); 24 elm_win_autodel_set(win, EINA_TRUE);
26 25
27 bg = elm_bg_add(win);
28 elm_win_resize_object_add(win, bg);
29 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
30 evas_object_show(bg);
31
32 in_layout = elm_layout_add( win ); 26 in_layout = elm_layout_add( win );
33 elm_win_resize_object_add(win, in_layout); 27 elm_win_resize_object_add(win, in_layout);
34 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); 28 snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
diff --git a/src/bin/test_separator.c b/src/bin/test_separator.c
index da00f059d..8c1959c08 100644
--- a/src/bin/test_separator.c
+++ b/src/bin/test_separator.c
@@ -6,17 +6,11 @@
6void 6void
7test_separator(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_separator(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bg, *bx0, *bx, *bt, *sp; 9 Evas_Object *win, *bx0, *bx, *bt, *sp;
10 10
11 win = elm_win_add(NULL, "separators", ELM_WIN_BASIC); 11 win = elm_win_util_standard_add("separators", "Separators");
12 elm_win_title_set(win, "Separators");
13 elm_win_autodel_set(win, EINA_TRUE); 12 elm_win_autodel_set(win, EINA_TRUE);
14 13
15 bg = elm_bg_add(win);
16 elm_win_resize_object_add(win, bg);
17 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
18 evas_object_show(bg);
19
20 bx0 = elm_box_add(win); 14 bx0 = elm_box_add(win);
21 evas_object_size_hint_weight_set(bx0, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 15 evas_object_size_hint_weight_set(bx0, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
22 elm_box_horizontal_set(bx0, EINA_TRUE); 16 elm_box_horizontal_set(bx0, EINA_TRUE);
diff --git a/src/bin/test_slider.c b/src/bin/test_slider.c
index c4197ba39..c10e93caa 100644
--- a/src/bin/test_slider.c
+++ b/src/bin/test_slider.c
@@ -14,18 +14,12 @@ _change_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
14void 14void
15test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 15test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
16{ 16{
17 Evas_Object *win, *bg, *bx, *sl, *ic, *sl1, *bx2; 17 Evas_Object *win, *bx, *sl, *ic, *sl1, *bx2;
18 char buf[PATH_MAX]; 18 char buf[PATH_MAX];
19 19
20 win = elm_win_add(NULL, "slider", ELM_WIN_BASIC); 20 win = elm_win_util_standard_add("slider", "Slider");
21 elm_win_title_set(win, "Slider");
22 elm_win_autodel_set(win, EINA_TRUE); 21 elm_win_autodel_set(win, EINA_TRUE);
23 22
24 bg = elm_bg_add(win);
25 elm_win_resize_object_add(win, bg);
26 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
27 evas_object_show(bg);
28
29 bx = elm_box_add(win); 23 bx = elm_box_add(win);
30 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 24 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
31 elm_win_resize_object_add(win, bx); 25 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_slideshow.c b/src/bin/test_slideshow.c
index 9c96e88a9..85ae3405c 100644
--- a/src/bin/test_slideshow.c
+++ b/src/bin/test_slideshow.c
@@ -110,20 +110,14 @@ _slide_transition(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
110void 110void
111test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 111test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
112{ 112{
113 Evas_Object *win, *bg, *notify, *bx, *bt, *hv, *spin; 113 Evas_Object *win, *notify, *bx, *bt, *hv, *spin;
114 const Eina_List *l; 114 const Eina_List *l;
115 const char *transition, *layout; 115 const char *transition, *layout;
116 Elm_Object_Item *slide_last_it; 116 Elm_Object_Item *slide_last_it;
117 117
118 win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC); 118 win = elm_win_util_standard_add("slideshow", "Slideshow");
119 elm_win_title_set(win, "Slideshow");
120 elm_win_autodel_set(win, EINA_TRUE); 119 elm_win_autodel_set(win, EINA_TRUE);
121 120
122 bg = elm_bg_add(win);
123 elm_win_resize_object_add(win, bg);
124 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
125 evas_object_show(bg);
126
127 slideshow = elm_slideshow_add(win); 121 slideshow = elm_slideshow_add(win);
128 elm_slideshow_loop_set(slideshow, EINA_TRUE); 122 elm_slideshow_loop_set(slideshow, EINA_TRUE);
129 elm_win_resize_object_add(win, slideshow); 123 elm_win_resize_object_add(win, slideshow);
diff --git a/src/bin/test_spinner.c b/src/bin/test_spinner.c
index e6bc1e7b7..17e743a0d 100644
--- a/src/bin/test_spinner.c
+++ b/src/bin/test_spinner.c
@@ -6,17 +6,11 @@
6void 6void
7test_spinner(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_spinner(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bg, *bx, *sp; 9 Evas_Object *win, *bx, *sp;
10 10
11 win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC); 11 win = elm_win_util_standard_add("spinner", "Spinner");
12 elm_win_title_set(win, "Spinner");
13 elm_win_autodel_set(win, EINA_TRUE); 12 elm_win_autodel_set(win, EINA_TRUE);
14 13
15 bg = elm_bg_add(win);
16 elm_win_resize_object_add(win, bg);
17 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
18 evas_object_show(bg);
19
20 bx = elm_box_add(win); 14 bx = elm_box_add(win);
21 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 15 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
22 elm_win_resize_object_add(win, bx); 16 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_store.c b/src/bin/test_store.c
index 3c7bd73c6..38e04c589 100644
--- a/src/bin/test_store.c
+++ b/src/bin/test_store.c
@@ -228,19 +228,12 @@ _st_store_unfetch(void *data __UNUSED__, Elm_Store_Item *sti)
228void 228void
229test_store(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 229test_store(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
230{ 230{
231 Evas_Object *win, *bg, *gl, *bx; 231 Evas_Object *win, *gl, *bx;
232
233 Elm_Store *st; 232 Elm_Store *st;
234 233
235 win = elm_win_add(NULL, "store", ELM_WIN_BASIC); 234 win = elm_win_util_standard_add("store", "Store");
236 elm_win_title_set(win, "Store");
237 elm_win_autodel_set(win, EINA_TRUE); 235 elm_win_autodel_set(win, EINA_TRUE);
238 236
239 bg = elm_bg_add(win);
240 elm_win_resize_object_add(win, bg);
241 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
242 evas_object_show(bg);
243
244 bx = elm_box_add(win); 237 bx = elm_box_add(win);
245 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 238 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
246 elm_win_resize_object_add(win, bx); 239 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_table.c b/src/bin/test_table.c
index 4c19c8244..4f406087e 100644
--- a/src/bin/test_table.c
+++ b/src/bin/test_table.c
@@ -6,17 +6,11 @@
6void 6void
7test_table(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_table(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bg, *tb, *bt; 9 Evas_Object *win, *tb, *bt;
10 10
11 win = elm_win_add(NULL, "table", ELM_WIN_BASIC); 11 win = elm_win_util_standard_add("table", "Table");
12 elm_win_title_set(win, "Table");
13 elm_win_autodel_set(win, EINA_TRUE); 12 elm_win_autodel_set(win, EINA_TRUE);
14 13
15 bg = elm_bg_add(win);
16 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
17 elm_win_resize_object_add(win, bg);
18 evas_object_show(bg);
19
20 tb = elm_table_add(win); 14 tb = elm_table_add(win);
21 elm_win_resize_object_add(win, tb); 15 elm_win_resize_object_add(win, tb);
22 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 16 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -70,17 +64,11 @@ test_table(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
70void 64void
71test_table2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 65test_table2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
72{ 66{
73 Evas_Object *win, *bg, *tb, *bt; 67 Evas_Object *win, *tb, *bt;
74 68
75 win = elm_win_add(NULL, "table2", ELM_WIN_BASIC); 69 win = elm_win_util_standard_add("table2", "Table Homogeneous");
76 elm_win_title_set(win, "Table Homogeneous");
77 elm_win_autodel_set(win, EINA_TRUE); 70 elm_win_autodel_set(win, EINA_TRUE);
78 71
79 bg = elm_bg_add(win);
80 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
81 elm_win_resize_object_add(win, bg);
82 evas_object_show(bg);
83
84 tb = elm_table_add(win); 72 tb = elm_table_add(win);
85 elm_table_homogeneous_set(tb, EINA_TRUE); 73 elm_table_homogeneous_set(tb, EINA_TRUE);
86 elm_win_resize_object_add(win, tb); 74 elm_win_resize_object_add(win, tb);
@@ -146,17 +134,11 @@ my_tb_ch(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
146void 134void
147test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 135test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
148{ 136{
149 Evas_Object *win, *bg, *tb, *bt; 137 Evas_Object *win, *tb, *bt;
150 138
151 win = elm_win_add(NULL, "table3", ELM_WIN_BASIC); 139 win = elm_win_util_standard_add("table3", "Table 3");
152 elm_win_title_set(win, "Table 3");
153 elm_win_autodel_set(win, EINA_TRUE); 140 elm_win_autodel_set(win, EINA_TRUE);
154 141
155 bg = elm_bg_add(win);
156 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
157 elm_win_resize_object_add(win, bg);
158 evas_object_show(bg);
159
160 tb = elm_table_add(win); 142 tb = elm_table_add(win);
161 elm_win_resize_object_add(win, tb); 143 elm_win_resize_object_add(win, tb);
162 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 144 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -196,17 +178,11 @@ test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
196void 178void
197test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 179test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
198{ 180{
199 Evas_Object *win, *bg, *tb, *bt; 181 Evas_Object *win, *tb, *bt;
200 182
201 win = elm_win_add(NULL, "table4", ELM_WIN_BASIC); 183 win = elm_win_util_standard_add("table4", "Table 4");
202 elm_win_title_set(win, "Table 4");
203 elm_win_autodel_set(win, EINA_TRUE); 184 elm_win_autodel_set(win, EINA_TRUE);
204 185
205 bg = elm_bg_add(win);
206 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
207 elm_win_resize_object_add(win, bg);
208 evas_object_show(bg);
209
210 tb = elm_table_add(win); 186 tb = elm_table_add(win);
211 elm_win_resize_object_add(win, tb); 187 elm_win_resize_object_add(win, tb);
212 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 188 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -246,17 +222,11 @@ test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
246void 222void
247test_table5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 223test_table5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
248{ 224{
249 Evas_Object *win, *bg, *tb, *bt; 225 Evas_Object *win, *tb, *bt;
250 226
251 win = elm_win_add(NULL, "table5", ELM_WIN_BASIC); 227 win = elm_win_util_standard_add("table5", "Table 5");
252 elm_win_title_set(win, "Table 5");
253 elm_win_autodel_set(win, EINA_TRUE); 228 elm_win_autodel_set(win, EINA_TRUE);
254 229
255 bg = elm_bg_add(win);
256 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
257 elm_win_resize_object_add(win, bg);
258 evas_object_show(bg);
259
260 tb = elm_table_add(win); 230 tb = elm_table_add(win);
261 elm_table_homogeneous_set(tb, EINA_TRUE); 231 elm_table_homogeneous_set(tb, EINA_TRUE);
262 elm_win_resize_object_add(win, tb); 232 elm_win_resize_object_add(win, tb);
@@ -304,17 +274,11 @@ test_table5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
304void 274void
305test_table6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 275test_table6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
306{ 276{
307 Evas_Object *win, *bg, *tb, *bt; 277 Evas_Object *win, *tb, *bt;
308 278
309 win = elm_win_add(NULL, "table6", ELM_WIN_BASIC); 279 win = elm_win_util_standard_add("table6", "Table 6");
310 elm_win_title_set(win, "Table 6");
311 elm_win_autodel_set(win, EINA_TRUE); 280 elm_win_autodel_set(win, EINA_TRUE);
312 281
313 bg = elm_bg_add(win);
314 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
315 elm_win_resize_object_add(win, bg);
316 evas_object_show(bg);
317
318 tb = elm_table_add(win); 282 tb = elm_table_add(win);
319 elm_table_homogeneous_set(tb, EINA_TRUE); 283 elm_table_homogeneous_set(tb, EINA_TRUE);
320 elm_win_resize_object_add(win, tb); 284 elm_win_resize_object_add(win, tb);
@@ -369,17 +333,11 @@ test_table6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
369void 333void
370test_table7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 334test_table7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
371{ 335{
372 Evas_Object *win, *bg, *tb, *bt; 336 Evas_Object *win, *tb, *bt;
373 337
374 win = elm_win_add(NULL, "table7", ELM_WIN_BASIC); 338 win = elm_win_util_standard_add("table7", "Table 7");
375 elm_win_title_set(win, "Table 7");
376 elm_win_autodel_set(win, EINA_TRUE); 339 elm_win_autodel_set(win, EINA_TRUE);
377 340
378 bg = elm_bg_add(win);
379 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
380 elm_win_resize_object_add(win, bg);
381 evas_object_show(bg);
382
383 tb = elm_table_add(win); 341 tb = elm_table_add(win);
384 elm_table_padding_set(tb, 10, 20); 342 elm_table_padding_set(tb, 10, 20);
385 elm_win_resize_object_add(win, tb); 343 elm_win_resize_object_add(win, tb);
diff --git a/src/bin/test_thumb.c b/src/bin/test_thumb.c
index 6f68d18a4..5a6c04a0a 100644
--- a/src/bin/test_thumb.c
+++ b/src/bin/test_thumb.c
@@ -6,7 +6,7 @@
6void 6void
7test_thumb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7test_thumb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *win, *bg, *sc, *tb, *th; 9 Evas_Object *win, *sc, *tb, *th;
10 int i, j, n; 10 int i, j, n;
11 char buf[PATH_MAX]; 11 char buf[PATH_MAX];
12 const char *img[11] = 12 const char *img[11] =
@@ -26,15 +26,9 @@ test_thumb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
26 26
27 elm_need_ethumb(); 27 elm_need_ethumb();
28 28
29 win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC); 29 win = elm_win_util_standard_add("thumb", "Thumb");
30 elm_win_title_set(win, "Thumb");
31 elm_win_autodel_set(win, EINA_TRUE); 30 elm_win_autodel_set(win, EINA_TRUE);
32 31
33 bg = elm_bg_add(win);
34 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
35 elm_win_resize_object_add(win, bg);
36 evas_object_show(bg);
37
38 tb = elm_table_add(win); 32 tb = elm_table_add(win);
39 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 33 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
40 34
diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c
index ecfbd19cb..e9ffdd1d5 100644
--- a/src/bin/test_toolbar.c
+++ b/src/bin/test_toolbar.c
@@ -64,21 +64,15 @@ tb_5(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
64void 64void
65test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 65test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
66{ 66{
67 Evas_Object *win, *bg, *bx, *tb, *ph, *menu; 67 Evas_Object *win, *bx, *tb, *ph, *menu;
68 Evas_Object *ph1, *ph2, *ph3, *ph4; 68 Evas_Object *ph1, *ph2, *ph3, *ph4;
69 Elm_Object_Item *tb_it; 69 Elm_Object_Item *tb_it;
70 Elm_Object_Item *menu_it; 70 Elm_Object_Item *menu_it;
71 char buf[PATH_MAX]; 71 char buf[PATH_MAX];
72 72
73 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); 73 win = elm_win_util_standard_add("toolbar", "Toolbar");
74 elm_win_title_set(win, "Toolbar 7");
75 elm_win_autodel_set(win, EINA_TRUE); 74 elm_win_autodel_set(win, EINA_TRUE);
76 75
77 bg = elm_bg_add(win);
78 elm_win_resize_object_add(win, bg);
79 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
80 evas_object_show(bg);
81
82 bx = elm_box_add(win); 76 bx = elm_box_add(win);
83 elm_win_resize_object_add(win, bx); 77 elm_win_resize_object_add(win, bx);
84 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 78 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -174,21 +168,15 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
174void 168void
175test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 169test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
176{ 170{
177 Evas_Object *win, *bg, *bx, *tb, *ph, *menu; 171 Evas_Object *win, *bx, *tb, *ph, *menu;
178 Evas_Object *ph1, *ph2, *ph3, *ph4; 172 Evas_Object *ph1, *ph2, *ph3, *ph4;
179 Elm_Object_Item *item; 173 Elm_Object_Item *item;
180 Elm_Object_Item *menu_it; 174 Elm_Object_Item *menu_it;
181 char buf[PATH_MAX]; 175 char buf[PATH_MAX];
182 176
183 win = elm_win_add(NULL, "toolbar2", ELM_WIN_BASIC); 177 win = elm_win_util_standard_add("toolbar2", "Toolbar 2");
184 elm_win_title_set(win, "Toolbar 2");
185 elm_win_autodel_set(win, EINA_TRUE); 178 elm_win_autodel_set(win, EINA_TRUE);
186 179
187 bg = elm_bg_add(win);
188 elm_win_resize_object_add(win, bg);
189 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
190 evas_object_show(bg);
191
192 bx = elm_box_add(win); 180 bx = elm_box_add(win);
193 elm_win_resize_object_add(win, bx); 181 elm_win_resize_object_add(win, bx);
194 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 182 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -284,21 +272,15 @@ test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
284void 272void
285test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 273test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
286{ 274{
287 Evas_Object *win, *bg, *bx, *tb, *ph, *menu; 275 Evas_Object *win, *bx, *tb, *ph, *menu;
288 Evas_Object *ph1, *ph2, *ph3, *ph4; 276 Evas_Object *ph1, *ph2, *ph3, *ph4;
289 Elm_Object_Item *tb_it; 277 Elm_Object_Item *tb_it;
290 Elm_Object_Item *menu_it; 278 Elm_Object_Item *menu_it;
291 char buf[PATH_MAX]; 279 char buf[PATH_MAX];
292 280
293 win = elm_win_add(NULL, "toolbar3", ELM_WIN_BASIC); 281 win = elm_win_util_standard_add("toolbar3", "Toolbar 3");
294 elm_win_title_set(win, "Toolbar 3");
295 elm_win_autodel_set(win, EINA_TRUE); 282 elm_win_autodel_set(win, EINA_TRUE);
296 283
297 bg = elm_bg_add(win);
298 elm_win_resize_object_add(win, bg);
299 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
300 evas_object_show(bg);
301
302 bx = elm_box_add(win); 284 bx = elm_box_add(win);
303 elm_win_resize_object_add(win, bx); 285 elm_win_resize_object_add(win, bx);
304 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 286 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -394,21 +376,15 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
394void 376void
395test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 377test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
396{ 378{
397 Evas_Object *win, *bg, *bx, *tb, *ph, *menu; 379 Evas_Object *win, *bx, *tb, *ph, *menu;
398 Evas_Object *ph1, *ph2, *ph3, *ph4; 380 Evas_Object *ph1, *ph2, *ph3, *ph4;
399 Elm_Object_Item *tb_it; 381 Elm_Object_Item *tb_it;
400 Elm_Object_Item *menu_it; 382 Elm_Object_Item *menu_it;
401 char buf[PATH_MAX]; 383 char buf[PATH_MAX];
402 384
403 win = elm_win_add(NULL, "toolbar4", ELM_WIN_BASIC); 385 win = elm_win_util_standard_add("toolbar4", "Toolbar 4");
404 elm_win_title_set(win, "Toolbar 4");
405 elm_win_autodel_set(win, EINA_TRUE); 386 elm_win_autodel_set(win, EINA_TRUE);
406 387
407 bg = elm_bg_add(win);
408 elm_win_resize_object_add(win, bg);
409 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
410 evas_object_show(bg);
411
412 bx = elm_box_add(win); 388 bx = elm_box_add(win);
413 elm_win_resize_object_add(win, bx); 389 elm_win_resize_object_add(win, bx);
414 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 390 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -504,21 +480,15 @@ test_toolbar4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
504void 480void
505test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 481test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
506{ 482{
507 Evas_Object *win, *bg, *bx, *tb, *ph, *menu; 483 Evas_Object *win, *bx, *tb, *ph, *menu;
508 Evas_Object *ph1, *ph2, *ph3, *ph4; 484 Evas_Object *ph1, *ph2, *ph3, *ph4;
509 Elm_Object_Item *tb_it; 485 Elm_Object_Item *tb_it;
510 Elm_Object_Item *menu_it; 486 Elm_Object_Item *menu_it;
511 char buf[PATH_MAX]; 487 char buf[PATH_MAX];
512 488
513 win = elm_win_add(NULL, "toolbar5", ELM_WIN_BASIC); 489 win = elm_win_util_standard_add("toolbar5", "Toolbar 5");
514 elm_win_title_set(win, "Toolbar 5");
515 elm_win_autodel_set(win, EINA_TRUE); 490 elm_win_autodel_set(win, EINA_TRUE);
516 491
517 bg = elm_bg_add(win);
518 elm_win_resize_object_add(win, bg);
519 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
520 evas_object_show(bg);
521
522 bx = elm_box_add(win); 492 bx = elm_box_add(win);
523 elm_win_resize_object_add(win, bx); 493 elm_win_resize_object_add(win, bx);
524 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 494 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -618,21 +588,15 @@ test_toolbar5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
618void 588void
619test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 589test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
620{ 590{
621 Evas_Object *win, *bg, *bx, *tb, *ph, *menu; 591 Evas_Object *win, *bx, *tb, *ph, *menu;
622 Evas_Object *ph1, *ph2, *ph3, *ph4; 592 Evas_Object *ph1, *ph2, *ph3, *ph4;
623 Elm_Object_Item *tb_it; 593 Elm_Object_Item *tb_it;
624 Elm_Object_Item *menu_it; 594 Elm_Object_Item *menu_it;
625 char buf[PATH_MAX]; 595 char buf[PATH_MAX];
626 596
627 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); 597 win = elm_win_util_standard_add("toolbar6", "Toolbar 6");
628 elm_win_title_set(win, "Toolbar");
629 elm_win_autodel_set(win, EINA_TRUE); 598 elm_win_autodel_set(win, EINA_TRUE);
630 599
631 bg = elm_bg_add(win);
632 elm_win_resize_object_add(win, bg);
633 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
634 evas_object_show(bg);
635
636 bx = elm_box_add(win); 600 bx = elm_box_add(win);
637 elm_win_resize_object_add(win, bx); 601 elm_win_resize_object_add(win, bx);
638 elm_box_horizontal_set(bx, EINA_TRUE); 602 elm_box_horizontal_set(bx, EINA_TRUE);
@@ -729,21 +693,15 @@ test_toolbar6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
729void 693void
730test_toolbar7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 694test_toolbar7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
731{ 695{
732 Evas_Object *win, *bg, *bx, *tb, *ph, *menu; 696 Evas_Object *win, *bx, *tb, *ph, *menu;
733 Evas_Object *ph1, *ph2, *ph3, *ph4; 697 Evas_Object *ph1, *ph2, *ph3, *ph4;
734 Elm_Object_Item *tb_it; 698 Elm_Object_Item *tb_it;
735 Elm_Object_Item *menu_it; 699 Elm_Object_Item *menu_it;
736 char buf[PATH_MAX]; 700 char buf[PATH_MAX];
737 701
738 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); 702 win = elm_win_util_standard_add("toolbar7", "Toolbar 7");
739 elm_win_title_set(win, "Toolbar");
740 elm_win_autodel_set(win, EINA_TRUE); 703 elm_win_autodel_set(win, EINA_TRUE);
741 704
742 bg = elm_bg_add(win);
743 elm_win_resize_object_add(win, bg);
744 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
745 evas_object_show(bg);
746
747 bx = elm_box_add(win); 705 bx = elm_box_add(win);
748 elm_win_resize_object_add(win, bx); 706 elm_win_resize_object_add(win, bx);
749 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 707 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -840,21 +798,15 @@ test_toolbar7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
840void 798void
841test_toolbar8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 799test_toolbar8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
842{ 800{
843 Evas_Object *win, *bg, *bx, *tb, *ph, *sl, *menu; 801 Evas_Object *win, *bx, *tb, *ph, *sl, *menu;
844 Evas_Object *ph1, *ph2, *ph3, *ph4; 802 Evas_Object *ph1, *ph2, *ph3, *ph4;
845 Elm_Object_Item *item; 803 Elm_Object_Item *item;
846 Elm_Object_Item *menu_it; 804 Elm_Object_Item *menu_it;
847 char buf[PATH_MAX]; 805 char buf[PATH_MAX];
848 806
849 win = elm_win_add(NULL, "toolbar8", ELM_WIN_BASIC); 807 win = elm_win_util_standard_add("toolbar8", "Toolbar 8");
850 elm_win_title_set(win, "Toolbar 8");
851 elm_win_autodel_set(win, EINA_TRUE); 808 elm_win_autodel_set(win, EINA_TRUE);
852 809
853 bg = elm_bg_add(win);
854 elm_win_resize_object_add(win, bg);
855 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
856 evas_object_show(bg);
857
858 bx = elm_box_add(win); 810 bx = elm_box_add(win);
859 elm_win_resize_object_add(win, bx); 811 elm_win_resize_object_add(win, bx);
860 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 812 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c
index 1b51e263a..7d4cb97a2 100644
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -371,20 +371,13 @@ test_tooltip(void *data __UNUSED__,
371 Evas_Object *obj __UNUSED__, 371 Evas_Object *obj __UNUSED__,
372 void *event_info __UNUSED__) 372 void *event_info __UNUSED__)
373{ 373{
374 Evas_Object *win, *bg, *bx, *tb, *bt, *se, *lst; 374 Evas_Object *win, *bx, *tb, *bt, *se, *lst;
375 Elm_Object_Item *tb_it; 375 Elm_Object_Item *tb_it;
376 Elm_Object_Item *lit; 376 Elm_Object_Item *lit;
377 377
378 win = elm_win_add(NULL, "tooltip", ELM_WIN_BASIC); 378 win = elm_win_util_standard_add("tooltip", "Tooltip");
379 elm_win_title_set(win, "Tooltip");
380 elm_win_autodel_set(win, EINA_TRUE); 379 elm_win_autodel_set(win, EINA_TRUE);
381 380
382 bg = elm_bg_add(win);
383 elm_win_resize_object_add(win, bg);
384 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
385 EVAS_HINT_EXPAND);
386 evas_object_show(bg);
387
388 bx = elm_box_add(win); 381 bx = elm_box_add(win);
389 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 382 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND,
390 EVAS_HINT_EXPAND); 383 EVAS_HINT_EXPAND);
@@ -517,7 +510,7 @@ test_tooltip2(void *data __UNUSED__,
517 Evas_Object *obj __UNUSED__, 510 Evas_Object *obj __UNUSED__,
518 void *event_info __UNUSED__) 511 void *event_info __UNUSED__)
519{ 512{
520 Evas_Object *win, *bg, *bx, *grid, *gl; 513 Evas_Object *win, *bx, *grid, *gl;
521 Elm_Object_Item *glit1, *glit2, *glit3; 514 Elm_Object_Item *glit1, *glit2, *glit3;
522 static Testitem ti[144]; 515 static Testitem ti[144];
523 int i, n; 516 int i, n;
@@ -535,16 +528,9 @@ test_tooltip2(void *data __UNUSED__,
535 "wood_01.jpg", 528 "wood_01.jpg",
536 }; 529 };
537 530
538 win = elm_win_add(NULL, "tooltip2", ELM_WIN_BASIC); 531 win = elm_win_util_standard_add("tooltip2", "Tooltip 2");
539 elm_win_title_set(win, "Tooltip 2");
540 elm_win_autodel_set(win, EINA_TRUE); 532 elm_win_autodel_set(win, EINA_TRUE);
541 533
542 bg = elm_bg_add(win);
543 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
544 EVAS_HINT_EXPAND);
545 elm_win_resize_object_add(win, bg);
546 evas_object_show(bg);
547
548 bx = elm_box_add(win); 534 bx = elm_box_add(win);
549 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 535 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND,
550 EVAS_HINT_EXPAND); 536 EVAS_HINT_EXPAND);
diff --git a/src/bin/test_transit.c b/src/bin/test_transit.c
index 901d91171..7596d019c 100644
--- a/src/bin/test_transit.c
+++ b/src/bin/test_transit.c
@@ -236,18 +236,12 @@ _transit_resizable_flip(void *data, Evas_Object *obj, void *event_info __UNUSED_
236void 236void
237test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 237test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
238{ 238{
239 Evas_Object *win, *bg, *bx, *bt, *ic; 239 Evas_Object *win, *bx, *bt, *ic;
240 char buf[PATH_MAX]; 240 char buf[PATH_MAX];
241 241
242 win = elm_win_add(NULL, "transit", ELM_WIN_BASIC); 242 win = elm_win_util_standard_add("transit", "Transit");
243 elm_win_title_set(win, "Transit");
244 elm_win_autodel_set(win, EINA_TRUE); 243 elm_win_autodel_set(win, EINA_TRUE);
245 244
246 bg = elm_bg_add(win);
247 elm_win_resize_object_add(win, bg);
248 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
249 evas_object_show(bg);
250
251 bx = elm_box_add(win); 245 bx = elm_box_add(win);
252 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 246 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
253 elm_win_resize_object_add(win, bx); 247 elm_win_resize_object_add(win, bx);
@@ -287,17 +281,11 @@ test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
287void 281void
288test_transit2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 282test_transit2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
289{ 283{
290 Evas_Object *win, *bg, *bt; 284 Evas_Object *win, *bt;
291 285
292 win = elm_win_add(NULL, "transit2", ELM_WIN_BASIC); 286 win = elm_win_util_standard_add("transit2", "Transit 2");
293 elm_win_title_set(win, "Transit 2");
294 elm_win_autodel_set(win, EINA_TRUE); 287 elm_win_autodel_set(win, EINA_TRUE);
295 288
296 bg = elm_bg_add(win);
297 elm_win_resize_object_add(win, bg);
298 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
299 evas_object_show(bg);
300
301 bt = elm_button_add(win); 289 bt = elm_button_add(win);
302 elm_object_text_set(bt, "Resizing Effect"); 290 elm_object_text_set(bt, "Resizing Effect");
303 evas_object_show(bt); 291 evas_object_show(bt);
@@ -313,17 +301,11 @@ test_transit2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
313void 301void
314test_transit3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 302test_transit3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
315{ 303{
316 Evas_Object *win, *bg, *bt, *bt2; 304 Evas_Object *win, *bt, *bt2;
317 305
318 win = elm_win_add(NULL, "transit3", ELM_WIN_BASIC); 306 win = elm_win_util_standard_add("transit3", "Transit 3");
319 elm_win_title_set(win, "Transit 3");
320 elm_win_autodel_set(win, EINA_TRUE); 307 elm_win_autodel_set(win, EINA_TRUE);
321 308
322 bg = elm_bg_add(win);
323 elm_win_resize_object_add(win, bg);
324 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
325 evas_object_show(bg);
326
327 bt = elm_button_add(win); 309 bt = elm_button_add(win);
328 elm_object_text_set(bt, "Front Button - Flip Effect"); 310 elm_object_text_set(bt, "Front Button - Flip Effect");
329 evas_object_show(bt); 311 evas_object_show(bt);
@@ -346,17 +328,11 @@ test_transit3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
346void 328void
347test_transit4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 329test_transit4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
348{ 330{
349 Evas_Object *win, *bg, *bt; 331 Evas_Object *win, *bt;
350 332
351 win = elm_win_add(NULL, "transit4", ELM_WIN_BASIC); 333 win = elm_win_util_standard_add("transit4", "Transit 4");
352 elm_win_title_set(win, "Transit 4");
353 elm_win_autodel_set(win, EINA_TRUE); 334 elm_win_autodel_set(win, EINA_TRUE);
354 335
355 bg = elm_bg_add(win);
356 elm_win_resize_object_add(win, bg);
357 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
358 evas_object_show(bg);
359
360 bt = elm_button_add(win); 336 bt = elm_button_add(win);
361 elm_object_text_set(bt, "Zoom Effect"); 337 elm_object_text_set(bt, "Zoom Effect");
362 evas_object_resize(bt, 100, 50); 338 evas_object_resize(bt, 100, 50);
@@ -373,18 +349,12 @@ test_transit4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
373void 349void
374test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 350test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
375{ 351{
376 Evas_Object *win, *bg, *bt, *bt2, *ic; 352 Evas_Object *win, *bt, *bt2, *ic;
377 char buf[PATH_MAX]; 353 char buf[PATH_MAX];
378 354
379 win = elm_win_add(NULL, "transit5", ELM_WIN_BASIC); 355 win = elm_win_util_standard_add("transit5", "Transit 5");
380 elm_win_title_set(win, "Transit 5");
381 elm_win_autodel_set(win, EINA_TRUE); 356 elm_win_autodel_set(win, EINA_TRUE);
382 357
383 bg = elm_bg_add(win);
384 elm_win_resize_object_add(win, bg);
385 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
386 evas_object_show(bg);
387
388 ic = elm_icon_add(win); 358 ic = elm_icon_add(win);
389 snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get()); 359 snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get());
390 elm_icon_file_set(ic, buf, NULL); 360 elm_icon_file_set(ic, buf, NULL);
@@ -419,18 +389,12 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
419void 389void
420test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 390test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
421{ 391{
422 Evas_Object *win, *bg, *bt, *bt2, *ic; 392 Evas_Object *win, *bt, *bt2, *ic;
423 char buf[PATH_MAX]; 393 char buf[PATH_MAX];
424 394
425 win = elm_win_add(NULL, "transit6", ELM_WIN_BASIC); 395 win = elm_win_util_standard_add("transit6","Transit 6");
426 elm_win_title_set(win, "Transit 6");
427 elm_win_autodel_set(win, EINA_TRUE); 396 elm_win_autodel_set(win, EINA_TRUE);
428 397
429 bg = elm_bg_add(win);
430 elm_win_resize_object_add(win, bg);
431 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
432 evas_object_show(bg);
433
434 ic = elm_icon_add(win); 398 ic = elm_icon_add(win);
435 snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get()); 399 snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get());
436 elm_icon_file_set(ic, buf, NULL); 400 elm_icon_file_set(ic, buf, NULL);
@@ -465,17 +429,11 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
465void 429void
466test_transit7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 430test_transit7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
467{ 431{
468 Evas_Object *win, *bg, *bt, *bt2; 432 Evas_Object *win, *bt, *bt2;
469 433
470 win = elm_win_add(NULL, "transit7", ELM_WIN_BASIC); 434 win = elm_win_util_standard_add("transit7", "Transit 7");
471 elm_win_title_set(win, "Transit 7");
472 elm_win_autodel_set(win, EINA_TRUE); 435 elm_win_autodel_set(win, EINA_TRUE);
473 436
474 bg = elm_bg_add(win);
475 elm_win_resize_object_add(win, bg);
476 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
477 evas_object_show(bg);
478
479 bt = elm_button_add(win); 437 bt = elm_button_add(win);
480 elm_object_text_set(bt, "Front Button - Resizable Flip Effect"); 438 elm_object_text_set(bt, "Front Button - Resizable Flip Effect");
481 evas_object_show(bt); 439 evas_object_show(bt);
@@ -498,19 +456,13 @@ test_transit7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
498void 456void
499test_transit8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 457test_transit8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
500{ 458{
501 Evas_Object *win, *bg, *bt; 459 Evas_Object *win, *bt;
502 Elm_Transit *trans; 460 Elm_Transit *trans;
503 Elm_Transit_Effect *effect_context; 461 Elm_Transit_Effect *effect_context;
504 462
505 win = elm_win_add(NULL, "transit8", ELM_WIN_BASIC); 463 win = elm_win_util_standard_add("transit8", "Transit 8");
506 elm_win_title_set(win, "Transit 8");
507 elm_win_autodel_set(win, EINA_TRUE); 464 elm_win_autodel_set(win, EINA_TRUE);
508 465
509 bg = elm_bg_add(win);
510 elm_win_resize_object_add(win, bg);
511 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
512 evas_object_show(bg);
513
514 bt = elm_button_add(win); 466 bt = elm_button_add(win);
515 elm_object_text_set(bt, "Button - Custom Effect"); 467 elm_object_text_set(bt, "Button - Custom Effect");
516 evas_object_show(bt); 468 evas_object_show(bt);
@@ -538,18 +490,12 @@ test_transit8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
538void 490void
539test_transit9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 491test_transit9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
540{ 492{
541 Evas_Object *win, *bg, *bt, *bt2, *bt3, *bt4; 493 Evas_Object *win, *bt, *bt2, *bt3, *bt4;
542 Elm_Transit *trans, *trans2, *trans3, *trans4; 494 Elm_Transit *trans, *trans2, *trans3, *trans4;
543 495
544 win = elm_win_add(NULL, "transit9", ELM_WIN_BASIC); 496 win = elm_win_util_standard_add("transit9", "Transit 9");
545 elm_win_title_set(win, "Transit 9");
546 elm_win_autodel_set(win, EINA_TRUE); 497 elm_win_autodel_set(win, EINA_TRUE);
547 498
548 bg = elm_bg_add(win);
549 elm_win_resize_object_add(win, bg);
550 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
551 evas_object_show(bg);
552
553 bt = elm_button_add(win); 499 bt = elm_button_add(win);
554 elm_object_text_set(bt, "Chain 1"); 500 elm_object_text_set(bt, "Chain 1");
555 evas_object_resize(bt, 100, 100); 501 evas_object_resize(bt, 100, 100);
diff --git a/src/bin/test_weather.c b/src/bin/test_weather.c
index 893af3fe2..062a9a0c3 100644
--- a/src/bin/test_weather.c
+++ b/src/bin/test_weather.c
@@ -55,7 +55,7 @@ _hover_select_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
55void 55void
56test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 56test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
57{ 57{
58 Evas_Object *win, *bg; 58 Evas_Object *win;
59#ifdef HAVE_ELEMENTARY_EWEATHER 59#ifdef HAVE_ELEMENTARY_EWEATHER
60 Evas_Object *bx, *bx0, *bt; 60 Evas_Object *bx, *bx0, *bt;
61 EWeather *eweather; 61 EWeather *eweather;
@@ -65,15 +65,9 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
65 unsigned int i; 65 unsigned int i;
66#endif 66#endif
67 67
68 win = elm_win_add(NULL, "weather", ELM_WIN_BASIC); 68 win = elm_win_util_standard_add("weather", "Weather");
69 elm_win_title_set(win, "Weather");
70 elm_win_autodel_set(win, EINA_TRUE); 69 elm_win_autodel_set(win, EINA_TRUE);
71 70
72 bg = elm_bg_add(win);
73 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
74 elm_win_resize_object_add(win, bg);
75 evas_object_show(bg);
76
77#ifdef HAVE_ELEMENTARY_EWEATHER 71#ifdef HAVE_ELEMENTARY_EWEATHER
78 bx = elm_box_add(win); 72 bx = elm_box_add(win);
79 elm_win_resize_object_add(win, bx); 73 elm_win_resize_object_add(win, bx);
diff --git a/src/bin/test_web.c b/src/bin/test_web.c
index 138063791..32c533f96 100644
--- a/src/bin/test_web.c
+++ b/src/bin/test_web.c
@@ -90,18 +90,13 @@ static Evas_Object *
90_new_window_hook(void *data, Evas_Object *obj __UNUSED__, Eina_Bool js __UNUSED__, const Elm_Web_Window_Features *wf __UNUSED__) 90_new_window_hook(void *data, Evas_Object *obj __UNUSED__, Eina_Bool js __UNUSED__, const Elm_Web_Window_Features *wf __UNUSED__)
91{ 91{
92 Web_Test *wt = data; 92 Web_Test *wt = data;
93 Evas_Object *new_win, *new_web, *bg; 93 Evas_Object *new_win, *new_web;
94 94
95 new_win = elm_win_add(NULL, "elm-web-test-popup", ELM_WIN_BASIC); 95 new_win = elm_win_util_standard_add("elm-web-test-popup", "Elm Web Test Popup");
96 elm_win_autodel_set(new_win, EINA_TRUE); 96 elm_win_autodel_set(new_win, EINA_TRUE);
97 evas_object_resize(new_win, 300, 300); 97 evas_object_resize(new_win, 300, 300);
98 evas_object_show(new_win); 98 evas_object_show(new_win);
99 99
100 bg = elm_bg_add(new_win);
101 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
102 elm_win_resize_object_add(new_win, bg);
103 evas_object_show(bg);
104
105 new_web = elm_web_add(new_win); 100 new_web = elm_web_add(new_win);
106 elm_web_useragent_set(new_web, wt->user_agent); 101 elm_web_useragent_set(new_web, wt->user_agent);
107 evas_object_size_hint_weight_set(new_web, EVAS_HINT_EXPAND, 102 evas_object_size_hint_weight_set(new_web, EVAS_HINT_EXPAND,
@@ -338,33 +333,26 @@ test_web(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
338{ 333{
339 const char user_agent_firefox[] = "Mozilla/5.0 (X11; Linux x86_64; rv:9.0.1) Gecko/20100101 Firefox/9.0.1"; 334 const char user_agent_firefox[] = "Mozilla/5.0 (X11; Linux x86_64; rv:9.0.1) Gecko/20100101 Firefox/9.0.1";
340 const char user_agent_mobile[] = "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3"; 335 const char user_agent_mobile[] = "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3";
341 Evas_Object *win, *bg, *bx, *bx2, *bt, *web, *url; 336 Evas_Object *win, *bx, *bx2, *bt, *web, *url;
342 Web_Test *wt; 337 Web_Test *wt;
343 338
344 elm_need_web(); 339 elm_need_web();
345 340
346 wt = calloc(1, sizeof(*wt)); 341 wt = calloc(1, sizeof(*wt));
347 342
348 win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
349
350 if (mobile == EINA_TRUE) 343 if (mobile == EINA_TRUE)
351 { 344 {
352 wt->user_agent = user_agent_mobile; 345 win = elm_win_util_standard_add("web-mobile", "Web Mobile");
353 elm_win_title_set(win, "Web-mobile"); 346 wt->user_agent = user_agent_mobile;
354 } 347 }
355 else 348 else
356 { 349 {
357 wt->user_agent = user_agent_firefox; 350 win = elm_win_util_standard_add("web", "Web");
358 elm_win_title_set(win, "Web"); 351 wt->user_agent = user_agent_firefox;
359 } 352 }
360 353
361 elm_win_autodel_set(win, EINA_TRUE); 354 elm_win_autodel_set(win, EINA_TRUE);
362 355
363 bg = elm_bg_add(win);
364 elm_win_resize_object_add(win, bg);
365 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
366 evas_object_show(bg);
367
368 bx = elm_box_add(win); 356 bx = elm_box_add(win);
369 elm_win_resize_object_add(win, bx); 357 elm_win_resize_object_add(win, bx);
370 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 358 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/bin/test_win_socket.c b/src/bin/test_win_socket.c
index d8b87ba06..223bb57d2 100644
--- a/src/bin/test_win_socket.c
+++ b/src/bin/test_win_socket.c
@@ -144,19 +144,13 @@ fill(Evas_Object *win, Eina_Bool do_bg)
144void 144void
145test_win_socket(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 145test_win_socket(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
146{ 146{
147 Evas_Object *win, *bg, *bx, *lb; 147 Evas_Object *win, *bx, *lb;
148 Evas_Object *win_socket; 148 Evas_Object *win_socket;
149 149
150 /* for socket info window */ 150 /* for socket info window */
151 win = elm_win_add(NULL, "label", ELM_WIN_BASIC); 151 win = elm_win_util_standard_add("win-socket", "Win Socket");
152 elm_win_title_set(win, "Label");
153 elm_win_autodel_set(win, EINA_TRUE); 152 elm_win_autodel_set(win, EINA_TRUE);
154 153
155 bg = elm_bg_add(win);
156 elm_win_resize_object_add(win, bg);
157 evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
158 evas_object_show(bg);
159
160 bx = elm_box_add(win); 154 bx = elm_box_add(win);
161 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 155 evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
162 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); 156 evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);