rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=15f5baffdc2ee98cbf300773f59b670143d8b03f
commit 15f5baffdc2ee98cbf300773f59b670143d8b03f
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date: Thu Jan 28 11:50:20 2016 +0000
Style Editor: delete header and move function to main_window
---
src/bin/ui/dialogs/about_window.c | 1 -
src/bin/ui/editors/style_editor.c | 1 -
src/bin/ui/editors/style_editor.h | 55 -----------------------------
src/bin/ui/main_window.h | 22 ++++++++++++
src/bin/ui/menu.c | 1 -
src/bin/ui/property_style.c | 1 -
src/bin/ui/shortcuts/shortcuts.c | 1 -
src/bin/ui/tabs.c | 1 -
tests/test_style_editor/test_style_editor.h | 1 -
9 files changed, 22 insertions(+), 62 deletions(-)
diff --git a/src/bin/ui/dialogs/about_window.c
b/src/bin/ui/dialogs/about_window.c
index e92c2df..8eef6e4 100644
--- a/src/bin/ui/dialogs/about_window.c
+++ b/src/bin/ui/dialogs/about_window.c
@@ -17,7 +17,6 @@
* along with this program; If not, see www.gnu.org/licenses/lgpl.html.
*/
-#include "style_editor.h"
#include "main_window.h"
#include "modal_window.h"
diff --git a/src/bin/ui/editors/style_editor.c
b/src/bin/ui/editors/style_editor.c
index 2596aab..d75e173 100644
--- a/src/bin/ui/editors/style_editor.c
+++ b/src/bin/ui/editors/style_editor.c
@@ -20,7 +20,6 @@
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
-#include "style_editor.h"
#include "main_window.h"
#include "project_manager.h"
diff --git a/src/bin/ui/editors/style_editor.h
b/src/bin/ui/editors/style_editor.h
deleted file mode 100644
index 55f865b..0000000
--- a/src/bin/ui/editors/style_editor.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Edje Theme Editor
- * Copyright (C) 2013-2014 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 STYLE_VIEWER_DIALOG_H
-#define STYLE_VIEWER_DIALOG_H
-
-/**
- * @defgroup TextStyle Text Style
- *
- * This widget emits the following signals:
- *
- * TextStyle is a Inwin that contain information
- * of the widgets text styles.
- */
-
-#include "eflete.h"
-
-struct _Style_Data
-{
- const char *st_name;
- const char *st_tag;
- Eina_Stringshare *stvalue;
- Eina_Strbuf *style;
- Evas_Object *textblock_style;
- Eina_Bool is_parent_item;
-};
-typedef struct _Style_Data Style_Data;
-/**
- * Show the whole inwin window by using some data
- * about loaded project (edj file)
- *
- * @return the inwin object that contain style viewer
- *
- * @ingroup TextStyle
- */
-Evas_Object *
-style_editor_window_add();
-
-#endif /* STYLE_VIEWER_DIALOG_H */
diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h
index d822727..f7d299e 100644
--- a/src/bin/ui/main_window.h
+++ b/src/bin/ui/main_window.h
@@ -457,4 +457,26 @@ struct _ColorClassData
Evas_Object *
colorclass_manager_add();
+struct _Style_Data
+{
+ const char *st_name;
+ const char *st_tag;
+ Eina_Stringshare *stvalue;
+ Eina_Strbuf *style;
+ Evas_Object *textblock_style;
+ Eina_Bool is_parent_item;
+};
+typedef struct _Style_Data Style_Data;
+
+/**
+ * Add new style manager layout object.
+ *
+ * @return Pointer to layout object, which contain list of styles,
+ * control buttons, etc.
+ *
+ * @ingroup Window
+ */
+Evas_Object *
+style_editor_window_add();
+
#endif /* UI_MAIN_WINDOW_H */
diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c
index d0060e4..f2a7e5a 100644
--- a/src/bin/ui/menu.c
+++ b/src/bin/ui/menu.c
@@ -19,7 +19,6 @@
#include "main_window.h"
#include "preference.h"
-#include "style_editor.h"
#include "sound_editor.h"
#include "animator.h"
#include "about_window.h"
diff --git a/src/bin/ui/property_style.c b/src/bin/ui/property_style.c
index 2370a15..d691970 100644
--- a/src/bin/ui/property_style.c
+++ b/src/bin/ui/property_style.c
@@ -19,7 +19,6 @@
#include "property_private.h"
#include "property_macros.h"
#include "main_window.h"
-#include "style_editor.h"
#include "colorsel.h"
#include "project_manager.h"
diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c
index d3b6813..99dee3b 100644
--- a/src/bin/ui/shortcuts/shortcuts.c
+++ b/src/bin/ui/shortcuts/shortcuts.c
@@ -19,7 +19,6 @@
#include "shortcuts.h"
#include "main_window.h"
-#include "style_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 e27a6c3..b6af101 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -25,7 +25,6 @@
#include "main_window.h"
#include "change.h"
-#include "style_editor.h"
#include "sound_editor.h"
#include "animator.h"
diff --git a/tests/test_style_editor/test_style_editor.h
b/tests/test_style_editor/test_style_editor.h
index a3cf9e6..a742c54 100644
--- a/tests/test_style_editor/test_style_editor.h
+++ b/tests/test_style_editor/test_style_editor.h
@@ -18,7 +18,6 @@
*/
#include "utc_common.h"
-#include "style_editor.h"
#include "main_window.h"
/**
--
