Bug fix - edje externals are cleaned

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

diff --git a/data/edje_externals/ico_datepicker.png b/data/edje_externals/ico_datepicker.png
deleted file mode 100755 (executable)
index 88ffd95..0000000
Binary files a/data/edje_externals/ico_datepicker.png and /dev/null differ

diff --git a/data/edje_externals/ico_notepad.png b/data/edje_externals/ico_notepad.png
deleted file mode 100644 (file)
index b957492..0000000
Binary files a/data/edje_externals/ico_notepad.png and /dev/null differ

diff --git a/data/edje_externals/ico_picker.png b/data/edje_externals/ico_picker.png
deleted file mode 100644 (file)
index 0ab2af6..0000000
Binary files a/data/edje_externals/ico_picker.png and /dev/null differ

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

diff --git a/data/edje_externals/icons.edc b/data/edje_externals/icons.edc
index df3a0d7..fe945e4 100644 (file)
--- a/data/edje_externals/icons.edc
+++ b/data/edje_externals/icons.edc
@@ -18,7 +18,6 @@ ICON("check")
 ICON("clock")
 ICON("colorpalette")
 ICON("datefield")
-ICON("datepicker")
 ICON("fileselector")
 ICON("fileselector_button")
 ICON("gengrid")
@@ -29,10 +28,8 @@ ICON("list")
 ICON("map")
 ICON("multibuttonentry")
 ICON("nocontents")
-ICON("notepad")
 ICON("page_control")
 ICON("photocam")
-ICON("picker")
 ICON("progressbar")
 ICON("radio")
 ICON("scrolled_entry")
@@ -45,6 +42,5 @@ ICON("thumb")
 ICON("toggle")
 ICON("toolbar")
 ICON("slideshow")
-ICON("timepicker")
 
 

diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index c4b919b..0da011d 100644 (file)
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -36,7 +36,6 @@ elm_clock.c \
 elm_colorpalette.c\
 elm_calendar.c \
 elm_datefield.c \
-elm_datepicker.c \
 elm_fileselector.c \
 elm_fileselector_button.c \
 elm_gengrid.c \
@@ -47,10 +46,8 @@ elm_list.c \
 elm_map.c \
 elm_multibuttonentry.c \
 elm_nocontents.c \
-elm_notepad.c \
 elm_page_control.c \
 elm_photocam.c \
-elm_picker.c \
 elm_progressbar.c \
 elm_radio.c \
 elm_scrolled_entry.c \
@@ -66,8 +63,7 @@ elm_notify.c \
 elm_panes.c \
 elm_navigationbar.c \
 elm_navigationbar_ex.c \
-elm_pager.c \
-elm_timepicker.c 
+elm_pager.c 
 
 module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
 module_la_LDFLAGS = -no-undefined -module -avoid-version -shared -fPIC

diff --git a/src/edje_externals/elm_navigationbar.c b/src/edje_externals/elm_navigationbar.c
index ae86e46..1b7a9e5 100644 (file)
--- a/src/edje_externals/elm_navigationbar.c
+++ b/src/edje_externals/elm_navigationbar.c
@@ -20,7 +20,7 @@ external_navigationbar_state_set(void *data __UNUSED__, Evas_Object *obj, const
    else if (from_params) p = from_params;
    else return;
 
-  if(p->disable_animation_exists) elm_navigationbar_animation_disable_set(obj, p->disable_animation);
+  if(p->disable_animation_exists) elm_navigationbar_animation_disabled_set(obj, p->disable_animation);
   if(p->hidden_exists) elm_navigationbar_hidden_set(obj, p->hidden);
 }
 
@@ -31,7 +31,7 @@ external_navigationbar_param_set(void *data __UNUSED__, Evas_Object *obj, const
      {
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
          {
-            elm_navigationbar_animation_disable_set(obj, param->i);
+            elm_navigationbar_animation_disabled_set(obj, param->i);
             return EINA_TRUE;
          }
      }

diff --git a/src/edje_externals/elm_slider.c b/src/edje_externals/elm_slider.c
index b2cb8d0..8218bf9 100644 (file)
--- a/src/edje_externals/elm_slider.c
+++ b/src/edje_externals/elm_slider.c
@@ -18,9 +18,6 @@ typedef struct _Elm_Params_Slider
    Evas_Object *end_icon;
    Eina_Bool indicator_show:1;
    Eina_Bool indicator_show_exists:1;
-   double value_animated;
-   Eina_Bool value_animated_exists:1;
-   const char *end_label;
 } Elm_Params_Slider;
 
 static void
@@ -63,10 +60,6 @@ external_slider_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f
      elm_slider_icon_set(obj, p->end_icon);
    if (p->indicator_show_exists)
      elm_slider_horizontal_set(obj, p->indicator_show);
-   if (p->value_animated_exists)
-     elm_slider_value_animated_set(obj, p->value_animated);
-   if (p->end_label)
-     elm_slider_end_label_set(obj, p->end_label);
 }
 
 static Eina_Bool
@@ -176,22 +169,6 @@ external_slider_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex
             return EINA_TRUE;
          }
      }
-   else if (!strcmp(param->name, "value animated"))
-     {
-       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-         {
-            elm_slider_value_animated_set(obj, param->d);
-            return EINA_TRUE;
-         }
-     }
-   if (!strcmp(param->name, "end label"))
-     {
-       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
-         {
-            elm_slider_end_label_set(obj, param->s);
-            return EINA_TRUE;
-         }
-     }
 
    ERR("unknown parameter '%s' of type '%s'",
        param->name, edje_external_param_type_str(param->type));
@@ -295,21 +272,6 @@ external_slider_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex
             return EINA_FALSE;
          }
      }
-   else if (!strcmp(param->name, "value animated"))
-     {
-       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
-         {
-            return EINA_FALSE;
-         }
-     }
-   else if (!strcmp(param->name, "end label"))
-     {
-       if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
-         {
-            param->s = elm_slider_end_label_get(obj);
-            return EINA_TRUE;
-         }
-     }
 
    ERR("unknown parameter '%s' of type '%s'",
        param->name, edje_external_param_type_str(param->type));
@@ -372,13 +334,6 @@ external_slider_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
             mem->indicator_show = param->i;
             mem->indicator_show_exists = EINA_TRUE;
          }
-       else if (!strcmp(param->name, "value animated"))
-         {
-            mem->value_animated = param->d;
-            mem->value_animated_exists = EINA_TRUE;
-         }
-       else if (!strcmp(param->name, "end label"))
-         mem->end_label = eina_stringshare_add(param->s);
      }
 
    return mem;
@@ -400,8 +355,6 @@ external_slider_params_free(void *params)
      eina_stringshare_del(mem->unit);
    if (mem->indicator)
      eina_stringshare_del(mem->indicator);
-   if (mem->end_label)
-     eina_stringshare_del(mem->end_label);
    external_common_params_free(params);
 }
 
@@ -418,8 +371,6 @@ static Edje_External_Param_Info external_slider_params[] = {
    EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("indicator format", "%1.2f"),
    EDJE_EXTERNAL_PARAM_INFO_STRING("end icon"),
    EDJE_EXTERNAL_PARAM_INFO_BOOL("indicator show"),
-   EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value animated"),
-   EDJE_EXTERNAL_PARAM_INFO_STRING("end label"),
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };
 

diff --git a/src/edje_externals/modules.inc b/src/edje_externals/modules.inc
index 02038f1..43a4a84 100644 (file)
--- a/src/edje_externals/modules.inc
+++ b/src/edje_externals/modules.inc
@@ -7,7 +7,6 @@ DEFINE_TYPE(check)
 DEFINE_TYPE(clock)
 DEFINE_TYPE(colorpalette)
 DEFINE_TYPE(datefield)
-DEFINE_TYPE(datepicker)
 DEFINE_TYPE(fileselector)
 DEFINE_TYPE(fileselector_button)
 DEFINE_TYPE(gengrid)
@@ -20,11 +19,9 @@ DEFINE_TYPE(multibuttonentry)
 DEFINE_TYPE(navigationbar)
 DEFINE_TYPE(navigationbar_ex)
 DEFINE_TYPE(nocontents)
-DEFINE_TYPE(notepad)
 DEFINE_TYPE(page_control)
 DEFINE_TYPE(pager)
 DEFINE_TYPE(photocam)
-DEFINE_TYPE(picker)
 DEFINE_TYPE(progressbar)
 DEFINE_TYPE(radio)
 DEFINE_TYPE(scrolled_entry)
@@ -38,4 +35,3 @@ DEFINE_TYPE(toggle)
 DEFINE_TYPE(toolbar)
 DEFINE_TYPE(notify)
 DEFINE_TYPE(panes)
-DEFINE_TYPE(timepicker)