From: Enlightenment S. <no-...@en...> - 2011-03-28 01:34:13
|
Log: elementary/test_transit.c - removed white spaces Author: hermet Date: 2011-03-27 18:34:06 -0700 (Sun, 27 Mar 2011) New Revision: 58140 Trac: http://trac.enlightenment.org/e/changeset/58140 Modified: trunk/elementary/src/bin/test_transit.c Modified: trunk/elementary/src/bin/test_transit.c =================================================================== --- trunk/elementary/src/bin/test_transit.c 2011-03-28 01:24:08 UTC (rev 58139) +++ trunk/elementary/src/bin/test_transit.c 2011-03-28 01:34:06 UTC (rev 58140) @@ -78,7 +78,7 @@ elm_transit_effect_translation_add(trans, -70.0, -150.0, 70.0, 150.0); /* Color Effect */ - elm_transit_effect_color_add(trans, 100, 255, 100, 255, 200, 50, 200, 50); + elm_transit_effect_color_add(trans, 100, 255, 100, 255, 200, 50, 200, 50); /* Rotation Effect */ elm_transit_effect_rotation_add(trans, 0.0, 135.0); @@ -96,7 +96,7 @@ elm_transit_object_add(trans, obj); elm_transit_auto_reverse_set(trans, EINA_TRUE); - elm_transit_effect_wipe_add(trans, + elm_transit_effect_wipe_add(trans, ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE, ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT); @@ -129,7 +129,7 @@ elm_transit_effect_image_animation_add(trans, images); - elm_transit_duration_set(trans, 5.0); + elm_transit_duration_set(trans, 5.0); elm_transit_go(trans); } @@ -139,7 +139,7 @@ Elm_Transit *trans; trans = elm_transit_add(); - elm_transit_object_add(trans, obj); + elm_transit_object_add(trans, obj); elm_transit_effect_resizing_add(trans, 100, 50, 300, 150); @@ -354,7 +354,7 @@ bt = elm_button_add(win); elm_button_label_set(bt, "Zoom Effect"); evas_object_resize(bt, 100, 50); - evas_object_move(bt, 100, 125); + evas_object_move(bt, 100, 125); evas_object_show(bt); evas_object_smart_callback_add(bt, "clicked", _transit_zoom, NULL); @@ -386,7 +386,7 @@ elm_button_icon_set(bt, ic); elm_button_label_set(bt, "Before Button - Blend Effect"); evas_object_move(bt, 25, 125); - evas_object_resize(bt, 250, 50); + evas_object_resize(bt, 250, 50); evas_object_show(bt); ic = elm_icon_add(win); @@ -397,7 +397,7 @@ elm_button_icon_set(bt2, ic); elm_button_label_set(bt2, "After Button - Blend Effect"); evas_object_move(bt2, 25, 125); - evas_object_resize(bt2, 250, 50); + evas_object_resize(bt2, 250, 50); evas_object_show(win); @@ -429,7 +429,7 @@ elm_button_icon_set(bt, ic); elm_button_label_set(bt, "Before Button - Fade Effect"); evas_object_move(bt, 25, 125); - evas_object_resize(bt, 250, 50); + evas_object_resize(bt, 250, 50); evas_object_show(bt); ic = elm_icon_add(win); @@ -440,7 +440,7 @@ elm_button_icon_set(bt2, ic); elm_button_label_set(bt2, "After Button - Fade Effect"); evas_object_move(bt2, 25, 125); - evas_object_resize(bt2, 250, 50); + evas_object_resize(bt2, 250, 50); evas_object_show(win); @@ -468,7 +468,7 @@ elm_button_label_set(bt, "Front Button - Resizable Flip Effect"); evas_object_show(bt); evas_object_move(bt, 50, 100); - evas_object_resize(bt, 250, 30); + evas_object_resize(bt, 250, 30); bt2 = elm_button_add(win); elm_button_label_set(bt2, "Back Button - Resizable Flip Effect"); @@ -511,7 +511,7 @@ trans = elm_transit_add(); elm_transit_auto_reverse_set(trans, EINA_TRUE); elm_transit_tween_mode_set(trans, ELM_TRANSIT_TWEEN_MODE_DECELERATE); - //Negative value makes transition repeate for infinite times. + //Negative value makes transition repeate for infinite times. elm_transit_repeat_times_set(trans, -1); effect_context = _custom_context_new(100, 100, 250, 250); elm_transit_object_add(trans, bt); |
From: Enlightenment S. <no-...@en...> - 2011-04-12 05:49:54
|
Log: elementary/transit - updated test_transit for the chain transit Author: hermet Date: 2011-04-11 22:49:47 -0700 (Mon, 11 Apr 2011) New Revision: 58576 Trac: http://trac.enlightenment.org/e/changeset/58576 Modified: trunk/elementary/src/bin/test_transit.c Modified: trunk/elementary/src/bin/test_transit.c =================================================================== --- trunk/elementary/src/bin/test_transit.c 2011-04-12 05:48:44 UTC (rev 58575) +++ trunk/elementary/src/bin/test_transit.c 2011-04-12 05:49:47 UTC (rev 58576) @@ -486,8 +486,8 @@ void test_transit8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *win, *bg, *bt; - Elm_Transit *trans; + Evas_Object *win, *bg, *bt, *bt2; + Elm_Transit *trans, *trans2; Elm_Transit_Effect *effect_context; win = elm_win_add(NULL, "transit8", ELM_WIN_BASIC); @@ -503,23 +503,39 @@ bt = elm_button_add(win); elm_button_label_set(bt, "Button - Custom Effect"); evas_object_show(bt); - evas_object_move(bt, 50, 100); - evas_object_resize(bt, 250, 150); + evas_object_move(bt, 50, 50); + evas_object_resize(bt, 150, 150); + bt2 = elm_button_add(win); + elm_button_label_set(bt2, "Button - Chain Transit"); + evas_object_show(bt2); + evas_object_move(bt2, 200, 200); + evas_object_resize(bt2, 150, 150); + evas_object_show(win); /* Adding Transit */ trans = elm_transit_add(); elm_transit_auto_reverse_set(trans, EINA_TRUE); elm_transit_tween_mode_set(trans, ELM_TRANSIT_TWEEN_MODE_DECELERATE); - //Negative value makes transition repeate for infinite times. - elm_transit_repeat_times_set(trans, -1); - effect_context = _custom_context_new(100, 100, 250, 250); + effect_context = _custom_context_new(150, 150, 50, 50); elm_transit_object_add(trans, bt); elm_transit_effect_add(trans, _custom_op, effect_context, _custom_context_free); elm_transit_duration_set(trans, 5.0); + + /* Adding Chain Transit */ + trans2 = elm_transit_add(); + elm_transit_object_add(trans2, bt2); + elm_transit_object_add(trans2, bt2); + elm_transit_effect_flip_add(trans2, ELM_TRANSIT_EFFECT_FLIP_AXIS_Y, EINA_TRUE); + elm_transit_tween_mode_set(trans2, ELM_TRANSIT_TWEEN_MODE_ACCELERATE); + elm_transit_duration_set(trans2, 2.0); + //Negative value makes transition repeate for infinite times. + elm_transit_repeat_times_set(trans2, -1); + + elm_transit_chain_transit_add(trans, trans2); elm_transit_go(trans); } |
From: Enlightenment S. <no-...@en...> - 2011-05-27 02:00:53
|
Log: elementary / transit - updated sample code Author: hermet Date: 2011-05-26 19:00:46 -0700 (Thu, 26 May 2011) New Revision: 59719 Trac: http://trac.enlightenment.org/e/changeset/59719 Modified: trunk/elementary/src/bin/test_transit.c Modified: trunk/elementary/src/bin/test_transit.c =================================================================== --- trunk/elementary/src/bin/test_transit.c 2011-05-27 02:00:15 UTC (rev 59718) +++ trunk/elementary/src/bin/test_transit.c 2011-05-27 02:00:46 UTC (rev 59719) @@ -486,14 +486,15 @@ void test_transit8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *win, *bg, *bt, *bt2; - Elm_Transit *trans, *trans2; + Evas_Object *win, *bg, *bt; + Elm_Transit *trans; Elm_Transit_Effect *effect_context; win = elm_win_add(NULL, "transit8", ELM_WIN_BASIC); elm_win_title_set(win, "Transit 8"); elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 400, 400); + evas_object_show(win); bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); @@ -506,14 +507,6 @@ evas_object_move(bt, 50, 50); evas_object_resize(bt, 150, 150); - bt2 = elm_button_add(win); - elm_button_label_set(bt2, "Button - Chain Transit"); - evas_object_show(bt2); - evas_object_move(bt2, 200, 200); - evas_object_resize(bt2, 150, 150); - - evas_object_show(win); - /* Adding Transit */ trans = elm_transit_add(); elm_transit_auto_reverse_set(trans, EINA_TRUE); @@ -524,18 +517,7 @@ _custom_op, effect_context, _custom_context_free); elm_transit_duration_set(trans, 5.0); - - /* Adding Chain Transit */ - trans2 = elm_transit_add(); - elm_transit_object_add(trans2, bt2); - elm_transit_object_add(trans2, bt2); - elm_transit_effect_flip_add(trans2, ELM_TRANSIT_EFFECT_FLIP_AXIS_Y, EINA_TRUE); - elm_transit_tween_mode_set(trans2, ELM_TRANSIT_TWEEN_MODE_ACCELERATE); - elm_transit_duration_set(trans2, 2.0); - //Negative value makes transition repeate for infinite times. - elm_transit_repeat_times_set(trans2, -1); - - elm_transit_chain_transit_add(trans, trans2); + elm_transit_repeat_times_set(trans, -1); elm_transit_go(trans); } |
From: Enlightenment S. <no-...@en...> - 2011-05-28 03:39:22
|
Log: elementary/transit - added one more sample Author: hermet Date: 2011-05-27 20:39:14 -0700 (Fri, 27 May 2011) New Revision: 59764 Trac: http://trac.enlightenment.org/e/changeset/59764 Modified: trunk/elementary/src/bin/test.c trunk/elementary/src/bin/test_transit.c Modified: trunk/elementary/src/bin/test.c =================================================================== --- trunk/elementary/src/bin/test.c 2011-05-27 20:09:10 UTC (rev 59763) +++ trunk/elementary/src/bin/test.c 2011-05-28 03:39:14 UTC (rev 59764) @@ -22,6 +22,7 @@ void test_transit6(void *data, Evas_Object *obj, void *event_info); void test_transit7(void *data, Evas_Object *obj, void *event_info); void test_transit8(void *data, Evas_Object *obj, void *event_info); +void test_transit9(void *data, Evas_Object *obj, void *event_info); void test_fileselector_button(void *data, Evas_Object *obj, void *event_info); void test_fileselector_entry(void *data, Evas_Object *obj, void *event_info); void test_toggle(void *data, Evas_Object *obj, void *event_info); @@ -288,6 +289,7 @@ ADD_TEST("Transit 6", test_transit6); ADD_TEST("Transit 7", test_transit7); ADD_TEST("Transit 8", test_transit8); + ADD_TEST("Transit 9", test_transit9); ADD_TEST("File Selector Button", test_fileselector_button); ADD_TEST("File Selector Entry", test_fileselector_entry); ADD_TEST("Toggles", test_toggle); Modified: trunk/elementary/src/bin/test_transit.c =================================================================== --- trunk/elementary/src/bin/test_transit.c 2011-05-27 20:09:10 UTC (rev 59763) +++ trunk/elementary/src/bin/test_transit.c 2011-05-28 03:39:14 UTC (rev 59764) @@ -521,4 +521,81 @@ elm_transit_go(trans); } +/* Chain Transit Effect */ +void +test_transit9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + Evas_Object *win, *bg, *bt, *bt2, *bt3, *bt4; + Elm_Transit *trans, *trans2, *trans3, *trans4; + Elm_Transit_Effect *effect_context; + + win = elm_win_add(NULL, "transit9", ELM_WIN_BASIC); + elm_win_title_set(win, "Transit 9"); + elm_win_autodel_set(win, EINA_TRUE); + evas_object_resize(win, 400, 400); + 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); + + bt = elm_button_add(win); + elm_button_label_set(bt, "Chain 1"); + evas_object_resize(bt, 100, 100); + evas_object_move(bt, 0, 0); + evas_object_show(bt); + + bt2 = elm_button_add(win); + elm_button_label_set(bt2, "Chain 2"); + evas_object_resize(bt2, 100, 100); + evas_object_move(bt2, 300, 0); + evas_object_show(bt2); + + bt3 = elm_button_add(win); + elm_button_label_set(bt3, "Chain 3"); + evas_object_resize(bt3, 100, 100); + evas_object_move(bt3, 300, 300); + evas_object_show(bt3); + + bt4 = elm_button_add(win); + elm_button_label_set(bt4, "Chain 4"); + evas_object_resize(bt4, 100, 100); + evas_object_move(bt4, 0, 300); + evas_object_show(bt4); + + trans = elm_transit_add(); + elm_transit_tween_mode_set(trans, ELM_TRANSIT_TWEEN_MODE_ACCELERATE); + elm_transit_effect_translation_add(trans, 0, 0, 300, 0); + elm_transit_object_add(trans, bt); + elm_transit_duration_set(trans, 1); + elm_transit_objects_final_state_keep_set(trans, EINA_TRUE); + elm_transit_go(trans); + + trans2 = elm_transit_add(); + elm_transit_tween_mode_set(trans2, ELM_TRANSIT_TWEEN_MODE_ACCELERATE); + elm_transit_effect_translation_add(trans2, 0, 0, 0, 300); + elm_transit_object_add(trans2, bt2); + elm_transit_duration_set(trans2, 1); + elm_transit_objects_final_state_keep_set(trans2, EINA_TRUE); + elm_transit_chain_transit_add(trans, trans2); + + trans3 = elm_transit_add(); + elm_transit_tween_mode_set(trans3, ELM_TRANSIT_TWEEN_MODE_ACCELERATE); + elm_transit_effect_translation_add(trans3, 0, 0, -300, 0); + elm_transit_object_add(trans3, bt3); + elm_transit_duration_set(trans3, 1); + elm_transit_objects_final_state_keep_set(trans3, EINA_TRUE); + elm_transit_chain_transit_add(trans2, trans3); + + trans4 = elm_transit_add(); + elm_transit_tween_mode_set(trans4, ELM_TRANSIT_TWEEN_MODE_ACCELERATE); + elm_transit_effect_translation_add(trans4, 0, 0, 0, -300); + elm_transit_object_add(trans4, bt4); + elm_transit_duration_set(trans4, 1); + elm_transit_objects_final_state_keep_set(trans4, EINA_TRUE); + elm_transit_chain_transit_add(trans3, trans4); +} + + #endif |
From: Enlightenment S. <no-...@en...> - 2011-07-13 01:35:20
|
Log: elementary/test_gesture_layer - modified to use elm_transit. but need to check it works fine. Author: hermet Date: 2011-07-12 18:35:10 -0700 (Tue, 12 Jul 2011) New Revision: 61310 Trac: http://trac.enlightenment.org/e/changeset/61310 Modified: trunk/elementary/src/bin/test_gesture_layer.c Modified: trunk/elementary/src/bin/test_gesture_layer.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer.c 2011-07-13 00:56:12 UTC (rev 61309) +++ trunk/elementary/src/bin/test_gesture_layer.c 2011-07-13 01:35:10 UTC (rev 61310) @@ -115,23 +115,22 @@ /* Zoom out animation */ static void -zoom_out_animation_operation(void *_po, Elm_Animator *animator __UNUSED__, - double frame) +zoom_out_animation_operation(void *_po, Elm_Transit *transit __UNUSED__, + double progress) { Photo_Object *po = (Photo_Object *) _po; - po->zoom = BASE_ZOOM + ((po->base_zoom - BASE_ZOOM) * (1.0 - frame)); + po->zoom = BASE_ZOOM + ((po->base_zoom - BASE_ZOOM) * (1.0 - progress)); apply_changes(po); } static void -zoom_out_animation_end(void *_po) +zoom_out_animation_end(void *_po, Elm_Transit *transit) { Photo_Object *po = (Photo_Object *) _po; po->base_zoom = po->zoom = BASE_ZOOM; apply_changes(po); - elm_animator_del(po->zoom_out); po->zoom_out = NULL; } @@ -170,7 +169,7 @@ /* If there's an active animator, stop it */ if (po->zoom_out) { - elm_animator_del(po->zoom_out); + elm_transit_del(po->zoom_out); po->zoom_out = NULL; } @@ -227,14 +226,10 @@ /* Apply the zoom out animator */ po->shadow_zoom = 1.3; po->base_zoom = po->zoom; - po->zoom_out = elm_animator_add(po->ic); - elm_animator_duration_set(po->zoom_out, zoom_out_animation_duration); - elm_animator_curve_style_set(po->zoom_out, ELM_ANIMATOR_CURVE_LINEAR); - elm_animator_operation_callback_set(po->zoom_out, - zoom_out_animation_operation, po); - elm_animator_completion_callback_set(po->zoom_out, - zoom_out_animation_end, po); - elm_animator_animate(po->zoom_out); + po->zoom_out = elm_transit_add(); + elm_transit_duration_set(po->zoom_out, zoom_out_animation_duration); + elm_transit_effect_add(po->zoom_out, zoom_out_animation_operation, po, zoom_out_animation_end); + elm_transit_go(po->zoom_out); return EVAS_EVENT_FLAG_NONE; } |
From: Enlightenment S. <no-...@en...> - 2011-07-13 01:39:49
|
Log: elementray/test_gesture_layer - trivial changes. Author: hermet Date: 2011-07-12 18:39:43 -0700 (Tue, 12 Jul 2011) New Revision: 61311 Trac: http://trac.enlightenment.org/e/changeset/61311 Modified: trunk/elementary/src/bin/test_gesture_layer.c Modified: trunk/elementary/src/bin/test_gesture_layer.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer.c 2011-07-13 01:35:10 UTC (rev 61310) +++ trunk/elementary/src/bin/test_gesture_layer.c 2011-07-13 01:39:43 UTC (rev 61311) @@ -124,7 +124,7 @@ } static void -zoom_out_animation_end(void *_po, Elm_Transit *transit) +zoom_out_animation_end(void *_po, Elm_Transit *transit __UNUSED__) { Photo_Object *po = (Photo_Object *) _po; |
From: Enlightenment S. <no-...@en...> - 2011-07-13 01:42:06
|
Log: elementary/test_gesture_layer - oops. ciritical misktake. :p elm_animator -> elm_transit Author: hermet Date: 2011-07-12 18:41:56 -0700 (Tue, 12 Jul 2011) New Revision: 61312 Trac: http://trac.enlightenment.org/e/changeset/61312 Modified: trunk/elementary/src/bin/test_gesture_layer.c Modified: trunk/elementary/src/bin/test_gesture_layer.c =================================================================== --- trunk/elementary/src/bin/test_gesture_layer.c 2011-07-13 01:39:43 UTC (rev 61311) +++ trunk/elementary/src/bin/test_gesture_layer.c 2011-07-13 01:41:56 UTC (rev 61312) @@ -20,7 +20,7 @@ Evas_Object *ic, *shadow; Evas_Object *hit; Evas_Object *gl; - Elm_Animator *zoom_out; + Elm_Transit *zoom_out; /* bx, by - current wanted coordinates of the photo object. * bw, bh - original size of the "ic" object. * dx, dy - Used to indicate the distance between the center point |
From: Enlightenment S. <no-...@en...> - 2011-07-13 05:15:42
|
Log: elementary/naviframe - removed white spaces. Author: hermet Date: 2011-07-12 22:15:35 -0700 (Tue, 12 Jul 2011) New Revision: 61316 Trac: http://trac.enlightenment.org/e/changeset/61316 Modified: trunk/elementary/src/bin/test_naviframe.c Modified: trunk/elementary/src/bin/test_naviframe.c =================================================================== --- trunk/elementary/src/bin/test_naviframe.c 2011-07-13 04:42:45 UTC (rev 61315) +++ trunk/elementary/src/bin/test_naviframe.c 2011-07-13 05:15:35 UTC (rev 61316) @@ -20,7 +20,7 @@ _title_visible(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { elm_naviframe_item_title_visible_set(data, - !elm_naviframe_item_title_visible_get(data)); + !elm_naviframe_item_title_visible_get(data)); } void |
From: Enlightenment S. <no-...@en...> - 2011-08-03 09:32:27
|
Log: elementary/ctxpopup - modified to use elm_object_content_set Author: hermet Date: 2011-08-03 02:32:15 -0700 (Wed, 03 Aug 2011) New Revision: 62046 Trac: http://trac.enlightenment.org/e/changeset/62046 Modified: trunk/elementary/src/bin/test_ctxpopup.c Modified: trunk/elementary/src/bin/test_ctxpopup.c =================================================================== --- trunk/elementary/src/bin/test_ctxpopup.c 2011-08-03 09:00:36 UTC (rev 62045) +++ trunk/elementary/src/bin/test_ctxpopup.c 2011-08-03 09:32:15 UTC (rev 62046) @@ -139,7 +139,7 @@ elm_box_pack_end(bx, sc); ctxpopup = elm_ctxpopup_add(obj); - elm_ctxpopup_content_set(ctxpopup, bx); + elm_object_content_set(ctxpopup, bx); evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y); evas_object_move(ctxpopup, x, y); |
From: Enlightenment S. <no-...@en...> - 2011-08-28 07:13:11
|
Log: elementry/ctxpopup - updated test code for checking elm_ctxpopup_direction_get API. Author: hermet Date: 2011-08-28 00:13:04 -0700 (Sun, 28 Aug 2011) New Revision: 62906 Trac: http://trac.enlightenment.org/e/changeset/62906 Modified: trunk/elementary/src/bin/test_ctxpopup.c Modified: trunk/elementary/src/bin/test_ctxpopup.c =================================================================== --- trunk/elementary/src/bin/test_ctxpopup.c 2011-08-28 07:12:16 UTC (rev 62905) +++ trunk/elementary/src/bin/test_ctxpopup.c 2011-08-28 07:13:04 UTC (rev 62906) @@ -5,6 +5,32 @@ #ifndef ELM_LIB_QUICKLAUNCH static void +_print_current_dir(Evas_Object *obj) +{ + Elm_Ctxpopup_Direction dir; + dir = elm_ctxpopup_direction_get(obj); + + switch(dir) + { + case ELM_CTXPOPUP_DIRECTION_LEFT: + printf("ctxpopup direction: left!\n"); + break; + case ELM_CTXPOPUP_DIRECTION_RIGHT: + printf("ctxpopup direction: right!\n"); + break; + case ELM_CTXPOPUP_DIRECTION_UP: + printf("ctxpopup direction: up!\n"); + break; + case ELM_CTXPOPUP_DIRECTION_DOWN: + printf("ctxpopup direction: down!\n"); + break; + case ELM_CTXPOPUP_DIRECTION_DONT_KNOW: + printf("ctxpopup direction: dont know!\n"); + break; + } +} + +static void _ctxpopup_item_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { printf("ctxpopup item selected: %s\n", @@ -44,6 +70,7 @@ evas_object_size_hint_max_set(ctxpopup, 240, 240); evas_object_move(ctxpopup, x, y); evas_object_show(ctxpopup); + _print_current_dir(ctxpopup); } static void @@ -67,6 +94,7 @@ evas_object_size_hint_max_set(ctxpopup, 240, 240); evas_object_move(ctxpopup, x, y); evas_object_show(ctxpopup); + _print_current_dir(ctxpopup); } static void @@ -89,6 +117,7 @@ evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y); evas_object_move(ctxpopup, x, y); evas_object_show(ctxpopup); + _print_current_dir(ctxpopup); } static void @@ -112,6 +141,7 @@ evas_object_size_hint_max_set(ctxpopup, 240, 240); evas_object_move(ctxpopup, x, y); evas_object_show(ctxpopup); + _print_current_dir(ctxpopup); } @@ -144,6 +174,7 @@ evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y); evas_object_move(ctxpopup, x, y); evas_object_show(ctxpopup); + _print_current_dir(ctxpopup); } |
From: Enlightenment S. <no-...@en...> - 2011-09-14 07:50:12
|
Log: elementry/ctxpopup - oopss. fixed ctxpopup according to changes Author: hermet Date: 2011-09-14 00:50:05 -0700 (Wed, 14 Sep 2011) New Revision: 63375 Trac: http://trac.enlightenment.org/e/changeset/63375 Modified: trunk/elementary/src/bin/test_ctxpopup.c Modified: trunk/elementary/src/bin/test_ctxpopup.c =================================================================== --- trunk/elementary/src/bin/test_ctxpopup.c 2011-09-14 07:48:54 UTC (rev 63374) +++ trunk/elementary/src/bin/test_ctxpopup.c 2011-09-14 07:50:05 UTC (rev 63375) @@ -24,8 +24,8 @@ case ELM_CTXPOPUP_DIRECTION_DOWN: printf("ctxpopup direction: down!\n"); break; - case ELM_CTXPOPUP_DIRECTION_DONT_KNOW: - printf("ctxpopup direction: dont know!\n"); + case ELM_CTXPOPUP_DIRECTION_UNKNOWN: + printf("ctxpopup direction: unknow!\n"); break; } } |
From: Enlightenment S. <no-...@en...> - 2011-10-14 06:05:51
|
Log: elementary/ctxpopup - added lines to remove ctxpopup Author: hermet Date: 2011-10-13 23:05:44 -0700 (Thu, 13 Oct 2011) New Revision: 64064 Trac: http://trac.enlightenment.org/e/changeset/64064 Modified: trunk/elementary/src/bin/test_ctxpopup.c Modified: trunk/elementary/src/bin/test_ctxpopup.c =================================================================== --- trunk/elementary/src/bin/test_ctxpopup.c 2011-10-14 05:47:39 UTC (rev 64063) +++ trunk/elementary/src/bin/test_ctxpopup.c 2011-10-14 06:05:44 UTC (rev 64064) @@ -4,7 +4,14 @@ #endif #ifndef ELM_LIB_QUICKLAUNCH + static void +_hide_finished(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +{ + evas_object_del(obj); +} + +static void _print_current_dir(Evas_Object *obj) { Elm_Ctxpopup_Direction dir; @@ -56,6 +63,10 @@ Evas_Coord x,y; ctxpopup = elm_ctxpopup_add(obj); + evas_object_smart_callback_add(ctxpopup, + "dismissed", + _hide_finished, + NULL); ITEM_NEW(ctxpopup, "Go to home folder", "home"); ITEM_NEW(ctxpopup, "Save file", "file"); @@ -81,6 +92,10 @@ Evas_Coord x,y; ctxpopup = elm_ctxpopup_add(obj); + evas_object_smart_callback_add(ctxpopup, + "dismissed", + _hide_finished, + NULL); ITEM_NEW(ctxpopup, NULL, "home"); ITEM_NEW(ctxpopup, NULL, "file"); @@ -105,6 +120,10 @@ Evas_Coord x,y; ctxpopup = elm_ctxpopup_add(obj); + evas_object_smart_callback_add(ctxpopup, + "dismissed", + _hide_finished, + NULL); ITEM_NEW(ctxpopup, "Eina", NULL); ITEM_NEW(ctxpopup, "Eet", NULL); @@ -128,6 +147,11 @@ Evas_Coord x,y; ctxpopup = elm_ctxpopup_add(obj); + evas_object_smart_callback_add(ctxpopup, + "dismissed", + _hide_finished, + NULL); + elm_ctxpopup_horizontal_set(ctxpopup, EINA_TRUE); ITEM_NEW(ctxpopup, NULL, "home"); @@ -169,6 +193,11 @@ elm_box_pack_end(bx, sc); ctxpopup = elm_ctxpopup_add(obj); + evas_object_smart_callback_add(ctxpopup, + "dismissed", + _hide_finished, + NULL); + elm_object_content_set(ctxpopup, bx); evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x, &y); |
From: Enlightenment S. <no-...@en...> - 2011-10-14 06:12:10
|
Log: elementary/ctxpopup - more proper function name Author: hermet Date: 2011-10-13 23:12:04 -0700 (Thu, 13 Oct 2011) New Revision: 64065 Trac: http://trac.enlightenment.org/e/changeset/64065 Modified: trunk/elementary/src/bin/test_ctxpopup.c Modified: trunk/elementary/src/bin/test_ctxpopup.c =================================================================== --- trunk/elementary/src/bin/test_ctxpopup.c 2011-10-14 06:05:44 UTC (rev 64064) +++ trunk/elementary/src/bin/test_ctxpopup.c 2011-10-14 06:12:04 UTC (rev 64065) @@ -6,7 +6,7 @@ static void -_hide_finished(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_dismissed(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { evas_object_del(obj); } @@ -65,7 +65,7 @@ ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", - _hide_finished, + _dismissed, NULL); ITEM_NEW(ctxpopup, "Go to home folder", "home"); @@ -94,7 +94,7 @@ ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", - _hide_finished, + _dismissed, NULL); ITEM_NEW(ctxpopup, NULL, "home"); @@ -122,7 +122,7 @@ ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", - _hide_finished, + _dismissed, NULL); ITEM_NEW(ctxpopup, "Eina", NULL); @@ -149,7 +149,7 @@ ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", - _hide_finished, + _dismissed, NULL); elm_ctxpopup_horizontal_set(ctxpopup, EINA_TRUE); @@ -195,7 +195,7 @@ ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", - _hide_finished, + _dismissed, NULL); elm_object_content_set(ctxpopup, bx); |
From: Enlightenment S. <no-...@en...> - 2011-11-01 01:37:34
|
Log: elementary/hover - modified to look better. Author: hermet Date: 2011-10-31 18:37:28 -0700 (Mon, 31 Oct 2011) New Revision: 64593 Trac: http://trac.enlightenment.org/e/changeset/64593 Modified: trunk/elementary/src/bin/test_hover.c Modified: trunk/elementary/src/bin/test_hover.c =================================================================== --- trunk/elementary/src/bin/test_hover.c 2011-11-01 01:24:55 UTC (rev 64592) +++ trunk/elementary/src/bin/test_hover.c 2011-11-01 01:37:28 UTC (rev 64593) @@ -86,7 +86,7 @@ evas_object_size_hint_min_set(bg, 160, 160); evas_object_size_hint_max_set(bg, 640, 640); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 440, 440); evas_object_show(win); } @@ -166,7 +166,7 @@ evas_object_size_hint_min_set(bg, 160, 160); evas_object_size_hint_max_set(bg, 640, 640); - evas_object_resize(win, 320, 320); + evas_object_resize(win, 440, 440); evas_object_show(win); } #endif |
From: Enlightenment S. <no-...@en...> - 2011-11-01 01:38:51
|
Log: elementary/transit - modified to freeze events on transiting Author: hermet Date: 2011-10-31 18:38:45 -0700 (Mon, 31 Oct 2011) New Revision: 64594 Trac: http://trac.enlightenment.org/e/changeset/64594 Modified: trunk/elementary/src/bin/test_transit.c Modified: trunk/elementary/src/bin/test_transit.c =================================================================== --- trunk/elementary/src/bin/test_transit.c 2011-11-01 01:37:28 UTC (rev 64593) +++ trunk/elementary/src/bin/test_transit.c 2011-11-01 01:38:45 UTC (rev 64594) @@ -106,6 +106,12 @@ } static void +_transit_del_cb(void *data, Elm_Transit *transit __UNUSED__) +{ + evas_object_freeze_events_set(data, EINA_FALSE); +} + +static void _transit_image_animation(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Eina_List *images = NULL; @@ -126,12 +132,13 @@ images = eina_list_append(images, eina_stringshare_add(buf)); trans = elm_transit_add(); + elm_transit_del_cb_set(trans, _transit_del_cb, obj); elm_transit_object_add(trans, ic); - elm_transit_effect_image_animation_add(trans, images); - elm_transit_duration_set(trans, 5.0); elm_transit_go(trans); + + evas_object_freeze_events_set(obj, EINA_TRUE); } static void |
From: Enlightenment S. <no-...@en...> - 2011-11-11 16:47:12
|
Log: elementary/test_map.c - Those test code should not be committed. maybe raster you. Author: hermet Date: 2011-11-11 08:47:05 -0800 (Fri, 11 Nov 2011) New Revision: 65071 Trac: http://trac.enlightenment.org/e/changeset/65071 Modified: trunk/elementary/src/bin/test_map.c Modified: trunk/elementary/src/bin/test_map.c =================================================================== --- trunk/elementary/src/bin/test_map.c 2011-11-11 16:34:14 UTC (rev 65070) +++ trunk/elementary/src/bin/test_map.c 2011-11-11 16:47:05 UTC (rev 65071) @@ -711,7 +711,7 @@ void test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *win, *bg, *map, *tab, *r, *en; + Evas_Object *win, *bg, *map; int idx = 0; win = elm_win_add(NULL, "map", ELM_WIN_BASIC); @@ -723,19 +723,6 @@ elm_win_resize_object_add(win, bg); evas_object_show(bg); - tab = elm_table_add(win); - evas_object_size_hint_weight_set(tab, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, tab); - evas_object_show(tab); - - r = evas_object_rectangle_add(evas_object_evas_get(win)); - evas_object_color_set(r, 20, 40, 60, 255); - evas_object_size_hint_min_set(r, 200, 200); - evas_object_size_hint_weight_set(r, EVAS_HINT_EXPAND, 0); - evas_object_size_hint_fill_set(r, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_table_pack(tab, r, 0, 0, 1, 1); - evas_object_show(r); - map = elm_map_add(win); if (map) { @@ -749,9 +736,7 @@ printf("]\n"); evas_object_size_hint_weight_set(map, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_fill_set(map, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_table_pack(tab, map, 0, 2, 1, 1); -// elm_win_resize_object_add(win, map); + elm_win_resize_object_add(win, map); evas_object_data_set(map, "window", win); // @@ -842,14 +827,6 @@ evas_object_show(map); } - en = elm_entry_add(win); - elm_entry_scrollable_set(en, EINA_TRUE); - elm_entry_single_line_set(en, 1); - evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.1); - elm_table_pack(tab, en, 0, 1, 1, 1); - evas_object_show(en); - evas_object_resize(win, 800, 800); evas_object_show(win); |
From: Enlightenment S. <no-...@en...> - 2011-11-15 00:30:40
|
Log: elementary/pager - removed white spaces Author: hermet Date: 2011-11-14 16:30:33 -0800 (Mon, 14 Nov 2011) New Revision: 65215 Trac: http://trac.enlightenment.org/e/changeset/65215 Modified: trunk/elementary/src/bin/test_pager.c Modified: trunk/elementary/src/bin/test_pager.c =================================================================== --- trunk/elementary/src/bin/test_pager.c 2011-11-14 23:45:19 UTC (rev 65214) +++ trunk/elementary/src/bin/test_pager.c 2011-11-15 00:30:33 UTC (rev 65215) @@ -98,18 +98,18 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is page 1 in a pager stack.<br>" - "<br>" - "So what is a pager stack? It is a stack<br>" - "of pages that hold widgets in it. The<br>" - "pages can be pushed and popped on and<br>" - "off the stack, activated and otherwise<br>" - "activated if already in the stack<br>" - "(activated means promoted to the top of<br>" - "the stack).<br>" - "<br>" - "The theme may define the animation how<br>" - "show and hide of pages. Select one theme style:"); + "This is page 1 in a pager stack.<br>" + "<br>" + "So what is a pager stack? It is a stack<br>" + "of pages that hold widgets in it. The<br>" + "pages can be pushed and popped on and<br>" + "off the stack, activated and otherwise<br>" + "activated if already in the stack<br>" + "(activated means promoted to the top of<br>" + "the stack).<br>" + "<br>" + "The theme may define the animation how<br>" + "show and hide of pages. Select one theme style:"); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -150,11 +150,11 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is page 2 in a pager stack.<br>" - "<br>" - "This is just like the previous page in<br>" - "the pager stack." - ); + "This is page 2 in a pager stack.<br>" + "<br>" + "This is just like the previous page in<br>" + "the pager stack." + ); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -178,10 +178,10 @@ lb = elm_label_add(win); elm_object_text_set(lb, - "This is page 3 in a pager stack.<br>" - "<br>" - "This is just like the previous page in<br>" - "the pager stack."); + "This is page 3 in a pager stack.<br>" + "<br>" + "This is just like the previous page in<br>" + "the pager stack."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -215,9 +215,6 @@ //elm_win_resize_object_add(win, ly2); evas_object_show(ly2); - - - bt = elm_button_add(win); elm_object_text_set(bt, "Flip to 1"); evas_object_smart_callback_add(bt, "clicked", my_pager_4, &info); @@ -291,24 +288,24 @@ pg = elm_pager_add(win); elm_win_resize_object_add(win, pg); + evas_object_smart_callback_add(pg, "hide,finished", _hide_finished, info); elm_object_style_set(pg, "slide"); evas_object_show(pg); info.pager = pg; - bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bx); lb = elm_label_add(win); elm_object_text_set(lb, - "This is page 1 in a slide pager.<br>" - "<br>" - "The slide pager style is useful for browsing<br>" - "a hierarchy of objects, as it makes clear<br>" - "the direction of the browse.<br>" - "This is the 'slide' style, also available<br>" - "a fully transparent style named 'slide_invisble'.<br>" - "<br>"); + "This is page 1 in a slide pager.<br>" + "<br>" + "The slide pager style is useful for browsing<br>" + "a hierarchy of objects, as it makes clear<br>" + "the direction of the browse.<br>" + "This is the 'slide' style, also available<br>" + "a fully transparent style named 'slide_invisble'.<br>" + "<br>"); elm_box_pack_end(bx, lb); evas_object_show(lb); |
From: Enlightenment S. <no-...@en...> - 2011-11-15 00:35:28
|
Log: elementary/pager - updated test case to prevent window size become 0 when pager has emtpy stack. Author: hermet Date: 2011-11-14 16:35:21 -0800 (Mon, 14 Nov 2011) New Revision: 65216 Trac: http://trac.enlightenment.org/e/changeset/65216 Modified: trunk/elementary/src/bin/test_pager.c Modified: trunk/elementary/src/bin/test_pager.c =================================================================== --- trunk/elementary/src/bin/test_pager.c 2011-11-15 00:30:33 UTC (rev 65215) +++ trunk/elementary/src/bin/test_pager.c 2011-11-15 00:35:21 UTC (rev 65216) @@ -270,6 +270,15 @@ } void +_hide_finished(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + //To prevent the window size become zero. + Pginfo *info = data; + if (elm_pager_content_top_get(info->pager)) return; + elm_win_resize_object_del(info->win, info->pager); +} + +void test_pager_slide(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *win, *bg, *pg, *bx, *lb, *bt; @@ -288,7 +297,8 @@ pg = elm_pager_add(win); elm_win_resize_object_add(win, pg); - evas_object_smart_callback_add(pg, "hide,finished", _hide_finished, info); + evas_object_smart_callback_add(pg, "hide,finished", + _hide_finished, &info); elm_object_style_set(pg, "slide"); evas_object_show(pg); info.pager = pg; |
From: Enlightenment S. <no-...@en...> - 2011-11-20 04:36:02
|
Log: elementary/naviframe - added test case for elm_naviframe_item_promote Author: hermet Date: 2011-11-19 20:35:55 -0800 (Sat, 19 Nov 2011) New Revision: 65419 Trac: http://trac.enlightenment.org/e/changeset/65419 Modified: trunk/elementary/src/bin/test_naviframe.c Modified: trunk/elementary/src/bin/test_naviframe.c =================================================================== --- trunk/elementary/src/bin/test_naviframe.c 2011-11-20 04:32:51 UTC (rev 65418) +++ trunk/elementary/src/bin/test_naviframe.c 2011-11-20 04:35:55 UTC (rev 65419) @@ -32,7 +32,6 @@ elm_naviframe_item_del(data); } - void _title_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -47,20 +46,32 @@ } void +_promote(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +{ + elm_naviframe_item_promote(data); +} + +void _page5(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *bt, *content, *nf = data; + Evas_Object *bt, *bt2, *content, *nf = data; Elm_Object_Item *it; bt = elm_button_add(nf); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_text_set(bt, "Prev"); + bt2 = elm_button_add(nf); + evas_object_size_hint_align_set(bt2, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_text_set(bt2, "Page 1"); + evas_object_smart_callback_add(bt2, "clicked", _promote, + evas_object_data_get(nf, "page1")); + content = _content_new(nf, img5); it = elm_naviframe_item_insert_after(elm_naviframe_top_item_get(nf), "Page 5", bt, - NULL, + bt2, content, NULL); @@ -93,6 +104,7 @@ bt, content, NULL); + ic = elm_icon_add(nf); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); @@ -164,6 +176,7 @@ test_naviframe(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *win, *bg, *nf, *btn, *content; + Elm_Object_Item *it; win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC); elm_win_title_set(win, "Naviframe"); @@ -188,7 +201,8 @@ evas_object_show(btn); content = _content_new(nf, img1); - elm_naviframe_item_push(nf, "Page 1", NULL, btn, content, NULL); + it = elm_naviframe_item_push(nf, "Page 1", NULL, btn, content, NULL); + evas_object_data_set(nf, "page1", it); evas_object_resize(win, 400, 600); evas_object_show(win); |
From: Enlightenment S. <no-...@en...> - 2011-11-30 00:16:42
|
Log: elementary/quicklaunch - [E-devel] [Patch] quicklaunch patch a. Fix to handle the condition when read returns 0 and the content of buf is uninitialized in function handle_run inside file "src/bin/quicklaunch.c". b. Indentation correction in function handle_run around the location of fix above. Signed-Off-By: RAJEEV RANJAN <raj...@sa...> Signed-Off-By: PRINCE KUMAR DUBEY <pri...@sa...> Signed-Off-By: ChunEon Park <he...@he...> Author: hermet Date: 2011-11-29 16:16:36 -0800 (Tue, 29 Nov 2011) New Revision: 65699 Trac: http://trac.enlightenment.org/e/changeset/65699 Modified: trunk/elementary/src/bin/quicklaunch.c Modified: trunk/elementary/src/bin/quicklaunch.c =================================================================== --- trunk/elementary/src/bin/quicklaunch.c 2011-11-30 00:12:10 UTC (rev 65698) +++ trunk/elementary/src/bin/quicklaunch.c 2011-11-30 00:16:36 UTC (rev 65699) @@ -95,10 +95,10 @@ int argc; buf = alloca(bytes); - if (read(fd, buf, bytes) < 0) + if (read(fd, buf, bytes) <= 0) { - close(fd); - return; + close(fd); + return; } close(fd); argc = ((unsigned long *)(buf))[0]; |
From: Enlightenment S. <no-...@en...> - 2011-12-05 05:04:31
|
Log: elementary/map I have using elementary_test for testing elementary map widget. But it use invalid object for signal callback. I have changed win --> map. Also I have fixed invalid log message. Signed-Off-By: TaeHwan Kim(oh...@gm...) Signed-Off-By: ChunEon Park(he...@he...) Author: hermet Date: 2011-12-04 21:04:24 -0800 (Sun, 04 Dec 2011) New Revision: 65886 Trac: http://trac.enlightenment.org/e/changeset/65886 Modified: trunk/elementary/src/bin/test_map.c Modified: trunk/elementary/src/bin/test_map.c =================================================================== --- trunk/elementary/src/bin/test_map.c 2011-12-05 04:32:37 UTC (rev 65885) +++ trunk/elementary/src/bin/test_map.c 2011-12-05 05:04:24 UTC (rev 65886) @@ -88,6 +88,7 @@ static void my_map_longpressed(void *data, Evas_Object *obj __UNUSED__, void *event_info) { + printf("longpressed\n"); double lon, lat; Evas_Coord ox, oy, x, y, w, h; int zoom; @@ -108,6 +109,7 @@ static void my_map_clicked_double(void *data, Evas_Object *obj, void *event_info) { + printf("clicked,double\n"); double lon, lat; double flon, flat, tlon, tlat; Evas_Coord ox, oy, x, y, w, h, rx, ry, tx, ty; @@ -196,30 +198,33 @@ static void my_map_anim_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - printf("anim,start\n"); + printf("scroll,anim,start\n"); } static void my_map_anim_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - printf("anim,stop\n"); + printf("scroll,anim,stop\n"); } static void my_map_drag_start(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { + printf("scroll,drag,start\n"); evas_object_smart_callback_del(data, "longpressed", my_map_longpressed); } static void my_map_drag_stop(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { + printf("scroll,drag,stop\n"); evas_object_smart_callback_add(data, "longpressed", my_map_longpressed, data); } static void my_map_scroll(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { + printf("scroll\n"); double lon, lat; elm_map_geo_region_get(obj, &lon, &lat); printf("scroll longitude : %f latitude : %f\n", lon, lat); @@ -236,12 +241,13 @@ static void my_map_route_load(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - printf("route_load\n"); + printf("route,load\n"); } static void my_map_route_loaded(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { + printf("route,loaded\n"); double d; const char *w, *n; d = elm_map_route_distance_get(route); @@ -257,12 +263,13 @@ static void my_map_name_load(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - printf("name_load\n"); + printf("name,load\n"); } static void my_map_name_loaded(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { + printf("name,loaded\n"); if (!name) return; double lon, lat; const char *addr = elm_map_name_address_get(name); @@ -806,20 +813,20 @@ nb_elts = 13; - evas_object_smart_callback_add(map, "clicked", my_map_clicked, win); - evas_object_smart_callback_add(map, "press", my_map_press, win); + evas_object_smart_callback_add(map, "clicked", my_map_clicked, map); + evas_object_smart_callback_add(map, "press", my_map_press, map); evas_object_smart_callback_add(map, "longpressed", my_map_longpressed, map); evas_object_smart_callback_add(map, "clicked,double", my_map_clicked_double, map); - evas_object_smart_callback_add(map, "load,detail", my_map_load_detail, win); - evas_object_smart_callback_add(map, "loaded,detail", my_map_loaded_detail, win); - evas_object_smart_callback_add(map, "zoom,start", my_map_zoom_start, win); - evas_object_smart_callback_add(map, "zoom,stop", my_map_zoom_stop, win); - evas_object_smart_callback_add(map, "zoom,change", my_map_zoom_change, win); - evas_object_smart_callback_add(map, "scroll,anim,start", my_map_anim_start, win); - evas_object_smart_callback_add(map, "scroll,anim,stop", my_map_anim_stop, win); + evas_object_smart_callback_add(map, "load,detail", my_map_load_detail, map); + evas_object_smart_callback_add(map, "loaded,detail", my_map_loaded_detail, map); + evas_object_smart_callback_add(map, "zoom,start", my_map_zoom_start, map); + evas_object_smart_callback_add(map, "zoom,stop", my_map_zoom_stop, map); + evas_object_smart_callback_add(map, "zoom,change", my_map_zoom_change, map); + evas_object_smart_callback_add(map, "scroll,anim,start", my_map_anim_start, map); + evas_object_smart_callback_add(map, "scroll,anim,stop", my_map_anim_stop, map); evas_object_smart_callback_add(map, "scroll,drag,start", my_map_drag_start, map); evas_object_smart_callback_add(map, "scroll,drag,stop", my_map_drag_stop, map); - evas_object_smart_callback_add(map, "scroll", my_map_scroll, win); + evas_object_smart_callback_add(map, "scroll", my_map_scroll, map); evas_object_smart_callback_add(map, "downloaded", my_map_downloaded, map); evas_object_smart_callback_add(map, "route,load", my_map_route_load, map); evas_object_smart_callback_add(map, "route,loaded", my_map_route_loaded, map); |
From: Enlightenment S. <no-...@en...> - 2011-12-26 04:10:52
|
Log: elementary/ctxpopup - removed restack test. need more proper test. Author: hermet Date: 2011-12-25 20:10:46 -0800 (Sun, 25 Dec 2011) New Revision: 66506 Trac: http://trac.enlightenment.org/e/changeset/66506 Modified: trunk/elementary/src/bin/test_ctxpopup.c Modified: trunk/elementary/src/bin/test_ctxpopup.c =================================================================== --- trunk/elementary/src/bin/test_ctxpopup.c 2011-12-26 04:08:45 UTC (rev 66505) +++ trunk/elementary/src/bin/test_ctxpopup.c 2011-12-26 04:10:46 UTC (rev 66506) @@ -37,40 +37,10 @@ } } -static Eina_Bool -_ctxpopup_raise_timer_cb(void *data) -{ - printf("Timer Called\n"); - Evas_Object *ctxpopup = (Evas_Object *) data; - evas_object_raise(ctxpopup); - return EINA_FALSE; -} - static void _btn_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { printf("Button Clicked\n"); - Evas_Object *ctxpopup = (Evas_Object *) data; - Evas_Object *lb = elm_label_add(ctxpopup); - elm_label_line_wrap_set(lb, ELM_WRAP_CHAR); - elm_object_text_set(lb, - "<b>" - "This is more text designed to line-wrap here as " - "This object is resized horizontally. As it is " - "resized vertically though, nothing should change. " - "The amount of space allocated vertically should " - "change as horizontal size changes." - "This is more text designed to line-wrap here as " - "This object is resized horizontally. As it is " - "resized vertically though, nothing should change. " - "The amount of space allocated vertically should " - "change as horizontal size changes." - "</b>" - ); - evas_object_resize(lb, 200, 400); - evas_object_show(lb); - - ecore_timer_add(1.5, _ctxpopup_raise_timer_cb, ctxpopup); } static void |
From: Enlightenment S. <no-...@en...> - 2011-12-30 08:46:41
|
Log: elementary/index - deprecated apis. Author: hermet Date: 2011-12-30 00:46:33 -0800 (Fri, 30 Dec 2011) New Revision: 66673 Trac: http://trac.enlightenment.org/e/changeset/66673 Modified: trunk/elementary/src/bin/test_index.c Modified: trunk/elementary/src/bin/test_index.c =================================================================== --- trunk/elementary/src/bin/test_index.c 2011-12-30 08:37:54 UTC (rev 66672) +++ trunk/elementary/src/bin/test_index.c 2011-12-30 08:46:33 UTC (rev 66673) @@ -20,7 +20,7 @@ { // called on a change but delayed in case multiple changes happen in a // short timespan - elm_genlist_item_top_bring_in(elm_index_item_data_get(event_info)); + elm_genlist_item_top_bring_in(elm_object_item_data_get(event_info)); } void @@ -34,7 +34,7 @@ index_selected(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { // called on final select - elm_genlist_item_top_bring_in(elm_index_item_data_get(event_info)); + elm_genlist_item_top_bring_in(elm_object_item_data_get(event_info)); } void @@ -178,7 +178,7 @@ iit = elm_index_item_find(gui->id, it); if (label[0] == label_next[0]) - elm_index_item_data_set(iit, it_next); + elm_object_item_data_set(iit, it_next); else elm_index_item_del(gui->id, iit); @@ -188,7 +188,7 @@ void test_index2_id_changed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { - elm_list_item_show(elm_index_item_data_get(event_info)); + elm_list_item_show(elm_object_item_data_get(event_info)); } void |
From: Enlightenment S. <no-...@en...> - 2012-01-02 11:44:46
|
Log: elementary/multibuttonentry - missing deprecated ones Author: hermet Date: 2012-01-02 03:44:40 -0800 (Mon, 02 Jan 2012) New Revision: 66747 Trac: http://trac.enlightenment.org/e/changeset/66747 Modified: trunk/elementary/src/bin/test_multibuttonentry.c Modified: trunk/elementary/src/bin/test_multibuttonentry.c =================================================================== --- trunk/elementary/src/bin/test_multibuttonentry.c 2012-01-02 11:43:25 UTC (rev 66746) +++ trunk/elementary/src/bin/test_multibuttonentry.c 2012-01-02 11:44:40 UTC (rev 66747) @@ -10,7 +10,7 @@ void *event_info) { Elm_Object_Item *mbe_it = event_info; - printf("selected item = %s\n", elm_multibuttonentry_item_label_get(mbe_it)); + printf("selected item = %s\n", elm_object_item_text_get(mbe_it)); } // "item,added" smart callback of multibuttonentry. @@ -20,7 +20,7 @@ void *event_info) { Elm_Object_Item *mbe_it = event_info; - printf("added item = %s\n", elm_multibuttonentry_item_label_get(mbe_it)); + printf("added item = %s\n", elm_object_item_text_get(mbe_it)); } // "item,deleted" smart callback @@ -39,7 +39,7 @@ void *event_info ) { Elm_Object_Item *mbe_it = event_info; - printf("clicked item = %s\n", elm_multibuttonentry_item_label_get(mbe_it)); + printf("clicked item = %s\n", elm_object_item_text_get(mbe_it)); } static void |
From: Enlightenment S. <no-...@en...> - 2012-01-11 05:42:20
|
Log: elementary/ctxpopup - modified for more proper. Author: hermet Date: 2012-01-10 21:42:13 -0800 (Tue, 10 Jan 2012) New Revision: 67039 Trac: http://trac.enlightenment.org/e/changeset/67039 Modified: trunk/elementary/src/bin/test_ctxpopup.c Modified: trunk/elementary/src/bin/test_ctxpopup.c =================================================================== --- trunk/elementary/src/bin/test_ctxpopup.c 2012-01-11 03:16:50 UTC (rev 67038) +++ trunk/elementary/src/bin/test_ctxpopup.c 2012-01-11 05:42:13 UTC (rev 67039) @@ -8,14 +8,8 @@ static void _dismissed(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { - void *ctxpopup_data; - ctxpopup_data = evas_object_data_get(obj, "im"); - if (ctxpopup_data) - { - evas_object_hide(ctxpopup_data); - evas_object_del(ctxpopup_data); - } - + Evas_Object *ctxpopup_data = evas_object_data_get(obj, "im"); + if (ctxpopup_data) evas_object_del(ctxpopup_data); evas_object_del(obj); } |