hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename elm_diskpicker to elm_diskselector 

Men at work. Sorry for the inconvenience.


SVN revision: 54406
This commit is contained in:
Bruno Dilly 2010-11-10 13:28:32 +00:00
parent 98ad22406b
commit 741d4b8878
7 changed files with 293 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/data/themes/default.edc
View File

@ -30843,9 +30843,9 @@ collections {
}
////////////////////////////////////////////////////////////////////////////////
// diskpicker
// diskselector
////////////////////////////////////////////////////////////////////////////////
group { name: "elm/diskpicker/base/default";
group { name: "elm/diskselector/base/default";
images {
image: "bar_shine.png" COMP;
}
@ -30912,7 +30912,7 @@ collections {
}
}
group { name: "elm/diskpicker/item/default";
group { name: "elm/diskselector/item/default";
data {
item: "len_threshold" "14";

2
legacy/elementary/src/bin/Makefile.am
View File

@ -89,7 +89,7 @@ test_cursor.c \
test_focus.c \
test_focus2.c \
test_flippicker.c \
test_diskpicker.c \
test_diskselector.c \
test_colorselector.c \
test_hoverlist.c

4
legacy/elementary/src/bin/test.c
View File

@ -113,7 +113,7 @@ void test_cursor3(void *data, Evas_Object *obj, void *event_info);
void test_focus(void *data, Evas_Object *obj, void *event_info);
void test_focus2(void *data, Evas_Object *obj, void *event_info);
void test_flippicker(void *data, Evas_Object *obj, void *event_info);
void test_diskpicker(void *data, Evas_Object *obj, void *event_info);
void test_diskselector(void *data, Evas_Object *obj, void *event_info);
void test_colorselector(void *data, Evas_Object *obj, void *event_info);
void test_hoverlist(void *data, Evas_Object *obj, void *event_info);
@ -346,7 +346,7 @@ my_win_main(char *autorun)
ADD_TEST("Focus", test_focus);
ADD_TEST("Focus 2", test_focus2);
ADD_TEST("Flippicker", test_flippicker);
ADD_TEST("Diskpicker", test_diskpicker);
ADD_TEST("Disk Selector", test_diskselector);
ADD_TEST("Color Selector", test_colorselector);
ADD_TEST("Hoverlist", test_hoverlist);
#undef ADD_TEST

88
legacy/elementary/src/bin/test_diskpicker.c → legacy/elementary/src/bin/test_diskselector.c
View File

@ -7,63 +7,63 @@
static void
_disk_sel(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info)
{
Elm_Diskpicker_Item *it = event_info;
printf("Equinox: %s\n", elm_diskpicker_item_label_get(it));
Elm_Diskselector_Item *it = event_info;
printf("Equinox: %s\n", elm_diskselector_item_label_get(it));
}
static void
_disk_next(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info)
{
Elm_Diskpicker_Item *next, *prev, *it = event_info;
prev = elm_diskpicker_item_prev_get(it);
next = elm_diskpicker_item_next_get(it);
printf("Prev: %s, Next: %s\n", elm_diskpicker_item_label_get(prev),
elm_diskpicker_item_label_get(next));
Elm_Diskselector_Item *next, *prev, *it = event_info;
prev = elm_diskselector_item_prev_get(it);
next = elm_diskselector_item_next_get(it);
printf("Prev: %s, Next: %s\n", elm_diskselector_item_label_get(prev),
elm_diskselector_item_label_get(next));
}
static void
_print_disk_info_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Elm_Diskpicker_Item *it = event_info;
printf("Selected label: %s\n", elm_diskpicker_item_label_get(it));
Elm_Diskselector_Item *it = event_info;
printf("Selected label: %s\n", elm_diskselector_item_label_get(it));
}
static Evas_Object *
_disk_create(Evas_Object *win, Eina_Bool round)
{
Elm_Diskpicker_Item *it;
Elm_Diskselector_Item *it;
Evas_Object *di;
di = elm_diskpicker_add(win);
di = elm_diskselector_add(win);
elm_diskpicker_item_append(di, "January", NULL, NULL, NULL);
elm_diskpicker_item_append(di, "February", NULL, _disk_next, NULL);
elm_diskpicker_item_append(di, "March", NULL, _disk_sel, NULL);
elm_diskpicker_item_append(di, "April", NULL, NULL, NULL);
elm_diskpicker_item_append(di, "May", NULL, NULL, NULL);
elm_diskpicker_item_append(di, "June", NULL, NULL, NULL);
elm_diskpicker_item_append(di, "July", NULL, NULL, NULL);
it = elm_diskpicker_item_append(di, "August", NULL, NULL, NULL);
elm_diskpicker_item_append(di, "September", NULL, _disk_sel, NULL);
elm_diskpicker_item_append(di, "October", NULL, NULL, NULL);
elm_diskpicker_item_append(di, "November", NULL, NULL, NULL);
elm_diskpicker_item_append(di, "December", NULL, NULL, NULL);
elm_diskselector_item_append(di, "January", NULL, NULL, NULL);
elm_diskselector_item_append(di, "February", NULL, _disk_next, NULL);
elm_diskselector_item_append(di, "March", NULL, _disk_sel, NULL);
elm_diskselector_item_append(di, "April", NULL, NULL, NULL);
elm_diskselector_item_append(di, "May", NULL, NULL, NULL);
elm_diskselector_item_append(di, "June", NULL, NULL, NULL);
elm_diskselector_item_append(di, "July", NULL, NULL, NULL);
it = elm_diskselector_item_append(di, "August", NULL, NULL, NULL);
elm_diskselector_item_append(di, "September", NULL, _disk_sel, NULL);
elm_diskselector_item_append(di, "October", NULL, NULL, NULL);
elm_diskselector_item_append(di, "November", NULL, NULL, NULL);
elm_diskselector_item_append(di, "December", NULL, NULL, NULL);
elm_diskpicker_item_selected_set(it, EINA_TRUE);
elm_diskpicker_round_set(di, round);
elm_diskselector_item_selected_set(it, EINA_TRUE);
elm_diskselector_round_set(di, round);
return di;
}
void
test_diskpicker(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *win, *bg, *bx, *disk, *ic;
Elm_Diskpicker_Item *it;
Elm_Diskselector_Item *it;
char buf[PATH_MAX];
win = elm_win_add(NULL, "diskpicker", ELM_WIN_BASIC);
elm_win_title_set(win, "Diskpicker");
win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
elm_win_title_set(win, "Disk Selector");
elm_win_autodel_set(win, 1);
bg = elm_bg_add(win);
@ -84,8 +84,8 @@ test_diskpicker(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
elm_box_pack_end(bx, disk);
evas_object_show(disk);
evas_object_smart_callback_add(disk, "selected", _print_disk_info_cb, NULL);
it = elm_diskpicker_selected_item_get(disk);
elm_diskpicker_item_selected_set(it, EINA_FALSE);
it = elm_diskselector_selected_item_get(disk);
elm_diskselector_item_selected_set(it, EINA_FALSE);
disk = _disk_create(win, EINA_FALSE);
evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -93,9 +93,9 @@ test_diskpicker(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
elm_box_pack_end(bx, disk);
evas_object_show(disk);
evas_object_smart_callback_add(disk, "selected", _print_disk_info_cb, NULL);
it = elm_diskpicker_first_item_get(disk);
it = elm_diskpicker_item_next_get(it);
elm_diskpicker_item_selected_set(it, EINA_TRUE);
it = elm_diskselector_first_item_get(disk);
it = elm_diskselector_item_next_get(it);
elm_diskselector_item_selected_set(it, EINA_TRUE);
disk = _disk_create(win, EINA_FALSE);
evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -103,21 +103,21 @@ test_diskpicker(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
elm_box_pack_end(bx, disk);
evas_object_show(disk);
evas_object_smart_callback_add(disk, "selected", _print_disk_info_cb, NULL);
elm_diskpicker_side_label_lenght_set(disk, 4);
elm_diskselector_side_label_lenght_set(disk, 4);
disk = elm_diskpicker_add(win);
disk = elm_diskselector_add(win);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 1, 1);
elm_diskpicker_item_append(disk, "Sunday", ic, NULL, NULL);
elm_diskpicker_item_append(disk, "Monday", NULL, NULL, NULL);
elm_diskpicker_item_append(disk, "Tuesday", NULL, NULL, NULL);
elm_diskpicker_item_append(disk, "Wednesday", NULL, NULL, NULL);
elm_diskpicker_item_append(disk, "Thursday", NULL, NULL, NULL);
elm_diskpicker_item_append(disk, "Friday", NULL, NULL, NULL);
elm_diskpicker_item_append(disk, "Saturday", NULL, NULL, NULL);
elm_diskpicker_round_set(disk, EINA_TRUE);
elm_diskselector_item_append(disk, "Sunday", ic, NULL, NULL);
elm_diskselector_item_append(disk, "Monday", NULL, NULL, NULL);
elm_diskselector_item_append(disk, "Tuesday", NULL, NULL, NULL);
elm_diskselector_item_append(disk, "Wednesday", NULL, NULL, NULL);
elm_diskselector_item_append(disk, "Thursday", NULL, NULL, NULL);
elm_diskselector_item_append(disk, "Friday", NULL, NULL, NULL);
elm_diskselector_item_append(disk, "Saturday", NULL, NULL, NULL);
elm_diskselector_round_set(disk, EINA_TRUE);
evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5);
elm_box_pack_end(bx, disk);

80
legacy/elementary/src/lib/Elementary.h.in
View File

@ -2236,47 +2236,47 @@ extern "C" {
* month.
*/
/* diskpicker */
typedef struct _Elm_Diskpicker_Item Elm_Diskpicker_Item;
/* diskselector */
typedef struct _Elm_Diskselector_Item Elm_Diskselector_Item;
EAPI Evas_Object *elm_diskpicker_add(Evas_Object *parent);
EAPI Eina_Bool elm_diskpicker_round_get(const Evas_Object *obj);
EAPI void elm_diskpicker_round_set(Evas_Object *obj, Eina_Bool round);
EAPI int elm_diskpicker_side_label_lenght_get(const Evas_Object *obj);
EAPI void elm_diskpicker_side_label_lenght_set(Evas_Object *obj, int len);
EAPI void elm_diskpicker_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
EAPI void elm_diskpicker_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
EAPI void elm_diskpicker_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
EAPI void elm_diskpicker_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
EAPI void elm_diskpicker_clear(Evas_Object *obj);
EAPI const Eina_List *elm_diskpicker_items_get(const Evas_Object *obj);
EAPI Elm_Diskpicker_Item *elm_diskpicker_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data);
EAPI void elm_diskpicker_item_del(Elm_Diskpicker_Item *item);
EAPI void elm_diskpicker_item_del_cb_set(Elm_Diskpicker_Item *item, Evas_Smart_Cb func);
EAPI void *elm_diskpicker_item_data_get(const Elm_Diskpicker_Item *item);
EAPI Evas_Object *elm_diskpicker_item_icon_get(const Elm_Diskpicker_Item *item);
EAPI void elm_diskpicker_item_icon_set(Elm_Diskpicker_Item *item, Evas_Object *icon);
EAPI const char *elm_diskpicker_item_label_get(const Elm_Diskpicker_Item *item);
EAPI void elm_diskpicker_item_label_set(Elm_Diskpicker_Item *item, const char *label);
EAPI Elm_Diskpicker_Item *elm_diskpicker_selected_item_get(const Evas_Object *obj);
EAPI void elm_diskpicker_item_selected_set(Elm_Diskpicker_Item *item, Eina_Bool selected);
EAPI Eina_Bool elm_diskpicker_item_selected_get(const Elm_Diskpicker_Item *item);
EAPI Elm_Diskpicker_Item *elm_diskpicker_first_item_get(const Evas_Object *obj);
EAPI Elm_Diskpicker_Item *elm_diskpicker_last_item_get(const Evas_Object *obj);
EAPI Elm_Diskpicker_Item *elm_diskpicker_item_prev_get(const Elm_Diskpicker_Item *item);
EAPI Elm_Diskpicker_Item *elm_diskpicker_item_next_get(const Elm_Diskpicker_Item *item);
EAPI void elm_diskpicker_item_tooltip_text_set(Elm_Diskpicker_Item *item, const char *text);
EAPI void elm_diskpicker_item_tooltip_content_cb_set(Elm_Diskpicker_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
EAPI void elm_diskpicker_item_tooltip_unset(Elm_Diskpicker_Item *item);
EAPI void elm_diskpicker_item_tooltip_style_set(Elm_Diskpicker_Item *item, const char *style);
EAPI const char* elm_diskpicker_item_tooltip_style_get(const Elm_Diskpicker_Item *item);
EAPI void elm_diskpicker_item_cursor_set(Elm_Diskpicker_Item *item, const char *cursor);
EAPI const char* elm_diskpicker_item_cursor_get(const Elm_Diskpicker_Item *item);
EAPI void elm_diskpicker_item_cursor_unset(Elm_Diskpicker_Item *item);
EAPI void elm_diskpicker_item_cursor_style_set(Elm_Diskpicker_Item *item, const char *style);
EAPI const char* elm_diskpicker_item_cursor_style_get(const Elm_Diskpicker_Item *item);
EAPI void elm_diskpicker_item_cursor_engine_only_set(Elm_Diskpicker_Item *item, Eina_Bool engine_only);
EAPI Eina_Bool elm_diskpicker_item_cursor_engine_only_get(const Elm_Diskpicker_Item *item);
EAPI Evas_Object *elm_diskselector_add(Evas_Object *parent);
EAPI Eina_Bool elm_diskselector_round_get(const Evas_Object *obj);
EAPI void elm_diskselector_round_set(Evas_Object *obj, Eina_Bool round);
EAPI int elm_diskselector_side_label_lenght_get(const Evas_Object *obj);
EAPI void elm_diskselector_side_label_lenght_set(Evas_Object *obj, int len);
EAPI void elm_diskselector_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
EAPI void elm_diskselector_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
EAPI void elm_diskselector_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
EAPI void elm_diskselector_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
EAPI void elm_diskselector_clear(Evas_Object *obj);
EAPI const Eina_List *elm_diskselector_items_get(const Evas_Object *obj);
EAPI Elm_Diskselector_Item *elm_diskselector_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data);
EAPI void elm_diskselector_item_del(Elm_Diskselector_Item *item);
EAPI void elm_diskselector_item_del_cb_set(Elm_Diskselector_Item *item, Evas_Smart_Cb func);
EAPI void *elm_diskselector_item_data_get(const Elm_Diskselector_Item *item);
EAPI Evas_Object *elm_diskselector_item_icon_get(const Elm_Diskselector_Item *item);
EAPI void elm_diskselector_item_icon_set(Elm_Diskselector_Item *item, Evas_Object *icon);
EAPI const char *elm_diskselector_item_label_get(const Elm_Diskselector_Item *item);
EAPI void elm_diskselector_item_label_set(Elm_Diskselector_Item *item, const char *label);
EAPI Elm_Diskselector_Item *elm_diskselector_selected_item_get(const Evas_Object *obj);
EAPI void elm_diskselector_item_selected_set(Elm_Diskselector_Item *item, Eina_Bool selected);
EAPI Eina_Bool elm_diskselector_item_selected_get(const Elm_Diskselector_Item *item);
EAPI Elm_Diskselector_Item *elm_diskselector_first_item_get(const Evas_Object *obj);
EAPI Elm_Diskselector_Item *elm_diskselector_last_item_get(const Evas_Object *obj);
EAPI Elm_Diskselector_Item *elm_diskselector_item_prev_get(const Elm_Diskselector_Item *item);
EAPI Elm_Diskselector_Item *elm_diskselector_item_next_get(const Elm_Diskselector_Item *item);
EAPI void elm_diskselector_item_tooltip_text_set(Elm_Diskselector_Item *item, const char *text);
EAPI void elm_diskselector_item_tooltip_content_cb_set(Elm_Diskselector_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
EAPI void elm_diskselector_item_tooltip_unset(Elm_Diskselector_Item *item);
EAPI void elm_diskselector_item_tooltip_style_set(Elm_Diskselector_Item *item, const char *style);
EAPI const char* elm_diskselector_item_tooltip_style_get(const Elm_Diskselector_Item *item);
EAPI void elm_diskselector_item_cursor_set(Elm_Diskselector_Item *item, const char *cursor);
EAPI const char* elm_diskselector_item_cursor_get(const Elm_Diskselector_Item *item);
EAPI void elm_diskselector_item_cursor_unset(Elm_Diskselector_Item *item);
EAPI void elm_diskselector_item_cursor_style_set(Elm_Diskselector_Item *item, const char *style);
EAPI const char* elm_diskselector_item_cursor_style_get(const Elm_Diskselector_Item *item);
EAPI void elm_diskselector_item_cursor_engine_only_set(Elm_Diskselector_Item *item, Eina_Bool engine_only);
EAPI Eina_Bool elm_diskselector_item_cursor_engine_only_get(const Elm_Diskselector_Item *item);
/* smart callbacks called:
* "selected" - when item is selected (scroller stops)
*/

2
legacy/elementary/src/lib/Makefile.am
View File

@ -84,7 +84,7 @@ elm_animator.c \
elm_transit.c \
elm_calendar.c \
elm_flippicker.c \
elm_diskpicker.c \
elm_diskselector.c \
elm_colorselector.c \
\
elc_anchorblock.c \

404
legacy/elementary/src/lib/elm_diskpicker.c → legacy/elementary/src/lib/elm_diskselector.c
View File

File diff suppressed because it is too large Load Diff