From 3240d746eba9bbbe02cff9aca7207c7d5c68aba6 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Mon, 29 Mar 2010 20:53:00 +0000 Subject: [PATCH] Elm notepad on edje_externals. Still lacking properties exported, will come with more powerful param. types, further. SVN revision: 47569 --- .../data/edje_externals/Makefile.am | 1 + .../data/edje_externals/ico_notepad.png | Bin 0 -> 148 bytes .../elementary/data/edje_externals/icons.edc | 1 + .../elementary/src/edje_externals/Makefile.am | 1 + .../src/edje_externals/elm_notepad.c | 59 ++++++++++++++++++ .../src/edje_externals/elm_toggle.c | 6 +- .../elementary/src/edje_externals/modules.inc | 1 + 7 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 legacy/elementary/data/edje_externals/ico_notepad.png create mode 100644 legacy/elementary/src/edje_externals/elm_notepad.c diff --git a/legacy/elementary/data/edje_externals/Makefile.am b/legacy/elementary/data/edje_externals/Makefile.am index 1d55767005..bc4fb23316 100644 --- a/legacy/elementary/data/edje_externals/Makefile.am +++ b/legacy/elementary/data/edje_externals/Makefile.am @@ -12,6 +12,7 @@ icons.edc \ ico_bubble.png \ ico_button.png \ ico_check.png \ +ico_notepad.png \ ico_radio.png \ ico_scrolled_entry.png \ ico_slider.png \ diff --git a/legacy/elementary/data/edje_externals/ico_notepad.png b/legacy/elementary/data/edje_externals/ico_notepad.png new file mode 100644 index 0000000000000000000000000000000000000000..b957492eb2fb8c79d8bf7f649b25d8e3da98964c GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4f(Vi}jAr_~T6BY<2@bL5dCnqG# z@JubfEP3eg;s3$XE$!|9(-(yXY)BBEW1P+x*|v1ak_YAzk&K}+KI^K}lWo*f wd%`hmXN5^~Pnv+$t{G`3d&@$F*D^3nI#R}b{O^U?Kx-I0UHx3vIVCg!0I>ryIsgCw literal 0 HcmV?d00001 diff --git a/legacy/elementary/data/edje_externals/icons.edc b/legacy/elementary/data/edje_externals/icons.edc index 45d2048dd4..9120ea6813 100644 --- a/legacy/elementary/data/edje_externals/icons.edc +++ b/legacy/elementary/data/edje_externals/icons.edc @@ -13,6 +13,7 @@ collections { group { name: "ico_"_name; \ ICON("bubble") ICON("button") ICON("check") +ICON("notepad") ICON("radio") ICON("scrolled_entry") ICON("slider") diff --git a/legacy/elementary/src/edje_externals/Makefile.am b/legacy/elementary/src/edje_externals/Makefile.am index 37f37173ed..92d593a87f 100644 --- a/legacy/elementary/src/edje_externals/Makefile.am +++ b/legacy/elementary/src/edje_externals/Makefile.am @@ -29,6 +29,7 @@ elm.c \ elm_bubble.c \ elm_button.c \ elm_check.c \ +elm_notepad.c \ elm_radio.c \ elm_scrolled_entry.c \ elm_slider.c \ diff --git a/legacy/elementary/src/edje_externals/elm_notepad.c b/legacy/elementary/src/edje_externals/elm_notepad.c new file mode 100644 index 0000000000..697b0ae1d0 --- /dev/null +++ b/legacy/elementary/src/edje_externals/elm_notepad.c @@ -0,0 +1,59 @@ +#include "private.h" + +typedef struct _Elm_Params_Notepad +{ +} Elm_Params_Notepad; + +static void +external_notepad_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__) +{ + const Elm_Params_Notepad *p; + + if (to_params) p = to_params; + else if (from_params) p = from_params; + else return; + + /* TODO: to be expanded */ +} + +static Eina_Bool +external_notepad_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param) +{ + /* TODO: to be expanded */ + + ERR("unknown parameter '%s' of type '%s'", + param->name, edje_external_param_type_str(param->type)); + + return EINA_FALSE; +} + +static Eina_Bool +external_notepad_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param) +{ + /* TODO: to be expanded */ + + ERR("unknown parameter '%s' of type '%s'", + param->name, edje_external_param_type_str(param->type)); + + return EINA_FALSE; +} + +static void * +external_notepad_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params) +{ + /* TODO: to be expanded */ + + return NULL; +} + +static void +external_notepad_params_free(void *params) +{ +} + +static Edje_External_Param_Info external_notepad_params[] = { + EDJE_EXTERNAL_PARAM_INFO_SENTINEL +}; + +DEFINE_EXTERNAL_ICON_ADD(notepad, "notepad") +DEFINE_EXTERNAL_TYPE_SIMPLE(notepad, "Notepad"); diff --git a/legacy/elementary/src/edje_externals/elm_toggle.c b/legacy/elementary/src/edje_externals/elm_toggle.c index fd6f9239f9..62d645f787 100644 --- a/legacy/elementary/src/edje_externals/elm_toggle.c +++ b/legacy/elementary/src/edje_externals/elm_toggle.c @@ -165,8 +165,10 @@ external_toggle_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, EINA_LIST_FOREACH(params, l, param) { - if (!strcmp(param->name, "state")) - mem->state = param->i; + if (!strcmp(param->name, "state")) { + mem->state = param->i; + mem->state_exists = EINA_TRUE; + } else if (!strcmp(param->name, "label on")) mem->on = eina_stringshare_add(param->s); else if (!strcmp(param->name, "label off")) diff --git a/legacy/elementary/src/edje_externals/modules.inc b/legacy/elementary/src/edje_externals/modules.inc index 40bd25cc80..b582a138d3 100644 --- a/legacy/elementary/src/edje_externals/modules.inc +++ b/legacy/elementary/src/edje_externals/modules.inc @@ -1,6 +1,7 @@ DEFINE_TYPE(bubble) DEFINE_TYPE(button) DEFINE_TYPE(check) +DEFINE_TYPE(notepad) DEFINE_TYPE(radio) DEFINE_TYPE(scrolled_entry) DEFINE_TYPE(slider)