seoz pushed a commit to branch master.
commit 38aebc64b8793ccba60ebd6f8a18365ab9d4a2c7
Author: Daniel Juyung Seo <[email protected]>
Date: Wed Jun 26 15:34:38 2013 +0900
examples: refactoring. use elm_win_util_standard_add() for normal cases.
season 2.
---
src/examples/efl_thread_6.c | 13 ++++---------
src/examples/efl_thread_win32_1.c | 13 ++++---------
src/examples/efl_thread_win32_2.c | 13 ++++---------
src/examples/efl_thread_win32_3.c | 13 ++++---------
src/examples/efl_thread_win32_4.c | 13 ++++---------
src/examples/entry_example.c | 10 ++--------
src/examples/fileselector_button_example.c | 10 ++--------
src/examples/fileselector_entry_example.c | 10 ++--------
src/examples/fileselector_example.c | 10 ++--------
src/examples/flip_example_01.c | 11 +++--------
src/examples/flipselector_example.c | 10 ++--------
src/examples/frame_example_01.c | 11 +++--------
src/examples/general_funcs_example.c | 11 +++--------
src/examples/gengrid_example.c | 11 ++---------
src/examples/glview_example_01.c | 11 +++--------
src/examples/hover_example_01.c | 11 +++--------
src/examples/hoversel_example_01.c | 13 ++++---------
src/examples/icon_example_01.c | 12 +++---------
src/examples/image_example_01.c | 12 +++---------
src/examples/index_example_01.c | 10 ++--------
src/examples/index_example_02.c | 10 ++--------
src/examples/inwin_example.c | 11 +++--------
src/examples/label_example_01.c | 11 +++--------
src/examples/layout_example_01.c | 11 +++--------
src/examples/layout_example_02.c | 12 +++---------
25 files changed, 73 insertions(+), 210 deletions(-)
diff --git a/src/examples/efl_thread_6.c b/src/examples/efl_thread_6.c
index 24b7c35..e5a4510 100644
--- a/src/examples/efl_thread_6.c
+++ b/src/examples/efl_thread_6.c
@@ -120,21 +120,16 @@ anim(void *data)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *o, *bg;
+ Evas_Object *o;
int i;
- win = elm_win_add(NULL, "efl-thread-6", ELM_WIN_BASIC);
- elm_win_title_set(win, "EFL Thread 6");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
+
+ win = elm_win_util_standard_add("efl-thread-6", "EFL Thread 6");
+ elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 400, 400);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
// queue up 64 mandel generation thread jobs
for (i = 0; i < 64; i++)
{
diff --git a/src/examples/efl_thread_win32_1.c
b/src/examples/efl_thread_win32_1.c
index 7c8df4d..5cf4990 100644
--- a/src/examples/efl_thread_win32_1.c
+++ b/src/examples/efl_thread_win32_1.c
@@ -53,20 +53,15 @@ my_thread_new(void)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *o, *bg;
+ Evas_Object *o;
- win = elm_win_add(NULL, "efl-thread-1", ELM_WIN_BASIC);
- elm_win_title_set(win, "EFL Thread 1");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
+
+ win = elm_win_util_standard_add("efl-thread-1", "EFL Thread 1");
+ elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 400, 400);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
o = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(o, 50, 80, 180, 255);
evas_object_resize(o, 100, 100);
diff --git a/src/examples/efl_thread_win32_2.c
b/src/examples/efl_thread_win32_2.c
index 81820eb..b708409 100644
--- a/src/examples/efl_thread_win32_2.c
+++ b/src/examples/efl_thread_win32_2.c
@@ -69,20 +69,15 @@ my_thread_mainloop_code(void *data)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *o, *bg;
+ Evas_Object *o;
- win = elm_win_add(NULL, "efl-thread-2", ELM_WIN_BASIC);
- elm_win_title_set(win, "EFL Thread 2");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
+
+ win = elm_win_util_standard_add("efl-thread-2", "EFL Thread 2");
+ elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 400, 400);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
o = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(o, 50, 80, 180, 255);
evas_object_resize(o, 100, 100);
diff --git a/src/examples/efl_thread_win32_3.c
b/src/examples/efl_thread_win32_3.c
index d1593a8..c8133cb 100644
--- a/src/examples/efl_thread_win32_3.c
+++ b/src/examples/efl_thread_win32_3.c
@@ -71,20 +71,15 @@ my_thread_mainloop_code(void *data)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *o, *bg;
+ Evas_Object *o;
- win = elm_win_add(NULL, "efl-thread-3", ELM_WIN_BASIC);
- elm_win_title_set(win, "EFL Thread 3");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
+
+ win = elm_win_util_standard_add("efl-thread-3", "EFL Thread 3");
+ elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 400, 400);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
o = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(o, 50, 80, 180, 255);
evas_object_resize(o, 100, 100);
diff --git a/src/examples/efl_thread_win32_4.c
b/src/examples/efl_thread_win32_4.c
index 83a8876..70299c9 100644
--- a/src/examples/efl_thread_win32_4.c
+++ b/src/examples/efl_thread_win32_4.c
@@ -92,20 +92,15 @@ down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *o, *bg;
+ Evas_Object *o;
- win = elm_win_add(NULL, "efl-thread-4", ELM_WIN_BASIC);
- elm_win_title_set(win, "EFL Thread 4");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
+
+ win = elm_win_util_standard_add("efl-thread-4", "EFL Thread 4");
+ elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 400, 400);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
o = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(o, 50, 80, 180, 255);
evas_object_resize(o, 100, 100);
diff --git a/src/examples/entry_example.c b/src/examples/entry_example.c
index 027b7ee..b76eb41 100644
--- a/src/examples/entry_example.c
+++ b/src/examples/entry_example.c
@@ -489,23 +489,17 @@ _edit_tplclick_cb(void *data, Evas_Object *obj, void
*event)
EAPI_MAIN int
elm_main(int argc, char *argv[])
{
- Evas_Object *win, *bg, *box, *tb, *en, *o, *icon;
+ Evas_Object *win, *box, *tb, *en, *o, *icon;
App_Data app;
memset(&app, 0, sizeof(app));
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "entry-example", ELM_WIN_BASIC);
- elm_win_title_set(win, "Emacs Lite");
+ win = elm_win_util_standard_add("entry-example", "Emacs Lite");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, box);
diff --git a/src/examples/fileselector_button_example.c
b/src/examples/fileselector_button_example.c
index cfa98ab..359dcf0 100644
--- a/src/examples/fileselector_button_example.c
+++ b/src/examples/fileselector_button_example.c
@@ -81,19 +81,13 @@ EAPI_MAIN int
elm_main(int argc,
char **argv)
{
- Evas_Object *win, *bg, *vbox, *hbox, *ic, *ck, *fs_bt, *en, *lb, *sep;
+ Evas_Object *win, *vbox, *hbox, *ic, *ck, *fs_bt, *en, *lb, *sep;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "fileselector-button", ELM_WIN_BASIC);
- elm_win_title_set(win, "File Selector Button Example");
+ win = elm_win_util_standard_add("fileselector-button", "File Selector
Button Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
vbox = elm_box_add(win);
elm_win_resize_object_add(win, vbox);
evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/fileselector_entry_example.c
b/src/examples/fileselector_entry_example.c
index 390b2a2..a04354f 100644
--- a/src/examples/fileselector_entry_example.c
+++ b/src/examples/fileselector_entry_example.c
@@ -79,19 +79,13 @@ EAPI_MAIN int
elm_main(int argc,
char **argv)
{
- Evas_Object *win, *bg, *vbox, *hbox, *ic, *ck, *fs_entry, *sep;
+ Evas_Object *win, *vbox, *hbox, *ic, *ck, *fs_entry, *sep;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "fileselector-entry", ELM_WIN_BASIC);
- elm_win_title_set(win, "File Selector Entry Example");
+ win = elm_win_util_standard_add("fileselector-entry", "File Selector Entry
Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
vbox = elm_box_add(win);
elm_win_resize_object_add(win, vbox);
evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/fileselector_example.c
b/src/examples/fileselector_example.c
index e02e3f1..b5cab2d 100644
--- a/src/examples/fileselector_example.c
+++ b/src/examples/fileselector_example.c
@@ -104,7 +104,7 @@ EAPI_MAIN int
elm_main(int argc,
char **argv)
{
- Evas_Object *win, *fs, *bg, *vbox, *buttons_bx, *bt, *sep, *bx;
+ Evas_Object *win, *fs, *vbox, *buttons_bx, *bt, *sep, *bx;
/* Set the locale according to the system pref. If you dont do so
* the file selector will order the files list in a case sensitive
@@ -115,15 +115,9 @@ elm_main(int argc,
elm_need_ethumb(); /* let's have thumbnails of images on grid view */
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
- elm_win_title_set(win, "File Selector Example");
+ win = elm_win_util_standard_add("fileselector", "File Selector Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
bx = elm_box_add(win);
elm_win_resize_object_add(win, bx);
elm_box_horizontal_set(bx, EINA_TRUE);
diff --git a/src/examples/flip_example_01.c b/src/examples/flip_example_01.c
index 41a0ef6..73e762f 100644
--- a/src/examples/flip_example_01.c
+++ b/src/examples/flip_example_01.c
@@ -8,17 +8,12 @@ static void _change_interaction(void *data, Evas_Object *obj,
void *event_info);
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *rect, *rect2, *flip, *radio, *radio2, *radio3;
+ Evas_Object *win, *rect, *rect2, *flip, *radio, *radio2, *radio3;
- win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
- elm_win_title_set(win, "Flip");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("flip", "Flip");
+ elm_win_autodel_set(win, EINA_TRUE);
rect = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_resize(rect, 150, 150);
diff --git a/src/examples/flipselector_example.c
b/src/examples/flipselector_example.c
index 895b43d..79fa15a 100644
--- a/src/examples/flipselector_example.c
+++ b/src/examples/flipselector_example.c
@@ -137,7 +137,7 @@ EAPI_MAIN int
elm_main(int argc, char **argv)
{
unsigned int i;
- Evas_Object *win, *bg, *bx, *fp, *bt;
+ Evas_Object *win, *bx, *fp, *bt;
static const char *lbl[] =
{
"Elementary",
@@ -152,15 +152,9 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
- elm_win_title_set(win, "Flip Selector Example");
+ win = elm_win_util_standard_add("flipselector", "Flip Selector Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, bx);
diff --git a/src/examples/frame_example_01.c b/src/examples/frame_example_01.c
index ed862b9..c697806 100644
--- a/src/examples/frame_example_01.c
+++ b/src/examples/frame_example_01.c
@@ -6,18 +6,13 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg;
+ Evas_Object *win;
Evas_Object *f1, *r1, *f2, *r2, *f3, *r3, *f4, *r4;
- win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
- elm_win_title_set(win, "Frame");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("frame", "Frame");
+ elm_win_autodel_set(win, EINA_TRUE);
r1 = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(r1, 255, 0, 0, 255);
diff --git a/src/examples/general_funcs_example.c
b/src/examples/general_funcs_example.c
index 568e91a..77fa48a 100644
--- a/src/examples/general_funcs_example.c
+++ b/src/examples/general_funcs_example.c
@@ -67,7 +67,7 @@ EAPI_MAIN int
elm_main(int argc,
char **argv)
{
- Evas_Object *win, *bg, *box, *frame, *check, *b, *slider;
+ Evas_Object *win, *box, *frame, *check, *b, *slider;
/* tell elm about our app so it can figure out where to get files */
elm_app_compile_bin_dir_set(BIN_DIR);
@@ -80,8 +80,8 @@ elm_main(int argc,
fprintf(stdout, "library directory is: %s\n", elm_app_lib_dir_get());
fprintf(stdout, "locale directory is: %s\n", elm_app_locale_dir_get());
- win = elm_win_add(NULL, "top-level-funcs-example", ELM_WIN_BASIC);
- elm_win_title_set(win, "Elementary Top-level Functions Example");
+ win = elm_win_util_standard_add("top-level-funcs-example",
+ "Elementary Top-level Functions Example");
/* by using this policy value, we avoid having to
* evas_object_smart_callback_add(win, "delete,request", _on_exit, NULL),
@@ -90,11 +90,6 @@ elm_main(int argc,
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
/* outer box */
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/gengrid_example.c b/src/examples/gengrid_example.c
index ab8d64e..6ec2e59 100644
--- a/src/examples/gengrid_example.c
+++ b/src/examples/gengrid_example.c
@@ -415,8 +415,7 @@ EAPI_MAIN int
elm_main(int argc,
char **argv)
{
- Evas_Object *win, *bg, *grid, *bx, *hbx_1, *hbx_2, *hbx_3, *bt, *ck, *sl,
- *sp;
+ Evas_Object *win, *grid, *bx, *hbx_1, *hbx_2, *hbx_3, *bt, *ck, *sl, *sp;
Eina_Bool bounce;
double h, v;
@@ -425,15 +424,9 @@ elm_main(int argc,
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_app_info_set(elm_main, "elementary", "images");
- win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
- elm_win_title_set(win, "Generic Grid Example");
+ win = elm_win_util_standard_add("gengrid", "Generic Grid Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, bx);
diff --git a/src/examples/glview_example_01.c b/src/examples/glview_example_01.c
index 00af06d..3fa2c02 100644
--- a/src/examples/glview_example_01.c
+++ b/src/examples/glview_example_01.c
@@ -244,7 +244,7 @@ _del(void *data, Evas *evas, Evas_Object *obj, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *bt, *gl;
+ Evas_Object *win, *bx, *bt, *gl;
Ecore_Animator *ani;
GLData *gld = NULL;
@@ -254,15 +254,10 @@ elm_main(int argc, char **argv)
// may use another transparently
elm_config_preferred_engine_set("opengl_x11");
- win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC);
- elm_win_title_set(win, "GLView Simple");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("glview simple", "GLView Simple");
+ elm_win_autodel_set(win, EINA_TRUE);
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/hover_example_01.c b/src/examples/hover_example_01.c
index e426200..70b9def 100644
--- a/src/examples/hover_example_01.c
+++ b/src/examples/hover_example_01.c
@@ -18,17 +18,12 @@ _hide_hover(void *data, Evas_Object *obj, void *event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bt, *bt2, *rect, *rect2, *rect3, *hover;
+ Evas_Object *win, *bt, *bt2, *rect, *rect2, *rect3, *hover;
- win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
- elm_win_title_set(win, "Hover");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("hover", "Hover");
+ elm_win_autodel_set(win, EINA_TRUE);
rect = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_size_hint_min_set(rect, 25, 25);
diff --git a/src/examples/hoversel_example_01.c
b/src/examples/hoversel_example_01.c
index 3a00c4f..c05d717 100644
--- a/src/examples/hoversel_example_01.c
+++ b/src/examples/hoversel_example_01.c
@@ -12,21 +12,16 @@ static void _add_item(void *data, Evas_Object *obj, void
*event_info);
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *rect, *hoversel;
+ Evas_Object *win, *rect, *hoversel;
Elm_Object_Item *hoversel_it;
- win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
- elm_win_title_set(win, "Hoversel");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
+
+ win = elm_win_util_standard_add("hoversel", "Hoversel");
+ elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 200, 300);
evas_object_show(win);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
rect = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(rect, 255, 0, 0, 255);
evas_object_show(rect);
diff --git a/src/examples/icon_example_01.c b/src/examples/icon_example_01.c
index 04ef3db..01bbcca 100644
--- a/src/examples/icon_example_01.c
+++ b/src/examples/icon_example_01.c
@@ -6,19 +6,13 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *icon;
+ Evas_Object *win, *icon;
const char *path, *group, *name;
- win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
- elm_win_title_set(win, "Icon");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255,255 ,255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("icon", "Icon");
+ elm_win_autodel_set(win, EINA_TRUE);
icon = elm_icon_add(win);
elm_icon_order_lookup_set(icon, ELM_ICON_LOOKUP_THEME_FDO);
diff --git a/src/examples/image_example_01.c b/src/examples/image_example_01.c
index e80148a..eeb672a 100644
--- a/src/examples/image_example_01.c
+++ b/src/examples/image_example_01.c
@@ -6,20 +6,14 @@
int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *image;
+ Evas_Object *win, *image;
char buf[PATH_MAX];
elm_app_info_set(elm_main, "elementary", "images/plant_01.jpg");
- win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
- elm_win_title_set(win, "Image");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255,255 ,255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("image", "Image");
+ elm_win_autodel_set(win, EINA_TRUE);
snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg",
elm_app_data_dir_get());
diff --git a/src/examples/index_example_01.c b/src/examples/index_example_01.c
index 43da2a0..1104fa6 100644
--- a/src/examples/index_example_01.c
+++ b/src/examples/index_example_01.c
@@ -99,22 +99,16 @@ EAPI_MAIN int
elm_main(int argc,
char **argv)
{
- Evas_Object *win, *bg, *hbox, *vbox, *bt, *sep;
+ Evas_Object *win, *hbox, *vbox, *bt, *sep;
Elm_Object_Item *lit;
unsigned int i;
char curr = 0;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
- elm_win_title_set(win, "Index Example");
+ win = elm_win_util_standard_add("index", "Index Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
vbox = elm_box_add(win);
elm_win_resize_object_add(win, vbox);
evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/index_example_02.c b/src/examples/index_example_02.c
index 6db72fe..aa40440 100644
--- a/src/examples/index_example_02.c
+++ b/src/examples/index_example_02.c
@@ -83,7 +83,7 @@ EAPI_MAIN int
elm_main(int argc,
char **argv)
{
- Evas_Object *win, *bg, *grid, *idx;
+ Evas_Object *win, *grid, *idx;
Elm_Object_Item *gg_it;
unsigned int i;
@@ -92,15 +92,9 @@ elm_main(int argc,
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_app_info_set(elm_main, "elementary", "images");
- win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
- elm_win_title_set(win, "Index Example");
+ win = elm_win_util_standard_add("index", "Index Example");
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_win_resize_object_add(win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
-
grid = elm_gengrid_add(win);
elm_gengrid_item_size_set(grid, 150, 150);
diff --git a/src/examples/inwin_example.c b/src/examples/inwin_example.c
index df7f679..5928cbd 100644
--- a/src/examples/inwin_example.c
+++ b/src/examples/inwin_example.c
@@ -111,22 +111,17 @@ _screenshot_hack_cb(void *data)
EAPI_MAIN int
elm_main(int argc, char *argv[])
{
- Evas_Object *win, *bg, *box, *o;
+ Evas_Object *win, *box, *o;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "inwin-example", ELM_WIN_BASIC);
- elm_win_title_set(win, "Inwin Example");
+ win = elm_win_util_standard_add("inwin-example", "Inwin Example");
+ elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 400, 400);
evas_object_show(win);
evas_object_smart_callback_add(win, "delete,request", _win_del_cb, NULL);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, box);
diff --git a/src/examples/label_example_01.c b/src/examples/label_example_01.c
index cdd7acc..81df1a4 100644
--- a/src/examples/label_example_01.c
+++ b/src/examples/label_example_01.c
@@ -6,17 +6,12 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *label, *label2, *label3, *label4, *label5, *label6;
+ Evas_Object *win, *label, *label2, *label3, *label4, *label5, *label6;
- win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
- elm_win_title_set(win, "Label");
- elm_win_autodel_set(win, EINA_TRUE);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("label", "Label");
+ elm_win_autodel_set(win, EINA_TRUE);
label = elm_label_add(win);
elm_object_text_set(label, "Some long text for our label, that is long but "
diff --git a/src/examples/layout_example_01.c b/src/examples/layout_example_01.c
index 9d32bb2..a6bc7ea 100644
--- a/src/examples/layout_example_01.c
+++ b/src/examples/layout_example_01.c
@@ -52,21 +52,16 @@ _swallow_btn_cb(void *data, Evas_Object *btn, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *icon, *icon2, *bt, *bt2, *layout;
+ Evas_Object *win, *icon, *icon2, *bt, *bt2, *layout;
Evas_Object *clk;
Evas_Object *item;
char buf[PATH_MAX];
elm_app_info_set(elm_main, "elementary", "examples/layout_example.edj");
- win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255,255 ,255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("layout", "Layout");
+ elm_win_autodel_set(win, EINA_TRUE);
// Adding layout and filling it with widgets
layout = elm_layout_add(win);
diff --git a/src/examples/layout_example_02.c b/src/examples/layout_example_02.c
index 95cf076..5b60224 100644
--- a/src/examples/layout_example_02.c
+++ b/src/examples/layout_example_02.c
@@ -38,21 +38,15 @@ _signal_cb(void *data, Evas_Object *o, const char
*emission, const char *source)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *layout, *icon;
+ Evas_Object *win, *layout, *icon;
struct _App app;
app.current = 0;
- win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
- elm_win_title_set(win, "Layout");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255, 255, 255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("layout", "Layout");
+ elm_win_autodel_set(win, EINA_TRUE);
// Adding layout and filling it with widgets
layout = elm_layout_add(win);
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
