rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=aeaeac87dd00b83fc0663e3c2409472556d4054b
commit aeaeac87dd00b83fc0663e3c2409472556d4054b Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Thu Dec 24 16:52:08 2015 +0200 refactor: remove widget_manager.h commented out all code that still uses it exclude animator from build --- src/bin/Makefile.am | 3 - src/bin/project_manager/project_manager.c | 9 +- src/bin/project_manager/project_manager.h | 22 +- src/bin/project_manager/widget_manager.h | 574 ------------------------------ src/bin/ui/editors/colorclass_manager.h | 1 - src/bin/ui/editors/image_editor.h | 1 - src/bin/ui/live_view/live_view.c | 3 +- src/bin/ui/live_view/live_view.h | 13 +- src/bin/ui/live_view/live_view_prop.c | 6 + src/bin/ui/live_view/live_view_prop.h | 8 +- src/bin/ui/main_window.h | 81 ----- src/bin/ui/menu.c | 4 +- src/bin/ui/property.h | 1 - src/bin/ui/property_private.h | 1 - src/bin/ui/shortcuts/shortcuts.c | 4 +- src/bin/ui/workspace/workspace.h | 13 - 16 files changed, 37 insertions(+), 707 deletions(-) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 050f31b..8abb51e 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -42,9 +42,6 @@ libete_a_SOURCES = \ ../../src/bin/ui/editors/image_editor.c \ ../../src/bin/ui/editors/sound_editor.c \ ../../src/bin/ui/editors/colorclass_manager.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/dialogs/about_window.c \ ../../src/bin/ui/dialogs/colorsel.c \ ../../src/bin/ui/modal_window/modal_window.c \ diff --git a/src/bin/project_manager/project_manager.c b/src/bin/project_manager/project_manager.c index 1d11a9c..967c366 100644 --- a/src/bin/project_manager/project_manager.c +++ b/src/bin/project_manager/project_manager.c @@ -1211,11 +1211,12 @@ _styles_resources_load(Project *project) edje_edit_string_list_free(styles); } +TODO("rewrite") +#if 0 Eina_Bool pm_style_resource_export(Project *pro __UNUSED__ , Style *style __UNUSED__, Eina_Stringshare *path __UNUSED__) { return false; -#if 0 Eina_List *l, *l_next, *parts, *state_list, *l_states, *tween_list, *l_tween; Eina_List *programs; @@ -1337,8 +1338,8 @@ pm_style_resource_export(Project *pro __UNUSED__ , Style *style __UNUSED__, Eina eina_stringshare_del(data); return true; -#endif } +#endif Eina_Bool pm_project_resource_export(Project *pro __UNUSED__, const char* dir_path __UNUSED__) @@ -1346,6 +1347,8 @@ pm_project_resource_export(Project *pro __UNUSED__, const char* dir_path __UNUSE return false; } +TODO("rewrite this") +/* Eina_Bool pm_project_style_source_code_export(Project *pro, Style *style, const char *file) { @@ -1374,7 +1377,7 @@ pm_project_style_source_code_export(Project *pro, Style *style, const char *file eina_stringshare_del(path); return true; } - +*/ static void _external_resource_export(Eina_List *resources, const char *dst) { diff --git a/src/bin/project_manager/project_manager.h b/src/bin/project_manager/project_manager.h index ed08c53..f3c4675 100644 --- a/src/bin/project_manager/project_manager.h +++ b/src/bin/project_manager/project_manager.h @@ -38,10 +38,13 @@ * information about project in the current folder. */ -#include "widget_manager.h" -#include "logger.h" +#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT +#include <Eina.h> +#include <Ecore_Evas.h> +#include <Edje_Edit.h> #include <Eet.h> #include <assert.h> +#include "logger.h" /* don't forget to update on major changes */ #define PROJECT_FILE_VERSION 3 @@ -80,13 +83,6 @@ struct _Project /** compile options for release edj file. see edje_cc reference */ Eina_Stringshare *release_options; - /** current editing group */ - Style *current_style; - /** list of widgets and they styles in that theme */ - Eina_Inlist *widgets; - /**< list of custom layouts int loaded theme */ - Eina_Inlist *layouts; - Eina_List *groups; Eina_List *images; Eina_List *sounds; @@ -448,8 +444,8 @@ pm_project_resource_export(Project *pro, const char* dir_path); * * @ingroup ProjectManager. */ -Eina_Bool -pm_project_style_source_code_export(Project *pro, Style *style, const char *file); +//Eina_Bool +//pm_project_style_source_code_export(Project *pro, Style *style, const char *file); /** * Export the source code of Project (for each style edje objects) to a directory @@ -529,8 +525,8 @@ pm_project_enventor_save(Project *project, * * @ingroup ProjectManager. */ -Eina_Bool -pm_style_resource_export(Project *pro, Style *style, Eina_Stringshare *path); +//Eina_Bool +//pm_style_resource_export(Project *pro, Style *style, Eina_Stringshare *path); /** diff --git a/src/bin/project_manager/widget_manager.h b/src/bin/project_manager/widget_manager.h deleted file mode 100644 index b5fa075..0000000 --- a/src/bin/project_manager/widget_manager.h +++ /dev/null @@ -1,574 +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 WIDGET_MANAGER_B_H -#define WIDGET_MANAGER_B_H - -/** - * @defgroup WidgetManager Widget Manager - * @ingroup ProjectManager - * - * The module 'Widget Manager' designed to create, storage and manipulation the - * data of a widget theme. A module create a list, for a list are using - * Eina_Inlist, of widgets which consist in a theme file. List has the following - * stucture: - * - widget (#_Widget) - * - class (#_Class) - * - style (#_Style) - * - part (#_Part) - * - [part] - * - ... - * - [style] - * - ... - * - [class] - * - ... - * - [widget] - * - ... - * - */ - -#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT - -#include <Eina.h> -#include <Ecore_Evas.h> -#include <Edje_Edit.h> -#include "logger.h" - -#define EFLETE_INTERNAL_GROUP_NAME "___eflete_internal_group___" -/** - * @enum _Type - * @ingroup WidgetManager - */ -enum _Type -{ - WIDGET = 0, - CLASS, - STYLE, - PART, - LAYOUT -}; - -/** - * @typedef Type - * @ingroup WidgetManager - */ -typedef enum _Type Type; - -/** - * @typedef Part - * @ingroup WidgetManager - */ -typedef struct _Part Part; - -/** - * @typedef Style - * @ingroup WidgetManager - */ -typedef struct _Style Style; - - -/** - * @typedef Class - * @ingroup WidgetManager - */ -typedef struct _Class Class; - -/** - * @typedef Widget - * @ingroup WidgetManager - */ -typedef struct _Widget Widget; - -/** - * @struct _Part - * - * @brief This struct designed to storage a data part in style. - * In a theme file (.edc) this data presented as block 'part' - * - * @ingroup WidgetManager - */ -struct _Part -{ - EINA_INLIST; - Type __type; /**< PART from enum @_type */ - Eina_Stringshare *name; /**< Part name in style */ - Eina_Stringshare *curr_state; /**< Current selected part state name */ - double curr_state_value; /**< Current selected part state value */ - Eina_Bool show; /**< Flag indicate current visibly part evas primitive */ - int type; /**< Id part type. Type value equal @Edje_Part_Type enum */ - Eina_List *items; /**<List of the item names, uses for part types BOX or TABLE */ -}; - -/** - * @struct _Style - * - * @brief This struct designed to storage a data of 'style' - a widget layout. - * In a theme file (.edc) this data presented as block 'group'. - * - * @ingroup WidgetManager - */ -struct _Style -{ - EINA_INLIST; - Type __type; /**< STYLE from enum @_type */ - Eina_Stringshare *name; /**< The name of style. */ - Eina_Stringshare *full_group_name; /**< The name of a block 'group' in edc. */ - Evas_Object *obj; /** Edje edit object, which loaded form theme file. */ - /** is it Group an alias **/ - Eina_Bool isAlias; - /** link to main group that is being aliased **/ - Style *main_group; - Eina_Inlist *parts; /**< The list of a style parts data. */ - Eina_List *aliasses; /**< The list of pointer Style structures which aliased to this style */ - Class *parent; /**< Pointer to class, which contain this style */ -}; - -/** - * @struct _Class - * - * @brief This struct designed to storage a data of class. - * - * @ingroup WidgetManager - */ -struct _Class -{ - EINA_INLIST; - Type __type; /**< CLASS from enum @_type */ - Eina_Stringshare *name; /**< The name of a class. */ - Eina_Inlist *styles; /**<The list of styles that make up the class. */ - Widget *parent; /**< Pointer to widget, which contain this class*/ -}; - -/** - * @struct _Widget - * - * @brief This struct designed to storage a widget classes data. - * - * @ingroup WidgetManager - */ -struct _Widget -{ - EINA_INLIST; - Type __type; /**< WIDGET from enum @_type */ - Eina_Stringshare *name; /**< The name of a widget. */ - Eina_Inlist *classes; /**< The list of a widget classes. */ -}; - -/** - * @struct _Signal - * - * @brief This struct is designed to store a signal data. I.e. program name - * where this signal is used, source name (emitter) of this signal and - * pointer to @Style which using this signal. - * - * @ingroup WidgetManager - */ -struct _Signal -{ - Eina_Stringshare *name; /**< text name of signal */ - Eina_Stringshare *source; /**< emitter name */ - Eina_Stringshare *program; /**< program, where this signal is used */ - Style *style; /**< pointer to style, where this signal is used */ -}; -typedef struct _Signal Signal; -/** - * Delete a Part from the @Style object - * - * @param style A @Style object being editing - * @param part A Part object to be deleted. - * @return EINA_TRUE if a object deleted, else EINA_FALSE. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_part_del(Style *style, Part *part); - -/** - * Set a current state in Part object. - * - * @param part The part to set the state of. - * @param state Name of the state to set. - * @return EINA_TRUE if successful, EINA_FALSE otherwise. - * - * @note State has format "NAME X.X" we need to extract NAME - * and double value separately - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_part_current_state_set(Part *part, const char *state); - -/** - * Fill current states for all parts structures, which exist in style. - * - * @param style A @Style object being editing - * - * @return EINA_TRUE if successful, EINA_FALSE if not. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_style_current_state_parts_update(Style *style); - -/** - * Set "default" 0.0 state for all parts, which exist in style. - * - * @param style A @Style object being editing - * - * @return EINA_TRUE if successful, EINA_FALSE if not. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_style_state_parts_reset(Style *style); - -/** - * Create a new Part object - * - * @param style The @Style object. - * @param part The name of a part. - * @return A new Part object. - * - * @ingroup WidgetManager - */ -Part * -wm_part_add(Style *style, const char *part); - -/** - * Get a list of signals which using in a style programs - * - * @param style The @Style object with loaded edje edit object. - * @return A list of signals - * - * @ingroup WidgetManager - */ -Eina_List * -wm_program_signals_list_get(Style *style); - -/** - * Free a signal list. - * - * @param signals A list of signals to free. - * @return EINA_TRUE if a list is deleted, else EINA_FALSE - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_program_signals_list_free(Eina_List *signals); - -/** - * Load part data to @Style object, also load base style parametrs and create - * edje_edit object. - * - * @param style A @Style object pointer, in wich must be loaded data. - * @param e A Evas, parent object. - * @param mmap_file A mmap of edj file, that provide data for style. - * - * @return EINA_TRUE if successful, EINA_FALSE if not. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_style_data_load(Style *style, Evas *e, Eina_File *mmap_file); - -/** - * Reload parts data. This function initiate deleting all entities of the - * parts for given style, and add new parts from given file and given style. - * Style object pointer will be renewed from the given file. - * - * @param style A @Style object pointer. - * @param mmap_file A mmap of edj file, that provide data for style. - * - * @return EINA_TRUE if successful, EINA_FALSE if not. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_style_data_reload(Style *style, Eina_File *mmap_file); - -/** - * Create a new @Style object. - * - * @param style_name The style name. - * @param full_group_name A full name of group, a name of block 'group' in a - * edc-file. - * @param style_type May be STYLE or LAYOUT, in case what type needed to create. - * @param parent The pointer to Class structure, which contain creating style. - * - * @return A new @Style object. - * - * @ingroup WidgetManager - */ -Style * -wm_style_add(const char* style_name, const char* full_group_name, - Type style_type, Class *parent); - -/** - * Set new name to given Style. - * - * @param style The given @Style object - * @param name The new name for style - * - * @return New style name or NULL - * - * @ingroup WidgetManager - */ -const char * -wm_style_name_set(Style *style, const char *name); - -/** - * Free a @Style object. - * - * @param style A @Style object to free. - * - * @return EINA_TRUE if a object is deleted, else EINA_FALSE. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_style_free(Style *style); - -/** - * Check Style type. - * - * @param style The given @Style object - * - * @return EINA_TRUE if given style is layout, otherwise EINA_FALSE - */ -Eina_Bool -wm_style_layout_is(Style *style); - -/** - * Copy all parms of style from one edje_edit object to new style of the same object. - * First of all copy main params of style, like min/max size. At second copy - * all params of states of parts in style. Also copyes programms for style. - * - * @param dest_edje The edje_edit object, which provide access to edj file data. - * in this object will copy new style. - * @param source_full_name The string with full name of source style. - * @param full_name The string with full name of new style. - * @param dest_file The string path to edj file, where will copyed new style. - * @param style The new @Style structure object with new style - * - * @return EINA_FALSE on failure, EINA_TRUE on success. - * - */ -Eina_Bool -wm_style_copy(Evas_Object *dest_edje, Eina_Stringshare *source_full_name, - Eina_Stringshare *full_name, Eina_Stringshare *dest_file, - Style *style); - -/** - * Create a new @Class object. - * - * @param class_name A name of a class. - * @param styles A list of styles in a current class. - * @param parent A pointer to Widget structure, which contain creating class. - * - * @ingroup WidgetManager - */ -Class * -wm_class_add(const char *class_name, Eina_List *styles, Widget *parent); - -/** - * Free a @Class object. - * - * @param class A @Class object to free. - * - * @return EINA_TRUE if a object is deleted. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_class_free(Class *class_st); - -/** - * Create a new Widget object. - * - * @param widget A name of a widget. - * @param styles A pointer to list of styles in a current widget. - * @return A new Widget object. - * - * @ingroup WidgetManager - */ -Widget * -wm_widget_add(const char *widget_name, Eina_List **styles); - -/** - * Free a Widget object. - * - * @param widget A Widget object to free. - * @return EINA_TRUE if a object is deleted. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_widget_free(Widget *widget); - -/** - * Create a new list of Widgets. - * - * @param file A edj-file to load data of widgets styles. - * @return A list of widgets. - * - * @ingroup WidgetManager - */ -Eina_Inlist * -wm_widgets_list_new(const char *file); - -/** - * Load list of custom layouts, which stored in file. - * - * @param file A edj-file to load data of custom layouts styles. - * @return A list of custom layouts if successful or NULL if failed. - * - * @ingroup WidgetManager - */ -Eina_Inlist * -wm_layouts_list_new(const char *file); - -/** - * Free a generic Eina_Inlist of widgets, allocated by \ref wm_widgets_list_new. - * - * @param widget_list A list of widgets to free. - * @return EINA_TRUE if a list os deleted. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_widgets_list_free(Eina_Inlist *widget_list); - -/** - * Free a generic Eina_Inlist of widgets, allocated by \ref wm_layouts_list_new. - * - * @param widget_list A list of widgets to free. - * @return EINA_TRUE if a list os deleted. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_layouts_list_free(Eina_Inlist *widget_list); - -/** - * Find style object in widget list. Use full name of style. - * - * @param widget_list the Eina_Inlist list that contain wdgets structures. - * @param style_full_name the string full name of style.(with widget/class/style) - * - * @return the @Style object. - * - * @ingroup WidgetManager - */ -Style * -wm_style_object_find(Eina_Inlist *widget_list, const char *style_full_name); - -/** - * Create edje edit object and load data from edj-file. - * - * @param widget_list A list of widget to load data. - * @param e A Evas, parent object. - * @param mmap_file A mmap of the edj file. - * @return EINA_TRUE if a list os deleted. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_widgets_list_objects_load(Eina_Inlist *widget_list, - Evas *e, - Eina_File *mmap_file); - -/** - * Create edje edit object and load data from edj-file for custom layouts only. - * - * @param layouts_list A list of layouts, which stored in file. - * @param e A Evas object. - * @param mmap_file A mmap of the edj file. - * @return EINA_TRUE if a list os deleted. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_layouts_list_objects_load(Eina_Inlist *layouts_list, - Evas *e, - Eina_File *mmap_file); - -/** - * Link all aliased and alias groups together. - * - * @param widget_list A list of widget to load data. - * @param layouts_list A list of layouts, which stored in file. - * @return EINA_TRUE if alias building was successful. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_styles_build_alias(Eina_Inlist *widgets_list, - Eina_Inlist *layouts_list); - -/** - * Return the string with the name of the part type by the giving id (int). - * @note the returned string should not be deleted! - * - * @param type part type id. - * @return string with the name of part type. - * - * @ingroup WidgetManager - */ -const char * -wm_part_type_get(Edje_Part_Type type); - -/** - * Find Part structure in style. - * - * @param Style The group structure, in which shoud be stored part. - * @param part_name The name of a part. - * - * @return if successful Part structure, NULL in otherwise. - * - * @note Input params shoud be Eina_Stringshare value, that creates with using - * eina_stringshare_add or eina_stringshare_printf. - * - * @ingroup WidgetManager - */ -Part * -wm_part_by_name_find(Style *style, Eina_Stringshare *part_name); - -/** - * Restack Part structure position in style. - * - * @param Style The group structure. - * @param part_name The name of a part, that should be restacked - * @param rel_name The name of a relative part. - * - * @return EINA_TRUE if successful or EINA_FALSE in otherwise. - * - * @note Input params shoud be Eina_Stringshare value, that creates with using - * eina_stringshare_add or eina_stringshare_printf. - * - * @ingroup WidgetManager - */ -Eina_Bool -wm_style_parts_restack(Style *style, Eina_Stringshare *part_name, - Eina_Stringshare *rel_name); - -Eina_Bool -wm_widgets_list_objects_del(Eina_Inlist *widget_list); - - -#endif /* WIDGET_MANAGER_B_H*/ diff --git a/src/bin/ui/editors/colorclass_manager.h b/src/bin/ui/editors/colorclass_manager.h index 39ce82a..af288e3 100644 --- a/src/bin/ui/editors/colorclass_manager.h +++ b/src/bin/ui/editors/colorclass_manager.h @@ -28,7 +28,6 @@ */ #include "eflete.h" -#include "widget_manager.h" #include "modal_window.h" #include "widget_macro.h" #include "string_common.h" diff --git a/src/bin/ui/editors/image_editor.h b/src/bin/ui/editors/image_editor.h index 769b878..1ba40a2 100644 --- a/src/bin/ui/editors/image_editor.h +++ b/src/bin/ui/editors/image_editor.h @@ -29,7 +29,6 @@ #include "eflete.h" #include "modal_window.h" -#include "widget_manager.h" #include "widget_macro.h" #define SIG_IMAGE_SELECTED "image_selected" diff --git a/src/bin/ui/live_view/live_view.c b/src/bin/ui/live_view/live_view.c index 3100d70..50c17fa 100644 --- a/src/bin/ui/live_view/live_view.c +++ b/src/bin/ui/live_view/live_view.c @@ -279,6 +279,7 @@ live_view_part_del(Evas_Object *object, Part_ *part) return live_view_property_part_del(live->property, part); } +/* Eina_Bool live_view_part_rename(Live_View *live, Part *part, Eina_Stringshare *new_name) { @@ -304,7 +305,7 @@ live_view_part_restack_below(Live_View *live, Part *part_move) assert(part_move != NULL); return live_view_property_part_restack_below(live->property, part_move); } - +*/ Evas_Object * live_view_live_object_get(Evas_Object *object) { diff --git a/src/bin/ui/live_view/live_view.h b/src/bin/ui/live_view/live_view.h index 0ff5a26..aebbe0d 100644 --- a/src/bin/ui/live_view/live_view.h +++ b/src/bin/ui/live_view/live_view.h @@ -29,7 +29,6 @@ * by using user's theme (already saved one). */ -#include "widget_manager.h" #include "project_manager.h" #include "common_macro.h" #include <Evas.h> @@ -137,8 +136,8 @@ live_view_part_del(Evas_Object *object, Part_ *part); * * @ingroup Live_View */ -Eina_Bool -live_view_part_rename(Live_View *live, Part *part, Eina_Stringshare *new_name); +//Eina_Bool +//live_view_part_rename(Live_View *live, Part *part, Eina_Stringshare *new_name); /** * Restack part in list of parts in live view property above given part. @@ -155,8 +154,8 @@ live_view_part_rename(Live_View *live, Part *part, Eina_Stringshare *new_name); * * @ingroup Live_View */ -Eina_Bool -live_view_part_restack_above(Live_View *live, Part *part_move, Part *part_above); +//Eina_Bool +//live_view_part_restack_above(Live_View *live, Part *part_move, Part *part_above); /** * Restack part in list of parts in live view property below given part. @@ -173,8 +172,8 @@ live_view_part_restack_above(Live_View *live, Part *part_move, Part *part_above) * * @ingroup Live_View */ -Eina_Bool -live_view_part_restack_below(Live_View *live, Part *part_move); +//Eina_Bool +//live_view_part_restack_below(Live_View *live, Part *part_move); /** * Get current live object. diff --git a/src/bin/ui/live_view/live_view_prop.c b/src/bin/ui/live_view/live_view_prop.c index 6f59c6c..3ae1ed3 100644 --- a/src/bin/ui/live_view/live_view_prop.c +++ b/src/bin/ui/live_view/live_view_prop.c @@ -515,6 +515,7 @@ live_view_property_part_del(Evas_Object *property, Part_ *part) return true; } +#if 0 Eina_Bool live_view_property_part_rename(Evas_Object *property, Part *part, Eina_Stringshare *new_name) { @@ -550,6 +551,7 @@ live_view_property_part_rename(Evas_Object *property, Part *part, Eina_Stringsha return true; } +#endif #define IS_SWALLOW_MOVE (part_move->type == EDJE_PART_TYPE_SWALLOW) #define IS_SWALLOW_CURR (part_type == EDJE_PART_TYPE_SWALLOW) @@ -560,6 +562,7 @@ live_view_property_part_rename(Evas_Object *property, Part *part, Eina_Stringsha #define IS_TEXT_OR_TEXTBLOCK_CURR \ ((part_type == EDJE_PART_TYPE_TEXT) || (part_type == EDJE_PART_TYPE_TEXTBLOCK)) +#if 0 Eina_Bool live_view_property_part_restack_above(Evas_Object *property, Part *part_move, Part *part_above) { @@ -632,12 +635,14 @@ live_view_property_part_restack_above(Evas_Object *property, Part *part_move, Pa return true; } +#endif #undef IS_SWALLOW_MOVE #undef IS_SWALLOW_CURR #undef IS_TEXT_OR_TEXTBLOCK_MOVE #undef IS_TEXT_OR_TEXTBLOCK_CURR +#if 0 Eina_Bool live_view_property_part_restack_below(Evas_Object *property, Part *part_move) { @@ -674,6 +679,7 @@ live_view_property_part_restack_below(Evas_Object *property, Part *part_move) elm_box_pack_end(item_box, check_move); return true; } +#endif Evas_Object * live_view_property_add(Evas_Object *object, Group *group, Eina_Bool in_prog_edit) diff --git a/src/bin/ui/live_view/live_view_prop.h b/src/bin/ui/live_view/live_view_prop.h index db7a3c8..d072dfc 100644 --- a/src/bin/ui/live_view/live_view_prop.h +++ b/src/bin/ui/live_view/live_view_prop.h @@ -101,8 +101,8 @@ live_view_property_free(Evas_Object *property); * * @ingroup Live_View_Property */ -Eina_Bool -live_view_property_style_set(Evas_Object *property, Evas_Object *object, Style *style, const char *widget, Evas_Object *parent); +//Eina_Bool +//live_view_property_style_set(Evas_Object *property, Evas_Object *object, Style *style, const char *widget, Evas_Object *parent); /** * Clear all data from to Live View Property widget. @@ -122,7 +122,7 @@ live_view_property_part_add(Evas_Object *property, Part_ *part); Eina_Bool live_view_property_part_del(Evas_Object *property, Part_ *part); - +/* Eina_Bool live_view_property_part_rename(Evas_Object *property, Part *part, Eina_Stringshare *new_name); @@ -131,5 +131,5 @@ live_view_property_part_restack_above(Evas_Object *property, Part *part_move, Pa Eina_Bool live_view_property_part_restack_below(Evas_Object *property, Part *part_move); - +*/ #endif /* UI_LIVEVIEWPROP_HEADER_H */ diff --git a/src/bin/ui/main_window.h b/src/bin/ui/main_window.h index 2384a58..abf2813 100644 --- a/src/bin/ui/main_window.h +++ b/src/bin/ui/main_window.h @@ -209,19 +209,6 @@ void ui_state_select(Evas_Object *obj, Eina_Stringshare *state); /** - * Show information about properties of part. Highlight part object - * on workspace. - * Moved to own method for the separation of the interaction between the blocks. - * - * @param part The Part pointer. - * - * @return Evas_object pointer. States gen list object. - * @ingroup Window - */ -Evas_Object * -ui_part_select(Part* part); - -/** * Load project data to App_Data structure. Turn to work state for application. * Moved to own method for the separation of the interaction between the blocks. * @@ -235,17 +222,6 @@ Eina_Bool ui_edj_load(const char *selected_file); /** - * Delete selected style/class/layout from current widget - * - * @param group_type type of group to be deleted. - * @return EINA_TRUE if successful, EINA_FALSE otherwise. - * - * @ingroup Window - */ -Eina_Bool -ui_group_delete(Type group_type); - -/** * Open new theme from template file. * * @return EINA_TRUE if successful, EINA_FALSE otherwise. @@ -267,53 +243,6 @@ Eina_Bool ui_close_project_request(const char *msg); /** - * Get data of widget user currently works with. - * - * @return Widget data structure. - */ -Widget * -ui_widget_from_ap_get(void); - -/** - * Get data of class user currently works with. - * - * @return Class data structure. - */ -Class * -ui_class_from_ap_get(void); - -/* FIXME: Add comments */ -Eina_Bool -register_callbacks(void); - -/** - * Add callbacks to widget list. Callbacks are using next signals: - * "wl,group,select" - * "wl,part,select", - * "wl,part,back", - * "wl,group,back", - * - * @param wd_list A pointer to widget list object. - * @return EINA_TRUE if succeed, EINA_FALSE otherwise. - */ -Eina_Bool -add_callbacks_wd(Evas_Object *wd_list); - -/** - * Switch code editing mode ON or OFF. - * The Code Editing mode means that Workspace, States, History and Signals - * blocks are hidden and only Widget List, Life Wiew and Code tab are available - * for user. - * - * @param is_on value to toggle Code Editing mode ON/OFF. - * @return EINA_TRUE if succeed, EINA_FALSE otherwise. - * - * @ingroup Window - */ -Eina_Bool -code_edit_mode_switch(Eina_Bool is_on); - -/** * The splash window with animation and info line. * * @param parent The parent widget, MUST be a window; @@ -344,16 +273,6 @@ void splash_del(Evas_Object *obj); /** - * Show the main layout blocks. - * - * @return EINA_TRUE on success, otherwise EINA_FALSE. - * - * @ingroup Window - */ -Eina_Bool -blocks_show(void); - -/** * Open existing project. * * @ingroup Window diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c index c00ba6b..7681902 100644 --- a/src/bin/ui/menu.c +++ b/src/bin/ui/menu.c @@ -169,8 +169,8 @@ _menu_cb(void *data __UNUSED__, { if (!ap.project) NOTIFY_WARNING(_("Please open the widget style for editing style programs!")) - else - animator_window_add(ap.project); + /* else + animator_window_add(ap.project);*/ } break; case MENU_EDITORS_IMAGE: diff --git a/src/bin/ui/property.h b/src/bin/ui/property.h index 6a5abba..b94c0ce 100644 --- a/src/bin/ui/property.h +++ b/src/bin/ui/property.h @@ -30,7 +30,6 @@ #ifndef HAVE_ENVENTOR #include "syntax_color.h" #endif -#include "widget_manager.h" #include "workspace.h" /** diff --git a/src/bin/ui/property_private.h b/src/bin/ui/property_private.h index 371d482..a04380e 100644 --- a/src/bin/ui/property_private.h +++ b/src/bin/ui/property_private.h @@ -30,7 +30,6 @@ #ifndef HAVE_ENVENTOR #include "syntax_color.h" #endif -#include "widget_manager.h" #include "workspace.h" diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c index 53a8fde..03ce07b 100644 --- a/src/bin/ui/shortcuts/shortcuts.c +++ b/src/bin/ui/shortcuts/shortcuts.c @@ -486,8 +486,8 @@ _colorclass_manager_open_cb(void) static Eina_Bool _animator_open_cb(void) { - if ((ap.project) && (tabs_current_group_get())) - animator_window_add(ap.project); +/* if ((ap.project) && (tabs_current_group_get())) + animator_window_add(ap.project);*/ return true; } diff --git a/src/bin/ui/workspace/workspace.h b/src/bin/ui/workspace/workspace.h index e436a04..c671fd6 100644 --- a/src/bin/ui/workspace/workspace.h +++ b/src/bin/ui/workspace/workspace.h @@ -221,19 +221,6 @@ Eina_Bool workspace_legend_visible_set(Evas_Object *obj); /** - * Set highlight to selected part. - * - * @param obj The workspace object. - * @param part Evas_Object pointer to selected part object. - * - * @return EINA_FALSE on failure, EINA_TRUE on success. - * - * @ingroup Workspace - */ -Eina_Bool -workspace_highlight_set(Evas_Object *obj, Part *part); - -/** * Unset highlight from previously selected part. * * @param obj The workspace object. --