rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=8b03d81a33acda0e1da40f3bb04ad0ab898bec75
commit 8b03d81a33acda0e1da40f3bb04ad0ab898bec75
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Mon Sep 19 17:12:16 2016 +0300
signals: move used eflete_widget signals to signals struct
---
src/bin/common/signals.c | 33 ++++++++++++++++++++++++++
src/bin/common/signals.h | 34 +++++++++++++++++++++++++++
src/bin/ui/colorclass_manager.c | 4 ++--
src/bin/ui/image_manager.c | 4 ++--
src/bin/ui/modal_window/modal_window.c | 11 ++++-----
src/bin/ui/property/property_color_control.c | 4 ++--
src/bin/ui/property/property_common.c | 10 ++++----
src/bin/ui/property/property_common_image.c | 2 +-
src/bin/ui/property/property_common_tween.c | 4 ++--
src/bin/ui/property/property_image_selector.c | 2 +-
src/bin/ui/sound_manager.c | 4 ++--
src/bin/ui/style_manager.c | 4 ++--
src/bin/ui/workspace/container.c | 17 ++++----------
src/bin/ui/workspace/groupview.c | 6 ++---
src/bin/ui/workspace/highlight.c | 6 ++---
src/bin/ui/workspace/workspace.c | 2 +-
16 files changed, 101 insertions(+), 46 deletions(-)
diff --git a/src/bin/common/signals.c b/src/bin/common/signals.c
index d1f9242..4407337 100644
--- a/src/bin/common/signals.c
+++ b/src/bin/common/signals.c
@@ -81,6 +81,39 @@ const Signals signals = {
},
},
+ .eflete = {
+ .modal_window = {
+ .done = "[eflete]done",
+ .cancel = "[eflete]cancel",
+ .show_animation_finished= "[eflete]show,animation,finished",
+ .hide_animation_finished= "[eflete]hide,animation,finished",
+ },
+ .container = {
+ .changed = "[eflete]changed",
+ .handler_br_moved = "[eflete]handler,BR,moved",
+ },
+ .highlight = {
+ .drag_start = "[eflete]hl,drag,start",
+ .drag_stop = "[eflete]hl,drag,stop",
+ .changed = "[eflete]changed",
+ },
+ .property = {
+ .color_control = {
+ .changed = "[eflete]color,changed",
+ .dismissed = "[eflete]color,dismissed",
+ },
+ .image_normal_control = {
+ .changed = "[eflete]image,normal,changed",
+ },
+ .image_tween_control = {
+ .changed = "[eflete]image,tween,changed",
+ },
+ .image_selector = {
+ .changed = "[eflete]image,selector,changed",
+ },
+ },
+ },
+
.elm = {
.spinner = {
.changed = "changed",
diff --git a/src/bin/common/signals.h b/src/bin/common/signals.h
index 4fa4d26..35492be 100644
--- a/src/bin/common/signals.h
+++ b/src/bin/common/signals.h
@@ -80,6 +80,40 @@ typedef struct {
} zoom;
} workspace;
} shortcut;
+
+ const struct {
+ const struct {
+ const char *done;
+ const char *cancel;
+ const char *show_animation_finished;
+ const char *hide_animation_finished;
+ } modal_window;
+ const struct {
+ const char *changed;
+ const char *handler_br_moved;
+ } container;
+ const struct {
+ const char *drag_start;
+ const char *drag_stop;
+ const char *changed;
+ } highlight;
+ const struct {
+ const struct {
+ const char *changed;
+ const char *dismissed;
+ } color_control;
+ const struct {
+ const char *changed;
+ } image_normal_control;
+ const struct {
+ const char *changed;
+ } image_tween_control;
+ const struct {
+ const char *changed;
+ } image_selector;
+ } property;
+ } eflete;
+
const struct {
const struct {
const char *changed;
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index 312300a..757e0f2 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -443,8 +443,8 @@ colorclass_manager_add(void)
/* Creating main layout of window */
mng.win = mw_add();
mw_title_set(mng.win, _("Color class manager"));
- evas_object_smart_callback_add(mng.win, "cancel", _mw_cancel_cb, NULL);
- evas_object_smart_callback_add(mng.win, "done", _mw_done_cb, NULL);
+ evas_object_smart_callback_add(mng.win, signals.eflete.modal_window.cancel,
_mw_cancel_cb, NULL);
+ evas_object_smart_callback_add(mng.win, signals.eflete.modal_window.done,
_mw_done_cb, NULL);
#if !HAVE_TIZEN
ic = elm_icon_add(mng.win);
elm_icon_standard_set(ic, "image2");
diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c
index 599dd00..3b0d6fa 100644
--- a/src/bin/ui/image_manager.c
+++ b/src/bin/ui/image_manager.c
@@ -511,8 +511,8 @@ image_manager_add(void)
mng.win = mw_add();
mw_title_set(mng.win, _("Image manager"));
- evas_object_smart_callback_add(mng.win, "cancel", _mw_cancel_cb, NULL);
- evas_object_smart_callback_add(mng.win, "done", _mw_done_cb, NULL);
+ evas_object_smart_callback_add(mng.win, signals.eflete.modal_window.cancel,
_mw_cancel_cb, NULL);
+ evas_object_smart_callback_add(mng.win, signals.eflete.modal_window.done,
_mw_done_cb, NULL);
#if !HAVE_TIZEN
ic = elm_icon_add(mng.win);
elm_icon_standard_set(ic, "image2");
diff --git a/src/bin/ui/modal_window/modal_window.c
b/src/bin/ui/modal_window/modal_window.c
index d68fca2..5871243 100644
--- a/src/bin/ui/modal_window/modal_window.c
+++ b/src/bin/ui/modal_window/modal_window.c
@@ -22,9 +22,6 @@
#include "main_window.h"
#include "shortcuts.h"
-#define SIGNAL_DONE "done"
-#define SIGNAL_CANCEL "cancel"
-
static void
_response_cb(void *data,
Evas_Object *obj __UNUSED__,
@@ -87,7 +84,7 @@ _anim_show_finish(void *data,
assert(mw != NULL);
- evas_object_smart_callback_call(mw, "show,anim,finished", "eflete");
+ evas_object_smart_callback_call(mw,
signals.eflete.modal_window.show_animation_finished, "eflete");
img = elm_layout_content_get(obj, "elm.swallow.content");
evas_object_image_source_visible_set(img, true);
@@ -107,7 +104,7 @@ _anim_hide_finish(void *data,
assert(mw != NULL);
- evas_object_smart_callback_call(mw, "hide,anim,finished", "eflete");
+ evas_object_smart_callback_call(mw,
signals.eflete.modal_window.hide_animation_finished, "eflete");
img = elm_layout_content_get(obj, "elm.swallow.content");
evas_object_image_source_visible_set(img, true);
@@ -157,7 +154,7 @@ _mw_close(void *data,
assert(mw != NULL);
_anim_hide(elm_object_parent_widget_get(mw), evas_object_evas_get(mw), mw,
NULL);
- evas_object_smart_callback_call(mw, SIGNAL_CANCEL, NULL);
+ evas_object_smart_callback_call(mw, signals.eflete.modal_window.cancel,
NULL);
ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, false);
}
@@ -171,7 +168,7 @@ _mw_done(void *data,
assert(mw != NULL);
_anim_hide(elm_object_parent_widget_get(mw), evas_object_evas_get(mw), mw,
NULL);
- evas_object_smart_callback_call(mw, SIGNAL_DONE, NULL);
+ evas_object_smart_callback_call(mw, signals.eflete.modal_window.done, NULL);
ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, false);
}
diff --git a/src/bin/ui/property/property_color_control.c
b/src/bin/ui/property/property_color_control.c
index 50b5f7c..1005fdd 100644
--- a/src/bin/ui/property/property_color_control.c
+++ b/src/bin/ui/property/property_color_control.c
@@ -39,7 +39,7 @@ _on_color_change(void *data,
c = evas_object_data_get(control, COLOR_DATA);
elm_colorselector_color_get(obj, &c->r, &c->g, &c->b, &c->a);
property_color_control_color_set(control, c->r, c->g, c->b, c->a);
- evas_object_smart_callback_call(control, "changed", NULL);
+ evas_object_smart_callback_call(control,
signals.eflete.property.color_control.changed, NULL);
}
static Eina_Bool
@@ -52,7 +52,7 @@ _on_dismissed(void *data,
assert(control != NULL);
elm_object_scroll_freeze_pop(control);
- evas_object_smart_callback_call(control, "dismissed", NULL);
+ evas_object_smart_callback_call(control,
signals.eflete.property.color_control.dismissed, NULL);
evas_object_hide(obj);
return true;
diff --git a/src/bin/ui/property/property_common.c
b/src/bin/ui/property/property_common.c
index 12c53eb..67ba71f 100644
--- a/src/bin/ui/property/property_common.c
+++ b/src/bin/ui/property/property_common.c
@@ -386,8 +386,8 @@ _control_create(Property_Attribute *pa, Property_Action
*action, Evas_Object *pa
break;
case PROPERTY_CONTROL_COLOR:
content = property_color_control_add(parent);
- evas_object_smart_callback_add(content, "changed", _start_change_cb,
pa);
- evas_object_smart_callback_add(content, "dismissed", _stop_cb, pa);
+ evas_object_smart_callback_add(content,
signals.eflete.property.color_control.changed, _start_change_cb, pa);
+ evas_object_smart_callback_add(content,
signals.eflete.property.color_control.dismissed, _stop_cb, pa);
break;
case PROPERTY_CONTROL_COLORSEL:
content = elm_colorselector_add(parent);
@@ -426,15 +426,15 @@ _control_create(Property_Attribute *pa, Property_Action
*action, Evas_Object *pa
break;
case PROPERTY_CONTROL_IMAGE_NORMAL:
content = property_image_normal_control_add(parent);
- evas_object_smart_callback_add(content, "image,changed",
_start_change_stop_cb, pa);
+ evas_object_smart_callback_add(content,
signals.eflete.property.image_normal_control.changed, _start_change_stop_cb,
pa);
break;
case PROPERTY_CONTROL_IMAGE_TWEEN:
content = property_image_tween_control_add(parent);
- evas_object_smart_callback_add(content, "image,tween,changed",
_start_change_stop_cb, pa);
+ evas_object_smart_callback_add(content,
signals.eflete.property.image_tween_control.changed, _start_change_stop_cb, pa);
break;
case PROPERTY_CONTROL_IMAGE_SELECTOR:
content = property_image_selector_get(parent);
- evas_object_smart_callback_add(content, "changed,demo,image",
_start_change_stop_cb, pa);
+ evas_object_smart_callback_add(content,
signals.eflete.property.image_selector.changed, _start_change_stop_cb, pa);
evas_object_show(content);
break;
case PROPERTY_CONTROL_NONE:
diff --git a/src/bin/ui/property/property_common_image.c
b/src/bin/ui/property/property_common_image.c
index a1ce325..96d644e 100644
--- a/src/bin/ui/property/property_common_image.c
+++ b/src/bin/ui/property/property_common_image.c
@@ -41,7 +41,7 @@ TODO("apply after helper popup would be fixed")
if (strcmp(value, selected) == 0) return true;
property_entry_set(data, selected);
- evas_object_smart_callback_call(data, "image,changed", NULL);
+ evas_object_smart_callback_call(data,
signals.eflete.property.image_normal_control.changed, NULL);
elm_object_scroll_freeze_pop(data);
return true;
diff --git a/src/bin/ui/property/property_common_tween.c
b/src/bin/ui/property/property_common_tween.c
index b43a3af..b3d77de 100644
--- a/src/bin/ui/property/property_common_tween.c
+++ b/src/bin/ui/property/property_common_tween.c
@@ -90,7 +90,7 @@ _del_tween_image(void *data,
}
eina_list_free(selected);
- evas_object_smart_callback_call(control, "image,tween,changed", NULL);
+ evas_object_smart_callback_call(control,
signals.eflete.property.image_tween_control.changed, NULL);
}
static Eina_Bool
@@ -110,7 +110,7 @@ _on_image_editor_tween_done(void *data,
added_tweens = eina_list_append(added_tweens, name);
}
- evas_object_smart_callback_call(control, "image,tween,changed", NULL);
+ evas_object_smart_callback_call(control,
signals.eflete.property.image_tween_control.changed, NULL);
TODO("apply when popup will be fixed");
// elm_object_scroll_freeze_pop(tween_list);
diff --git a/src/bin/ui/property/property_image_selector.c
b/src/bin/ui/property/property_image_selector.c
index 1811cab..9369ade 100644
--- a/src/bin/ui/property/property_image_selector.c
+++ b/src/bin/ui/property/property_image_selector.c
@@ -38,7 +38,7 @@ _on_image_done(void *data,
if (strcmp(value, selected) == 0) return true;
property_entry_set(data, selected);
- evas_object_smart_callback_call(data, "changed,demo,image", NULL);
+ evas_object_smart_callback_call(data,
signals.eflete.property.image_selector.changed, NULL);
return true;
}
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index b32cf85..3bf1fc8 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -556,8 +556,8 @@ sound_manager_add(void)
mng.win = mw_add();
mw_title_set(mng.win, _("Sound manager"));
- evas_object_smart_callback_add(mng.win, "cancel", _mw_cancel_cb, NULL);
- evas_object_smart_callback_add(mng.win, "done", _mw_done_cb, NULL);
+ evas_object_smart_callback_add(mng.win, signals.eflete.modal_window.cancel,
_mw_cancel_cb, NULL);
+ evas_object_smart_callback_add(mng.win, signals.eflete.modal_window.done,
_mw_done_cb, NULL);
#if !HAVE_TIZEN
ic = elm_icon_add(mng.win);
elm_icon_standard_set(ic, "image2");
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index a9eddfb..b4099fa 100644
--- a/src/bin/ui/style_manager.c
+++ b/src/bin/ui/style_manager.c
@@ -811,8 +811,8 @@ style_manager_add()
mng.win = mw_add();
mw_title_set(mng.win, _("Textblock style manager"));
- evas_object_smart_callback_add(mng.win, "cancel", _mw_cancel_cb, NULL);
- evas_object_smart_callback_add(mng.win, "done", _mw_done_cb, NULL);
+ evas_object_smart_callback_add(mng.win, signals.eflete.modal_window.cancel,
_mw_cancel_cb, NULL);
+ evas_object_smart_callback_add(mng.win, signals.eflete.modal_window.done,
_mw_done_cb, NULL);
#if !HAVE_TIZEN
ic = elm_icon_add(mng.win);
elm_icon_standard_set(ic, "image2");
diff --git a/src/bin/ui/workspace/container.c b/src/bin/ui/workspace/container.c
index a071903..fd46745 100644
--- a/src/bin/ui/workspace/container.c
+++ b/src/bin/ui/workspace/container.c
@@ -26,18 +26,9 @@
typedef struct _Container_Smart_Data Container_Smart_Data;
-static const char SIG_CHANGED[] = "container,changed";
-static const char SIG_HANDLER_BR_MOVE[] = "handler,BR,moved";
-
static const char TEXT_TOOLTIP[] = "eflete.size.tooltip";
static const char SWALLOW[] = "eflete.swallow.container";
-static const Evas_Smart_Cb_Description _smart_callbacks[] = {
- {SIG_CHANGED, "(iiii)"},
- {SIG_HANDLER_BR_MOVE, "(ii)"},
- {NULL, NULL}
-};
-
struct _Container_Smart_Data
{
Evas_Object_Smart_Clipped_Data base;
@@ -81,7 +72,7 @@ struct _Container_Smart_Data
* object that is inherited from general Smart Object. */
EVAS_SMART_SUBCLASS_NEW(MY_CLASS_NAME, _container,
Evas_Smart_Class, Evas_Smart_Class,
- evas_object_smart_clipped_class_get, _smart_callbacks);
+ evas_object_smart_clipped_class_get, NULL);
static void
_mouse_down_hRB_cb(void *data,
@@ -127,7 +118,7 @@ _mouse_move_hBR_cb(void *data,
sd->downx = ev->cur.canvas.x;
sd->downy = ev->cur.canvas.y;
- evas_object_smart_callback_call(o, SIG_HANDLER_BR_MOVE, &sd->zoom1);
+ evas_object_smart_callback_call(o,
signals.eflete.container.handler_br_moved, &sd->zoom1);
evas_object_smart_changed(o);
}
@@ -258,7 +249,7 @@ _container_smart_move(Evas_Object *o,
evas_object_move(sd->container, sd->size.x, sd->size.y);
evas_object_move(sd->handler_BR.obj, sd->size.x + sd->size.w, sd->size.y +
sd->size.h);
- evas_object_smart_callback_call(o, SIG_CHANGED, &sd->size);
+ evas_object_smart_callback_call(o, signals.eflete.container.changed,
&sd->size);
}
static void
@@ -363,7 +354,7 @@ _container_smart_calculate(Evas_Object *o)
snprintf(buff, 16, "%i %i", sd->zoom1.w, sd->zoom1.h);
edje_object_part_text_set(sd->container, TEXT_TOOLTIP, buff);
- evas_object_smart_callback_call(o, SIG_CHANGED, &sd->zoom1);
+ evas_object_smart_callback_call(o, signals.eflete.container.changed,
&sd->zoom1);
if ((int)sd->zoom > 1) divisior = (int)sd->zoom;
sd->dx = sd->dx % divisior;
diff --git a/src/bin/ui/workspace/groupview.c b/src/bin/ui/workspace/groupview.c
index aa2db0d..314e6ce 100644
--- a/src/bin/ui/workspace/groupview.c
+++ b/src/bin/ui/workspace/groupview.c
@@ -291,9 +291,9 @@ groupview_add(Evas_Object *parent, Group *group)
sd->highlight = highlight_add(sd->box);
evas_object_color_set(sd->highlight, HIGHLIGHT_COLOR);
- evas_object_smart_callback_add(sd->highlight, "hl,drag,start",
_hl_part_drag_start_cb, sd);
- evas_object_smart_callback_add(sd->highlight, "hl,changed",
_hl_part_changed_cb, sd);
- evas_object_smart_callback_add(sd->highlight, "hl,drag,stop",
_hl_part_drag_stop_cb, sd);
+ evas_object_smart_callback_add(sd->highlight,
signals.eflete.highlight.drag_start, _hl_part_drag_start_cb, sd);
+ evas_object_smart_callback_add(sd->highlight,
signals.eflete.highlight.changed, _hl_part_changed_cb, sd);
+ evas_object_smart_callback_add(sd->highlight,
signals.eflete.highlight.drag_stop, _hl_part_drag_stop_cb, sd);
evas_object_smart_member_add(sd->highlight, obj);
/* hide the editing object by using clipper (clipper is small, it's size is
0,0)
diff --git a/src/bin/ui/workspace/highlight.c b/src/bin/ui/workspace/highlight.c
index 7824ae8..0f6c47a 100644
--- a/src/bin/ui/workspace/highlight.c
+++ b/src/bin/ui/workspace/highlight.c
@@ -236,7 +236,7 @@ _handler_down_cb(void *data,
highlight->clicked = true;
evas_object_smart_callback_call(highlight->smart_object,
- "hl,drag,start", highlight->events);
+ signals.eflete.highlight.drag_start,
highlight->events);
}
static void
@@ -435,7 +435,7 @@ _handler_up_cb(void *data,
handler->highlight->clicked = false;
evas_object_smart_callback_call(handler->highlight->smart_object,
- "hl,drag,stop", handler->highlight->events);
+ signals.eflete.highlight.drag_stop,
handler->highlight->events);
}
/*
@@ -573,7 +573,7 @@ _smart_calc(Evas_Object *obj)
if (highlight->clicked)
evas_object_smart_callback_call(highlight->smart_object,
- "hl,changed", highlight->events);
+ signals.eflete.highlight.changed,
highlight->events);
}
/* create and setup a new example smart object's internals */
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 11d9fda..a644ce4 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -1100,7 +1100,7 @@ _scroll_area_add(Workspace_Data *wd, Scroll_Area *area,
Eina_Bool scale_rel)
area->container = container_add(area->scroller);
evas_object_size_hint_weight_set(area->container, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
container_handler_size_set(area->container, 8, 8);
- evas_object_smart_callback_add(area->container, "container,changed",
_container_changed, wd);
+ evas_object_smart_callback_add(area->container,
signals.eflete.container.changed, _container_changed, wd);
elm_object_content_set(area->helper, area->container);
container_container_size_set(area->container, 350, 350);
--
