seoz pushed a commit to branch master.
commit b927171ba2205fce75e95ea696c69bd20c70c885
Author: Daniel Juyung Seo <[email protected]>
Date: Wed Jun 26 19:11:21 2013 +0900
examples: refactoring. use elm_win_util_standard_add() for normal cases.
season 4.
now it's done :)
---
src/examples/scroller_example_01.c | 11 +++--------
src/examples/segment_control_example.c | 10 ++--------
src/examples/separator_example_01.c | 10 +++-------
src/examples/slider_example.c | 10 ++--------
src/examples/slideshow_example.c | 11 ++---------
src/examples/spinner_example.c | 10 ++--------
src/examples/table_example_01.c | 10 +++-------
src/examples/table_example_02.c | 10 +++-------
src/examples/theme_example_01.c | 9 ++-------
src/examples/theme_example_02.c | 9 ++-------
src/examples/thumb_example_01.c | 11 +++--------
src/examples/toolbar_example_01.c | 10 ++--------
src/examples/toolbar_example_02.c | 10 ++--------
src/examples/toolbar_example_03.c | 10 ++--------
src/examples/transit_example_01.c | 11 ++---------
src/examples/transit_example_02.c | 13 ++++---------
src/examples/transit_example_03.c | 12 ++----------
src/examples/transit_example_04.c | 12 ++----------
src/examples/web_example_02.c | 9 ++-------
src/examples/win_example.c | 19 ++++---------------
20 files changed, 49 insertions(+), 168 deletions(-)
diff --git a/src/examples/scroller_example_01.c
b/src/examples/scroller_example_01.c
index 5a26488..e5f81d0 100644
--- a/src/examples/scroller_example_01.c
+++ b/src/examples/scroller_example_01.c
@@ -106,17 +106,12 @@ static const char *text = "Lorem ipsum dolor sit amet,
consectetur adipiscing el
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *label, *scroller;
+ Evas_Object *win, *label, *scroller;
- win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
- elm_win_title_set(win, "Scroller");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("scroller", "Scroller");
+ elm_win_autodel_set(win, EINA_TRUE);
label = elm_label_add(win);
elm_object_text_set(label, text);
diff --git a/src/examples/segment_control_example.c
b/src/examples/segment_control_example.c
index 6a33916..7680eaa 100644
--- a/src/examples/segment_control_example.c
+++ b/src/examples/segment_control_example.c
@@ -14,21 +14,15 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *sc, *ic;
+ Evas_Object *win, *sc, *ic;
Elm_Object_Item *seg_it;
int count, idx;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "segment_control", ELM_WIN_BASIC);
- elm_win_title_set(win, "Segment Control Example");
+ win = elm_win_util_standard_add("segment_control", "Segment Control
Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
sc = elm_segment_control_add(win);
evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, sc);
diff --git a/src/examples/separator_example_01.c
b/src/examples/separator_example_01.c
index 344784d..6d3576b 100644
--- a/src/examples/separator_example_01.c
+++ b/src/examples/separator_example_01.c
@@ -6,16 +6,12 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *rect, *separator;
+ Evas_Object *win, *bx, *rect, *separator;
- win = elm_win_add(NULL, "separator", ELM_WIN_BASIC);
- elm_win_title_set(win, "Separator");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("separator", "Separator");
+ elm_win_autodel_set(win, EINA_TRUE);
bx = elm_box_add(win);
elm_box_horizontal_set(bx, EINA_TRUE);
diff --git a/src/examples/slider_example.c b/src/examples/slider_example.c
index 4a0f3af..0ad833a 100644
--- a/src/examples/slider_example.c
+++ b/src/examples/slider_example.c
@@ -42,19 +42,13 @@ _indicator_free(char *str)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *sl, *ic;
+ Evas_Object *win, *bx, *sl, *ic;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
- elm_win_title_set(win, "Slider Example");
+ win = elm_win_util_standard_add("slider", "Slider Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, bx);
diff --git a/src/examples/slideshow_example.c b/src/examples/slideshow_example.c
index bc1ebe3..5f535f8 100644
--- a/src/examples/slideshow_example.c
+++ b/src/examples/slideshow_example.c
@@ -161,7 +161,7 @@ EAPI_MAIN int
elm_main(int argc,
char **argv)
{
- Evas_Object *win, *bg, *notify, *bx, *bt, *hv, *spin;
+ Evas_Object *win, *notify, *bx, *bt, *hv, *spin;
Elm_Object_Item *slide_first, *slide_last, *slide_it;
const char *transition, *layout;
const Eina_List *l, *list;
@@ -181,18 +181,11 @@ elm_main(int argc,
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
- elm_win_title_set(win, "Slideshow example");
+ win = elm_win_util_standard_add("slideshow", "Slideshow example");
elm_win_autodel_set(win, EINA_TRUE);
- elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
evas_object_resize(win, 600, 400);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
slideshow = elm_slideshow_add(win);
elm_slideshow_loop_set(slideshow, EINA_TRUE);
evas_object_size_hint_weight_set(slideshow,
diff --git a/src/examples/spinner_example.c b/src/examples/spinner_example.c
index bad1772..ae6da48 100644
--- a/src/examples/spinner_example.c
+++ b/src/examples/spinner_example.c
@@ -26,19 +26,13 @@ _delay_changed_cb(void *data, Evas_Object *obj, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *sp;
+ Evas_Object *win, *bx, *sp;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
- elm_win_title_set(win, "Spinner Example");
+ win = elm_win_util_standard_add("spinner", "Spinner Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, bx);
diff --git a/src/examples/table_example_01.c b/src/examples/table_example_01.c
index 16d6036..5c9756c 100644
--- a/src/examples/table_example_01.c
+++ b/src/examples/table_example_01.c
@@ -6,16 +6,12 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *label, *table;
+ Evas_Object *win, *label, *table;
- win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
- elm_win_title_set(win, "Table");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("table", "Table");
+ elm_win_autodel_set(win, EINA_TRUE);
table = elm_table_add(win);
elm_win_resize_object_add(win, table);
diff --git a/src/examples/table_example_02.c b/src/examples/table_example_02.c
index d466fe8..6a37489 100644
--- a/src/examples/table_example_02.c
+++ b/src/examples/table_example_02.c
@@ -6,16 +6,12 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *rect, *table;
+ Evas_Object *win, *rect, *table;
- win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
- elm_win_title_set(win, "Table");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("table", "Table");
+ elm_win_autodel_set(win, EINA_TRUE);
table = elm_table_add(win);
elm_win_resize_object_add(win, table);
diff --git a/src/examples/theme_example_01.c b/src/examples/theme_example_01.c
index e848297..b8013d3 100644
--- a/src/examples/theme_example_01.c
+++ b/src/examples/theme_example_01.c
@@ -37,22 +37,17 @@ btn_style_click_cb(void *data, Evas_Object *btn, void *ev)
EAPI_MAIN int
elm_main(int argc, char *argv[])
{
- Evas_Object *win, *bg, *box, *btn;
+ Evas_Object *win, *box, *btn;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_theme_extension_add(NULL, "./theme_example.edj");
- win = elm_win_add(NULL, "Theme example", ELM_WIN_BASIC);
+ win = elm_win_util_standard_add("theme", "Theme example");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 300, 320);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, box);
diff --git a/src/examples/theme_example_02.c b/src/examples/theme_example_02.c
index acab9d7..d66c0db 100644
--- a/src/examples/theme_example_02.c
+++ b/src/examples/theme_example_02.c
@@ -17,22 +17,17 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *ev)
EAPI_MAIN int
elm_main(int argc, char *argv[])
{
- Evas_Object *win, *bg, *box, *btn;
+ Evas_Object *win, *box, *btn;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_theme_overlay_add(NULL, "./theme_example.edj");
- win = elm_win_add(NULL, "Theme example", ELM_WIN_BASIC);
+ win = elm_win_util_standard_add("theme", "Theme example");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 300, 320);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, box);
diff --git a/src/examples/thumb_example_01.c b/src/examples/thumb_example_01.c
index 532966e..f8d3b23 100644
--- a/src/examples/thumb_example_01.c
+++ b/src/examples/thumb_example_01.c
@@ -24,7 +24,7 @@ _generation_error_cb(void *data, Evas_Object *o, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg;
+ Evas_Object *win;
Evas_Object *thumb;
char buf[PATH_MAX];
#ifdef ELM_ETHUMB
@@ -34,15 +34,10 @@ elm_main(int argc, char **argv)
elm_need_ethumb();
elm_app_info_set(elm_main, "elementary", "images/plant_01.jpg");
- win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
- elm_win_title_set(win, "Thumbnailer");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("thumb", "Thumbnailer");
+ elm_win_autodel_set(win, EINA_TRUE);
#ifdef ELM_ETHUMB
client = elm_thumb_ethumb_client_get();
diff --git a/src/examples/toolbar_example_01.c
b/src/examples/toolbar_example_01.c
index cf0c740..aa38703 100644
--- a/src/examples/toolbar_example_01.c
+++ b/src/examples/toolbar_example_01.c
@@ -36,20 +36,14 @@ _item_3_pressed(void *data, Evas_Object *obj, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *tb, *bt;
+ Evas_Object *win, *bx, *tb, *bt;
Elm_Object_Item *tb_it;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
- elm_win_title_set(win, "Toolbar Example");
+ win = elm_win_util_standard_add("toolbar", "Toolbar Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
bx = elm_box_add(win);
elm_win_resize_object_add(win, bx);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/toolbar_example_02.c
b/src/examples/toolbar_example_02.c
index b535ffe..dea8ec7 100644
--- a/src/examples/toolbar_example_02.c
+++ b/src/examples/toolbar_example_02.c
@@ -22,20 +22,14 @@ _item_pressed(void *data, Evas_Object *obj, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *tb, *bt;
+ Evas_Object *win, *bx, *tb, *bt;
Elm_Object_Item *tb_it;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
- elm_win_title_set(win, "Toolbar Example");
+ win = elm_win_util_standard_add("toolbar", "Toolbar Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
bx = elm_box_add(win);
elm_win_resize_object_add(win, bx);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/toolbar_example_03.c
b/src/examples/toolbar_example_03.c
index 58ed132..b15b73c 100644
--- a/src/examples/toolbar_example_03.c
+++ b/src/examples/toolbar_example_03.c
@@ -14,20 +14,14 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *tb, *bt, *menu;
+ Evas_Object *win, *bx, *tb, *bt, *menu;
Elm_Object_Item *tb_it;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
- elm_win_title_set(win, "Toolbar Example");
+ win = elm_win_util_standard_add("toolbar", "Toolbar Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
bx = elm_box_add(win);
elm_win_resize_object_add(win, bx);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/transit_example_01.c
b/src/examples/transit_example_01.c
index 2ad231d..d7065e1 100644
--- a/src/examples/transit_example_01.c
+++ b/src/examples/transit_example_01.c
@@ -6,22 +6,15 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bt;
+ Evas_Object *win, *bt;
Elm_Transit *trans;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "transit-basic", ELM_WIN_BASIC);
- elm_win_title_set(win, "Transit - Basic");
+ win = elm_win_util_standard_add("transit-basic", "Transit - Basic");
elm_win_autodel_set(win, EINA_TRUE);
- elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
evas_object_resize(win, 400, 400);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
bt = elm_button_add(win);
elm_object_text_set(bt, "Resizing Effect");
evas_object_show(bt);
diff --git a/src/examples/transit_example_02.c
b/src/examples/transit_example_02.c
index c00e83a..7c34e13 100644
--- a/src/examples/transit_example_02.c
+++ b/src/examples/transit_example_02.c
@@ -6,21 +6,16 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bt, *bt2, *bt3, *bt4;
+ Evas_Object *win, *bt, *bt2, *bt3, *bt4;
Elm_Transit *trans, *trans2, *trans3, *trans4;
- win = elm_win_add(NULL, "transit9", ELM_WIN_BASIC);
- elm_win_title_set(win, "Transit 9");
+ elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
+
+ win = elm_win_util_standard_add("transit9", "Transit 9");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 400, 400);
- elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
bt = elm_button_add(win);
elm_object_text_set(bt, "Chain 1");
evas_object_resize(bt, 100, 100);
diff --git a/src/examples/transit_example_03.c
b/src/examples/transit_example_03.c
index bd8150c..45bcb0a 100644
--- a/src/examples/transit_example_03.c
+++ b/src/examples/transit_example_03.c
@@ -166,7 +166,7 @@ _cb_tween_changed(void *data, Evas_Object *obj, void *event)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *vbox2, *hbox, *btn;
+ Evas_Object *win, *obj, *icon, *box, *vbox, *vbox2, *hbox, *btn;
Evas_Object *cbox, *dummy, *spinner;
char buf[PATH_MAX];
int i;
@@ -183,17 +183,9 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
/* add a window */
- win = elm_win_add(NULL, "transit", ELM_WIN_BASIC);
- elm_win_title_set(win, "Transit Example");
+ win = elm_win_util_standard_add("transit", "Transit Example");
elm_win_autodel_set(win, EINA_TRUE);
- /* add a scalable white background to this window */
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255, 255, 255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
/* add a vertical box that will hold everything */
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/transit_example_04.c
b/src/examples/transit_example_04.c
index 58214db..ee91531 100644
--- a/src/examples/transit_example_04.c
+++ b/src/examples/transit_example_04.c
@@ -81,7 +81,7 @@ _transit_start(void *data, Evas_Object *o, void *event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *btn, *dummy;
+ Evas_Object *win, *obj, *icon, *box, *vbox, *btn, *dummy;
Eina_List *objs = NULL;
char buf[PATH_MAX];
int i;
@@ -90,17 +90,9 @@ elm_main(int argc, char **argv)
elm_app_info_set(elm_main, "elementary", "images/icon_07.png");
/* add a window */
- win = elm_win_add(NULL, "transit", ELM_WIN_BASIC);
- elm_win_title_set(win, "Transit Example");
+ win = elm_win_util_standard_add("transit", "Transit Example");
elm_win_autodel_set(win, EINA_TRUE);
- /* add a scalable white background to this window */
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255, 255, 255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/examples/web_example_02.c b/src/examples/web_example_02.c
index ec5f10c..461e7f5 100644
--- a/src/examples/web_example_02.c
+++ b/src/examples/web_example_02.c
@@ -462,7 +462,7 @@ default_content_set(Evas_Object *web)
EAPI_MAIN int
elm_main(int argc, char *argv[])
{
- Evas_Object *win, *bg, *box, *box2, *btn, *ic, *url_bar, *naviframe, *tabs,
*web;
+ Evas_Object *win, *box, *box2, *btn, *ic, *url_bar, *naviframe, *tabs, *web;
Evas *e;
Evas_Modifier_Mask ctrl_mask;
App_Data *ad;
@@ -475,7 +475,7 @@ elm_main(int argc, char *argv[])
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "example-web", ELM_WIN_BASIC);
+ win = elm_win_util_standard_add("example-web", "Web Example");
elm_win_autodel_set(win, EINA_TRUE);
e = evas_object_evas_get(win);
@@ -489,11 +489,6 @@ elm_main(int argc, char *argv[])
_win_search_trigger_cb, ad);
evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _win_free_cb, ad);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, box);
diff --git a/src/examples/win_example.c b/src/examples/win_example.c
index 5500cf4..b88e1e2 100644
--- a/src/examples/win_example.c
+++ b/src/examples/win_example.c
@@ -171,12 +171,12 @@ _win_focused_cb(void *data, Evas_Object *obj, void *event)
EAPI_MAIN int
elm_main(int argc, char *argv[])
{
- Evas_Object *win, *win2, *bg, *bigbox, *box, *btn, *o;
+ Evas_Object *win, *win2, *bigbox, *box, *btn, *o;
char buf[256];
elm_app_info_set(elm_main, "elementary", "images/logo.png");
- win = elm_win_add(NULL, "win-example", ELM_WIN_BASIC);
- elm_win_title_set(win, "Elm_Win Example");
+
+ win = elm_win_util_standard_add("win-example", "Elm_Win Example");
elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
evas_object_resize(win, 400, 400);
evas_object_show(win);
@@ -186,11 +186,6 @@ elm_main(int argc, char *argv[])
evas_object_smart_callback_add(win, "delete,request", _main_win_del_cb,
NULL);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
bigbox = elm_box_add(win);
elm_box_horizontal_set(bigbox, EINA_TRUE);
evas_object_size_hint_weight_set(bigbox, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
@@ -251,20 +246,14 @@ elm_main(int argc, char *argv[])
elm_box_pack_end(bigbox, box);
evas_object_show(box);
- win2 = elm_win_add(NULL, "sub-win-example2", ELM_WIN_BASIC);
+ win2 = elm_win_util_standard_add("sub-win-example2", "Non-managed window");
elm_win_autodel_set(win2, EINA_TRUE);
- elm_win_title_set(win2, "Non-managed window");
elm_win_override_set(win2, EINA_TRUE);
evas_object_show(win2);
evas_object_smart_callback_add(win2, "focus,in", _win_focused_cb,
"override");
- o = elm_bg_add(win2);
- evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win2, o);
- evas_object_show(o);
-
bigbox = elm_box_add(win2);
evas_object_size_hint_weight_set(bigbox, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
elm_win_resize_object_add(win2, bigbox);
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
