Icons for available externals, how exciting.

SVN revision: 45449

legacy/elementary/configure.ac

@@ -303,6 +303,7 @@ data/themes/Makefile
 data/images/Makefile
 data/objects/Makefile
 data/desktop/Makefile
+data/edje_externals/Makefile
 config/Makefile
 config/default/Makefile
 config/standard/Makefile

legacy/elementary/data/Makefile.am

@@ -1,3 +1,3 @@
 AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS              = themes images objects desktop
+SUBDIRS              = themes images objects desktop edje_externals

legacy/elementary/data/edje_externals/Makefile.am

@@ -0,0 +1,25 @@
+AUTOMAKE_OPTIONS     = 1.4 foreign
+MAINTAINERCLEANFILES = Makefile.in
+
+EDJE_CC = @edje_cc@
+EDJE_FLAGS = -v -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals
+
+filesdir = $(datadir)/elementary/edje_externals
+files_DATA = icons.edj
+
+EXTRA_DIST = \
+icons.edc \
+ico_button.png \
+ico_check.png \
+ico_radio.png \
+ico_scrolled_entry.png \
+ico_slider.png \
+ico_toggle.png
+
+icons.edj: Makefile $(EXTRA_DIST)
+	$(EDJE_CC) $(EDJE_FLAGS) \
+	$(top_srcdir)/data/edje_externals/icons.edc \
+	$(top_builddir)/data/edje_externals/icons.edj
+
+clean-local:
+	rm -f *.edj

legacy/elementary/data/edje_externals/icons.edc

@@ -0,0 +1,18 @@
+#define ICON(_name)                                         \
+images { image: "ico_"_name".png" COMP; }                   \
+collections { group { name: "ico_"_name;                     \
+      parts { part { name: "icon";                          \
+            type: IMAGE; mouse_events: 0;                   \
+            description { state: "default" 0.0;             \
+               align: 0.5 0.5;                              \
+               aspect: 1.0 1.0;                             \
+               aspect_preference: VERTICAL;                 \
+               image.normal: "ico_"_name".png";             \
+}}}}}
+
+ICON("button")
+ICON("check")
+ICON("radio")
+ICON("scrolled_entry")
+ICON("slider")
+ICON("toggle")

legacy/elementary/src/edje_externals/Makefile.am

@@ -1,4 +1,3 @@
-
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \

legacy/elementary/src/edje_externals/elm_button.c

@@ -40,7 +40,7 @@ external_button_params_parse(void *data, Evas_Object *obj, const Eina_List *para
    return mem;
 }
 
-static void
+ static void
 external_button_params_free(void *params)
 {
    Elm_Params_Button *mem = params;
@@ -56,4 +56,5 @@ static Edje_External_Param_Info external_button_params[] = {
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };
 
+DEFINE_EXTERNAL_ICON_ADD(button, "button");
 DEFINE_EXTERNAL_TYPE_SIMPLE(button, "Button");

legacy/elementary/src/edje_externals/elm_check.c

@@ -64,4 +64,5 @@ static Edje_External_Param_Info external_check_params[] = {
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };
 
+DEFINE_EXTERNAL_ICON_ADD(check, "check")
 DEFINE_EXTERNAL_TYPE_SIMPLE(check, "Check")

legacy/elementary/src/edje_externals/elm_radio.c

@@ -86,4 +86,5 @@ static Edje_External_Param_Info external_radio_params[] = {
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };
 
+DEFINE_EXTERNAL_ICON_ADD(radio, "radio")
 DEFINE_EXTERNAL_TYPE_SIMPLE(radio, "Radio")

legacy/elementary/src/edje_externals/elm_scrolled_entry.c

@@ -68,4 +68,5 @@ static Edje_External_Param_Info external_scrolled_entry_params[] = {
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };
 
+DEFINE_EXTERNAL_ICON_ADD(scrolled_entry, "scrolled_entry")
 DEFINE_EXTERNAL_TYPE_SIMPLE(scrolled_entry, "Entry");

legacy/elementary/src/edje_externals/elm_slider.c

@@ -106,4 +106,5 @@ static Edje_External_Param_Info external_slider_params[] = {
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };
 
+DEFINE_EXTERNAL_ICON_ADD(slider, "slider")
 DEFINE_EXTERNAL_TYPE_SIMPLE(slider, "Slider")

legacy/elementary/src/edje_externals/elm_toggle.c

@@ -82,4 +82,5 @@ static Edje_External_Param_Info external_toggle_params[] = {
    EDJE_EXTERNAL_PARAM_INFO_SENTINEL
 };
 
+DEFINE_EXTERNAL_ICON_ADD(toggle, "toggle")
 DEFINE_EXTERNAL_TYPE_SIMPLE(toggle, "Toggle")

legacy/elementary/src/edje_externals/private.h

@@ -54,7 +54,7 @@ const Edje_External_Type external_##type_name##_type = {\
     .state_set = external_##type_name##_state_set,      \
     .params_parse = external_##type_name##_params_parse,\
     .params_free = external_##type_name##_params_free,  \
-    .icon_add = NULL,                                   \
+    .icon_add = external_##type_name##_icon_add,        \
     .label_get = external_##type_name##_label_get,      \
     .parameters_info = external_##type_name##_params,   \
     .data = NULL                                        \
@@ -69,6 +69,18 @@ external_##type_name##_add(void *data, Evas *evas, Evas_Object *parent, const Ei
 \
 DEFINE_EXTERNAL_TYPE(type_name, name)
 
+#define DEFINE_EXTERNAL_ICON_ADD(type_name, name)                   \
+Evas_Object *                                                       \
+external_##type_name##_icon_add(void *data, Evas *e) {              \
+   Evas_Object *ic;                                                 \
+   int w = 20, h = 10;                                              \
+                                                                    \
+   ic = edje_object_add(e);                                         \
+   edje_object_file_set(ic, PACKAGE_DATA_DIR"/edje_externals/icons.edj", "ico_"name);\
+   evas_object_size_hint_min_set(ic, w, h);                         \
+                                                                    \
+   return ic;                                                       \
+}
 
 #define DEFINE_EXTERNAL_COMMON_PARAMS           \
     EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("label", "label goes here")