[Edje external]Added for colorpicker and colorpalette

diff --git a/data/edje_externals/Makefile.am b/data/edje_externals/Makefile.am
index 9ed20b3..e2f585f 100644 (file)
--- a/data/edje_externals/Makefile.am
+++ b/data/edje_externals/Makefile.am
@@ -15,6 +15,8 @@ ico_bubble.png \
 ico_button.png \
 ico_check.png \
 ico_clock.png \
+ico_colorpicker.png\
+ico_colorpalette.png\
 ico_datefield.png \
 ico_datepicker.png \
 ico_fileselector.png \

diff --git a/data/edje_externals/ico_colorpalette.png b/data/edje_externals/ico_colorpalette.png
new file mode 100644 (file)
index 0000000..f5b933b
Binary files /dev/null and b/data/edje_externals/ico_colorpalette.png differ

diff --git a/data/edje_externals/ico_colorpicker.png b/data/edje_externals/ico_colorpicker.png
new file mode 100644 (file)
index 0000000..1b7e655
Binary files /dev/null and b/data/edje_externals/ico_colorpicker.png differ

diff --git a/data/edje_externals/icons.edc b/data/edje_externals/icons.edc
index 7a3a888..aa94b81 100644 (file)
--- a/data/edje_externals/icons.edc
+++ b/data/edje_externals/icons.edc
@@ -16,6 +16,8 @@ ICON("bubble")
 ICON("button")
 ICON("check")
 ICON("clock")
+ICON("colorpalette")
+ICON("colorpicker")
 ICON("datefield")
 ICON("datepicker")
 ICON("fileselector")

diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index 07c5f4f..fd1f999 100644 (file)
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -33,6 +33,8 @@ elm_bubble.c \
 elm_button.c \
 elm_check.c \
 elm_clock.c \
+elm_colorpalette.c\
+elm_colorpicker.c\
 elm_calendar.c \
 elm_datefield.c \
 elm_datepicker.c \

diff --git a/src/edje_externals/elm_colorpalette.c b/src/edje_externals/elm_colorpalette.c
new file mode 100644 (file)
index 0000000..c2788e8
--- /dev/null
+++ b/src/edje_externals/elm_colorpalette.c
@@ -0,0 +1,169 @@
+
+
+#include "private.h"
+
+typedef struct _Elm_Params_colorpalette
+{
+   unsigned int row, col;
+   Elm_Colorpalette_Color *color;
+   char *color_set ;
+   int color_num ;
+
+} Elm_Params_colorpalette;
+
+static void
+external_colorpalette_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_colorpalette *p;
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+   if((p->row > 0)&&( p->col > 0))
+          elm_colorpalette_row_column_set(obj,p->row,p->col) ;
+   if(p->color_num)
+   elm_colorpalette_color_set(obj,p->color_num, p->color) ;
+}
+
+static Eina_Bool
+external_colorpalette_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "row"))
+     {
+       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+         {
+               //No EAPI for row set
+            return EINA_FALSE;
+         }
+     }
+   else if (!strcmp(param->name, "col"))
+     {
+       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+         {
+               //No EAPI for column set
+               return EINA_FALSE;
+         }
+     }
+   else if (!strcmp(param->name,"color_num"))
+     {
+       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
+         {
+               //No EAPI for colour_number set
+               return EINA_FALSE;
+         }
+        }
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_colorpalette_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+       return EINA_FALSE;
+   //FIX ME:getter functions not provided
+}
+
+static void *
+external_colorpalette_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_colorpalette *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+   int k,m,ll ;
+   k = m = ll = 0;
+   char test[5] ;
+   int d = 0;
+   mem = calloc(1, sizeof(Elm_Params_colorpalette));
+   if (!mem)
+     return NULL;
+
+   EINA_LIST_FOREACH(params, l, param)
+     {
+        if (!strcmp(param->name, "row"))
+          {
+             mem->row = param->i;
+          }
+       else if (!strcmp(param->name, "col"))
+            {
+               mem->col = param->i;
+            }
+          else if (!strcmp(param->name, "color_num"))
+            {
+               mem->color_num = param->i ;
+            }
+
+          else if (!strcmp(param->name, "color_set"))
+         {
+           mem->color = (Elm_Colorpalette_Color*) calloc (mem->color_num, sizeof(Elm_Colorpalette_Color));
+           char *s = NULL ;
+           s = (char*)param->i;
+           while(k <(mem->color_num) && (ll <= (char*)strlen(param->i)))
+             {
+                  if(d == 0)
+                   {
+                     while(s[ll]!=':')
+                           test[m++] = s[ll++];
+                     test[m]= 0 ;
+                     ll++ ;
+                     m = 0 ;
+                     mem->color[k].r = atoi(test) ;
+                     d++ ;
+                   }
+                  if(d == 1)
+                   {
+                    while(s[ll]!=':')
+                          test[m++] = s[ll++];
+                    test[m]= 0 ;
+                    ll++ ;
+                     m = 0 ;
+                     mem->color[k].g = atoi(test) ;
+                     d++ ;
+                   }
+                  if(d == 2)
+                   {
+                     while(s[ll]!='/' &&  m<3)
+                           test[m++] = s[ll++];
+                     test[m]= 0 ;
+                     ll++ ;
+                      m = 0 ;
+                      mem->color[k].b = atoi(test) ;
+                      d = 0 ;
+                   }
+                }
+           k++;
+         }
+       }
+    return mem;
+}
+
+static Evas_Object *external_colorpalette_content_get(void *data __UNUSED__,
+               const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+       ERR("No content.");
+       return NULL;
+}
+
+static void
+external_colorpalette_params_free(void *params)
+{
+       Elm_Params_colorpalette *mem = params;
+    if(mem->color)free(mem->color);
+       if(mem->color_set)free(mem->color_set) ;
+       if(mem)free(mem);
+}
+
+static Edje_External_Param_Info external_colorpalette_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_INT("row"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("col"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("r"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("g"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("b"),
+   EDJE_EXTERNAL_PARAM_INFO_STRING("color_set"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("color_num"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(colorpalette, "colorpalette");
+DEFINE_EXTERNAL_TYPE_SIMPLE(colorpalette, "colorpalette");

diff --git a/src/edje_externals/elm_colorpicker.c b/src/edje_externals/elm_colorpicker.c
new file mode 100644 (file)
index 0000000..a06db0f
--- /dev/null
+++ b/src/edje_externals/elm_colorpicker.c
@@ -0,0 +1,127 @@
+/*
+ * elm_colorpicker.c
+ *
+ *  Created on: Nov 12, 2010
+ *      Author: Amit
+ */
+
+
+#include "private.h"
+
+typedef struct _Elm_Params_colorpicker
+{
+   unsigned int r, g, b;
+} Elm_Params_colorpicker ;
+
+static void
+external_colorpicker_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+{
+   const Elm_Params_colorpicker *p;
+   if (to_params) p = to_params;
+   else if (from_params) p = from_params;
+   else return;
+
+   if((p->r >= 0)&&( p->g >= 0)&& (p->b >= 0))
+   elm_colorpicker_color_set(obj, p->r, p->g, p->b) ;
+}
+
+static Eina_Bool
+external_colorpicker_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+{
+       //Cannot set particular parameter
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+external_colorpicker_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+{
+   if (!strcmp(param->name, "r"))
+     {
+       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+         {
+            elm_colorpicker_color_get( obj,&(param->i),NULL, NULL) ;
+            return EINA_TRUE;
+         }
+     }
+
+   if (!strcmp(param->name, "g"))
+       {
+       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+         {
+            elm_colorpicker_color_get( obj,NULL,&(param->i), NULL) ;
+            return EINA_TRUE;
+         }
+       }
+   if (!strcmp(param->name, "b"))
+         {
+       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
+         {
+            elm_colorpicker_color_get( obj,NULL, NULL,&(param->i)) ;
+            return EINA_TRUE;
+         }
+         }
+
+   ERR("unknown parameter '%s' of type '%s'",
+       param->name, edje_external_param_type_str(param->type));
+
+   return EINA_FALSE;
+}
+
+static void *
+external_colorpicker_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
+{
+   Elm_Params_colorpicker *mem;
+   Edje_External_Param *param;
+   const Eina_List *l;
+   mem = calloc(1, sizeof(Elm_Params_colorpicker));
+          if (!mem)
+            return NULL;
+
+          EINA_LIST_FOREACH(params, l, param)
+            {
+               if (!strcmp(param->name, "r"))
+                 {
+                    mem->r = param->i;
+                 }
+               else if (!strcmp(param->name, "g"))
+                 {
+                    mem->g = param->i;
+                 }
+               else if (!strcmp(param->name, "b"))
+                 {
+                    mem->b = param->i;
+                 }
+
+            }
+
+          return mem;
+       }
+
+static Evas_Object *external_colorpicker_content_get(void *data __UNUSED__,
+               const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
+{
+       ERR("No content.");
+       return NULL;
+}
+
+static void
+external_colorpicker_params_free(void *params)
+{
+       Elm_Params_colorpicker *mem = params;
+
+   free(mem);
+}
+
+static Edje_External_Param_Info external_colorpicker_params[] = {
+   DEFINE_EXTERNAL_COMMON_PARAMS,
+   EDJE_EXTERNAL_PARAM_INFO_INT("r"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("g"),
+   EDJE_EXTERNAL_PARAM_INFO_INT("b"),
+   EDJE_EXTERNAL_PARAM_INFO_SENTINEL
+};
+
+DEFINE_EXTERNAL_ICON_ADD(colorpicker, "colorpicker");
+DEFINE_EXTERNAL_TYPE_SIMPLE(colorpicker, "colorpicker");
+

diff --git a/src/edje_externals/modules.inc b/src/edje_externals/modules.inc
index bb731ed..31be3ba 100644 (file)
--- a/src/edje_externals/modules.inc
+++ b/src/edje_externals/modules.inc
@@ -5,6 +5,8 @@ DEFINE_TYPE(button)
 DEFINE_TYPE(calendar)
 DEFINE_TYPE(check)
 DEFINE_TYPE(clock)
+DEFINE_TYPE(colorpalette)
+DEFINE_TYPE(colorpicker)
 DEFINE_TYPE(datefield)
 DEFINE_TYPE(datepicker)
 DEFINE_TYPE(fileselector)