rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=4b9de2fff5c48d814d4057e6cea01c2df3ca240f
commit 4b9de2fff5c48d814d4057e6cea01c2df3ca240f Author: Vitalii Vorobiov <vi.vorob...@samsung.com> Date: Tue Jan 26 15:41:12 2016 +0000 image_manager: rename image_editor into his new form --- po/POTFILES.in | 2 +- src/bin/Makefile.am | 2 +- .../ui/{editors/image_editor.c => image_manager.c} | 15 +++++------- src/bin/ui/main_window.h | 9 ++++++++ src/bin/ui/menu.c | 1 - src/bin/ui/shortcuts/shortcuts.c | 1 - src/bin/ui/tabs.c | 1 - .../test_image_manager/test_image_manager.h | 27 +++++----------------- 8 files changed, 23 insertions(+), 35 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1ca810d..d590961 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -15,7 +15,7 @@ src/bin/ui/editors/animator.c src/bin/ui/editors/animator_program_editor.c src/bin/ui/editors/animator_program_sequence.c src/bin/ui/editors/colorclass_manager.c -src/bin/ui/editors/image_editor.c +src/bin/ui/image_manager.c src/bin/ui/editors/sound_editor.c src/bin/ui/editors/style_editor.c src/bin/ui/live_view/elementary/live_actionslider.c diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 965f14b..ee181fb 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -39,13 +39,13 @@ libete_a_SOURCES = \ ../../src/bin/ui/shortcuts/shortcuts.c \ ../../src/bin/ui/container/container.c \ ../../src/bin/ui/editors/style_editor.c \ -../../src/bin/ui/editors/image_editor.c \ ../../src/bin/ui/editors/sound_editor.c \ ../../src/bin/ui/editors/colorclass_manager.c \ ../../src/bin/ui/dialogs/about_window.c \ ../../src/bin/ui/dialogs/colorsel.c \ ../../src/bin/ui/modal_window/modal_window.c \ ../../src/bin/ui/project_navigator.c \ +../../src/bin/ui/image_manager.c \ ../../src/bin/ui/tabs.c \ ../../src/bin/ui/tab_home_common.c \ ../../src/bin/ui/tab_home_open.c \ diff --git a/src/bin/ui/editors/image_editor.c b/src/bin/ui/image_manager.c similarity index 97% rename from src/bin/ui/editors/image_editor.c rename to src/bin/ui/image_manager.c index fb60a82..e558f71 100644 --- a/src/bin/ui/editors/image_editor.c +++ b/src/bin/ui/image_manager.c @@ -17,15 +17,12 @@ * along with this program; If not, see www.gnu.org/licenses/lgpl.html. */ -#include "image_editor.h" #include "main_window.h" #include "project_manager.h" -TODO("Rename this file to image_manager") - #define ITEM_WIDTH 100 #define ITEM_HEIGHT 115 -#define IMG_EDIT_KEY "image_editor_key" +#define IMG_MANAGER_KEY "image_manager_key" typedef struct _Image_Editor Image_Editor; typedef struct _Search_Data Search_Data; @@ -99,8 +96,8 @@ _image_editor_del(Image_Editor *img_edit) elm_gengrid_item_class_free(gic); gic = NULL; - evas_object_data_del(img_edit->layout, IMG_EDIT_KEY); - evas_object_data_del(img_edit->gengrid, IMG_EDIT_KEY); + evas_object_data_del(img_edit->layout, IMG_MANAGER_KEY); + evas_object_data_del(img_edit->gengrid, IMG_MANAGER_KEY); //evas_object_del(img_edit->gengrid); free(img_edit); } @@ -585,8 +582,8 @@ image_manager_add() ERR("Filed initialize image editor"); abort(); } - evas_object_data_set(img_edit->gengrid, IMG_EDIT_KEY, img_edit); - evas_object_data_set(img_edit->layout, IMG_EDIT_KEY, img_edit); + evas_object_data_set(img_edit->gengrid, IMG_MANAGER_KEY, img_edit); + evas_object_data_set(img_edit->layout, IMG_MANAGER_KEY, img_edit); ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, true); evas_object_event_callback_add(img_edit->layout, EVAS_CALLBACK_DEL, _on_image_editor_del, img_edit); @@ -596,4 +593,4 @@ image_manager_add() #undef ITEM_WIDTH #undef ITEM_HEIGHT -#undef IMG_EDIT_KEY +#undef IMG_MANAGER_KEY diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h index 54a7a64..9b2fdbc 100644 --- a/src/bin/ui/main_window.h +++ b/src/bin/ui/main_window.h @@ -421,5 +421,14 @@ project_export_edc_project(void); void project_export_edc_group(void); +/** + * Add new image editor layout for setting into tab. + * + * @return Pointer to layout object, which contain image grid and buttons. + * + * @ingroup Window + */ +Evas_Object * +image_manager_add(void); #endif /* UI_MAIN_WINDOW_H */ diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c index 274ad34..d0060e4 100644 --- a/src/bin/ui/menu.c +++ b/src/bin/ui/menu.c @@ -20,7 +20,6 @@ #include "main_window.h" #include "preference.h" #include "style_editor.h" -#include "image_editor.h" #include "sound_editor.h" #include "animator.h" #include "about_window.h" diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c index b90d976..845ecfa 100644 --- a/src/bin/ui/shortcuts/shortcuts.c +++ b/src/bin/ui/shortcuts/shortcuts.c @@ -20,7 +20,6 @@ #include "shortcuts.h" #include "main_window.h" #include "style_editor.h" -#include "image_editor.h" #include "sound_editor.h" #include "animator.h" #include "tabs.h" diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c index 62f7f67..17650f4 100644 --- a/src/bin/ui/tabs.c +++ b/src/bin/ui/tabs.c @@ -26,7 +26,6 @@ #include "change.h" #include "style_editor.h" -#include "image_editor.h" #include "sound_editor.h" #include "colorclass_manager.h" #include "animator.h" diff --git a/src/bin/ui/editors/image_editor.h b/tests/test_image_manager/test_image_manager.h similarity index 60% rename from src/bin/ui/editors/image_editor.h rename to tests/test_image_manager/test_image_manager.h index c983931..96022c1 100644 --- a/src/bin/ui/editors/image_editor.h +++ b/tests/test_image_manager/test_image_manager.h @@ -1,4 +1,4 @@ -/* +/** * Edje Theme Editor * Copyright (C) 2013-2014 Samsung Electronics. * @@ -17,28 +17,13 @@ * along with this program; If not, see www.gnu.org/licenses/lgpl.html. */ -#ifndef IMAGE_EDITOR_H -#define IMAGE_EDITOR_H +#include "utc_common.h" +#include "main_window.h" /** - * @defgroup ImageEditor Image Editor - * - * Image editor is subwindow that contain information about - * all the images used by the project. + * @defgroup image_manager_test */ -#include "eflete.h" - -#define SIG_IMAGE_SELECTED "image_selected" - -/** - * Add new image editor layout for setting into tab. - * - * @return Pointer to layout object, which contain image grid and buttons. - * - * @ingroup ImageEditor - */ -Evas_Object * -image_manager_add(void); +#define TEST_NAME "image_manager" -#endif /*IMAGE_EDITOR_H*/ +void image_manager_add_test_p(int); --