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

Rename elm_colorpicker to elm_colorselector 

Suggested by k-s as part of our
"Beautiful, Consistent ELM API" effort.

colorpicker, diskpicker and flippicker should follow
fileselector name.


SVN revision: 54405
This commit is contained in:
Bruno Dilly 2010-11-10 13:14:50 +00:00
parent d2874eecec
commit 98ad22406b
7 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29820,9 +29820,9 @@ collections {
#undef CH
////////////////////////////////////////////////////////////////////////////////
// colorpicker
// colorselector
////////////////////////////////////////////////////////////////////////////////
group { name: "elm/colorpicker/bg/default";
group { name: "elm/colorselector/bg/default";
parts {
part { name: "elm.colorbar_0";
type: SWALLOW;
@ -29863,7 +29863,7 @@ collections {
}
}
group { name: "elm/colorpicker/base/default";
group { name: "elm/colorselector/base/default";
parts {
part { name: "elm.l_button";
type: SWALLOW;
@ -29967,7 +29967,7 @@ collections {
}
}
group{ name: "elm/colorpicker/image/colorbar_0";
group{ name: "elm/colorselector/image/colorbar_0";
images {
image: "color_picker_color.png" COMP;
}
@ -29983,7 +29983,7 @@ collections {
}
}
group { name: "elm/colorpicker/image/colorbar_1";
group { name: "elm/colorselector/image/colorbar_1";
images {
image: "color_picker_opacity.png" COMP;
}
@ -29999,7 +29999,7 @@ collections {
}
}
group { name: "elm/colorpicker/image/colorbar_2";
group { name: "elm/colorselector/image/colorbar_2";
images {
image: "color_picker_brightness.png" COMP;
}
@ -30015,7 +30015,7 @@ collections {
}
}
group { name: "elm/colorpicker/image/colorbar_3";
group { name: "elm/colorselector/image/colorbar_3";
images {
image: "color_picker_alpha.png" COMP;
}
@ -30031,7 +30031,7 @@ collections {
}
}
group { name: "elm/colorpicker/bg_image/colorbar_3";
group { name: "elm/colorselector/bg_image/colorbar_3";
images {
image: "color_picker_alpha_bg.png" COMP;
}
@ -30047,7 +30047,7 @@ collections {
}
}
group { name: "elm/colorpicker/image/updown";
group { name: "elm/colorselector/image/updown";
images {
image: "icon_arrow_down.png" COMP;
}
@ -30070,7 +30070,7 @@ collections {
}
}
group { name: "elm/colorpicker/button/left";
group { name: "elm/colorselector/button/left";
images {
image: "bt_base1.png" COMP;
image: "bt_shine.png" COMP;
@ -30170,7 +30170,7 @@ collections {
}
}
group { name: "elm/colorpicker/button/right";
group { name: "elm/colorselector/button/right";
images {
image: "bt_base1.png" COMP;
image: "bt_shine.png" COMP;

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

@ -90,7 +90,7 @@ test_focus.c \
test_focus2.c \
test_flippicker.c \
test_diskpicker.c \
test_colorpicker.c \
test_colorselector.c \
test_hoverlist.c
elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@

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

@ -114,7 +114,7 @@ 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_colorpicker(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);
struct elm_test
@ -347,7 +347,7 @@ my_win_main(char *autorun)
ADD_TEST("Focus 2", test_focus2);
ADD_TEST("Flippicker", test_flippicker);
ADD_TEST("Diskpicker", test_diskpicker);
ADD_TEST("Colorpicker", test_colorpicker);
ADD_TEST("Color Selector", test_colorselector);
ADD_TEST("Hoverlist", test_hoverlist);
#undef ADD_TEST

20
legacy/elementary/src/bin/test_colorpicker.c → legacy/elementary/src/bin/test_colorselector.c
View File

@ -5,12 +5,12 @@
#ifndef ELM_LIB_QUICKLAUNCH
static void
_colorpicker_clicked_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
_colorselector_clicked_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
Evas_Object *re = data;
int r, g, b, a;
elm_colorpicker_color_get(obj, &r, &g, &b, &a);
elm_colorselector_color_get(obj, &r, &g, &b, &a);
printf("Current Color [r=%d g=%d b=%d a=%d]\n",r, g, b, a);
/* Fix Alpha pre multiplication by edje */
@ -22,14 +22,14 @@ _colorpicker_clicked_cb(void *data, Evas_Object *obj, void *event_info __UNUSED_
}
void
test_colorpicker(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *win, *bg, *bx, *cp, *fr, *ly, *re;
char buf[PATH_MAX];
int r, g, b, a;
win = elm_win_add(NULL, "colorpicker", ELM_WIN_BASIC);
elm_win_title_set(win, "Colorpicker");
win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
elm_win_title_set(win, "Color Selector");
elm_win_autodel_set(win, EINA_TRUE);
bg = elm_bg_add(win);
@ -65,25 +65,25 @@ test_colorpicker(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
fr = elm_frame_add(win);
evas_object_size_hint_weight_set(fr, 1.0, 0.5);
evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_frame_label_set(fr, "Color Picker");
elm_frame_label_set(fr, "Color Selector");
elm_box_pack_end(bx, fr);
evas_object_show(fr);
cp = elm_colorpicker_add(win);
cp = elm_colorselector_add(win);
a = 180;
r = 255;
g = 160;
b = 132;
elm_colorpicker_color_set(cp, r, g, b, a);
elm_colorselector_color_set(cp, r, g, b, a);
evas_object_size_hint_weight_set(cp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(cp, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_frame_content_set(fr, cp);
evas_object_show(cp);
evas_object_smart_callback_add(cp, "changed", _colorpicker_clicked_cb, re);
evas_object_smart_callback_add(cp, "changed", _colorselector_clicked_cb, re);
elm_colorpicker_color_get(cp, &r, &g, &b, &a);
elm_colorselector_color_get(cp, &r, &g, &b, &a);
/* Fix Alpha pre multiplication by edje */
r = (r * a) / 255;
g = (g * a) / 255;

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

@ -2281,10 +2281,10 @@ extern "C" {
* "selected" - when item is selected (scroller stops)
*/
/* colorpicker */
EAPI Evas_Object *elm_colorpicker_add(Evas_Object *parent);
EAPI void elm_colorpicker_color_set(Evas_Object *obj, int r, int g , int b, int a);
EAPI void elm_colorpicker_color_get(const Evas_Object *obj, int *r, int *g , int *b, int *a);
/* colorselector */
EAPI Evas_Object *elm_colorselector_add(Evas_Object *parent);
EAPI void elm_colorselector_color_set(Evas_Object *obj, int r, int g , int b, int a);
EAPI void elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g , int *b, int *a);
/* smart callbacks called:
* "changed" - when the color value changes
*/

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

@ -85,7 +85,7 @@ elm_transit.c \
elm_calendar.c \
elm_flippicker.c \
elm_diskpicker.c \
elm_colorpicker.c \
elm_colorselector.c \
\
elc_anchorblock.c \
elc_anchorview.c \

98
legacy/elementary/src/lib/elm_colorpicker.c → legacy/elementary/src/lib/elm_colorselector.c
View File

@ -2,10 +2,10 @@
#include "elm_priv.h"
/**
* @addtogroup Colorpicker Colorpicker
* @addtogroup Colorselector Colorselector
*
* By using colorpicker, you can select a color.
* Colorpicker made a color using HSV/HSB mode.
* By using colorselector, you can select a color.
* Colorselector made a color using HSV/HSB mode.
*/
#define BASE_STEP 360.0
@ -14,9 +14,9 @@
#define LIG_STEP 256.0
#define ALP_STEP 256.0
typedef struct _Colorpicker_Data Colorpicker_Data;
typedef struct _Colorselector_Data Colorselector_Data;
struct _Colorpicker_Data
struct _Colorselector_Data
{
Evas_Object *parent;
Evas_Object *colorbar;
@ -26,7 +26,7 @@ struct _Colorpicker_Data
Evas_Object *bg_rect;
Evas_Object *arrow;
Evas_Object *touch_area;
int colorpicker_num;
int colorselector_num;
int button_state;
};
@ -35,7 +35,7 @@ typedef struct _Widget_Data Widget_Data;
struct _Widget_Data
{
Evas_Object *base;
Colorpicker_Data *cp[4];
Colorselector_Data *cp[4];
Evas_Coord _x, _y, _w, _h;
int r, g, b, a;
int er, eg, eb;
@ -104,7 +104,7 @@ _theme_hook(Evas_Object *obj)
if ((!wd) || (!wd->base)) return;
_elm_theme_object_set(obj, wd->base, "colorpicker", "bg",
_elm_theme_object_set(obj, wd->base, "colorselector", "bg",
elm_widget_style_get(obj));
for (i = 0; i < 4; i++)
@ -313,11 +313,11 @@ _color_with_lightness(void *data)
static void
_draw_rects(void *data, double x)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
Widget_Data *wd = elm_widget_data_get(cp->parent);
double one_six = 1.0 / 6.0;
switch (cp->colorpicker_num)
switch (cp->colorselector_num)
{
case 0:
wd->h = 360.0 * x;
@ -404,7 +404,7 @@ _draw_rects(void *data, double x)
static void
_arrow_cb(void *data, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
double x, y;
edje_object_part_drag_value_get(obj, "elm.arrow", &x, &y);
@ -415,7 +415,7 @@ _arrow_cb(void *data, Evas_Object *obj, const char *emission __UNUSED__, const c
static void
_colorbar_cb(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
Evas_Event_Mouse_Down *ev = event_info;
Evas_Coord x, y, w, h;
double arrow_x = 0, arrow_y;
@ -436,7 +436,7 @@ _colorbar_cb(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info)
static void
_arrow_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
Evas_Coord arrow_w, arrow_h;
evas_object_geometry_get(cp->touch_area, NULL, NULL, NULL, &arrow_h);
@ -449,7 +449,7 @@ _arrow_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, vo
static Eina_Bool
_mv_timer(void *data)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
Widget_Data *wd = elm_widget_data_get(cp->parent);
double x, y;
@ -481,7 +481,7 @@ _mv_timer(void *data)
static Eina_Bool
_long_press_timer(void *data)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
Widget_Data *wd = elm_widget_data_get(cp->parent);
if (wd->mv_timer) ecore_timer_del(wd->mv_timer);
@ -494,7 +494,7 @@ _long_press_timer(void *data)
static void
_left_button_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
Widget_Data *wd = elm_widget_data_get(cp->parent);
double x, y;
@ -502,10 +502,10 @@ _left_button_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__
"left_button");
edje_object_part_drag_value_get(cp->colorbar, "elm.arrow", &x, &y);
if (!cp->colorpicker_num) x -= 1.0 / HUE_STEP;
else if (cp->colorpicker_num == 1) x -= 1.0 / SAT_STEP;
else if (cp->colorpicker_num == 2) x -= 1.0 / LIG_STEP;
else if (cp->colorpicker_num == 3) x -= 1.0 / ALP_STEP;
if (!cp->colorselector_num) x -= 1.0 / HUE_STEP;
else if (cp->colorselector_num == 1) x -= 1.0 / SAT_STEP;
else if (cp->colorselector_num == 2) x -= 1.0 / LIG_STEP;
else if (cp->colorselector_num == 3) x -= 1.0 / ALP_STEP;
if (x < 0.0) x = 0.0;
@ -520,7 +520,7 @@ _left_button_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__
static void
_right_button_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
Widget_Data *wd = elm_widget_data_get(cp->parent);
double x, y;
@ -528,10 +528,10 @@ _right_button_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
"right_button");
edje_object_part_drag_value_get(cp->colorbar, "elm.arrow", &x, &y);
if (!cp->colorpicker_num) x += 1.0 / HUE_STEP;
else if (cp->colorpicker_num == 1) x += 1.0 / SAT_STEP;
else if (cp->colorpicker_num == 2) x += 1.0 / LIG_STEP;
else if (cp->colorpicker_num == 3) x += 1.0 / ALP_STEP;
if (!cp->colorselector_num) x += 1.0 / HUE_STEP;
else if (cp->colorselector_num == 1) x += 1.0 / SAT_STEP;
else if (cp->colorselector_num == 2) x += 1.0 / LIG_STEP;
else if (cp->colorselector_num == 3) x += 1.0 / ALP_STEP;
if (x > 1.0) x = 1.0;
@ -545,7 +545,7 @@ _right_button_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
static void
_left_button_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
Widget_Data *wd = elm_widget_data_get(cp->parent);
if (wd->lp_timer)
@ -566,7 +566,7 @@ _left_button_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
static void
_right_button_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Colorpicker_Data *cp = data;
Colorselector_Data *cp = data;
Widget_Data *wd = elm_widget_data_get(cp->parent);
if (wd->lp_timer)
@ -601,14 +601,14 @@ _add_colorbar(Evas_Object *obj)
for (i = 0; i < 4; i++)
{
wd->cp[i] = ELM_NEW(Colorpicker_Data);
wd->cp[i] = ELM_NEW(Colorselector_Data);
wd->cp[i]->parent = obj;
wd->cp[i]->colorpicker_num = i;
wd->cp[i]->colorselector_num = i;
/* load colorbar area */
wd->cp[i]->colorbar = edje_object_add(e);
_elm_theme_object_set(obj, wd->cp[i]->colorbar, "colorpicker", "base",
_elm_theme_object_set(obj, wd->cp[i]->colorbar, "colorselector", "base",
"default");
snprintf(colorbar_name, sizeof(colorbar_name), "colorbar_%d", i);
snprintf(colorbar_s, sizeof(colorbar_s), "elm.colorbar_%d", i);
@ -620,7 +620,7 @@ _add_colorbar(Evas_Object *obj)
/* load colorbar image */
wd->cp[i]->bar = edje_object_add(e);
_elm_theme_object_set(obj, wd->cp[i]->bar, "colorpicker", "image",
_elm_theme_object_set(obj, wd->cp[i]->bar, "colorselector", "image",
colorbar_name);
evas_object_show(wd->cp[i]->bar);
edje_object_part_swallow(wd->cp[i]->colorbar, "elm.bar",
@ -657,7 +657,7 @@ _add_colorbar(Evas_Object *obj)
if (i == 3)
{
wd->cp[i]->bg_rect = edje_object_add(e);
_elm_theme_object_set(obj, wd->cp[i]->bg_rect, "colorpicker",
_elm_theme_object_set(obj, wd->cp[i]->bg_rect, "colorselector",
"bg_image", colorbar_name);
evas_object_show(wd->cp[i]->bg_rect);
edje_object_part_swallow(wd->cp[i]->colorbar, "elm.bar_bg",
@ -667,7 +667,7 @@ _add_colorbar(Evas_Object *obj)
}
/* load arrow image, pointing the colorbar */
wd->cp[i]->arrow = edje_object_add(e);
_elm_theme_object_set(obj, wd->cp[i]->arrow, "colorpicker", "image",
_elm_theme_object_set(obj, wd->cp[i]->arrow, "colorselector", "image",
"updown");
evas_object_show(wd->cp[i]->arrow);
edje_object_part_swallow(wd->cp[i]->colorbar, "elm.arrow",
@ -682,7 +682,7 @@ _add_colorbar(Evas_Object *obj)
/* load left button */
wd->cp[i]->lbt = edje_object_add(e);
_elm_theme_object_set(obj, wd->cp[i]->lbt, "colorpicker", "button",
_elm_theme_object_set(obj, wd->cp[i]->lbt, "colorselector", "button",
"left");
evas_object_event_callback_add(wd->cp[i]->lbt, EVAS_CALLBACK_MOUSE_DOWN,
_left_button_down_cb, wd->cp[i]);
@ -695,7 +695,7 @@ _add_colorbar(Evas_Object *obj)
/* load right button */
wd->cp[i]->rbt = edje_object_add(e);
_elm_theme_object_set(obj, wd->cp[i]->rbt, "colorpicker", "button",
_elm_theme_object_set(obj, wd->cp[i]->rbt, "colorselector", "button",
"right");
evas_object_event_callback_add(wd->cp[i]->rbt, EVAS_CALLBACK_MOUSE_DOWN,
_right_button_down_cb, wd->cp[i]);
@ -744,15 +744,15 @@ _set_color(Evas_Object *obj, int r, int g, int b, int a)
}
/**
* Add a new colorpicker to the parent
* Add a new colorselector to the parent
*
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
* @ingroup Colorpicker
* @ingroup Colorselector
*/
EAPI Evas_Object *
elm_colorpicker_add(Evas_Object *parent)
elm_colorselector_add(Evas_Object *parent)
{
Evas_Object *obj = NULL;
Widget_Data *wd = NULL;
@ -761,8 +761,8 @@ elm_colorpicker_add(Evas_Object *parent)
wd = ELM_NEW(Widget_Data);
e = evas_object_evas_get(parent);
obj = elm_widget_add(e);
ELM_SET_WIDTYPE(widtype, "colorpicker");
elm_widget_type_set(obj, "colorpicker");
ELM_SET_WIDTYPE(widtype, "colorselector");
elm_widget_type_set(obj, "colorselector");
elm_widget_sub_object_add(parent, obj);
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
@ -770,7 +770,7 @@ elm_colorpicker_add(Evas_Object *parent)
/* load background edj */
wd->base = edje_object_add(e);
_elm_theme_object_set(obj, wd->base, "colorpicker", "bg", "default");
_elm_theme_object_set(obj, wd->base, "colorselector", "bg", "default");
elm_widget_resize_object_set(obj, wd->base);
wd->er = 255;
@ -790,36 +790,36 @@ elm_colorpicker_add(Evas_Object *parent)
}
/**
* Set a color for the colorpicker
* Set a color for the colorselector
*
* @param obj Colorpicker object
* @param obj Colorselector object
* @param r r-value of color
* @param g g-value of color
* @param b b-value of color
* @param a a-value of color
*
* @ingroup Colorpicker
* @ingroup Colorselector
*/
EAPI void
elm_colorpicker_color_set(Evas_Object *obj, int r, int g, int b, int a)
elm_colorselector_color_set(Evas_Object *obj, int r, int g, int b, int a)
{
ELM_CHECK_WIDTYPE(obj, widtype);
_set_color(obj, r, g, b, a);
}
/**
* Get a color from the colorpicker
* Get a color from the colorselector
*
* @param obj Colorpicker object
* @param obj Colorselector object
* @param r integer pointer for r-value of color
* @param g integer pointer for g-value of color
* @param b integer pointer for b-value of color
* @param a integer pointer for a-value of color
*
* @ingroup Colorpicker
* @ingroup Colorselector
*/
EAPI void
elm_colorpicker_color_get(const Evas_Object *obj, int *r, int *g, int *b, int*a)
elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, int *b, int*a)
{
Widget_Data *wd = elm_widget_data_get(obj);
ELM_CHECK_WIDTYPE(obj, widtype);