enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elementary/dayselector - New widget Elc_dayselector 

Hi Raster,
Please find the modified patch after the suggested changes. 
[ APIs are provided for setting week_start, weekend_start & weekend_length.Default values are fetched
from elm_config instead of edc styles.] 
Please review the patch and push it to svn. 
Thanks,
Sumanth 

Signed-Off-By: Sumanth Krishna Mannam(sumanth.m@samsung.com)



SVN revision: 68868
This commit is contained in:
ChunEon Park 2012-03-07 04:57:03 +00:00
parent b70396c859
commit 18e3c65c0e
16 changed files with 296 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/elementary/config/default/base.src
View File

@ -52,4 +52,7 @@ group "Elm_Config" struct {
value "glayer_flick_time_limit_ms" uint: 120; /* ms to finish flick */
value "glayer_long_tap_start_timeout" double: 1.2; /* sec to start long-tap */
value "glayer_continues_enable" uchar: 1; /* Continues gesture enabled */
value "week_start" int: 0;
value "weekend_start" int: 6;
value "weekend_len" int: 2;
}

3
legacy/elementary/config/illume/base.src
View File

@ -56,4 +56,7 @@ group "Elm_Config" struct {
value "glayer_flick_time_limit_ms" uint: 100; /* ms to finish flick */
value "glayer_long_tap_start_timeout" double: 1.2; /* sec to start long-tap */
value "glayer_continues_enable" uchar: 1; /* Continues gesture enabled */
value "week_start" int: 0;
value "weekend_start" int: 6;
value "weekend_len" int: 2;
}

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

@ -325,6 +325,7 @@ collections {
#include "widgets/toggle.edc"
#include "widgets/clock.edc"
#include "widgets/datetime.edc"
#include "widgets/dayselector.edc"
#include "widgets/menu.edc"
#include "widgets/frame.edc"
#include "widgets/tooltip.edc"

1
legacy/elementary/doc/Makefile.am
View File

@ -36,6 +36,7 @@ WGT_PREVIEW = \
datetime:preview-00.png:widget_preview_datetime1:360:60 \
datetime:preview-01.png:widget_preview_datetime2:200:60 \
datetime:preview-02.png:widget_preview_datetime3:200:60 \
dayselector:preview-00.png:widget_preview_dayselector:350:50 \
slider:preview-00.png:widget_preview_slider:200:100 \
panes:preview-00.png:widget_preview_panes:200:100 \
toolbar:preview-00.png:widget_preview_toolbar:300:100 \

48
legacy/elementary/doc/examples.dox
View File

@ -39,6 +39,8 @@
*
* @ref datetime_example
*
* @ref dayselector_example
*
* @ref mapbuf_example
* @ref map_example_01
@ -1744,6 +1746,46 @@
* @example datetime_example.c
*/
/**
* @page dayselector_example Dayselector widget example
*
* This code places two Elementary dayselector widgets on a window, each of
* them exemplifying the different widget styles.
*
* The first of them is the dayselector in default style:
* @dontinclude dayselector_example.c
* @skip weekdays starting from Sunday
* @until evas_object_show
*
* As you see, the default style displays the weekdays starting from Sunday.
*
* One can select/unselect a day just by clicking on the day object.
* The selection toggles once it is being pressed.
*
*
* For showing weekdays starting from Monday, see the second dayselector:
* @dontinclude dayselector_example.c
* @skip weekdays starting from Monday
* @until evas_object_show
*
*
* The following code exemplifies the selection APIs of Dayselector:
* @dontinclude dayselector_example.c
* @skip Callback function
* @until End of clicked callback
*
*
* See the full @ref dayselector_example.c "example", whose window should
* look like this picture:
*
* @image html screenshots/dayselector_example.png
* @image latex screenshots/dayselector_example.eps width=\textwidth
*
* See the full @ref dayselector_example_c "source code" for this example.
*
* @example dayselector_example.c
*/
/**
* @page mapbuf_example Mapbuf Widget Example
*
@ -6257,6 +6299,12 @@
* @example datetime_example.c
*/
/**
* @page dayselector_example_c Dayselector example
* @include dayselector_example.c
* @example dayselector_example.c
*/
/**
* @page flipselector_example_c Flipselector example
* @include flipselector_example.c

4
legacy/elementary/doc/index.doxy
View File

@ -87,6 +87,10 @@
*
* @image html img/widget/datetime/preview-00.png
* @image latex img/widget/datetime/preview-00.eps
* @li @ref Dayselector
*
* @image html img/widget/dayselector/preview-00.png
* @image latex img/widget/dayselector/preview-00.eps
* @li @ref Diskselector
*
* @image html img/widget/diskselector/preview-00.png

2
legacy/elementary/doc/widgets/Makefile.am
View File

@ -45,6 +45,7 @@ widget_preview_segment_control \
widget_preview_conformant \
widget_preview_index \
widget_preview_clock \
widget_preview_dayselector \
widget_preview_label \
widget_preview_frame \
widget_preview_slider \
@ -127,6 +128,7 @@ EXTRA_DIST = \
widget_preview_datetime1.c \
widget_preview_datetime2.c \
widget_preview_datetime3.c \
widget_preview_dayselector.c \
widget_preview_diskselector.c \
widget_preview_entry1.c \
widget_preview_entry2.c \

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

@ -47,6 +47,7 @@ test_conform.c \
test_ctxpopup.c \
test_cursor.c \
test_datetime.c \
test_dayselector.c \
test_diskselector.c \
test_entry.c \
test_entry_anchor.c \

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

@ -110,6 +110,7 @@ void test_scroller2(void *data, Evas_Object *obj, void *event_info);
void test_spinner(void *data, Evas_Object *obj, void *event_info);
void test_index(void *data, Evas_Object *obj, void *event_info);
void test_index2(void *data, Evas_Object *obj, void *event_info);
void test_index3(void *data, Evas_Object *obj, void *event_info);
void test_photocam(void *data, Evas_Object *obj, void *event_info);
void test_photo(void *data, Evas_Object *obj, void *event_info);
void test_thumb(void *data, Evas_Object *obj, void *event_info);
@ -166,6 +167,7 @@ void test_naviframe(void *data, Evas_Object *obj, void *event_info);
//void test_factory(void *data, Evas_Object *obj, void *event_info);
void test_datetime(void *data, Evas_Object *obj, void *event_info);
void test_popup(void *data, Evas_Object *obj, void *event_info);
void test_dayselector(void *data, Evas_Object *obj, void *event_info);
#ifdef HAVE_EMOTION
void test_video(void *data, Evas_Object *obj, void *event_info);
#endif
@ -464,6 +466,7 @@ add_tests:
//------------------------------//
ADD_TEST(NULL, "Selectors", "Index", test_index);
ADD_TEST(NULL, "Selectors", "Index 2", test_index2);
ADD_TEST(NULL, "Selectors", "Index 3", test_index3);
ADD_TEST(NULL, "Selectors", "File Selector", test_fileselector);
ADD_TEST(NULL, "Selectors", "File Selector Entry", test_fileselector_entry);
ADD_TEST(NULL, "Selectors", "File Selector Button", test_fileselector_button);
@ -475,6 +478,7 @@ add_tests:
ADD_TEST(NULL, "Selectors", "Hoversel", test_hoversel);
ADD_TEST(NULL, "Selectors", "Radios", test_radio);
ADD_TEST(NULL, "Selectors", "Flip Selector", test_flipselector);
ADD_TEST(NULL, "Selectors", "Dayselector", test_dayselector);
//------------------------------//
ADD_TEST(NULL, "Cursors", "Cursor", test_cursor);

192
legacy/elementary/src/bin/test_index.c
View File

@ -18,6 +18,18 @@ struct _api_data
};
typedef struct _api_data api_data;
struct _pagectrl_data
{
Evas_Object *index;
Evas_Object *sc;
Evas_Coord recent_x;
Evas_Coord page_width;
int page_cnt;
Eina_Bool drag_started : 1;
Eina_Bool changed : 1;
};
typedef struct _pagectrl_data pagectrl_data;
enum _api_state
{
INDEX_LEVEL_SET,
@ -192,6 +204,7 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
itci.func.state_get = NULL;
itci.func.del = NULL;
Elm_Object_Item *it;
j = 0;
for (i = 0; i < 100; i++)
{
@ -205,8 +218,10 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
char buf[32];
snprintf(buf, sizeof(buf), "%c", 'A' + ((j >> 4) & 0xf));
if (j == 96)
it = elm_index_item_append(id, buf, id_cb, glit);
else
elm_index_item_append(id, buf, id_cb, glit);
if (*buf == 'G') /* Just init dt->item later used in API test */
api->dt.item = glit;
}
@ -216,7 +231,7 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_smart_callback_add(id, "changed", _index_changed_cb, NULL);
evas_object_smart_callback_add(id, "selected", _index_selected_cb, NULL);
elm_index_level_go(id, 0);
elm_index_item_selected_set(it, 1);
evas_object_resize(win, 320, 480);
evas_object_show(win);
}
@ -342,10 +357,10 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
gui->id = elm_index_add(win);
evas_object_size_hint_weight_set(gui->id, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, gui->id);
evas_object_smart_callback_add(gui->id, "delay,changed",
test_index2_id_changed, NULL);
test_index2_id_changed, NULL);
evas_object_show(gui->id);
gui->entry = elm_entry_add(win);
@ -368,14 +383,179 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
gui->lst = elm_list_add(win);
elm_box_pack_end(box, gui->lst);
evas_object_size_hint_weight_set(gui->lst, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(gui->lst, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(gui->lst, "selected", test_index2_it_del,
gui);
gui);
elm_list_go(gui->lst);
evas_object_show(gui->lst);
evas_object_resize(win, 320, 480);
evas_object_show(win);
}
static void
_drag_start(void *data , Evas_Object *obj, void *event_info __UNUSED__)
{
pagectrl_data *page_data = data;
Evas_Coord x, y, w, h;
elm_scroller_region_get(obj, &x, &y, &w, &h);
page_data->recent_x = x;
page_data->drag_started = EINA_TRUE;
}
static void
_drag_stop(void *data , Evas_Object *obj, void *event_info __UNUSED__)
{
pagectrl_data *page_data = data;
Evas_Coord x, y, w, h;
elm_scroller_region_get(obj, &x, &y, &w, &h);
if ((page_data->recent_x == x) && (x != 0))
elm_object_scroll_hold_push(obj);
}
static void
_anim_start(void *data , Evas_Object *obj, void *event_info __UNUSED__)
{
pagectrl_data *page_data = data;
Evas_Coord x, y, w, h;
Elm_Object_Item *it;
int idx;
int threshold;
Evas_Coord max_page_x;
if (page_data->changed)
{
page_data->changed = EINA_FALSE;
return;
}
if (!page_data->drag_started) return;
max_page_x = (page_data->page_cnt - 1) * page_data->page_width;
elm_scroller_region_get(obj, &x, &y, &w, &h);
it = elm_index_selected_item_get(page_data->index, 0);
if (!it) return;
idx = (int) elm_object_item_data_get(it);
if (x < 0) x = 0;
if (x > max_page_x) x = max_page_x;
threshold = page_data->page_width * 0.2;
if (abs(page_data->recent_x - x) > threshold)
{
if (x > page_data->recent_x) idx++;
else if ((x < page_data->recent_x) && (idx > 0)) idx--;
}
if (idx > page_data->page_cnt) idx = page_data->page_cnt;
page_data->drag_started = EINA_FALSE;
elm_scroller_region_bring_in(obj, page_data->page_width * idx, 0, w, h);
it = elm_index_item_find(page_data->index, (void *) idx);
// elm_index_item_selected_set(it, EINA_TRUE);
}
static void
_anim_stop(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
elm_object_scroll_hold_pop(obj);
}
static void
_index3_selected_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info)
{
Evas_Coord x, y, w, h;
Elm_Object_Item *it = event_info;
int idx = (int) elm_object_item_data_get(it);
pagectrl_data *page_data = data;
evas_object_geometry_get(page_data->sc, &x, &y, &w, &h);
page_data->changed = EINA_TRUE;
elm_scroller_region_bring_in(page_data->sc, page_data->page_width * idx, 0,
w, h);
}
void
test_index3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *win, *bg, *sc, *img, *id;
char buf[PATH_MAX];
api_data *api = calloc(1, sizeof(api_data));
pagectrl_data *page_data = calloc(1, sizeof(pagectrl_data));
Evas_Coord page_h;
int i;
Elm_Object_Item *it;
page_data->page_width = 480;
page_data->page_cnt = 3;
win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
elm_win_title_set(win, "index - pagecontrol style");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
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);
img = elm_image_add(win);
snprintf(buf, sizeof(buf), "%s/images/horz_scrollbar.jpg", elm_app_data_dir_get());
elm_image_file_set(img, buf, NULL);
elm_image_resizable_set(img, EINA_TRUE, EINA_FALSE);
elm_image_object_size_get(img, NULL, &page_h);
evas_object_show(img);
page_data->sc = sc = elm_scroller_add(win);
evas_object_smart_callback_add(sc, "scroll,drag,start", _drag_start,
page_data);
evas_object_smart_callback_add(sc, "scroll,drag,stop", _drag_stop,
page_data);
evas_object_smart_callback_add(sc, "scroll,anim,start", _anim_start,
page_data);
evas_object_smart_callback_add(sc, "scroll,anim,stop", _anim_stop,
page_data);
elm_scroller_bounce_set(sc, EINA_FALSE, EINA_FALSE);
elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
elm_scroller_page_size_set(sc, page_data->page_width, page_h);
elm_object_content_set(sc, img);
elm_object_scroll_lock_y_set(sc, EINA_TRUE);
elm_win_resize_object_add(win, sc);
evas_object_show(sc);
page_data->index = api->dt.id = id = elm_index_add(win);
elm_index_horizontal_set(id, EINA_TRUE);
elm_index_autohide_disabled_set(id, EINA_TRUE);
elm_object_style_set(id, "pagecontrol");
evas_object_smart_callback_add(id, "selected", _index3_selected_cb,
page_data);
evas_object_size_hint_weight_set(id, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(id, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(id);
for(i = 0; i < page_data->page_cnt; i++)
{
snprintf(buf, sizeof(buf), "%c", '1' + i);
if (i == 0)
it = elm_index_item_append(id, buf, NULL, (void *) i);
else
elm_index_item_append(id, buf, NULL, (void *) i);
}
elm_index_level_go(id, 0);
//elm_index_item_selected_set(it, EINA_TRUE);
elm_win_resize_object_add(win, id);
evas_object_resize(win, page_data->page_width, 585);
evas_object_show(win);
}
#endif

3
legacy/elementary/src/examples/Makefile.am
View File

@ -69,6 +69,7 @@ SRCS = \
toolbar_example_03.c \
spinner_example.c \
clock_example.c \
dayselector_example.c \
mapbuf_example.c \
conformant_example_01.c \
conformant_example_02.c \
@ -181,6 +182,7 @@ examples_PROGRAMS += \
toolbar_example_03 \
spinner_example \
clock_example \
dayselector_example \
mapbuf_example \
conformant_example_01 \
conformant_example_02 \
@ -274,6 +276,7 @@ SCREENSHOTS = \
toolbar_example_03:toolbar_example_03.png:1 \
spinner_example:spinner_example.png:0.0 \
clock_example:clock_example.png:0.5 \
dayselector_example:dayselector_example.png:0.0 \
mapbuf_example:mapbuf_example.png:0.0 \
image_example_01:image_example_01.png:0.0 \
diskselector_example_01:diskselector_example_01.png:0.2 \

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

@ -161,6 +161,7 @@ EAPI extern Elm_Version *elm_version;
/* other includes */
// Tom Hacohen
#include <elc_ctxpopup.h>
#include <elc_dayselector.h>
#include <elc_fileselector_button.h>
#include <elc_fileselector_entry.h>
#include <elc_fileselector.h>

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

@ -46,6 +46,7 @@ includesunstabledir = $(includedir)/elementary-@VMAJ@
includesub_HEADERS = \
elc_ctxpopup.h \
elc_dayselector.h \
elc_fileselector_button.h \
elc_fileselector_entry.h \
elc_fileselector.h \
@ -136,6 +137,7 @@ includesubdir = $(includedir)/elementary-@VMAJ@/
libelementary_la_SOURCES = \
elm_priv.h \
elc_ctxpopup.c \
elc_dayselector.c \
elc_popup.c \
elc_fileselector_button.c \
elc_fileselector.c \

28
legacy/elementary/src/lib/elm_check.c
View File

@ -209,6 +209,31 @@ _activate_hook(Evas_Object *obj)
_activate(obj);
}
static void
_signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
edje_object_signal_emit(wd->chk, emission, source);
}
static void
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
edje_object_signal_callback_add(wd->chk, emission, source, func_cb, data);
}
static void
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
{
Widget_Data *wd = elm_widget_data_get(obj);
edje_object_signal_callback_del_full(wd->chk, emission, source, func_cb,
data);
}
static void
_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
{
@ -409,6 +434,9 @@ elm_check_add(Evas_Object *parent)
elm_widget_can_focus_set(obj, EINA_TRUE);
elm_widget_activate_hook_set(obj, _activate_hook);
elm_widget_event_hook_set(obj, _event_hook);
elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);
elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook);
elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
elm_widget_text_set_hook_set(obj, _elm_check_label_set);
elm_widget_text_get_hook_set(obj, _elm_check_label_get);
elm_widget_content_set_hook_set(obj, _content_set_hook);

6
legacy/elementary/src/lib/elm_config.c
View File

@ -334,6 +334,9 @@ _desc_init(void)
ELM_CONFIG_VAL(D, T, glayer_long_tap_start_timeout, T_DOUBLE);
ELM_CONFIG_VAL(D, T, access_mode, T_INT);
ELM_CONFIG_VAL(D, T, glayer_continues_enable, T_UCHAR);
ELM_CONFIG_VAL(D, T, week_start, T_INT);
ELM_CONFIG_VAL(D, T, weekend_start, T_INT);
ELM_CONFIG_VAL(D, T, weekend_len, T_INT);
#undef T
#undef D
#undef T_INT
@ -905,6 +908,9 @@ _config_load(void)
_elm_config->glayer_flick_time_limit_ms = 120; /* ms to finish flick */
_elm_config->glayer_long_tap_start_timeout = 1.2; /* 1.2 second to start long-tap */
_elm_config->glayer_continues_enable = EINA_TRUE; /* Continue gestures default */
_elm_config->week_start = 0;
_elm_config->weekend_start = 6;
_elm_config->weekend_len = 2;
}
static const char *

3
legacy/elementary/src/lib/elm_priv.h
View File

@ -165,6 +165,9 @@ struct _Elm_Config
double glayer_long_tap_start_timeout;
int access_mode;
Eina_Bool glayer_continues_enable;
int week_start;
int weekend_start;
int weekend_len;
/* Not part of the EET file */
Eina_Bool is_mirrored : 1;