rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3e2860ac84b0e8e0d10383d25900e6c5f0240322
commit 3e2860ac84b0e8e0d10383d25900e6c5f0240322
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Mon May 16 17:11:00 2016 +0300
property: make property for managers is public
Change-Id: I0ff5e0cb8152d544c2de592588a20e0f4ff67c3f
---
src/bin/eflete.h | 4 ++++
src/bin/ui/main_window.c | 4 ++++
src/bin/ui/property.c | 6 ++++++
src/bin/ui/property.h | 13 +++++++++++++
src/bin/ui/property_private.h | 12 ------------
5 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/bin/eflete.h b/src/bin/eflete.h
index 98d8267..586f22e 100644
--- a/src/bin/eflete.h
+++ b/src/bin/eflete.h
@@ -101,6 +101,10 @@ struct _App_Data
} panes;
struct {
Evas_Object *group;
+ Evas_Object *image_manager;
+ Evas_Object *sound_manager;
+ Evas_Object *style_manager;
+ Evas_Object *color_manager;
} property;
struct {
diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index 070d355..7c5be89 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -190,6 +190,10 @@ ui_main_window_add(void)
evas_object_smart_callback_add(ap.win, SIGNAL_SHORTCUT_QUIT, _on_done,
NULL);
ap.property.group = ui_property_add(ap.win);
+ ap.property.image_manager = ui_property_image_add(ap.win);
+ ap.property.sound_manager = ui_property_sound_add(ap.win);
+ ap.property.style_manager = ui_property_style_add(ap.win);
+ ap.property.color_manager = ui_property_color_add(ap.win);
elm_layout_content_set(ap.tabs, "elm.swallow.property", ap.property.group);
ap.block.history = history_ui_add();
elm_layout_content_set(ap.tabs, "elm.swallow.history", ap.block.history);
diff --git a/src/bin/ui/property.c b/src/bin/ui/property.c
index 5310947..d22d546 100644
--- a/src/bin/ui/property.c
+++ b/src/bin/ui/property.c
@@ -126,6 +126,7 @@ _on_different_clicked(void *data,
pd->type = PROPERTY;
}
+#if 0
static void
_on_image_editor_clicked(void *data,
Evas_Object *obj __UNUSED__,
@@ -225,6 +226,7 @@ _on_color_editor_clicked(void *data,
pd->type = STYLE_PROPERTY;
}
+#endif /* if 0 */
static void
_on_text_part_clicked(void *data,
@@ -380,19 +382,23 @@ ui_property_add(Evas_Object *parent)
elm_object_content_set(pd->layout, pd->group_property);
evas_object_data_set(pd->layout, PROP_DATA, pd);
+ /*
pd->image_property = ui_property_image_add(pd->layout);
pd->sound_property = ui_property_sound_add(pd->layout);
pd->style_property = ui_property_style_add(pd->layout);
pd->color_property = ui_property_color_add(pd->layout);
+ */
pd->demo_text_property = ui_property_demo_text_add(pd->layout);
pd->demo_swallow_property = ui_property_demo_swallow_add(pd->layout);
pd->demo_program_property = ui_property_demo_program_add(pd->layout);
/* register global callbacks */
evas_object_smart_callback_add(ap.win, SIGNAL_TAB_CHANGED, _on_tab_changed,
pd->layout);
+ /*
evas_object_smart_callback_add(ap.win, SIGNAL_IMAGE_EDITOR_TAB_CLICKED,
_on_image_editor_clicked, pd->layout);
evas_object_smart_callback_add(ap.win, SIGNAL_SOUND_EDITOR_TAB_CLICKED,
_on_sound_editor_clicked, pd->layout);
evas_object_smart_callback_add(ap.win, SIGNAL_STYLE_EDITOR_TAB_CLICKED,
_on_style_editor_clicked, pd->layout);
evas_object_smart_callback_add(ap.win, SIGNAL_COLOR_EDITOR_TAB_CLICKED,
_on_color_editor_clicked, pd->layout);
+ */
evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_PART_CLICKED,
_on_text_part_clicked, pd->layout);
evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_PART_CLICKED,
_on_swallow_part_clicked, pd->layout);
evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_PROGRAM_PART_CLICKED,
_on_demo_program_clicked, pd->layout);
diff --git a/src/bin/ui/property.h b/src/bin/ui/property.h
index ec1a424..e3a4606 100644
--- a/src/bin/ui/property.h
+++ b/src/bin/ui/property.h
@@ -40,4 +40,17 @@
Evas_Object *
ui_property_add(Evas_Object *parent);
+Evas_Object *
+ui_property_image_add(Evas_Object *parent);
+
+Evas_Object *
+ui_property_sound_add(Evas_Object *parent);
+
+Evas_Object *
+ui_property_style_add(Evas_Object *parent);
+
+Evas_Object *
+ui_property_color_add(Evas_Object *parent);
+
+
#endif /* UI_PROPERTY_1_H */
diff --git a/src/bin/ui/property_private.h b/src/bin/ui/property_private.h
index 0260a8a..044fa82 100644
--- a/src/bin/ui/property_private.h
+++ b/src/bin/ui/property_private.h
@@ -45,9 +45,6 @@ ui_property_part_set(Evas_Object *parent, Part *part);
void
ui_property_part_state_set(Evas_Object *parent, Part *part);
-Evas_Object *
-ui_property_image_add(Evas_Object *parent);
-
/* TODO: put this function into a certain place */
void
_on_frame_click(void *data,
@@ -55,15 +52,6 @@ _on_frame_click(void *data,
void *event_info);
Evas_Object *
-ui_property_sound_add(Evas_Object *parent);
-
-Evas_Object *
-ui_property_style_add(Evas_Object *parent);
-
-Evas_Object *
-ui_property_color_add(Evas_Object *parent);
-
-Evas_Object *
ui_property_demo_text_add(Evas_Object *parent);
void
--
