seoz pushed a commit to branch master.
commit 1f7d2efe339ccd742ccfad98da3667be4d2edece
Author: Daniel Juyung Seo <[email protected]>
Date: Wed Jun 26 12:06:34 2013 +0900
examples: refactoring. use elm_win_util_standard_add() for normal cases.
---
src/examples/actionslider_example_01.c | 10 ++--------
src/examples/bg_example_03.c | 10 ++--------
src/examples/box_example_02.c | 10 ++--------
src/examples/bubble_example_01.c | 13 ++++---------
src/examples/button_example_00.c | 14 +++-----------
src/examples/button_example_01.c | 10 ++--------
src/examples/calendar_example_01.c | 10 ++--------
src/examples/calendar_example_02.c | 11 +++--------
src/examples/calendar_example_03.c | 11 +++--------
src/examples/calendar_example_04.c | 10 ++--------
src/examples/calendar_example_05.c | 10 ++--------
src/examples/calendar_example_06.c | 10 ++--------
src/examples/check_example_01.c | 11 +++--------
src/examples/clock_example.c | 10 ++--------
src/examples/codegen_example.c | 11 +++--------
src/examples/colorselector_example_01.c | 11 +++--------
src/examples/conformant_example_01.c | 11 +++--------
src/examples/conformant_example_02.c | 10 ++--------
src/examples/ctxpopup_example_01.c | 13 ++++---------
src/examples/datetime_example.c | 10 ++--------
src/examples/dayselector_example.c | 10 ++--------
src/examples/diskselector_example_01.c | 10 ++--------
src/examples/diskselector_example_02.c | 10 ++--------
src/examples/efl_thread_1.c | 13 ++++---------
src/examples/efl_thread_2.c | 10 ++--------
src/examples/efl_thread_3.c | 13 ++++---------
src/examples/efl_thread_4.c | 13 ++++---------
src/examples/efl_thread_5.c | 13 ++++---------
28 files changed, 75 insertions(+), 233 deletions(-)
diff --git a/src/examples/actionslider_example_01.c
b/src/examples/actionslider_example_01.c
index 129cd88..ffd223d 100644
--- a/src/examples/actionslider_example_01.c
+++ b/src/examples/actionslider_example_01.c
@@ -30,19 +30,13 @@ _magnet_enable_disable_cb(void *data, Evas_Object *obj,
void *event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *as;
+ Evas_Object *win, *bx, *as;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
- elm_win_title_set(win, "Actionslider");
+ win = elm_win_util_standard_add("actionslider", "Actionslider");
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, 0);
- evas_object_show(bg);
-
bx = elm_box_add(win);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0);
elm_win_resize_object_add(win, bx);
diff --git a/src/examples/bg_example_03.c b/src/examples/bg_example_03.c
index 9f08514..2309d91 100644
--- a/src/examples/bg_example_03.c
+++ b/src/examples/bg_example_03.c
@@ -52,7 +52,7 @@ _cb_color_changed(void *data, Evas_Object *obj, void *event)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg;
+ Evas_Object *win;
Evas_Object *box, *hbox, *o_bg;
Evas_Object *rd, *rdg;
char buf[PATH_MAX];
@@ -60,15 +60,9 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_app_info_set(elm_main, "elementary", "objects/test.edj");
- win = elm_win_add(NULL, "bg-options", ELM_WIN_BASIC);
- elm_win_title_set(win, "Bg Options");
+ win = elm_win_util_standard_add("bg-options", "Bg Options");
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);
-
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/box_example_02.c b/src/examples/box_example_02.c
index dab8475..0db0cd0 100644
--- a/src/examples/box_example_02.c
+++ b/src/examples/box_example_02.c
@@ -69,7 +69,7 @@ _test_box_transition_change(void *data)
EAPI_MAIN int
elm_main(int argc, char *argv[])
{
- Evas_Object *win, *bg, *bigbox, *bx, *bt;
+ Evas_Object *win, *bigbox, *bx, *bt;
static Transitions_Data tdata = {
.transitions = NULL,
.box = NULL,
@@ -78,17 +78,11 @@ elm_main(int argc, char *argv[])
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "box-transition", ELM_WIN_BASIC);
- elm_win_title_set(win, "Box Transition");
+ win = elm_win_util_standard_add("box-transition", "Box Transition");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 300, 320);
evas_object_show(win);
- 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);
-
bigbox = elm_box_add(win);
evas_object_size_hint_weight_set(bigbox, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, bigbox);
diff --git a/src/examples/bubble_example_01.c b/src/examples/bubble_example_01.c
index c3e2cff..3e734d5 100644
--- a/src/examples/bubble_example_01.c
+++ b/src/examples/bubble_example_01.c
@@ -18,20 +18,15 @@ _bla(void *data, Evas_Object *obj, void *event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bubble, *label, *icon;
+ Evas_Object *win, *bubble, *label, *icon;
- win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
- elm_win_title_set(win, "Bubble");
- 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("bubble", "Bubble");
+ elm_win_autodel_set(win, EINA_TRUE);
evas_object_resize(win, 300, 200);
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);
-
label = elm_label_add(win);
elm_object_text_set(label, "This is the CONTENT of our bubble");
evas_object_show(label);
diff --git a/src/examples/button_example_00.c b/src/examples/button_example_00.c
index d9f37b1..ea6fff7 100644
--- a/src/examples/button_example_00.c
+++ b/src/examples/button_example_00.c
@@ -13,25 +13,17 @@ EAPI_MAIN int
elm_main(int argc, char **argv)
{
Evas_Object *win = NULL;
- Evas_Object *bg = NULL;
Evas_Object *btn = NULL;
+ elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
+
/* Create an win, associate it with a canvas and */
/* turn it visible on WM (Window Manager). */
- win = elm_win_add(NULL, "Greetings", ELM_WIN_BASIC);
- elm_win_title_set(win, "Hello, World!");
+ win = elm_win_util_standard_add("Greetings", "Hello, World!");
elm_win_autodel_set(win, EINA_TRUE);
- elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
evas_object_resize(win, 240, 60);
evas_object_show(win);
- /* Create a bg, associate it to an win */
- /* and turn it visible on WM. */
- 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);
-
/* Create a btn, associate to a function, associate */
/* to win, give a dimension and position. */
btn = elm_button_add(win);
diff --git a/src/examples/button_example_01.c b/src/examples/button_example_01.c
index e171aff..d39c2f7 100644
--- a/src/examples/button_example_01.c
+++ b/src/examples/button_example_01.c
@@ -99,22 +99,16 @@ _btn_options_cb(void *data, Evas_Object *btn, void *ev)
EAPI_MAIN int
elm_main(int argc, char *argv[])
{
- Evas_Object *win, *bg, *box, *box2, *btn, *icon;
+ Evas_Object *win, *box, *box2, *btn, *icon;
static App_Data data;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "Button example", ELM_WIN_BASIC);
- elm_win_title_set(win, "Button example");
+ win = elm_win_util_standard_add("Button example", "Button 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/calendar_example_01.c
b/src/examples/calendar_example_01.c
index f00cfc4..29c8fac 100644
--- a/src/examples/calendar_example_01.c
+++ b/src/examples/calendar_example_01.c
@@ -14,18 +14,12 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *cal;
+ Evas_Object *win, *cal;
- win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
- elm_win_title_set(win, "Calendar Creation Example");
+ win = elm_win_util_standard_add("calendar", "Calendar Creation Example");
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);
-
cal = elm_calendar_add(win);
elm_win_resize_object_add(win, cal);
evas_object_size_hint_weight_set(cal, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/calendar_example_02.c
b/src/examples/calendar_example_02.c
index 8978451..615830a 100644
--- a/src/examples/calendar_example_02.c
+++ b/src/examples/calendar_example_02.c
@@ -24,21 +24,16 @@ _format_month_year(struct tm *format_time)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *cal;
+ Evas_Object *win, *cal;
const char *weekdays[] =
{
"S", "M", "T", "W", "T", "F", "S"
};
- win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
- elm_win_title_set(win, "Calendar Layout Formatting Example");
- 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("calendar", "Calendar Layout Formatting
Example");
+ elm_win_autodel_set(win, EINA_TRUE);
cal = elm_calendar_add(win);
elm_win_resize_object_add(win, cal);
diff --git a/src/examples/calendar_example_03.c
b/src/examples/calendar_example_03.c
index 2e86be5..518f4c0 100644
--- a/src/examples/calendar_example_03.c
+++ b/src/examples/calendar_example_03.c
@@ -15,17 +15,12 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *cal;
+ Evas_Object *win, *cal;
- win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
- elm_win_title_set(win, "Calendar Min/Max Year Example");
- 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("calendar", "Calendar Min/Max Year
Example");
+ elm_win_autodel_set(win, EINA_TRUE);
cal = elm_calendar_add(win);
elm_win_resize_object_add(win, cal);
diff --git a/src/examples/calendar_example_04.c
b/src/examples/calendar_example_04.c
index de27c17..3c874e9 100644
--- a/src/examples/calendar_example_04.c
+++ b/src/examples/calendar_example_04.c
@@ -17,20 +17,14 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *cal, *cal2;
+ Evas_Object *win, *bx, *cal, *cal2;
struct tm selected_time;
time_t current_time;
- win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
- elm_win_title_set(win, "Calendar Day Selection Example");
+ win = elm_win_util_standard_add("calendar", "Calendar Day Selection
Example");
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);
-
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/calendar_example_05.c
b/src/examples/calendar_example_05.c
index 3ca141d..a490e00 100644
--- a/src/examples/calendar_example_05.c
+++ b/src/examples/calendar_example_05.c
@@ -39,18 +39,12 @@ _print_cal_info_cb(void *data, Evas_Object *obj, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *cal;
+ Evas_Object *win, *cal;
- win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
- elm_win_title_set(win, "Calendar Getters Example");
+ win = elm_win_util_standard_add("calendar", "Calendar Getters Example");
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);
-
cal = elm_calendar_add(win);
elm_win_resize_object_add(win, cal);
evas_object_size_hint_weight_set(cal, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/examples/calendar_example_06.c
b/src/examples/calendar_example_06.c
index 192aed3..ce9d278 100644
--- a/src/examples/calendar_example_06.c
+++ b/src/examples/calendar_example_06.c
@@ -23,7 +23,7 @@ _btn_clear_cb(void *data, Evas_Object *btn, void *ev)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bt, *bx, *cal;
+ Evas_Object *win, *bt, *bx, *cal;
Elm_Calendar_Mark *mark;
struct tm selected_time;
time_t current_time;
@@ -35,16 +35,10 @@ elm_main(int argc, char **argv)
/* months since Jan, in the range 0 to 11 */
christmas.tm_mon = 11;
- win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
- elm_win_title_set(win, "Calendar Marks Example");
+ win = elm_win_util_standard_add("calendar", "Calendar Marks Example");
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);
-
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/check_example_01.c b/src/examples/check_example_01.c
index d31b5b7..234100f 100644
--- a/src/examples/check_example_01.c
+++ b/src/examples/check_example_01.c
@@ -12,18 +12,13 @@ _print(void *data, Evas_Object *obj, void *event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *cb, *cb2, *icon;
+ Evas_Object *win, *cb, *cb2, *icon;
Eina_Bool value;
- win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
- elm_win_title_set(win, "Check");
- 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("check", "Check");
+ elm_win_autodel_set(win, EINA_TRUE);
cb = elm_check_add(win);
elm_object_text_set(cb, "checkbox");
diff --git a/src/examples/clock_example.c b/src/examples/clock_example.c
index 6ed473b..95ddebe 100644
--- a/src/examples/clock_example.c
+++ b/src/examples/clock_example.c
@@ -14,20 +14,14 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *ck;
+ Evas_Object *win, *bx, *ck;
unsigned int digedit;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
- elm_win_title_set(win, "Clock Example");
+ win = elm_win_util_standard_add("clock", "Clock 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/codegen_example.c b/src/examples/codegen_example.c
index 1779cb9..babce83 100644
--- a/src/examples/codegen_example.c
+++ b/src/examples/codegen_example.c
@@ -77,21 +77,16 @@ _button_create(Evas_Object *parent, const char *label)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *btn, *layout, *tbl_items[6];
+ Evas_Object *win, *btn, *layout, *tbl_items[6];
const char *labels[] = {"One", "Two", "Three", "Four", "Five", "Six"};
int i;
elm_app_info_set(elm_main, "elementary", "examples/codegen_example.edj");
- win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
+
+ win = elm_win_util_standard_add("codegen", "Elementary CodeGen");
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);
-
// Adding layout
layout = codegen_example_layout_add(win, NULL, NULL);
if (!layout)
diff --git a/src/examples/colorselector_example_01.c
b/src/examples/colorselector_example_01.c
index 93ea32b..e43a761 100644
--- a/src/examples/colorselector_example_01.c
+++ b/src/examples/colorselector_example_01.c
@@ -10,17 +10,12 @@ static void _colorpalette_longpressed_cb(void *data,
Evas_Object *obj, void *eve
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *cs, *rect, *bx, *fr;
+ Evas_Object *win, *cs, *rect, *bx, *fr;
- win = elm_win_add(NULL, "color selector", ELM_WIN_BASIC);
- elm_win_title_set(win, "Color selector");
- 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("color selector", "Color selector");
+ 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/conformant_example_01.c
b/src/examples/conformant_example_01.c
index 426bea4..6f4a444 100644
--- a/src/examples/conformant_example_01.c
+++ b/src/examples/conformant_example_01.c
@@ -14,17 +14,12 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *btn, *bx, *en;
+ Evas_Object *win, *btn, *bx, *en;
- win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
- elm_win_title_set(win, "Conformant Example");
- 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("conformant", "Conformant Example");
+ elm_win_autodel_set(win, EINA_TRUE);
bx = elm_box_add(win);
elm_win_resize_object_add(win, bx);
diff --git a/src/examples/conformant_example_02.c
b/src/examples/conformant_example_02.c
index aba7c95..560f37e 100644
--- a/src/examples/conformant_example_02.c
+++ b/src/examples/conformant_example_02.c
@@ -14,19 +14,13 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *conform, *btn, *bx, *en;
+ Evas_Object *win, *conform, *btn, *bx, *en;
- win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
- elm_win_title_set(win, "Conformant Example");
+ win = elm_win_util_standard_add("conformant", "Conformant Example");
elm_win_autodel_set(win, EINA_TRUE);
elm_win_conformant_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);
-
conform = elm_conformant_add(win);
elm_win_resize_object_add(win, conform);
evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
diff --git a/src/examples/ctxpopup_example_01.c
b/src/examples/ctxpopup_example_01.c
index 90e5ab7..9b998ac 100644
--- a/src/examples/ctxpopup_example_01.c
+++ b/src/examples/ctxpopup_example_01.c
@@ -78,20 +78,15 @@ _list_item_cb2(void *data, Evas_Object *obj, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *list;
+ Evas_Object *win, *list;
- win = elm_win_add(NULL, "Contextual Popup", ELM_WIN_BASIC);
- elm_win_title_set(win, "Contextual Popup");
- 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("Contextual Popup", "Contextual Popup");
+ 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);
-
list = elm_list_add(win);
evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, list);
diff --git a/src/examples/datetime_example.c b/src/examples/datetime_example.c
index 15097ab..eec733c 100644
--- a/src/examples/datetime_example.c
+++ b/src/examples/datetime_example.c
@@ -6,19 +6,13 @@
EAPI_MAIN int
elm_main(int argc, char *argv[])
{
- Evas_Object *win, *bg, *bx, *datetime;
+ Evas_Object *win, *bx, *datetime;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "Datetime", ELM_WIN_BASIC);
- elm_win_title_set(win, "Datetime");
+ win = elm_win_util_standard_add("Datetime", "Datetime");
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/dayselector_example.c
b/src/examples/dayselector_example.c
index 6c1e8ee..2269145 100644
--- a/src/examples/dayselector_example.c
+++ b/src/examples/dayselector_example.c
@@ -40,19 +40,13 @@ static void _changed_cb(void* data, Evas_Object* obj, void*
event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *dayselector;
+ Evas_Object *win, *bx, *dayselector;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
- elm_win_title_set(win, "Dayselector Example");
+ win = elm_win_util_standard_add("dayselector", "Dayselector 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/diskselector_example_01.c
b/src/examples/diskselector_example_01.c
index 35e3aa7..fbd211e 100644
--- a/src/examples/diskselector_example_01.c
+++ b/src/examples/diskselector_example_01.c
@@ -14,7 +14,7 @@
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *ds;
+ Evas_Object *win, *bx, *ds;
unsigned int i;
static const char *lbl[] =
{
@@ -29,15 +29,9 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
- elm_win_title_set(win, "Diskselector Example");
+ win = elm_win_util_standard_add("diskselector", "Diskselector 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);
evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/examples/diskselector_example_02.c
b/src/examples/diskselector_example_02.c
index cae2064..837f1db 100644
--- a/src/examples/diskselector_example_02.c
+++ b/src/examples/diskselector_example_02.c
@@ -185,19 +185,13 @@ _select_prev_cb(void *data, Evas_Object *obj, void
*event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *bx, *hbx, *ds, *bt;
+ Evas_Object *win, *bx, *hbx, *ds, *bt;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
- elm_win_title_set(win, "Diskselector Items Example");
+ win = elm_win_util_standard_add("diskselector", "Diskselector Items
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/efl_thread_1.c b/src/examples/efl_thread_1.c
index 1352c58..03546b9 100644
--- a/src/examples/efl_thread_1.c
+++ b/src/examples/efl_thread_1.c
@@ -48,20 +48,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_2.c b/src/examples/efl_thread_2.c
index 43f215a..d178dd8 100644
--- a/src/examples/efl_thread_2.c
+++ b/src/examples/efl_thread_2.c
@@ -64,20 +64,14 @@ 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");
+ win = elm_win_util_standard_add("efl-thread-2", "EFL Thread 2");
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);
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_3.c b/src/examples/efl_thread_3.c
index c7b0784..452a690 100644
--- a/src/examples/efl_thread_3.c
+++ b/src/examples/efl_thread_3.c
@@ -66,20 +66,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_4.c b/src/examples/efl_thread_4.c
index 5504069..84136d7 100644
--- a/src/examples/efl_thread_4.c
+++ b/src/examples/efl_thread_4.c
@@ -86,20 +86,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/efl_thread_5.c b/src/examples/efl_thread_5.c
index 4e53dd0..d7cebb4 100644
--- a/src/examples/efl_thread_5.c
+++ b/src/examples/efl_thread_5.c
@@ -66,20 +66,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-5", ELM_WIN_BASIC);
- elm_win_title_set(win, "EFL Thread 5");
- 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-5", "EFL Thread 5");
+ 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);
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
