From f8b8439868354e565afcd813b8a8b2405221661c Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 1 Dec 2010 09:54:20 +0000 Subject: [PATCH] magnet->action (slider) SVN revision: 55116 --- legacy/elementary/data/themes/default.edc | 10 +- legacy/elementary/src/bin/Makefile.am | 2 +- legacy/elementary/src/bin/test.c | 4 +- ...est_magnetslider.c => test_actionslider.c} | 66 +++---- legacy/elementary/src/lib/Elementary.h.in | 36 ++-- legacy/elementary/src/lib/Makefile.am | 2 +- ...{elm_magnetslider.c => elm_actionslider.c} | 166 +++++++++--------- 7 files changed, 143 insertions(+), 143 deletions(-) rename legacy/elementary/src/bin/{test_magnetslider.c => test_actionslider.c} (58%) rename legacy/elementary/src/lib/{elm_magnetslider.c => elm_actionslider.c} (75%) diff --git a/legacy/elementary/data/themes/default.edc b/legacy/elementary/data/themes/default.edc index e49b360fb2..20e6b85e55 100644 --- a/legacy/elementary/data/themes/default.edc +++ b/legacy/elementary/data/themes/default.edc @@ -14870,9 +14870,9 @@ collections { } //////////////////////////////////////////////////////////////////////////////// -// magnetslider +// actionslider //////////////////////////////////////////////////////////////////////////////// - group { name: "elm/magnetslider/base/default"; + group { name: "elm/actionslider/base/default"; images { image: "shelf_inset.png" COMP; @@ -14983,8 +14983,8 @@ collections { } } - group { name: "elm/magnetslider/icon/default"; - alias: "elm/magnetslider/icon/bar"; + group { name: "elm/actionslider/icon/default"; + alias: "elm/actionslider/icon/bar"; images { image: "bt_bases.png" COMP; @@ -15044,7 +15044,7 @@ collections { } } - group { name: "elm/magnetslider/base/bar"; + group { name: "elm/actionslider/base/bar"; images { image: "shelf_inset.png" COMP; diff --git a/legacy/elementary/src/bin/Makefile.am b/legacy/elementary/src/bin/Makefile.am index c8541f9e33..34dfa7f901 100644 --- a/legacy/elementary/src/bin/Makefile.am +++ b/legacy/elementary/src/bin/Makefile.am @@ -53,7 +53,7 @@ test_list.c \ test_inwin.c \ test_scaling.c \ test_slider.c \ -test_magnetslider.c \ +test_actionslider.c \ test_genlist.c \ test_check.c \ test_pager.c \ diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c index 9b8c15a550..b0c208e6c9 100644 --- a/legacy/elementary/src/bin/test.c +++ b/legacy/elementary/src/bin/test.c @@ -57,7 +57,7 @@ void test_inwin2(void *data, Evas_Object *obj, void *event_info); void test_scaling(void *data, Evas_Object *obj, void *event_info); void test_scaling2(void *data, Evas_Object *obj, void *event_info); void test_slider(void *data, Evas_Object *obj, void *event_info); -void test_magnetslider(void *data, Evas_Object *obj, void *event_info); +void test_actionslider(void *data, Evas_Object *obj, void *event_info); void test_genlist(void *data, Evas_Object *obj, void *event_info); void test_genlist2(void *data, Evas_Object *obj, void *event_info); void test_genlist3(void *data, Evas_Object *obj, void *event_info); @@ -291,7 +291,7 @@ my_win_main(char *autorun) ADD_TEST("Scaling", test_scaling); ADD_TEST("Scaling 2", test_scaling2); ADD_TEST("Slider", test_slider); - ADD_TEST("Magnetslider", test_magnetslider); + ADD_TEST("Actionslider", test_actionslider); ADD_TEST("Genlist", test_genlist); ADD_TEST("Genlist 2", test_genlist2); ADD_TEST("Genlist 3", test_genlist3); diff --git a/legacy/elementary/src/bin/test_magnetslider.c b/legacy/elementary/src/bin/test_actionslider.c similarity index 58% rename from legacy/elementary/src/bin/test_magnetslider.c rename to legacy/elementary/src/bin/test_actionslider.c index bf50e524c9..88a954611d 100644 --- a/legacy/elementary/src/bin/test_magnetslider.c +++ b/legacy/elementary/src/bin/test_actionslider.c @@ -7,25 +7,25 @@ static void _pos_selected_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) { printf("Selection: %s\n", (char *)event_info); - printf("Label selected: %s\n", elm_magnetslider_selected_label_get(obj)); + printf("Label selected: %s\n", elm_actionslider_selected_label_get(obj)); } static void _position_change_magnetic_cb(void *data __UNUSED__, Evas_Object * obj, void *event_info) { if (!strcmp((char *)event_info, "left")) - elm_magnetslider_magnet_pos_set(obj, ELM_MAGNETSLIDER_LEFT); + elm_actionslider_magnet_pos_set(obj, ELM_ACTIONSLIDER_LEFT); else if (!strcmp((char *)event_info, "right")) - elm_magnetslider_magnet_pos_set(obj, ELM_MAGNETSLIDER_RIGHT); + elm_actionslider_magnet_pos_set(obj, ELM_ACTIONSLIDER_RIGHT); } void -test_magnetslider(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) +test_actionslider(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *win, *bg, *bx, *ms; - win = elm_win_add(NULL, "magnetslider", ELM_WIN_BASIC); - elm_win_title_set(win, "Magnetslider"); + win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC); + elm_win_title_set(win, "Actionslider"); elm_win_autodel_set(win, 1); bg = elm_bg_add(win); @@ -38,53 +38,53 @@ test_magnetslider(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *eve elm_win_resize_object_add(win, bx); evas_object_show(bx); - ms = elm_magnetslider_add(win); + ms = elm_actionslider_add(win); evas_object_size_hint_weight_set(ms, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ms, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_magnetslider_indicator_pos_set(ms, ELM_MAGNETSLIDER_RIGHT); - elm_magnetslider_magnet_pos_set(ms, ELM_MAGNETSLIDER_RIGHT); - elm_magnetslider_labels_set(ms, "Snooze", NULL, "Stop"); - elm_magnetslider_enabled_pos_set(ms, ELM_MAGNETSLIDER_LEFT | - ELM_MAGNETSLIDER_RIGHT); + elm_actionslider_indicator_pos_set(ms, ELM_ACTIONSLIDER_RIGHT); + elm_actionslider_magnet_pos_set(ms, ELM_ACTIONSLIDER_RIGHT); + elm_actionslider_labels_set(ms, "Snooze", NULL, "Stop"); + elm_actionslider_enabled_pos_set(ms, ELM_ACTIONSLIDER_LEFT | + ELM_ACTIONSLIDER_RIGHT); evas_object_smart_callback_add(ms, "pos_changed", _position_change_magnetic_cb, NULL); evas_object_smart_callback_add(ms, "selected", _pos_selected_cb, NULL); evas_object_show(ms); elm_box_pack_end(bx, ms); - ms = elm_magnetslider_add(win); + ms = elm_actionslider_add(win); evas_object_size_hint_weight_set(ms, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ms, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_magnetslider_indicator_pos_set(ms, ELM_MAGNETSLIDER_CENTER); - elm_magnetslider_magnet_pos_set(ms, ELM_MAGNETSLIDER_CENTER); - elm_magnetslider_labels_set(ms, "Snooze", NULL, "Stop"); - elm_magnetslider_enabled_pos_set(ms, ELM_MAGNETSLIDER_LEFT | - ELM_MAGNETSLIDER_RIGHT); + elm_actionslider_indicator_pos_set(ms, ELM_ACTIONSLIDER_CENTER); + elm_actionslider_magnet_pos_set(ms, ELM_ACTIONSLIDER_CENTER); + elm_actionslider_labels_set(ms, "Snooze", NULL, "Stop"); + elm_actionslider_enabled_pos_set(ms, ELM_ACTIONSLIDER_LEFT | + ELM_ACTIONSLIDER_RIGHT); evas_object_smart_callback_add(ms, "selected", _pos_selected_cb, NULL); evas_object_show(ms); elm_box_pack_end(bx, ms); - ms = elm_magnetslider_add(win); + ms = elm_actionslider_add(win); elm_object_style_set(ms, "bar"); evas_object_size_hint_weight_set(ms, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ms, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_magnetslider_indicator_pos_set(ms, ELM_MAGNETSLIDER_LEFT); - elm_magnetslider_magnet_pos_set(ms, ELM_MAGNETSLIDER_CENTER| - ELM_MAGNETSLIDER_RIGHT); - elm_magnetslider_enabled_pos_set(ms, ELM_MAGNETSLIDER_CENTER | - ELM_MAGNETSLIDER_RIGHT); - elm_magnetslider_labels_set(ms, NULL, "Accept", "Reject"); + elm_actionslider_indicator_pos_set(ms, ELM_ACTIONSLIDER_LEFT); + elm_actionslider_magnet_pos_set(ms, ELM_ACTIONSLIDER_CENTER| + ELM_ACTIONSLIDER_RIGHT); + elm_actionslider_enabled_pos_set(ms, ELM_ACTIONSLIDER_CENTER | + ELM_ACTIONSLIDER_RIGHT); + elm_actionslider_labels_set(ms, NULL, "Accept", "Reject"); evas_object_smart_callback_add(ms, "selected", _pos_selected_cb, NULL); evas_object_show(ms); elm_box_pack_end(bx, ms); - ms = elm_magnetslider_add(win); + ms = elm_actionslider_add(win); elm_object_style_set(ms, "bar"); evas_object_size_hint_weight_set(ms, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ms, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_magnetslider_indicator_pos_set(ms, ELM_MAGNETSLIDER_LEFT); - elm_magnetslider_magnet_pos_set(ms, ELM_MAGNETSLIDER_LEFT); - elm_magnetslider_labels_set(ms, NULL, "Accept", "Reject"); + elm_actionslider_indicator_pos_set(ms, ELM_ACTIONSLIDER_LEFT); + elm_actionslider_magnet_pos_set(ms, ELM_ACTIONSLIDER_LEFT); + elm_actionslider_labels_set(ms, NULL, "Accept", "Reject"); evas_object_smart_callback_add(ms, "pos_changed", _position_change_magnetic_cb, NULL); evas_object_smart_callback_add(ms, "selected", _pos_selected_cb, NULL); @@ -92,12 +92,12 @@ test_magnetslider(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *eve elm_box_pack_end(bx, ms); - ms = elm_magnetslider_add(win); + ms = elm_actionslider_add(win); evas_object_size_hint_weight_set(ms, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(ms, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_magnetslider_indicator_pos_set(ms, ELM_MAGNETSLIDER_LEFT); - elm_magnetslider_magnet_pos_set(ms, ELM_MAGNETSLIDER_ALL); - elm_magnetslider_labels_set(ms, "Left", "Center", "Right"); + elm_actionslider_indicator_pos_set(ms, ELM_ACTIONSLIDER_LEFT); + elm_actionslider_magnet_pos_set(ms, ELM_ACTIONSLIDER_ALL); + elm_actionslider_labels_set(ms, "Left", "Center", "Right"); evas_object_smart_callback_add(ms, "selected", _pos_selected_cb, NULL); evas_object_show(ms); elm_box_pack_end(bx, ms); diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in index 98a8017857..07937b3b21 100644 --- a/legacy/elementary/src/lib/Elementary.h.in +++ b/legacy/elementary/src/lib/Elementary.h.in @@ -1614,26 +1614,26 @@ extern "C" { EAPI void elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show); EAPI Eina_Bool elm_slider_indicator_show_get(const Evas_Object *obj); - /* magnetslider */ - typedef enum _Elm_Magnetslider_Pos + /* actionslider */ + typedef enum _Elm_Actionslider_Pos { - ELM_MAGNETSLIDER_NONE = 0, - ELM_MAGNETSLIDER_LEFT = 1 << 0, - ELM_MAGNETSLIDER_CENTER = 1 << 1, - ELM_MAGNETSLIDER_RIGHT = 1 << 2, - ELM_MAGNETSLIDER_ALL = (1 << 3) -1 - } Elm_Magnetslider_Pos; + ELM_ACTIONSLIDER_NONE = 0, + ELM_ACTIONSLIDER_LEFT = 1 << 0, + ELM_ACTIONSLIDER_CENTER = 1 << 1, + ELM_ACTIONSLIDER_RIGHT = 1 << 2, + ELM_ACTIONSLIDER_ALL = (1 << 3) -1 + } Elm_Actionslider_Pos; - EAPI Evas_Object *elm_magnetslider_add(Evas_Object *parent); - EAPI void elm_magnetslider_labels_set(Evas_Object *obj, const char *left_label, const char *center_label, const char *right_label); - EAPI void elm_magnetslider_labels_get(const Evas_Object *obj, const char **left_label, const char **center_label, const char **right_label); - EAPI const char *elm_magnetslider_selected_label_get(const Evas_Object *obj); - EAPI void elm_magnetslider_indicator_pos_set(Evas_Object *obj, Elm_Magnetslider_Pos pos); - EAPI Elm_Magnetslider_Pos elm_magnetslider_indicator_pos_get(const Evas_Object *obj); - EAPI void elm_magnetslider_magnet_pos_set(Evas_Object *obj, Elm_Magnetslider_Pos pos); - EAPI Elm_Magnetslider_Pos elm_magnetslider_magnet_pos_get(const Evas_Object *obj); - EAPI void elm_magnetslider_enabled_pos_set(Evas_Object *obj, Elm_Magnetslider_Pos pos); - EAPI Elm_Magnetslider_Pos elm_magnetslider_enabled_pos_get(const Evas_Object *obj); + EAPI Evas_Object *elm_actionslider_add(Evas_Object *parent); + EAPI void elm_actionslider_labels_set(Evas_Object *obj, const char *left_label, const char *center_label, const char *right_label); + EAPI void elm_actionslider_labels_get(const Evas_Object *obj, const char **left_label, const char **center_label, const char **right_label); + EAPI const char *elm_actionslider_selected_label_get(const Evas_Object *obj); + EAPI void elm_actionslider_indicator_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos); + EAPI Elm_Actionslider_Pos elm_actionslider_indicator_pos_get(const Evas_Object *obj); + EAPI void elm_actionslider_magnet_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos); + EAPI Elm_Actionslider_Pos elm_actionslider_magnet_pos_get(const Evas_Object *obj); + EAPI void elm_actionslider_enabled_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos); + EAPI Elm_Actionslider_Pos elm_actionslider_enabled_pos_get(const Evas_Object *obj); /* smart callbacks called: * "selected" - when user selects a position (the label is passed as * event info)". diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index e14510efad..cecdeb9c07 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -64,7 +64,7 @@ elm_photo.c \ elm_toolbar.c \ elm_list.c \ elm_slider.c \ -elm_magnetslider.c \ +elm_actionslider.c \ elm_genlist.c \ elm_check.c \ elm_radio.c \ diff --git a/legacy/elementary/src/lib/elm_magnetslider.c b/legacy/elementary/src/lib/elm_actionslider.c similarity index 75% rename from legacy/elementary/src/lib/elm_magnetslider.c rename to legacy/elementary/src/lib/elm_actionslider.c index ae31e7b2e0..7c1507d56b 100644 --- a/legacy/elementary/src/lib/elm_magnetslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -1,5 +1,5 @@ /** - * @addtogroup Magnetslider Magnetslider + * @addtogroup Actionslider Actionslider * * A magnet slider is a switcher for 3 labels with customizable * magnet properties. When the position is set with magnet, the knob @@ -20,9 +20,9 @@ typedef struct _Widget_Data Widget_Data; struct _Widget_Data { - Evas_Object *ms; // magnetslider + Evas_Object *ms; // actionslider Evas_Object *icon; // an icon for a button or a bar - Elm_Magnetslider_Pos magnet_position, enabled_position; + Elm_Actionslider_Pos magnet_position, enabled_position; const char *text_left, *text_right, *text_center; Ecore_Animator *icon_animator; double final_position; @@ -71,9 +71,9 @@ _theme_hook(Evas_Object *obj) if (!edje_object_part_swallow_get(wd->ms, "elm.swallow.icon")) edje_object_part_unswallow(wd->ms, wd->icon); - _elm_theme_object_set(obj, wd->ms, "magnetslider", + _elm_theme_object_set(obj, wd->ms, "actionslider", "base", elm_widget_style_get(obj)); - _elm_theme_object_set(obj, wd->icon, "magnetslider", + _elm_theme_object_set(obj, wd->icon, "actionslider", "icon", elm_widget_style_get(obj)); edje_object_part_swallow(wd->ms, "elm.swallow.icon", wd->icon); edje_object_part_text_set(wd->ms, "elm.text.left", wd->text_left); @@ -133,7 +133,7 @@ _icon_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e edje_object_part_drag_value_get(wd->ms, "elm.swallow.icon", &position, NULL); - if (position == 0.0 && (wd->enabled_position & ELM_MAGNETSLIDER_LEFT)) + if (position == 0.0 && (wd->enabled_position & ELM_ACTIONSLIDER_LEFT)) { wd->final_position = 0; evas_object_smart_callback_call(data, SIG_SELECTED, @@ -141,14 +141,14 @@ _icon_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e return; } if (position >= 0.45 && position <= 0.55 && - (wd->enabled_position & ELM_MAGNETSLIDER_CENTER)) + (wd->enabled_position & ELM_ACTIONSLIDER_CENTER)) { wd->final_position = 0.5; evas_object_smart_callback_call(data, SIG_SELECTED, (void *)wd->text_center); return; } - if (position == 1.0 && (wd->enabled_position & ELM_MAGNETSLIDER_RIGHT)) + if (position == 1.0 && (wd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) { wd->final_position = 1; evas_object_smart_callback_call(data, SIG_SELECTED, @@ -164,27 +164,27 @@ _icon_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e if (position < 0.3) { - if (wd->magnet_position & ELM_MAGNETSLIDER_LEFT) + if (wd->magnet_position & ELM_ACTIONSLIDER_LEFT) wd->final_position = 0; - else if (wd->magnet_position & ELM_MAGNETSLIDER_CENTER) + else if (wd->magnet_position & ELM_ACTIONSLIDER_CENTER) wd->final_position = 0.5; - else if (wd->magnet_position & ELM_MAGNETSLIDER_RIGHT) + else if (wd->magnet_position & ELM_ACTIONSLIDER_RIGHT) wd->final_position = 1; } else if ((position >= 0.3) && (position <= 0.7)) { - if (wd->magnet_position & ELM_MAGNETSLIDER_CENTER) + if (wd->magnet_position & ELM_ACTIONSLIDER_CENTER) wd->final_position = 0.5; else if (position < 0.5) { - if (wd->magnet_position & ELM_MAGNETSLIDER_LEFT) + if (wd->magnet_position & ELM_ACTIONSLIDER_LEFT) wd->final_position = 0; else wd->final_position = 1; } else { - if (wd->magnet_position & ELM_MAGNETSLIDER_RIGHT) + if (wd->magnet_position & ELM_ACTIONSLIDER_RIGHT) wd->final_position = 1; else wd->final_position = 0; @@ -192,9 +192,9 @@ _icon_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e } else { - if (wd->magnet_position & ELM_MAGNETSLIDER_RIGHT) + if (wd->magnet_position & ELM_ACTIONSLIDER_RIGHT) wd->final_position = 1; - else if (wd->magnet_position & ELM_MAGNETSLIDER_CENTER) + else if (wd->magnet_position & ELM_ACTIONSLIDER_CENTER) wd->final_position = 0.5; else wd->final_position = 0; @@ -239,15 +239,15 @@ _icon_animation(void *data) if (flag_finish_animation) { if ((!wd->final_position) && - (wd->enabled_position & ELM_MAGNETSLIDER_LEFT)) + (wd->enabled_position & ELM_ACTIONSLIDER_LEFT)) evas_object_smart_callback_call(data, SIG_SELECTED, (void *)wd->text_left); else if ((wd->final_position == 0.5) && - (wd->enabled_position & ELM_MAGNETSLIDER_CENTER)) + (wd->enabled_position & ELM_ACTIONSLIDER_CENTER)) evas_object_smart_callback_call(data, SIG_SELECTED, (void *)wd->text_center); else if ((wd->final_position == 1) && - (wd->enabled_position & ELM_MAGNETSLIDER_RIGHT)) + (wd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) evas_object_smart_callback_call(data, SIG_SELECTED, (void *)wd->text_right); return EINA_FALSE; @@ -256,15 +256,15 @@ _icon_animation(void *data) } /** - * Add a new magnetslider to the parent. + * Add a new actionslider to the parent. * * @param parent The parent object - * @return The new magnetslider object or NULL if it cannot be created + * @return The new actionslider object or NULL if it cannot be created * - * @ingroup Magnetslider + * @ingroup Actionslider */ EAPI Evas_Object * -elm_magnetslider_add(Evas_Object *parent) +elm_actionslider_add(Evas_Object *parent) { Evas_Object *obj; Widget_Data *wd; @@ -273,23 +273,23 @@ elm_magnetslider_add(Evas_Object *parent) wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); - ELM_SET_WIDTYPE(widtype, "magnetslider"); - elm_widget_type_set(obj, "magnetslider"); + ELM_SET_WIDTYPE(widtype, "actionslider"); + elm_widget_type_set(obj, "actionslider"); elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); wd->mouse_down = EINA_FALSE; - wd->enabled_position = ELM_MAGNETSLIDER_ALL; + wd->enabled_position = ELM_ACTIONSLIDER_ALL; wd->ms = edje_object_add(e); - _elm_theme_object_set(obj, wd->ms, "magnetslider", "base", "default"); + _elm_theme_object_set(obj, wd->ms, "actionslider", "base", "default"); elm_widget_resize_object_set(obj, wd->ms); wd->icon = edje_object_add(e); elm_widget_sub_object_add(obj, wd->icon); - _elm_theme_object_set(obj, wd->icon, "magnetslider", "icon", "default"); + _elm_theme_object_set(obj, wd->icon, "actionslider", "icon", "default"); edje_object_part_swallow(wd->ms, "elm.swallow.icon", wd->icon); evas_object_event_callback_add(wd->icon, EVAS_CALLBACK_MOUSE_DOWN, @@ -305,62 +305,62 @@ elm_magnetslider_add(Evas_Object *parent) } /** - * Set magnetslider indicator position. + * Set actionslider indicator position. * - * @param obj The magnetslider object. + * @param obj The actionslider object. * @param pos The position of the indicator. * - * @ingroup Magnetslider + * @ingroup Actionslider */ EAPI void -elm_magnetslider_indicator_pos_set(Evas_Object *obj, Elm_Magnetslider_Pos pos) +elm_actionslider_indicator_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); double position = 0.0; if (!wd) return; - if (pos == ELM_MAGNETSLIDER_CENTER) position = 0.5; - else if (pos == ELM_MAGNETSLIDER_RIGHT) position = 1.0; + if (pos == ELM_ACTIONSLIDER_CENTER) position = 0.5; + else if (pos == ELM_ACTIONSLIDER_RIGHT) position = 1.0; edje_object_part_drag_value_set(wd->ms, "elm.swallow.icon", position, 0.5); } /** - * Get magnetslider indicator position. + * Get actionslider indicator position. * - * @param obj The magnetslider object. + * @param obj The actionslider object. * @return The position of the indicator. * - * @ingroup Magnetslider + * @ingroup Actionslider */ -EAPI Elm_Magnetslider_Pos -elm_magnetslider_indicator_pos_get(const Evas_Object *obj) +EAPI Elm_Actionslider_Pos +elm_actionslider_indicator_pos_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) ELM_MAGNETSLIDER_NONE; + ELM_CHECK_WIDTYPE(obj, widtype) ELM_ACTIONSLIDER_NONE; Widget_Data *wd = elm_widget_data_get(obj); double position; - if (!wd) return ELM_MAGNETSLIDER_NONE; + if (!wd) return ELM_ACTIONSLIDER_NONE; edje_object_part_drag_value_get(wd->ms, "elm.swallow.icon", &position, NULL); if (position < 0.3) - return ELM_MAGNETSLIDER_LEFT; + return ELM_ACTIONSLIDER_LEFT; else if (position < 0.7) - return ELM_MAGNETSLIDER_CENTER; + return ELM_ACTIONSLIDER_CENTER; else - return ELM_MAGNETSLIDER_RIGHT; + return ELM_ACTIONSLIDER_RIGHT; } /** - * Set magnetslider magnet position. + * Set actionslider magnet position. * - * @param obj The magnetslider object. + * @param obj The actionslider object. * @param pos Bit mask indicating the magnet positions. - * Example: use (ELM_MAGNETSLIDER_LEFT | ELM_MAGNETSLIDER_RIGHT) + * Example: use (ELM_ACTIONSLIDER_LEFT | ELM_ACTIONSLIDER_RIGHT) * to put magnet property on both positions * - * @ingroup Magnetslider + * @ingroup Actionslider */ EAPI void -elm_magnetslider_magnet_pos_set(Evas_Object *obj, Elm_Magnetslider_Pos pos) +elm_actionslider_magnet_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -369,36 +369,36 @@ elm_magnetslider_magnet_pos_set(Evas_Object *obj, Elm_Magnetslider_Pos pos) } /** - * Get magnetslider magnet position. + * Get actionslider magnet position. * - * @param obj The magnetslider object. + * @param obj The actionslider object. * @return The positions with magnet property. * - * @ingroup Magnetslider + * @ingroup Actionslider */ -EAPI Elm_Magnetslider_Pos -elm_magnetslider_magnet_pos_get(const Evas_Object *obj) +EAPI Elm_Actionslider_Pos +elm_actionslider_magnet_pos_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) ELM_MAGNETSLIDER_NONE; + ELM_CHECK_WIDTYPE(obj, widtype) ELM_ACTIONSLIDER_NONE; Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return ELM_MAGNETSLIDER_NONE; + if (!wd) return ELM_ACTIONSLIDER_NONE; return wd->magnet_position; } /** - * Set magnetslider enabled position. + * Set actionslider enabled position. * * All the positions are enabled by default. * - * @param obj The magnetslider object. + * @param obj The actionslider object. * @param pos Bit mask indicating the enabled positions. - * Example: use (ELM_MAGNETSLIDER_LEFT | ELM_MAGNETSLIDER_RIGHT) + * Example: use (ELM_ACTIONSLIDER_LEFT | ELM_ACTIONSLIDER_RIGHT) * to enable both positions, so the user can select it. * - * @ingroup Magnetslider + * @ingroup Actionslider */ EAPI void -elm_magnetslider_enabled_pos_set(Evas_Object *obj, Elm_Magnetslider_Pos pos) +elm_actionslider_enabled_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -407,36 +407,36 @@ elm_magnetslider_enabled_pos_set(Evas_Object *obj, Elm_Magnetslider_Pos pos) } /** - * Get magnetslider enabled position. + * Get actionslider enabled position. * * All the positions are enabled by default. * - * @param obj The magnetslider object. + * @param obj The actionslider object. * @return The enabled positions. * - * @ingroup Magnetslider + * @ingroup Actionslider */ -EAPI Elm_Magnetslider_Pos -elm_magnetslider_enabled_pos_get(const Evas_Object *obj) +EAPI Elm_Actionslider_Pos +elm_actionslider_enabled_pos_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) ELM_MAGNETSLIDER_NONE; + ELM_CHECK_WIDTYPE(obj, widtype) ELM_ACTIONSLIDER_NONE; Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return ELM_MAGNETSLIDER_NONE; + if (!wd) return ELM_ACTIONSLIDER_NONE; return wd->enabled_position; } /** - * Set magnetslider labels. + * Set actionslider labels. * - * @param obj The magnetslider object + * @param obj The actionslider object * @param left_label The label which is going to be set. * @param center_label The label which is going to be set. * @param right_label The label which is going to be set. * - * @ingroup Magnetslider + * @ingroup Actionslider */ EAPI void -elm_magnetslider_labels_set(Evas_Object *obj, const char *left_label, const char *center_label, const char *right_label) +elm_actionslider_labels_set(Evas_Object *obj, const char *left_label, const char *center_label, const char *right_label) { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -451,17 +451,17 @@ elm_magnetslider_labels_set(Evas_Object *obj, const char *left_label, const char } /** - * Get magnetslider labels. + * Get actionslider labels. * - * @param obj The magnetslider object + * @param obj The actionslider object * @param left_label A char** to place the left_label of @p obj into * @param center_label A char** to place the center_label of @p obj into * @param right_label A char** to place the right_label of @p obj into * - * @ingroup Magnetslider + * @ingroup Actionslider */ EAPI void -elm_magnetslider_labels_get(const Evas_Object *obj, const char **left_label, const char **center_label, const char **right_label) +elm_actionslider_labels_get(const Evas_Object *obj, const char **left_label, const char **center_label, const char **right_label) { if (left_label) *left_label= NULL; if (center_label) *center_label= NULL; @@ -475,30 +475,30 @@ elm_magnetslider_labels_get(const Evas_Object *obj, const char **left_label, con } /** - * Get magnetslider selected label. + * Get actionslider selected label. * - * @param obj The magnetslider object + * @param obj The actionslider object * @return The selected label * - * @ingroup Magnetslider + * @ingroup Actionslider */ EAPI const char * -elm_magnetslider_selected_label_get(const Evas_Object *obj) +elm_actionslider_selected_label_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; if ((wd->final_position == 0.0) && - (wd->enabled_position & ELM_MAGNETSLIDER_LEFT)) + (wd->enabled_position & ELM_ACTIONSLIDER_LEFT)) return wd->text_left; if ((wd->final_position == 0.5) && - (wd->enabled_position & ELM_MAGNETSLIDER_CENTER)) + (wd->enabled_position & ELM_ACTIONSLIDER_CENTER)) return wd->text_center; if ((wd->final_position == 1.0) && - (wd->enabled_position & ELM_MAGNETSLIDER_RIGHT)) + (wd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) return wd->text_right; return NULL;