From: seoz Date: Fri, 8 Apr 2011 14:30:48 +0000 (+0000) Subject: Elementary src/bin: Removed all trailing whitespaces. X-Git-Tag: REL_F_I9500_20120323_1~17^2~2922 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6dcca0022e57f102eb828bf1ec691a0aa032112;p=framework%2Fuifw%2Felementary.git Elementary src/bin: Removed all trailing whitespaces. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@58491 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/bin/config.c b/src/bin/config.c index 7f78af3..6807501 100644 --- a/src/bin/config.c +++ b/src/bin/config.c @@ -363,7 +363,7 @@ cf_enable(void *data, void *event_info __UNUSED__) { Eina_Bool cf = elm_cache_flush_enabled_get(); - Eina_Bool val = elm_check_state_get(obj); + Eina_Bool val = elm_check_state_get(obj); if (cf == val) return; elm_object_disabled_set((Evas_Object *)data, !val); @@ -2734,10 +2734,10 @@ _status_config_caches(Evas_Object *win, evas_object_smart_callback_add(ck, "changed", cf_enable, sl); elm_box_pack_end(bx, ck); evas_object_show(ck); - + elm_box_pack_end(bx, sl); evas_object_show(sl); - + evas_object_smart_callback_add(sl, "changed", cf_round, NULL); evas_object_smart_callback_add(sl, "delay,changed", cf_change, NULL); diff --git a/src/bin/test_anchorblock.c b/src/bin/test_anchorblock.c index 89c7f83..d7dcd1b 100644 --- a/src/bin/test_anchorblock.c +++ b/src/bin/test_anchorblock.c @@ -161,7 +161,7 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event "Hi there. This is the most recent message in the " "list of messages. It has one +61 432 1234 " "(phone number) to click on."); - evas_object_smart_callback_add(av, "anchor,clicked", + evas_object_smart_callback_add(av, "anchor,clicked", my_anchorblock_anchor, av); elm_bubble_content_set(bb, av); evas_object_show(av); @@ -223,7 +223,7 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event elm_anchorblock_hover_style_set(av, "popout"); elm_anchorblock_hover_parent_set(av, win); elm_anchorblock_text_set(av, "This is a short message. "); - evas_object_smart_callback_add(av, "anchor,clicked", + evas_object_smart_callback_add(av, "anchor,clicked", my_anchorblock_anchor, av); elm_bubble_content_set(bb, av); evas_object_show(av); @@ -232,7 +232,7 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event elm_scroller_content_set(sc, bx); evas_object_show(bx); - + evas_object_show(sc); evas_object_resize(win, 320, 300); diff --git a/src/bin/test_anim.c b/src/bin/test_anim.c index 2601ef4..cf94d34 100644 --- a/src/bin/test_anim.c +++ b/src/bin/test_anim.c @@ -16,7 +16,7 @@ _del(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event { Evas_Object *win = data; Ecore_Animator *ani = evas_object_data_get(win, "animator"); - + ecore_animator_del(ani); } @@ -29,7 +29,7 @@ anim(void *data) double t, xx, yy, zz, r, fac; double lx, ly; unsigned int i; - + evas_output_viewport_get(evas_object_evas_get(win), 0, 0, &vw, &vh); r = 48; t = ecore_loop_time_get(); @@ -37,7 +37,7 @@ anim(void *data) evas_pointer_canvas_xy_get(evas_object_evas_get(win), &x, &y); lx = x; ly = y; - + for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++) { bub = evas_object_data_get(win, names[i * 2]); @@ -45,18 +45,18 @@ anim(void *data) zz = (((2 + sin(t * 6 + (M_PI * (i * fac)))) / 3) * 64) * 2; xx = (cos(t * 4 + (M_PI * (i * fac))) * r) * 2; yy = (sin(t * 6 + (M_PI * (i * fac))) * r) * 2; - + w = zz; h = zz; x = (vw / 2) + xx - (w / 2); y = (vh / 2) + yy - (h / 2); - + evas_object_move(bub, x, y); evas_object_resize(bub, w, h); - + x = x - ((lx - (x + (w / 2))) / 4); y = y - ((ly - (y + (h / 2))) / 4); - + evas_object_move(sh, x, y); evas_object_resize(sh, w, h); } @@ -70,7 +70,7 @@ test_anim(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ Ecore_Animator *ani; char buf[PATH_MAX]; unsigned int i; - + win = elm_win_add(NULL, "animation", ELM_WIN_BASIC); elm_win_title_set(win, "Animation"); elm_win_autodel_set(win, 1); @@ -81,7 +81,7 @@ test_anim(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ elm_win_resize_object_add(win, bg); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); - + snprintf(buf, sizeof(buf), "%s/images/bubble_sh.png", PACKAGE_DATA_DIR); for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++) { @@ -91,7 +91,7 @@ test_anim(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_show(sh); evas_object_data_set(win, names[(i * 2) + 1], sh); } - + snprintf(buf, sizeof(buf), "%s/images/bubble.png", PACKAGE_DATA_DIR); for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++) { @@ -101,13 +101,13 @@ test_anim(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_show(bub); evas_object_data_set(win, names[(i * 2)], bub); } - + evas_object_resize(win, 480, 800); evas_object_show(win); - + ani = ecore_animator_add(anim, win); evas_object_data_set(win, "animator", ani); - + evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _del, win); } #endif diff --git a/src/bin/test_bg.c b/src/bin/test_bg.c index a30b870..f858d4a 100644 --- a/src/bin/test_bg.c +++ b/src/bin/test_bg.c @@ -4,20 +4,20 @@ #endif #ifndef ELM_LIB_QUICKLAUNCH -static void -_cb_radio_changed(void *data, Evas_Object *obj, void *event __UNUSED__) +static void +_cb_radio_changed(void *data, Evas_Object *obj, void *event __UNUSED__) { Evas_Object *o_bg = data; elm_bg_option_set(o_bg, elm_radio_value_get((Evas_Object *)obj)); } -static void -_cb_overlay_changed(void *data, Evas_Object *obj, void *event __UNUSED__) +static void +_cb_overlay_changed(void *data, Evas_Object *obj, void *event __UNUSED__) { Evas_Object *o_bg = data; - if (elm_check_state_get(obj)) + if (elm_check_state_get(obj)) { Evas_Object *parent, *over; char buff[PATH_MAX]; @@ -28,12 +28,12 @@ _cb_overlay_changed(void *data, Evas_Object *obj, void *event __UNUSED__) edje_object_file_set(over, buff, "bg_overlay"); elm_bg_overlay_set(o_bg, over); } - else + else elm_bg_overlay_set(o_bg, NULL); } -static void -_cb_color_changed(void *data, Evas_Object *obj, void *event __UNUSED__) +static void +_cb_color_changed(void *data, Evas_Object *obj, void *event __UNUSED__) { Evas_Object *o_bg = data; double val = 0.0; @@ -41,11 +41,11 @@ _cb_color_changed(void *data, Evas_Object *obj, void *event __UNUSED__) val = elm_spinner_value_get(obj); if (val == 1.0) elm_bg_color_set(o_bg, 255, 255, 255); - else if (val == 2.0) + else if (val == 2.0) elm_bg_color_set(o_bg, 255, 0, 0); - else if (val == 3.0) + else if (val == 3.0) elm_bg_color_set(o_bg, 0, 0, 255); - else if (val == 4.0) + else if (val == 4.0) elm_bg_color_set(o_bg, 0, 255, 0); } @@ -182,7 +182,7 @@ test_bg_options(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ elm_box_pack_end(hbox, rd); evas_object_show(rd); - /* color choices ... this is ghetto, but we don't have a 'colorpicker' + /* color choices ... this is ghetto, but we don't have a 'colorpicker' * widget yet :( */ rd = elm_spinner_add(win); elm_object_style_set(rd, "vertical"); diff --git a/src/bin/test_button.c b/src/bin/test_button.c index caf9a05..84f7447 100644 --- a/src/bin/test_button.c +++ b/src/bin/test_button.c @@ -97,7 +97,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_box_pack_end(bx, bt); evas_object_show(bt); evas_object_show(ic); - + ic = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); @@ -110,7 +110,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_box_pack_end(bx, bt); evas_object_show(bt); evas_object_show(ic); - + bt = elm_button_add(win); elm_button_label_set(bt, "Label Only"); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)5); diff --git a/src/bin/test_conform.c b/src/bin/test_conform.c index 9beafe8..e8210e8 100644 --- a/src/bin/test_conform.c +++ b/src/bin/test_conform.c @@ -4,8 +4,8 @@ #endif #ifndef ELM_LIB_QUICKLAUNCH -void -test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +void +test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) { Evas_Object *win, *bg, *conform, *btn, *bx, *en; @@ -27,7 +27,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event 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); - + en = elm_scrolled_entry_add(win); elm_scrolled_entry_single_line_set(en, 1); elm_scrolled_entry_bounce_set(en, 1, 0); @@ -36,7 +36,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); evas_object_show(en); elm_box_pack_end(bx, en); - + btn = elm_button_add(win); elm_button_label_set(btn, "Test Conformant"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0); @@ -52,7 +52,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); evas_object_show(en); elm_box_pack_end(bx, en); - + btn = elm_button_add(win); elm_button_label_set(btn, "Test Conformant"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -62,7 +62,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event en = elm_scrolled_entry_add(win); elm_scrolled_entry_bounce_set(en, 0, 1); - elm_scrolled_entry_entry_set(en, + elm_scrolled_entry_entry_set(en, "This is a multi-line entry at the bottom
" "This can contain more than 1 line of text and be " "scrolled around to allow for entering of lots of " @@ -76,22 +76,22 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(en); elm_box_pack_end(bx, en); - + elm_conformant_content_set(conform, bx); evas_object_show(bx); - + evas_object_resize(win, 240, 240); evas_object_show(win); } -static void +static void popobj(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) { elm_pager_content_pop(data); } -void -test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) +void +test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) { Evas_Object *win, *bg, *conform, *btn, *bx, *en, *pg; @@ -127,15 +127,15 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, btn); evas_object_show(btn); - + pg = elm_pager_add(win); evas_object_size_hint_weight_set(pg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(pg, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, pg); evas_object_show(pg); - + evas_object_smart_callback_add(btn, "clicked", popobj, pg); - + conform = elm_conformant_add(win); evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(conform, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -145,7 +145,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event 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); - + en = elm_scrolled_entry_add(win); elm_scrolled_entry_bounce_set(en, 0, 1); elm_scrolled_entry_entry_set(en, "This entry and button below get deleted."); @@ -153,7 +153,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(en); elm_box_pack_end(bx, en); - + btn = elm_button_add(win); elm_object_focus_allow_set(btn, 0); elm_button_label_set(btn, "Delete this bottom bit 1"); @@ -163,10 +163,10 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", popobj, pg); - + elm_conformant_content_set(conform, bx); evas_object_show(bx); - + conform = elm_conformant_add(win); evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(conform, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -176,7 +176,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event 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); - + en = elm_scrolled_entry_add(win); elm_scrolled_entry_bounce_set(en, 0, 1); elm_scrolled_entry_entry_set(en, "This entry and button below get deleted."); @@ -184,7 +184,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(en); elm_box_pack_end(bx, en); - + btn = elm_button_add(win); elm_object_focus_allow_set(btn, 0); elm_button_label_set(btn, "Delete this bottom bit 2"); @@ -194,10 +194,10 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_show(btn); evas_object_smart_callback_add(btn, "clicked", popobj, pg); - + elm_conformant_content_set(conform, bx); evas_object_show(bx); - + evas_object_resize(win, 240, 480); evas_object_show(win); } diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c index 0d44331..7fec0de 100644 --- a/src/bin/test_entry.c +++ b/src/bin/test_entry.c @@ -86,19 +86,19 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info "called Anchors so you will need
" "to refer to them this way.
" "
" - + "Also you can stick in items with (relsize + ascent): " "" " (full) " "" " (to the left)
" - + "Also (size + ascent): " "" " (full) " "" " (before this)
" - + "And as well (absize + ascent): " "" " (full) " @@ -624,7 +624,7 @@ static void my_ent_bt_fmt(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *en = data; - printf("IS FORMAT: %i\n", + printf("IS FORMAT: %i\n", (int)elm_scrolled_entry_cursor_is_format_get(en)); } @@ -965,7 +965,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en); elm_box_pack_end(bx, en); evas_object_show(en); - + bx2 = elm_box_add(win); elm_box_horizontal_set(bx2, 1); evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); @@ -1210,7 +1210,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pas, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); - elm_box_pack_end(bx2, bt); + elm_box_pack_end(bx2, bt); evas_object_propagate_events_set(bt, 0); elm_object_focus_allow_set(bt, 0); evas_object_show(bt); @@ -1229,7 +1229,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info { Evas_Object *win, *bg, *ly, *en; char buf[PATH_MAX]; - + win = elm_win_add(NULL, "entry4", ELM_WIN_BASIC); elm_win_title_set(win, "Entry 4"); elm_win_autodel_set(win, 1); @@ -1245,7 +1245,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, ly); evas_object_show(ly); - + en = elm_scrolled_entry_add(win); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); @@ -1254,7 +1254,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_scrolled_entry_single_line_set(en, 1); elm_layout_content_set(ly, "element1", en); evas_object_show(en); - + en = elm_entry_add(win); elm_entry_line_wrap_set(en, 0); elm_entry_entry_set(en, @@ -1327,7 +1327,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en); elm_box_pack_end(bx, en); evas_object_show(en); - + bx2 = elm_box_add(win); elm_box_horizontal_set(bx2, 1); evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); @@ -1572,7 +1572,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pas, en); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); - elm_box_pack_end(bx2, bt); + elm_box_pack_end(bx2, bt); evas_object_propagate_events_set(bt, 0); elm_object_focus_allow_set(bt, 0); evas_object_show(bt); diff --git a/src/bin/test_flip.c b/src/bin/test_flip.c index 74f850f..346288d 100644 --- a/src/bin/test_flip.c +++ b/src/bin/test_flip.c @@ -65,7 +65,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ { Evas_Object *win, *bg, *bx, *bx2, *fl, *o, *bt, *ly; char buf[PATH_MAX]; - + win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); elm_win_title_set(win, "Flip"); elm_win_focus_highlight_enabled_set(win, EINA_TRUE); @@ -80,7 +80,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); - + fl = elm_flip_add(win); evas_object_size_hint_align_set(fl, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(fl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -93,7 +93,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ elm_bg_file_set(o, buf, NULL); elm_flip_content_front_set(fl, o); evas_object_show(o); - + ly = elm_layout_add(win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR); elm_layout_file_set(ly, buf, "layout"); @@ -123,7 +123,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ elm_box_horizontal_set(bx2, 1); evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); - + bt = elm_button_add(win); elm_button_label_set(bt, "1"); evas_object_smart_callback_add(bt, "clicked", my_fl_1, fl); @@ -131,7 +131,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "2"); evas_object_smart_callback_add(bt, "clicked", my_fl_2, fl); @@ -139,7 +139,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "3"); evas_object_smart_callback_add(bt, "clicked", my_fl_3, fl); @@ -147,7 +147,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "4"); evas_object_smart_callback_add(bt, "clicked", my_fl_4, fl); @@ -158,12 +158,12 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ elm_box_pack_end(bx, bx2); evas_object_show(bx2); - + bx2 = elm_box_add(win); elm_box_horizontal_set(bx2, 1); evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); - + bt = elm_button_add(win); elm_button_label_set(bt, "5"); evas_object_smart_callback_add(bt, "clicked", my_fl_5, fl); @@ -171,7 +171,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "6"); evas_object_smart_callback_add(bt, "clicked", my_fl_6, fl); @@ -179,7 +179,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "7"); evas_object_smart_callback_add(bt, "clicked", my_fl_7, fl); @@ -187,7 +187,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "8"); evas_object_smart_callback_add(bt, "clicked", my_fl_8, fl); @@ -195,7 +195,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + elm_box_pack_end(bx, bx2); evas_object_show(bx2); @@ -208,7 +208,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info { Evas_Object *win, *bg, *bx, *bx2, *fl, *o, *bt, *tb, *li, *en; char buf[PATH_MAX]; - + win = elm_win_add(NULL, "flip2", ELM_WIN_BASIC); elm_win_title_set(win, "Flip 2"); elm_win_autodel_set(win, 1); @@ -224,7 +224,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, bx); evas_object_show(bx); - + fl = elm_flip_add(win); evas_object_size_hint_align_set(fl, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(fl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -233,7 +233,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info o = elm_box_add(win); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - + tb = elm_toolbar_add(win); elm_toolbar_homogenous_set(tb, 0); evas_object_size_hint_weight_set(tb, 0.0, 0.0); @@ -243,14 +243,14 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_toolbar_item_append(tb, "arrow_right", "Out", NULL, NULL); elm_toolbar_item_append(tb, "home", "There", NULL, NULL); elm_toolbar_item_append(tb, "refresh", "World", NULL, NULL); - + elm_box_pack_end(o, tb); evas_object_show(tb); - + li = elm_list_add(win); evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - + elm_list_item_append(li, "This is a list", NULL, NULL, NULL, NULL); elm_list_item_append(li, "Second item", NULL, NULL, NULL, NULL); elm_list_item_append(li, "3rd", NULL, NULL, NULL, NULL); @@ -261,12 +261,12 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_list_item_append(li, "And another item", NULL, NULL, NULL, NULL); elm_list_item_append(li, "More of them", NULL, NULL, NULL, NULL); elm_list_item_append(li, "Get with it", NULL, NULL, NULL, NULL); - + elm_list_go(li); - + elm_box_pack_end(o, li); evas_object_show(li); - + elm_flip_content_front_set(fl, o); evas_object_show(o); @@ -281,19 +281,19 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info "called Anchors so you will need
" "to refer to them this way.
" "
" - + "Also you can stick in items with (relsize + ascent): " "" " (full) " "" " (to the left)
" - + "Also (size + ascent): " "" " (full) " "" " (before this)
" - + "And as well (absize + ascent): " "" " (full) " @@ -306,7 +306,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_scrolled_entry_entry_set(en, buf); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - + elm_flip_content_back_set(fl, en); evas_object_show(en); @@ -316,7 +316,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_box_horizontal_set(bx2, 1); evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0); - + bt = elm_button_add(win); elm_button_label_set(bt, "1"); evas_object_smart_callback_add(bt, "clicked", my_fl_1, fl); @@ -324,7 +324,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "2"); evas_object_smart_callback_add(bt, "clicked", my_fl_2, fl); @@ -332,7 +332,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "3"); evas_object_smart_callback_add(bt, "clicked", my_fl_3, fl); @@ -340,7 +340,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "4"); evas_object_smart_callback_add(bt, "clicked", my_fl_4, fl); @@ -348,7 +348,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "5"); evas_object_smart_callback_add(bt, "clicked", my_fl_5, fl); @@ -356,7 +356,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "6"); evas_object_smart_callback_add(bt, "clicked", my_fl_6, fl); @@ -364,7 +364,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); evas_object_show(bt); - + elm_box_pack_end(bx, bx2); evas_object_show(bx2); @@ -404,13 +404,13 @@ test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_flip_content_front_set(fl, fr); evas_object_show(fr); - + fl_f = elm_flip_add(win); evas_object_size_hint_align_set(fl_f, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(fl_f, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_frame_content_set(fr, fl_f); evas_object_show(fl_f); - + o = elm_bg_add(win); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -433,13 +433,13 @@ test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_flip_content_back_set(fl, fr); evas_object_show(fr); - + fl_b = elm_flip_add(win); evas_object_size_hint_align_set(fl_b, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(fl_b, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_frame_content_set(fr, fl_b); evas_object_show(fl_b); - + o = elm_bg_add(win); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/bin/test_floating.c b/src/bin/test_floating.c index 37942f2..407fe5e 100644 --- a/src/bin/test_floating.c +++ b/src/bin/test_floating.c @@ -47,7 +47,7 @@ anim(void *data) { Evas_Object *gl = data; Evas_Coord x, y; - + y = 0; x = (sin(ecore_loop_time_get()) * 500); evas_object_move(gl, x, y); @@ -58,7 +58,7 @@ static void _del(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Ecore_Animator *ani = data; - + ecore_animator_del(ani); } @@ -102,7 +102,7 @@ test_floating(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in } evas_object_resize(win, 480, 800); evas_object_show(win); - + ani = ecore_animator_add(anim, gl); evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _del, ani); } diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c index d128aba..810bcd1 100644 --- a/src/bin/test_focus3.c +++ b/src/bin/test_focus3.c @@ -64,12 +64,12 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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); evas_object_show(bx); - + en = elm_scrolled_entry_add(win); elm_scrolled_entry_entry_set(en, "An entry"); evas_object_smart_callback_add(en, "focused", _foc, NULL); @@ -88,7 +88,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_object_focus_allow_set(bt, 0); elm_button_label_set(bt, "Del"); @@ -97,7 +97,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_object_focus_allow_set(bt, 0); elm_button_label_set(bt, "Hide"); @@ -106,7 +106,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, bt); evas_object_show(bt); - + evas_object_show(win); } #endif diff --git a/src/bin/test_icon.c b/src/bin/test_icon.c index 966171b..af1d952 100644 --- a/src/bin/test_icon.c +++ b/src/bin/test_icon.c @@ -31,7 +31,7 @@ test_icon(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ evas_object_show(ic); evas_object_smart_callback_add(ic, "clicked", icon_clicked, NULL); - + evas_object_show(win); } #endif diff --git a/src/bin/test_icon_desktops.c b/src/bin/test_icon_desktops.c index 67ba6a1..f48b412 100644 --- a/src/bin/test_icon_desktops.c +++ b/src/bin/test_icon_desktops.c @@ -8,18 +8,18 @@ static Elm_Genlist_Item_Class it_desk; static char * desk_gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { -#ifdef ELM_EFREET +#ifdef ELM_EFREET Efreet_Desktop *d = (Efreet_Desktop *)data; return strdup(d->name); #else return NULL; (void)data; -#endif +#endif } static Evas_Object * desk_gl_icon_get(void *data, Evas_Object *obj, const char *part) { -#ifdef ELM_EFREET +#ifdef ELM_EFREET Efreet_Desktop *d = (Efreet_Desktop *)data; Evas_Object *ic; @@ -34,18 +34,18 @@ desk_gl_icon_get(void *data, Evas_Object *obj, const char *part) (void)data; (void)obj; (void)part; -#endif +#endif } static void desk_gl_del(void *data, Evas_Object *obj __UNUSED__) { -#ifdef ELM_EFREET +#ifdef ELM_EFREET Efreet_Desktop *d = (Efreet_Desktop *)data; efreet_desktop_free(d); #else return; (void)data; -#endif +#endif } #ifdef ELM_EFREET @@ -91,7 +91,7 @@ test_icon_desktops(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve if (desktops) { Efreet_Desktop *d; - + EINA_LIST_FREE(desktops, d) elm_genlist_item_append(gl, &it_desk, d, NULL, ELM_GENLIST_ITEM_NONE, diff --git a/src/bin/test_index.c b/src/bin/test_index.c index 442496c..e0e5d8a 100644 --- a/src/bin/test_index.c +++ b/src/bin/test_index.c @@ -57,11 +57,11 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, gl); evas_object_show(gl); - + id = elm_index_add(win); evas_object_size_hint_weight_set(id, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, id); - + evas_object_show(id); itci.item_style = "default"; @@ -74,13 +74,13 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info for (i = 0; i < 100; i++) { it = elm_genlist_item_append(gl, &itci, - (void *)(long)j/* item data */, + (void *)(long)j/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, NULL/* func */, NULL/* func data */); if (!(j & 0xf)) { char buf[32]; - + snprintf(buf, sizeof(buf), "%c", 'A' + ((j >> 4) & 0xf)); elm_index_item_append(id, buf, it); } diff --git a/src/bin/test_label.c b/src/bin/test_label.c index d26841e..2cd6a8f 100644 --- a/src/bin/test_label.c +++ b/src/bin/test_label.c @@ -23,7 +23,7 @@ test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_label_label_set(lb, "This is a small label" ); evas_object_size_hint_weight_set(lb, 0.0, 0.0); @@ -32,7 +32,7 @@ test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(lb); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_label_label_set(lb, "This is a larger label with newlines
" "to make it bigger, bit it won't expand or wrap
" "just be a block of text that can't change its
" @@ -60,7 +60,7 @@ test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(lb); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_label_label_set(lb, "This small label set to wrap" ); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); @@ -70,7 +70,7 @@ test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_win_resize_object_add(win, bx); evas_object_show(bx); - + evas_object_resize(win, 320, 300); evas_object_show(win); diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c index 12c86ff..66cad3c 100644 --- a/src/bin/test_launcher.c +++ b/src/bin/test_launcher.c @@ -10,7 +10,7 @@ mode_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) Evas_Object *win = data; Evas_Object *mb; Eina_List *mbs, *l; - + mbs = evas_object_data_get(win, "mbs"); EINA_LIST_FOREACH(mbs, l, mb) { @@ -34,7 +34,7 @@ alpha_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) Evas_Object *win = data; Evas_Object *mb; Eina_List *mbs, *l; - + mbs = evas_object_data_get(win, "mbs"); EINA_LIST_FOREACH(mbs, l, mb) { @@ -48,7 +48,7 @@ smooth_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) Evas_Object *win = data; Evas_Object *mb; Eina_List *mbs, *l; - + mbs = evas_object_data_get(win, "mbs"); EINA_LIST_FOREACH(mbs, l, mb) { @@ -67,7 +67,7 @@ tim_cb(void *data) { Evas_Object *tb, *sc, *mb; Eina_List *list, *l; - + evas_object_data_del(data, "timer"); tb = evas_object_data_get(data, "tb"); sc = evas_object_data_get(data, "sc"); @@ -86,7 +86,7 @@ static void ic_del_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Ecore_Timer *tim; - + tim = evas_object_data_get(obj, "timer"); if (tim) { @@ -101,9 +101,9 @@ ic_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) Evas_Event_Mouse_Down *ev = event_info; Ecore_Timer *tim; Evas_Coord x, y, w, h; - + evas_object_color_set(data, 128, 0, 0, 128); - + tim = evas_object_data_get(obj, "timer"); if (tim) evas_object_data_del(obj, "timer"); tim = ecore_timer_add(1.0, tim_cb, obj); @@ -114,7 +114,7 @@ ic_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) evas_object_data_set(obj, "y", (void *)(long)(ev->canvas.y)); evas_object_data_set(obj, "px", (void *)(long)(x)); evas_object_data_set(obj, "py", (void *)(long)(y)); - + if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) { printf("double click %p\n", obj); @@ -126,7 +126,7 @@ ic_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) { Evas_Event_Mouse_Up *ev = event_info; Ecore_Timer *tim; - + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; evas_object_color_set(data, 255, 255, 255, 255); tim = evas_object_data_get(obj, "timer"); @@ -140,7 +140,7 @@ ic_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) Evas_Object *tb, *sc, *mb; Eina_List *list, *l; int tbx, tby; - + evas_object_data_del(obj, "dragging"); tb = evas_object_data_get(obj, "tb"); sc = evas_object_data_get(obj, "sc"); @@ -162,19 +162,19 @@ ic_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) if (evas_object_data_get(obj, "dragging")) { Evas_Coord x, y, px, py; - + x = (Evas_Coord)(long)evas_object_data_get(obj, "x"); y = (Evas_Coord)(long)evas_object_data_get(obj, "y"); px = (Evas_Coord)(long)evas_object_data_get(obj, "px"); py = (Evas_Coord)(long)evas_object_data_get(obj, "py"); - evas_object_move(obj, - px + ev->cur.canvas.x - x, + evas_object_move(obj, + px + ev->cur.canvas.x - x, py + ev->cur.canvas.y - y); } if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) { Ecore_Timer *tim; - + tim = evas_object_data_get(obj, "timer"); if (tim) { @@ -194,13 +194,13 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in char buf[PATH_MAX]; const char *names[] = { - "Hello", "World", "Spam", "Egg", - "Ham", "Good", "Bad", "Milk", + "Hello", "World", "Spam", "Egg", + "Ham", "Good", "Bad", "Milk", "Smell", "Of", "Sky", "Gold", "Hole", "Pig", "And", "Calm" }; Eina_List *mbs = NULL; - + win = elm_win_add(NULL, "launcher", ELM_WIN_BASIC); elm_win_title_set(win, "Launcher"); elm_win_autodel_set(win, 1); @@ -215,13 +215,13 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in bx = elm_box_add(win); elm_box_homogenous_set(bx, 1); elm_box_horizontal_set(bx, 1); - + sc = elm_scroller_add(win); elm_scroller_bounce_set(sc, 1, 0); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); - + n = 0; m = 0; for (k = 0 ; k < 8; k++) { @@ -234,19 +234,19 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_weight_set(pad, 0.0, 0.0); evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, pad, 1, 0, 5, 1); - + pad = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(pad, 470, 4); evas_object_size_hint_weight_set(pad, 0.0, 0.0); evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, pad, 1, 11, 5, 1); - + pad = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(pad, 4, 4); evas_object_size_hint_weight_set(pad, 0.0, 0.0); evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, pad, 0, 1, 1, 10); - + pad = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(pad, 4, 4); evas_object_size_hint_weight_set(pad, 0.0, 0.0); @@ -256,7 +256,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in mb = elm_mapbuf_add(win); elm_mapbuf_content_set(mb, tb); evas_object_show(tb); - + for (j = 0; j < 5; j++) { for (i = 0; i < 5; i++) @@ -270,7 +270,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(ic, 0.5, 0.5); elm_table_pack(tb, ic, 1 + i, 1 + (j * 2), 1, 1); evas_object_show(ic); - + lb = elm_label_add(win); elm_object_style_set(lb, "marker"); elm_label_label_set(lb, names[m]); @@ -278,13 +278,13 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(lb, 0.5, 0.5); elm_table_pack(tb, lb, 1 + i, 1 + (j * 2) + 1, 1, 1); evas_object_show(lb); - + evas_object_event_callback_add(ic, EVAS_CALLBACK_DEL, ic_del_cb, ic); - + evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_DOWN, ic_down_cb, ic); evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_UP, ic_up_cb, ic); evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_MOVE, ic_move_cb, ic); - + evas_object_data_set(ic, "lb", lb); evas_object_data_set(ic, "tb", tb); evas_object_data_set(ic, "sc", sc); @@ -292,30 +292,30 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_data_set(ic, "mb", mb); evas_object_data_set(ic, "tbx", (void *)(long)(1 + i)); evas_object_data_set(ic, "tby", (void *)(long)(1 + (j * 2))); - + n++; if (n > 23) n = 0; m++; if (m > 15) m = 0; } } - + elm_box_pack_end(bx, mb); evas_object_show(mb); - + mbs = eina_list_append(mbs, mb); } // fixme: free mbs evas_object_data_set(win, "mbs", mbs); - + bx2 = elm_box_add(win); evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_horizontal_set(bx2, 0); elm_win_resize_object_add(win, bx2); evas_object_show(bx2); - + elm_scroller_content_set(sc, bx); evas_object_show(bx); - + elm_scroller_page_relative_set(sc, 1.0, 1.0); evas_object_show(sc); @@ -325,7 +325,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_box_pack_end(bx2, tb2); elm_box_pack_end(bx2, sc); - + ck = elm_check_add(win); elm_check_label_set(ck, "Map"); elm_check_state_set(ck, 0); @@ -334,7 +334,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(ck, 0.05, 0.99); elm_table_pack(tb2, ck, 0, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "A"); elm_check_state_set(ck, 1); @@ -343,7 +343,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(ck, 0.20, 0.99); elm_table_pack(tb2, ck, 1, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "Smo"); elm_check_state_set(ck, 1); @@ -352,7 +352,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(ck, 0.40, 0.99); elm_table_pack(tb2, ck, 2, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "FS"); elm_check_state_set(ck, 0); @@ -361,7 +361,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(ck, 0.5, 0.99); elm_table_pack(tb2, ck, 3, 0, 1, 1); evas_object_show(ck); - + bt = elm_button_add(win); elm_button_label_set(bt, "Close"); evas_object_smart_callback_add(bt, "clicked", close_cb, win); @@ -369,7 +369,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(bt, 0.95, 0.99); elm_table_pack(tb2, bt, 4, 0, 1, 1); evas_object_show(bt); - + evas_object_show(tb2); evas_object_resize(win, 480, 800); @@ -383,7 +383,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i int k; char buf[PATH_MAX]; Eina_List *mbs = NULL; - + win = elm_win_add(NULL, "launcher2", ELM_WIN_BASIC); elm_win_title_set(win, "Launcher 2"); elm_win_autodel_set(win, 1); @@ -394,62 +394,62 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i 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); elm_box_homogenous_set(bx, 1); elm_box_horizontal_set(bx, 1); - + for (k = 0 ; k < 8; k++) { ly = elm_layout_add(win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR); elm_layout_file_set(ly, buf, "layout"); evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - + bt = elm_button_add(win); elm_button_label_set(bt, "Button 1"); elm_layout_content_set(ly, "element1", bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "Button 2"); elm_layout_content_set(ly, "element2", bt); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "Button 3"); elm_layout_content_set(ly, "element3", bt); evas_object_show(bt); - + mb = elm_mapbuf_add(win); elm_mapbuf_content_set(mb, ly); evas_object_show(ly); - + elm_box_pack_end(bx, mb); evas_object_show(mb); - + mbs = eina_list_append(mbs, mb); } // fixme: free mbs evas_object_data_set(win, "mbs", mbs); - + sc = elm_scroller_add(win); elm_scroller_bounce_set(sc, 1, 0); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, sc); - + elm_scroller_content_set(sc, bx); evas_object_show(bx); - + elm_scroller_page_relative_set(sc, 1.0, 1.0); evas_object_show(sc); tb2 = elm_table_add(win); evas_object_size_hint_weight_set(tb2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, tb2); - + ck = elm_check_add(win); elm_check_label_set(ck, "Map"); elm_check_state_set(ck, 0); @@ -458,7 +458,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ck, 0.05, 0.99); elm_table_pack(tb2, ck, 0, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "A"); elm_check_state_set(ck, 1); @@ -467,7 +467,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ck, 0.20, 0.99); elm_table_pack(tb2, ck, 1, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "Smo"); elm_check_state_set(ck, 1); @@ -476,7 +476,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ck, 0.40, 0.99); elm_table_pack(tb2, ck, 2, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "FS"); elm_check_state_set(ck, 0); @@ -485,7 +485,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ck, 0.5, 0.99); elm_table_pack(tb2, ck, 3, 0, 1, 1); evas_object_show(ck); - + bt = elm_button_add(win); elm_button_label_set(bt, "Close"); evas_object_smart_callback_add(bt, "clicked", close_cb, win); @@ -493,7 +493,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(bt, 0.95, 0.99); elm_table_pack(tb2, bt, 4, 0, 1, 1); evas_object_show(bt); - + evas_object_show(tb2); evas_object_resize(win, 480, 800); @@ -506,7 +506,7 @@ l3_mode_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) Evas_Object *win = data; Evas_Object *mb; Eina_List *mbs, *l; - + mbs = evas_object_data_get(win, "mbs"); EINA_LIST_FOREACH(mbs, l, mb) { @@ -530,7 +530,7 @@ l3_alpha_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) Evas_Object *win = data; Evas_Object *mb; Eina_List *mbs, *l; - + mbs = evas_object_data_get(win, "mbs"); EINA_LIST_FOREACH(mbs, l, mb) { @@ -544,7 +544,7 @@ l3_smooth_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) Evas_Object *win = data; Evas_Object *mb; Eina_List *mbs, *l; - + mbs = evas_object_data_get(win, "mbs"); EINA_LIST_FOREACH(mbs, l, mb) { @@ -558,7 +558,7 @@ l3_hidden_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED_ Evas_Object *win = data; Evas_Object *mb; Eina_List *mbs, *l; - + mbs = evas_object_data_get(win, "mbs"); EINA_LIST_FOREACH(mbs, l, mb) { @@ -580,7 +580,7 @@ l3_tim_cb(void *data) Eina_List *list, *l; char buf[256]; int slx, sly; - + evas_object_data_del(data, "timer"); ly = evas_object_data_get(data, "ly"); ly2 = evas_object_data_get(data, "ly2"); @@ -604,7 +604,7 @@ static void l3_ic_del_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { Ecore_Timer *tim; - + tim = evas_object_data_get(obj, "timer"); if (tim) { @@ -620,7 +620,7 @@ l3_ic_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void Ecore_Timer *tim; Evas_Coord x, y, w, h; Evas_Object *ly2; - + tim = evas_object_data_get(obj, "timer"); if (tim) evas_object_data_del(obj, "timer"); tim = ecore_timer_add(1.0, l3_tim_cb, obj); @@ -632,9 +632,9 @@ l3_ic_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void evas_object_data_set(obj, "y", (void *)(long)(ev->canvas.y)); evas_object_data_set(obj, "px", (void *)(long)(x)); evas_object_data_set(obj, "py", (void *)(long)(y)); - + edje_object_signal_emit(elm_layout_edje_get(ly2), "click", "app"); - + if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) { printf("double click %p\n", obj); @@ -647,9 +647,9 @@ l3_ic_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *e Evas_Event_Mouse_Up *ev = event_info; Ecore_Timer *tim; Evas_Object *ly2; - + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; - + ly2 = evas_object_data_get(obj, "ly2"); tim = evas_object_data_get(obj, "timer"); if (tim) @@ -663,7 +663,7 @@ l3_ic_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *e Eina_List *list, *l; int slx, sly; char buf[256]; - + evas_object_data_del(obj, "dragging"); ly = evas_object_data_get(obj, "ly"); sc = evas_object_data_get(obj, "sc"); @@ -687,25 +687,25 @@ l3_ic_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void { Evas_Event_Mouse_Move *ev = event_info; Evas_Object *ly2; - + ly2 = evas_object_data_get(obj, "ly2"); - + if (evas_object_data_get(obj, "dragging")) { Evas_Coord x, y, px, py; - + x = (Evas_Coord)(long)evas_object_data_get(obj, "x"); y = (Evas_Coord)(long)evas_object_data_get(obj, "y"); px = (Evas_Coord)(long)evas_object_data_get(obj, "px"); py = (Evas_Coord)(long)evas_object_data_get(obj, "py"); - evas_object_move(ly2, - px + ev->cur.canvas.x - x, + evas_object_move(ly2, + px + ev->cur.canvas.x - x, py + ev->cur.canvas.y - y); } if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) { Ecore_Timer *tim; - + tim = evas_object_data_get(obj, "timer"); if (tim) { @@ -725,13 +725,13 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i char buf[PATH_MAX]; const char *names[] = { - "Hello", "World", "Spam", "Egg", - "Ham", "Good", "Bad", "Milk", + "Hello", "World", "Spam", "Egg", + "Ham", "Good", "Bad", "Milk", "Smell", "Of", "Sky", "Gold", "Hole", "Pig", "And", "Calm" }; Eina_List *mbs = NULL; - + win = elm_win_add(NULL, "launcher", ELM_WIN_BASIC); elm_win_title_set(win, "Launcher"); elm_win_autodel_set(win, 1); @@ -748,13 +748,13 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_homogenous_set(bx, 1); elm_box_horizontal_set(bx, 1); - + sc = elm_scroller_add(win); elm_scroller_bounce_set(sc, 1, 0); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); - + n = 0; m = 0; for (k = 0 ; k < 8; k++) { @@ -765,27 +765,27 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i pad = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(pad, 450, 10); elm_table_pack(tb, pad, 1, 0, 1, 1); - + pad = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(pad, 450, 10); elm_table_pack(tb, pad, 1, 2, 1, 1); - + pad = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(pad, 10, 450); elm_table_pack(tb, pad, 0, 1, 1, 1); - + pad = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(pad, 10, 450); elm_table_pack(tb, pad, 2, 1, 1, 1); mb = elm_mapbuf_add(win); mbs = eina_list_append(mbs, mb); - + elm_mapbuf_content_set(mb, tb); evas_object_show(tb); elm_box_pack_end(bx, mb); evas_object_show(mb); - + ly = elm_layout_add(win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR); elm_layout_file_set(ly, buf, "launcher_page"); @@ -793,7 +793,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, ly, 1, 1, 1, 1); evas_object_show(ly); - + for (j = 0; j < 4; j++) { for (i = 0; i < 4; i++) @@ -814,13 +814,13 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ic, 0.5, 0.5); elm_layout_content_set(ly2, "slot", ic); evas_object_show(ic); - + evas_object_event_callback_add(ic, EVAS_CALLBACK_DEL, l3_ic_del_cb, ic); - + evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_DOWN, l3_ic_down_cb, ic); evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_UP, l3_ic_up_cb, ic); evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_MOVE, l3_ic_move_cb, ic); - + evas_object_data_set(ic, "ly", ly); evas_object_data_set(ic, "ly2", ly2); evas_object_data_set(ic, "sc", sc); @@ -828,11 +828,11 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_data_set(ic, "mb", mb); evas_object_data_set(ic, "slx", (void *)(long)(i)); evas_object_data_set(ic, "sly", (void *)(long)(j)); - + snprintf(buf, sizeof(buf), "slot.%i.%i", i, j); elm_layout_content_set(ly, buf, ly2); evas_object_show(ly2); - + n++; if (n > 23) n = 0; m++; if (m > 15) m = 0; } @@ -841,16 +841,16 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i // fixme: free mbs evas_object_data_set(win, "mbs", mbs); - + bx2 = elm_box_add(win); evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_horizontal_set(bx2, 0); elm_win_resize_object_add(win, bx2); evas_object_show(bx2); - + elm_scroller_content_set(sc, bx); evas_object_show(bx); - + elm_scroller_page_relative_set(sc, 1.0, 1.0); evas_object_show(sc); @@ -860,7 +860,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_box_pack_end(bx2, tb2); elm_box_pack_end(bx2, sc); - + ck = elm_check_add(win); elm_check_label_set(ck, "Map"); elm_check_state_set(ck, 0); @@ -869,7 +869,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ck, 0.05, 0.99); elm_table_pack(tb2, ck, 0, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "A"); elm_check_state_set(ck, 1); @@ -878,7 +878,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ck, 0.20, 0.99); elm_table_pack(tb2, ck, 1, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "Smo"); elm_check_state_set(ck, 1); @@ -887,7 +887,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ck, 0.40, 0.99); elm_table_pack(tb2, ck, 2, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "FS"); elm_check_state_set(ck, 0); @@ -896,7 +896,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ck, 0.5, 0.99); elm_table_pack(tb2, ck, 3, 0, 1, 1); evas_object_show(ck); - + ck = elm_check_add(win); elm_check_label_set(ck, "Hid"); elm_check_state_set(ck, 0); @@ -905,7 +905,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(ck, 0.5, 0.99); elm_table_pack(tb2, ck, 4, 0, 1, 1); evas_object_show(ck); - + bt = elm_button_add(win); elm_button_label_set(bt, "Close"); evas_object_smart_callback_add(bt, "clicked", l3_close_cb, win); @@ -913,7 +913,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_align_set(bt, 0.95, 0.99); elm_table_pack(tb2, bt, 5, 0, 1, 1); evas_object_show(bt); - + evas_object_show(tb2); evas_object_resize(win, 480, 800); diff --git a/src/bin/test_map.c b/src/bin/test_map.c index ec4abcc..9efddd3 100644 --- a/src/bin/test_map.c +++ b/src/bin/test_map.c @@ -336,7 +336,7 @@ my_bt_remove(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf int i; for (i = 0; i= 0) && (zoom <= 18)) elm_map_zoom_set(map, zoom); } -static void +static void _map_move_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { int x,y,w,h; @@ -451,7 +451,7 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __ evas_object_show(bg); map = elm_map_add(win); - if (map) + if (map) { srand( time(NULL) ); @@ -463,7 +463,7 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __ itc1 = elm_map_marker_class_new(map); elm_map_marker_class_get_cb_set(itc1, _marker_get); elm_map_marker_class_del_cb_set(itc1, NULL); - + itc2 = elm_map_marker_class_new(map); elm_map_marker_class_get_cb_set(itc2, _marker_get); elm_map_marker_class_del_cb_set(itc2, NULL); @@ -496,13 +496,13 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __ evas_object_color_set(rect, 0, 0, 0, 0); evas_object_repeat_events_set(rect,1); evas_object_show(rect); - evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_WHEEL, + evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_WHEEL, _map_mouse_wheel_cb, map); evas_object_raise(rect); - evas_object_event_callback_add(map, EVAS_CALLBACK_RESIZE, + evas_object_event_callback_add(map, EVAS_CALLBACK_RESIZE, _map_move_resize_cb, map); - evas_object_event_callback_add(map, EVAS_CALLBACK_MOVE, + evas_object_event_callback_add(map, EVAS_CALLBACK_MOVE, _map_move_resize_cb, map); elm_map_marker_add(map, 2.352, 48.857, itc1, itc_group1, &data1); diff --git a/src/bin/test_menu.c b/src/bin/test_menu.c index 4b022d0..474e1a8 100644 --- a/src/bin/test_menu.c +++ b/src/bin/test_menu.c @@ -9,12 +9,12 @@ static Evas_Object *win, *bg, *menu, *rect; static void _show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { - Evas_Event_Mouse_Down *ev = event_info; + Evas_Event_Mouse_Down *ev = event_info; elm_menu_move(data, ev->canvas.x, ev->canvas.y); evas_object_show(data); } -static void +static void _populate_4(Elm_Menu_Item *item) { Elm_Menu_Item *item2; @@ -30,7 +30,7 @@ _populate_4(Elm_Menu_Item *item) elm_menu_item_disabled_set(item2, 1); } -static void +static void _populate_3(Elm_Menu_Item *item) { Elm_Menu_Item *item2; @@ -42,14 +42,14 @@ _populate_3(Elm_Menu_Item *item) elm_menu_item_disabled_set(item2, 1); } -static void +static void _populate_2(Elm_Menu_Item *item) { Elm_Menu_Item *item2, *item3; elm_menu_item_add(menu, item, "system-reboot", "menu 2", NULL, NULL); item2 = elm_menu_item_add(menu, item, "system-shutdown", "menu 3", NULL, NULL); - + _populate_3(item2); elm_menu_item_separator_add(menu,item); @@ -69,7 +69,7 @@ _populate_2(Elm_Menu_Item *item) _populate_4(item2); } -static void +static void _populate_1(Elm_Menu_Item *item) { Elm_Menu_Item *item2; diff --git a/src/bin/test_multi.c b/src/bin/test_multi.c index 45fe59d..126e02f 100644 --- a/src/bin/test_multi.c +++ b/src/bin/test_multi.c @@ -112,12 +112,12 @@ test_multi(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_event_callback_add(r, EVAS_CALLBACK_MULTI_DOWN, _multi_down, win); evas_object_event_callback_add(r, EVAS_CALLBACK_MULTI_UP, _multi_up, win); evas_object_event_callback_add(r, EVAS_CALLBACK_MULTI_MOVE, _multi_move, win); - + 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); evas_object_show(bx); - + bt = elm_button_add(win); elm_button_label_set(bt, "Rotate"); evas_object_smart_callback_add(bt, "clicked", my_bt_rot, win); @@ -125,7 +125,7 @@ test_multi(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx, bt); evas_object_show(bt); - + evas_object_size_hint_min_set(bg, 160, 160); evas_object_resize(win, 480, 800); diff --git a/src/bin/test_pager.c b/src/bin/test_pager.c index 3324da6..2b5402e 100644 --- a/src/bin/test_pager.c +++ b/src/bin/test_pager.c @@ -201,7 +201,7 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info Evas_Object *ly, *ly2; char buf[4096]; - + ly = elm_layout_add(win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR); elm_layout_file_set(ly, buf, "test/layout"); @@ -215,7 +215,7 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info //elm_win_resize_object_add(win, ly2); evas_object_show(ly2); - + bt = elm_button_add(win); diff --git a/src/bin/test_panel.c b/src/bin/test_panel.c index aa0493a..9e13c0a 100644 --- a/src/bin/test_panel.c +++ b/src/bin/test_panel.c @@ -46,15 +46,15 @@ _bstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__) } static char * -_label_get(void *data, Evas_Object *obj __UNUSED__, const char *source __UNUSED__) +_label_get(void *data, Evas_Object *obj __UNUSED__, const char *source __UNUSED__) { return strdup(ecore_file_file_get(data)); } static Evas_Object * -_icon_get(void *data, Evas_Object *obj, const char *source) +_icon_get(void *data, Evas_Object *obj, const char *source) { - if (!strcmp(source, "elm.swallow.icon")) + if (!strcmp(source, "elm.swallow.icon")) { Evas_Object *ic; @@ -70,20 +70,20 @@ _icon_get(void *data, Evas_Object *obj, const char *source) return NULL; } -static Eina_Bool -_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *source __UNUSED__) +static Eina_Bool +_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *source __UNUSED__) { return EINA_FALSE; } -static void -_item_del(void *data, Evas_Object *obj __UNUSED__) +static void +_item_del(void *data, Evas_Object *obj __UNUSED__) { eina_stringshare_del(data); } -static void -_fill_list(Evas_Object *obj) +static void +_fill_list(Evas_Object *obj) { DIR *d; struct dirent *de; @@ -91,7 +91,7 @@ _fill_list(Evas_Object *obj) char *real; if (!(d = opendir(getenv("HOME")))) return; - while ((de = readdir(d))) + while ((de = readdir(d))) { char buff[PATH_MAX]; @@ -105,25 +105,25 @@ _fill_list(Evas_Object *obj) dirs = eina_list_sort(dirs, eina_list_count(dirs), EINA_COMPARE_CB(strcoll)); - EINA_LIST_FOREACH(dirs, l, real) + EINA_LIST_FOREACH(dirs, l, real) { Eina_Bool result = EINA_FALSE; result = _dir_has_subs(real); - if (!result) - elm_genlist_item_append(obj, &itc, eina_stringshare_add(real), + if (!result) + elm_genlist_item_append(obj, &itc, eina_stringshare_add(real), NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); - else - elm_genlist_item_append(obj, &itc, eina_stringshare_add(real), - NULL, ELM_GENLIST_ITEM_SUBITEMS, + else + elm_genlist_item_append(obj, &itc, eina_stringshare_add(real), + NULL, ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL); free(real); } eina_list_free(dirs); } -static Eina_Bool -_dir_has_subs(const char *path) +static Eina_Bool +_dir_has_subs(const char *path) { DIR *d; struct dirent *de; @@ -131,13 +131,13 @@ _dir_has_subs(const char *path) if (!path) return result; if (!(d = opendir(path))) return result; - while ((de = readdir(d))) + while ((de = readdir(d))) { char buff[PATH_MAX]; if (de->d_name[0] == '.') continue; snprintf(buff, sizeof(buff), "%s/%s", path, de->d_name); - if (ecore_file_is_dir(buff)) + if (ecore_file_is_dir(buff)) { result = EINA_TRUE; break; diff --git a/src/bin/test_photo.c b/src/bin/test_photo.c index 1658f30..2f54366 100644 --- a/src/bin/test_photo.c +++ b/src/bin/test_photo.c @@ -38,7 +38,7 @@ test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info tb = elm_table_add(win); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - + n = 0; for (j = 0; j < 12; j++) { @@ -71,11 +71,11 @@ test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(ph); } } - + sc = elm_scroller_add(win); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, sc); - + elm_scroller_content_set(sc, tb); evas_object_show(tb); evas_object_show(sc); @@ -92,7 +92,7 @@ drop_cb(void *mydata __UNUSED__, Evas_Object *obj, void *evdata __UNUSED__){ static void drag_start_cb(void *mydata __UNUSED__, Evas_Object *obj __UNUSED__, void *evdata __UNUSED__){ - + } static void diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c index 198b63c..fd9ddf8 100644 --- a/src/bin/test_progressbar.c +++ b/src/bin/test_progressbar.c @@ -76,7 +76,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); elm_win_title_set(win, "Progressbar"); - evas_object_smart_callback_add(win, "delete,request", + evas_object_smart_callback_add(win, "delete,request", my_progressbar_destroy, NULL); bg = elm_bg_add(win); diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c index 7ad1d19..93a987e 100644 --- a/src/bin/test_scroller.c +++ b/src/bin/test_scroller.c @@ -35,13 +35,13 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in char buf[PATH_MAX]; const char *img[9] = { - "panel_01.jpg", - "plant_01.jpg", - "rock_01.jpg", + "panel_01.jpg", + "plant_01.jpg", + "rock_01.jpg", "rock_02.jpg", - "sky_01.jpg", - "sky_02.jpg", - "sky_03.jpg", + "sky_01.jpg", + "sky_02.jpg", + "sky_03.jpg", "sky_04.jpg", "wood_01.jpg" }; @@ -64,7 +64,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in for (i = 0; i < 12; i++) { bg2 = elm_bg_add(win); - snprintf(buf, sizeof(buf), "%s/images/%s", + snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[n]); n++; if (n >= 9) n = 0; @@ -76,7 +76,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_show(bg2); } } - + sc = elm_scroller_add(win); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, sc); @@ -99,7 +99,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(bt, 0.1, 0.1); elm_table_pack(tb2, bt, 0, 0, 1, 1); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "to 900 300"); evas_object_smart_callback_add(bt, "clicked", my_bt_go_900_300, sc); @@ -107,7 +107,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(bt, 0.9, 0.1); elm_table_pack(tb2, bt, 1, 0, 1, 1); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "to 300 900"); evas_object_smart_callback_add(bt, "clicked", my_bt_go_300_900, sc); @@ -115,7 +115,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(bt, 0.1, 0.9); elm_table_pack(tb2, bt, 0, 1, 1, 1); evas_object_show(bt); - + bt = elm_button_add(win); elm_button_label_set(bt, "to 900 900"); evas_object_smart_callback_add(bt, "clicked", my_bt_go_900_900, sc); @@ -123,9 +123,9 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_size_hint_align_set(bt, 0.9, 0.9); elm_table_pack(tb2, bt, 1, 1, 1, 1); evas_object_show(bt); - + evas_object_show(tb2); - + evas_object_resize(win, 320, 320); evas_object_show(win); } @@ -167,7 +167,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(bt); } /* } */ - + /* { */ sc = elm_scroller_add(win); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0); @@ -176,7 +176,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_scroller_content_min_limit(sc, 0, 1); elm_box_pack_end(bx, sc); evas_object_show(sc); - + bx2 = elm_box_add(win); elm_box_horizontal_set(bx2, 1); @@ -188,7 +188,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_box_pack_end(bx2, bt); evas_object_show(bt); } - + elm_scroller_content_set(sc, bx2); evas_object_show(bx2); /* } */ @@ -205,24 +205,24 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(bt); } /* } */ - + /* { */ tb = elm_table_add(win); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, tb); evas_object_show(tb); - + rc = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_min_set(rc, 200, 120); elm_table_pack(tb, rc, 0, 0, 1, 1); - + sc = elm_scroller_add(win); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_table_pack(tb, sc, 0, 0, 1, 1); evas_object_show(sc); - + tb2 = elm_table_add(win); for (j = 0; j < 16; j++) @@ -236,11 +236,11 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(bt); } } - + elm_scroller_content_set(sc, tb2); evas_object_show(tb2); /* } */ - + for (i = 0; i < 24; i++) { bt = elm_button_add(win); @@ -251,7 +251,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_box_pack_end(bx, bt); evas_object_show(bt); } - + sc = elm_scroller_add(win); evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_scroller_bounce_set(sc, 0, 1); @@ -259,7 +259,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i elm_scroller_content_set(sc, bx); evas_object_show(bx); evas_object_show(sc); - + evas_object_resize(win, 320, 480); evas_object_show(win); } diff --git a/src/bin/test_slider.c b/src/bin/test_slider.c index 6488cda..862d0a3 100644 --- a/src/bin/test_slider.c +++ b/src/bin/test_slider.c @@ -133,7 +133,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_box_horizontal_set(bx2, EINA_TRUE); elm_box_pack_end(bx, bx2); evas_object_show(bx2); - + ic = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR); elm_icon_file_set(ic, buf, NULL); @@ -193,7 +193,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_box_pack_end(bx2, sl); evas_object_show(ic); evas_object_show(sl); - + evas_object_show(win); } #endif diff --git a/src/bin/test_store.c b/src/bin/test_store.c index 64ce49d..8e7caeb 100644 --- a/src/bin/test_store.c +++ b/src/bin/test_store.c @@ -61,7 +61,7 @@ static const Elm_Store_Item_Mapping it1_mapping[] = ELM_STORE_ITEM_MAPPING_ICON, "elm.swallow.icon", 0, { .icon = { - 48, 48, + 48, 48, ELM_ICON_LOOKUP_THEME_FDO, EINA_TRUE, EINA_FALSE, EINA_TRUE, @@ -132,7 +132,7 @@ _st_store_fetch(void *data __UNUSED__, Elm_Store_Item *sti) // open the mail file and parse it f = fopen(path, "r"); if (!f) return; - + // alloc my item in memory that holds data to show in the list myit = calloc(1, sizeof(My_Item)); if (!myit) @@ -226,23 +226,23 @@ void test_store(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *win, *bg, *gl, *bx; - + Elm_Store *st; win = elm_win_add(NULL, "store", ELM_WIN_BASIC); elm_win_title_set(win, "Store"); elm_win_autodel_set(win, 1); - + 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); evas_object_show(bx); - + gl = elm_genlist_add(win); elm_genlist_height_for_width_mode_set(gl, EINA_TRUE); evas_object_smart_callback_add(gl, "selected", _st_selected, NULL); @@ -261,7 +261,7 @@ test_store(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_store_sorted_set(st, EINA_TRUE); elm_store_target_genlist_set(st, gl); elm_store_filesystem_directory_set(st, "./store"); - + evas_object_resize(win, 480, 800); evas_object_show(win); } diff --git a/src/bin/test_toggle.c b/src/bin/test_toggle.c index e8046f1..a190cd2 100644 --- a/src/bin/test_toggle.c +++ b/src/bin/test_toggle.c @@ -66,7 +66,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info tg = elm_toggle_add(win); elm_toggle_label_set(tg, "Label Only"); - elm_toggle_states_labels_set(tg, "Big long fun times label", + elm_toggle_states_labels_set(tg, "Big long fun times label", "Small long happy fun label"); elm_box_pack_end(bx, tg); evas_object_show(tg); diff --git a/src/bin/test_toolbar.c b/src/bin/test_toolbar.c index b3535e9..929d0aa 100644 --- a/src/bin/test_toolbar.c +++ b/src/bin/test_toolbar.c @@ -89,7 +89,7 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_MENU); evas_object_size_hint_weight_set(tb, 0.0, 0.0); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0); - + ph1 = elm_photo_add(win); ph2 = elm_photo_add(win); ph3 = elm_photo_add(win); @@ -116,7 +116,7 @@ test_toolbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf elm_toolbar_item_priority_set(item, -999999); elm_toolbar_menu_parent_set(tb, win); menu = elm_toolbar_item_menu_get(item); - + elm_menu_item_add(menu, NULL, "edit-cut", "Shrink", tb_3, ph4); menu_item = elm_menu_item_add(menu, NULL, "edit-copy", "Mode", tb_4, ph4); elm_menu_item_add(menu, menu_item, "edit-paste", "is set to", tb_4, ph4); @@ -199,7 +199,7 @@ test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_SCROLL); evas_object_size_hint_weight_set(tb, 0.0, 0.0); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0); - + ph1 = elm_photo_add(win); ph2 = elm_photo_add(win); ph3 = elm_photo_add(win); @@ -226,7 +226,7 @@ test_toolbar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_item_priority_set(item, -999999); elm_toolbar_menu_parent_set(tb, win); menu = elm_toolbar_item_menu_get(item); - + elm_menu_item_add(menu, NULL, "edit-cut", "Shrink", tb_3, ph4); menu_item = elm_menu_item_add(menu, NULL, "edit-copy", "Mode", tb_4, ph4); elm_menu_item_add(menu, menu_item, "edit-paste", "is set to", tb_4, ph4); @@ -309,7 +309,7 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_mode_shrink_set(tb, ELM_TOOLBAR_SHRINK_NONE); evas_object_size_hint_weight_set(tb, 0.0, 0.0); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0); - + ph1 = elm_photo_add(win); ph2 = elm_photo_add(win); ph3 = elm_photo_add(win); @@ -336,7 +336,7 @@ test_toolbar3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_toolbar_item_priority_set(item, 999999); elm_toolbar_menu_parent_set(tb, win); menu = elm_toolbar_item_menu_get(item); - + elm_menu_item_add(menu, NULL, "edit-cut", "Shrink", tb_3, ph4); menu_item = elm_menu_item_add(menu, NULL, "edit-copy", "Mode", tb_4, ph4); elm_menu_item_add(menu, menu_item, "edit-paste", "is set to", tb_4, ph4); diff --git a/src/bin/test_weather.c b/src/bin/test_weather.c index 536bd32..70900fa 100644 --- a/src/bin/test_weather.c +++ b/src/bin/test_weather.c @@ -74,7 +74,7 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf elm_win_resize_object_add(win, bg); evas_object_show(bg); -#ifdef HAVE_ELEMENTARY_EWEATHER +#ifdef HAVE_ELEMENTARY_EWEATHER 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); @@ -163,7 +163,7 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf #else Evas_Object *lbl; - + lbl = elm_label_add(win); elm_win_resize_object_add(win, lbl); elm_label_label_set(lbl, "libeweather is required to display the forecast."); diff --git a/src/bin/test_win_state.c b/src/bin/test_win_state.c index d847767..f1699b9 100644 --- a/src/bin/test_win_state.c +++ b/src/bin/test_win_state.c @@ -42,7 +42,7 @@ my_bt_38_rot_0(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSE Evas_Object *win = data; if (rotate_with_resize) elm_win_rotation_with_resize_set(win, 0); - else + else elm_win_rotation_set(win, 0); } @@ -52,7 +52,7 @@ my_bt_38_rot_90(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUS Evas_Object *win = data; if (rotate_with_resize) elm_win_rotation_with_resize_set(win, 90); - else + else elm_win_rotation_set(win, 90); } @@ -62,7 +62,7 @@ my_bt_38_rot_180(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU Evas_Object *win = data; if (rotate_with_resize) elm_win_rotation_with_resize_set(win, 180); - else + else elm_win_rotation_set(win, 180); } @@ -72,7 +72,7 @@ my_bt_38_rot_270(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU Evas_Object *win = data; if (rotate_with_resize) elm_win_rotation_with_resize_set(win, 270); - else + else elm_win_rotation_set(win, 270); } @@ -186,7 +186,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_smart_callback_add(ck, "changed", my_ck_38_resize, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ck, 0.02, 0.99); - evas_object_show(ck); + evas_object_show(ck); elm_box_pack_end(bx, ck); bx2 = elm_box_add(win); @@ -239,7 +239,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ { Evas_Object *win, *bg, *sl, *bx, *bx2, *bt, *ck; char buf[PATH_MAX]; - + win = elm_win_add(NULL, "window-states2", ELM_WIN_BASIC); elm_win_override_set(win, 1); evas_object_smart_callback_add(win, "moved", my_win_move, NULL); @@ -319,7 +319,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ evas_object_smart_callback_add(ck, "changed", my_ck_38_resize, win); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ck, 0.02, 0.99); - evas_object_show(ck); + evas_object_show(ck); elm_box_pack_end(bx, ck); bx2 = elm_box_add(win);