rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=297089ceb037a5f237229044e194a670050d6310
commit 297089ceb037a5f237229044e194a670050d6310
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date: Fri Mar 18 16:21:33 2016 +0200
property_demo_program: show correct information about selected program
---
src/bin/ui/property_demo_program.c | 4 ++--
src/bin/ui/workspace/demo_group.c | 32 ++++++++++++++++++++++++++++++--
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/bin/ui/property_demo_program.c
b/src/bin/ui/property_demo_program.c
index c26cbf1..bd78320 100644
--- a/src/bin/ui/property_demo_program.c
+++ b/src/bin/ui/property_demo_program.c
@@ -86,8 +86,8 @@ ui_property_demo_program_set(Evas_Object *property,
Demo_Signal *part)
/* setting */
if (part)
{
- elm_object_text_set(pd->signal, part->prog_name);
- elm_object_text_set(pd->source, part->sig_name);
+ elm_object_text_set(pd->signal, part->sig_name);
+ elm_object_text_set(pd->source, part->source_name);
switch (part->action)
{
diff --git a/src/bin/ui/workspace/demo_group.c
b/src/bin/ui/workspace/demo_group.c
index 5843b5d..97da5a7 100644
--- a/src/bin/ui/workspace/demo_group.c
+++ b/src/bin/ui/workspace/demo_group.c
@@ -242,7 +242,7 @@ _program_add(void *data,
{
Part_Demo_List *pl = data;
Demo_Signal *demo_sig, *pr;
- Eina_Stringshare *sig_name, *source_name;
+ Eina_Stringshare *sig_name, *source_name, *state1, *state2;
Eina_Stringshare *program_name = ei;
Eina_Bool correct = false;
Elm_Object_Item *part_item;
@@ -264,6 +264,8 @@ _program_add(void *data,
sig_name = edje_edit_program_signal_get(pl->group->edit_object,
program_name);
source_name = edje_edit_program_source_get(pl->group->edit_object,
program_name);
+ state1 = edje_edit_program_state_get(pl->group->edit_object, program_name);
+ state2 = edje_edit_program_state2_get(pl->group->edit_object, program_name);
if (!source_name) source_name = eina_stringshare_add("");
if ((sig_name) && (strcmp(sig_name, "drag") != 0) &&
(strncmp(sig_name, "mouse", strlen("mouse")) != 0))
@@ -276,6 +278,9 @@ _program_add(void *data,
demo_sig->prog_name = eina_stringshare_add(program_name);
demo_sig->sig_name = eina_stringshare_add(sig_name);
demo_sig->source_name = eina_stringshare_add(source_name);
+ demo_sig->action =
edje_edit_program_action_get(pl->group->edit_object, program_name);
+ demo_sig->emit_signal = eina_stringshare_add(state1);
+ demo_sig->emitter = eina_stringshare_add(state2);
pl->signal_list = eina_list_append(pl->signal_list, demo_sig);
elm_genlist_item_append(pl->genlist,
itc_signals,
@@ -290,9 +295,13 @@ _program_add(void *data,
eina_stringshare_del(pr->prog_name);
eina_stringshare_del(pr->sig_name);
eina_stringshare_del(pr->source_name);
+ eina_stringshare_del(pr->emit_signal);
+ eina_stringshare_del(pr->emitter);
pr->prog_name = eina_stringshare_add(program_name);
pr->sig_name = eina_stringshare_add(sig_name);
pr->source_name = eina_stringshare_add(source_name);
+ pr->emit_signal = eina_stringshare_add(state1);
+ pr->emitter = eina_stringshare_add(state2);
elm_genlist_item_update(part_item);
}
else if ((part_item) && (!correct)) /* if exists and data is NOT correct */
@@ -302,9 +311,15 @@ _program_add(void *data,
eina_stringshare_del(pr->prog_name);
eina_stringshare_del(pr->sig_name);
eina_stringshare_del(pr->source_name);
+ eina_stringshare_del(pr->emit_signal);
+ eina_stringshare_del(pr->emitter);
free(pr);
elm_object_item_del(part_item);
}
+ eina_stringshare_del(sig_name);
+ eina_stringshare_del(source_name);
+ eina_stringshare_del(state1);
+ eina_stringshare_del(state2);
}
@@ -504,11 +519,13 @@ demo_group_add(Group *group)
}
Resource *prog_name;
- Eina_Stringshare *sig_name, *source_name;
+ Eina_Stringshare *sig_name, *source_name, *state1, *state2;
EINA_LIST_FOREACH(pl->group->programs, l, prog_name)
{
sig_name = edje_edit_program_signal_get(pl->group->edit_object,
prog_name->name);
source_name = edje_edit_program_source_get(pl->group->edit_object,
prog_name->name);
+ state1 = edje_edit_program_state_get(pl->group->edit_object,
prog_name->name);
+ state2 = edje_edit_program_state2_get(pl->group->edit_object,
prog_name->name);
if (!source_name) source_name = eina_stringshare_add("");
if ((sig_name) && (strcmp(sig_name, "drag") != 0) &&
(strncmp(sig_name, "mouse", strlen("mouse")) != 0))
@@ -517,6 +534,9 @@ demo_group_add(Group *group)
demo_sig->prog_name = eina_stringshare_add(prog_name->name);
demo_sig->sig_name = eina_stringshare_add(sig_name);
demo_sig->source_name = eina_stringshare_add(source_name);
+ demo_sig->action =
edje_edit_program_action_get(pl->group->edit_object, prog_name->name);
+ demo_sig->emit_signal = eina_stringshare_add(state1);
+ demo_sig->emitter = eina_stringshare_add(state2);
pl->signal_list = eina_list_append(pl->signal_list, demo_sig);
elm_genlist_item_append(pl->genlist,
itc_signals,
@@ -527,6 +547,10 @@ demo_group_add(Group *group)
NULL);
}
+ eina_stringshare_del(sig_name);
+ eina_stringshare_del(source_name);
+ eina_stringshare_del(state1);
+ eina_stringshare_del(state2);
}
elm_object_text_set(pl->layout, pl->group->name);
@@ -562,6 +586,8 @@ demo_group_del(Evas_Object *demo)
eina_stringshare_del(demo_sig->prog_name);
eina_stringshare_del(demo_sig->sig_name);
eina_stringshare_del(demo_sig->source_name);
+ eina_stringshare_del(demo_sig->emit_signal);
+ eina_stringshare_del(demo_sig->emitter);
free(demo_sig);
}
@@ -733,6 +759,8 @@ demo_group_program_del(Evas_Object *demo, Eina_Stringshare
*program_name)
eina_stringshare_del(demo_sig->prog_name);
eina_stringshare_del(demo_sig->sig_name);
eina_stringshare_del(demo_sig->source_name);
+ eina_stringshare_del(demo_sig->emit_signal);
+ eina_stringshare_del(demo_sig->emitter);
free(demo_sig);
return;
}
--
