rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=a5911e5057276e38cb4e8adc22184a914a912812
commit a5911e5057276e38cb4e8adc22184a914a912812
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date: Wed Jan 27 13:53:38 2016 +0000
colorclass_manager: move manager into ui
---
po/POTFILES.in | 2 +-
src/bin/Makefile.am | 2 +-
src/bin/ui/{editors => }/colorclass_manager.c | 1 -
src/bin/ui/editors/colorclass_manager.h | 42 ----------------------
src/bin/ui/main_window.h | 11 ++++++
src/bin/ui/property_color.c | 1 -
src/bin/ui/tabs.c | 1 -
.../test_colorclass_manager.h | 1 -
8 files changed, 13 insertions(+), 48 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d590961..cc7d643 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,7 +14,7 @@ src/bin/ui/dialogs/colorsel.c
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/colorclass_manager.c
src/bin/ui/image_manager.c
src/bin/ui/editors/sound_editor.c
src/bin/ui/editors/style_editor.c
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ee181fb..fc2e6d1 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -40,12 +40,12 @@ libete_a_SOURCES = \
../../src/bin/ui/container/container.c \
../../src/bin/ui/editors/style_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/colorclass_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/colorclass_manager.c
b/src/bin/ui/colorclass_manager.c
similarity index 99%
rename from src/bin/ui/editors/colorclass_manager.c
rename to src/bin/ui/colorclass_manager.c
index b74797f..b1d262b 100644
--- a/src/bin/ui/editors/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -20,7 +20,6 @@
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
-#include "colorclass_manager.h"
#include "main_window.h"
#include "project_manager.h"
diff --git a/src/bin/ui/editors/colorclass_manager.h
b/src/bin/ui/editors/colorclass_manager.h
deleted file mode 100644
index e6542a9..0000000
--- a/src/bin/ui/editors/colorclass_manager.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Edje Theme Editor
- * Copyright (C) 2013-2015 Samsung Electronics.
- *
- * This file is part of Edje Theme Editor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
- */
-
-#ifndef COLORCLASS_MANAGER_DIALOG_H
-#define COLORCLASS_MANAGER_DIALOG_H
-
-/**
- * @defgroup Colorclass_Manager Colorclass_Manager
- * @ingroup Dialogs
- *
- * Show color classes, which uses in project.
- */
-
-#include "eflete.h"
-
-/**
- * Add new colorclass viewer inwin object.
- *
- * @return Pointer to inwin object.
- *
- * @ingroup Colorclass_Manager
- */
-Evas_Object *
-colorclass_manager_add();
-
-#endif /* COLORCLASS_MANAGER_DIALOG_H */
diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h
index bb1a10c..d822727 100644
--- a/src/bin/ui/main_window.h
+++ b/src/bin/ui/main_window.h
@@ -446,4 +446,15 @@ struct _ColorClassData
Evas_Object *edje_preview;
};
+/**
+ * Add new colorclass manager layout object.
+ *
+ * @return Pointer to layout object, which contain list of colorclasses,
+ * control buttons, etc.
+ *
+ * @ingroup Window
+ */
+Evas_Object *
+colorclass_manager_add();
+
#endif /* UI_MAIN_WINDOW_H */
diff --git a/src/bin/ui/property_color.c b/src/bin/ui/property_color.c
index f8ba4b4..df442c5 100644
--- a/src/bin/ui/property_color.c
+++ b/src/bin/ui/property_color.c
@@ -21,7 +21,6 @@
#include "main_window.h"
#include "colorsel.h"
#include "property_macros.h"
-#include "colorclass_manager.h"
#include "project_manager.h"
typedef struct _Color_Prop_Data Color_Prop_Data;
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index 17650f4..e27a6c3 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -27,7 +27,6 @@
#include "style_editor.h"
#include "sound_editor.h"
-#include "colorclass_manager.h"
#include "animator.h"
struct _Tabs_Item {
diff --git a/tests/test_colorclass_manager/test_colorclass_manager.h
b/tests/test_colorclass_manager/test_colorclass_manager.h
index 2ed30c2..913456c 100644
--- a/tests/test_colorclass_manager/test_colorclass_manager.h
+++ b/tests/test_colorclass_manager/test_colorclass_manager.h
@@ -17,7 +17,6 @@
* along with this program; If not, see www.gnu.org/licenses/lgpl.html.
*/
-#include "colorclass_manager.h"
#include "main_window.h"
#include "utc_common.h"
--
