From 818046befb7d2781714da30e0ba52c5f9386b231 Mon Sep 17 00:00:00 2001 From: sachiel Date: Wed, 16 Sep 2009 03:37:28 +0000 Subject: [PATCH] Move some defines to enum and expose them. Move to Eina_Bool. Return success for rename of group and part to the same name. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Tiago Rezende Campos Falcão git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@42506 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/Edje.h | 56 ++++++++++++++ src/lib/Edje_Edit.h | 179 ++++++++++++++++++++++----------------------- src/lib/edje_edit.c | 194 +++++++++++++++++++++++++------------------------ src/lib/edje_private.h | 44 ----------- 4 files changed, 245 insertions(+), 228 deletions(-) diff --git a/src/lib/Edje.h b/src/lib/Edje.h index a064af4..3b6a4eb 100644 --- a/src/lib/Edje.h +++ b/src/lib/Edje.h @@ -70,6 +70,62 @@ enum _Edje_Object_Table_Homogeneous_Mode }; typedef enum _Edje_Object_Table_Homogeneous_Mode Edje_Object_Table_Homogeneous_Mode; +typedef enum _Edje_Part_Type +{ + EDJE_PART_TYPE_NONE = 0, + EDJE_PART_TYPE_RECTANGLE = 1, + EDJE_PART_TYPE_TEXT = 2, + EDJE_PART_TYPE_IMAGE = 3, + EDJE_PART_TYPE_SWALLOW = 4, + EDJE_PART_TYPE_TEXTBLOCK = 5, + EDJE_PART_TYPE_GRADIENT = 6, + EDJE_PART_TYPE_GROUP = 7, + EDJE_PART_TYPE_BOX = 8, + EDJE_PART_TYPE_TABLE = 9, + EDJE_PART_TYPE_LAST = 10 +} Edje_Part_Type; + +typedef enum _Edje_Text_Effect +{ + EDJE_TEXT_EFFECT_NONE = 0, + EDJE_TEXT_EFFECT_PLAIN = 1, + EDJE_TEXT_EFFECT_OUTLINE = 2, + EDJE_TEXT_EFFECT_SOFT_OUTLINE = 3, + EDJE_TEXT_EFFECT_SHADOW = 4, + EDJE_TEXT_EFFECT_SOFT_SHADOW = 5, + EDJE_TEXT_EFFECT_OUTLINE_SHADOW = 6, + EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW = 7, + EDJE_TEXT_EFFECT_FAR_SHADOW = 8, + EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW = 9, + EDJE_TEXT_EFFECT_GLOW = 10, + EDJE_TEXT_EFFECT_LAST = 11 +} Edje_Text_Effect; + +typedef enum _Edje_Action_Type +{ + EDJE_ACTION_TYPE_NONE = 0, + EDJE_ACTION_TYPE_STATE_SET = 1, + EDJE_ACTION_TYPE_ACTION_STOP = 2, + EDJE_ACTION_TYPE_SIGNAL_EMIT = 3, + EDJE_ACTION_TYPE_DRAG_VAL_SET = 4, + EDJE_ACTION_TYPE_DRAG_VAL_STEP = 5, + EDJE_ACTION_TYPE_DRAG_VAL_PAGE = 6, + EDJE_ACTION_TYPE_SCRIPT = 7, + EDJE_ACTION_TYPE_FOCUS_SET = 8, + EDJE_ACTION_TYPE_LUA_SCRIPT = 9, + EDJE_ACTION_TYPE_LAST = 10 +} Edje_Action_Type; + +typedef enum _Edje_Tween_Mode +{ + EDJE_TWEEN_MODE_NONE = 0, + EDJE_TWEEN_MODE_LINEAR = 1, + EDJE_TWEEN_MODE_SINUSOIDAL = 2, + EDJE_TWEEN_MODE_ACCELERATE = 3, + EDJE_TWEEN_MODE_DECELERATE = 4, + EDJE_TWEEN_MODE_LAST = 5 +} Edje_Tween_Mode; + typedef struct _Edje_Message_String Edje_Message_String; typedef struct _Edje_Message_Int Edje_Message_Int; typedef struct _Edje_Message_Float Edje_Message_Float; diff --git a/src/lib/Edje_Edit.h b/src/lib/Edje_Edit.h index a8525f1..2788a75 100644 --- a/src/lib/Edje_Edit.h +++ b/src/lib/Edje_Edit.h @@ -1,7 +1,7 @@ #ifndef _EDJE_EDIT_H #define _EDJE_EDIT_H -#include +#include #ifdef EAPI # undef EAPI @@ -30,12 +30,13 @@ #endif -enum { +typedef enum _Edje_Edit_Image_Comp +{ EDJE_EDIT_IMAGE_COMP_RAW, EDJE_EDIT_IMAGE_COMP_USER, EDJE_EDIT_IMAGE_COMP_COMP, EDJE_EDIT_IMAGE_COMP_LOSSY -}; +} Edje_Edit_Image_Comp; /** * @file @@ -146,7 +147,7 @@ edje_edit_print_internal_status( /**Create a new empty group in the given edje. * If a group with the same name exist none is created. */ -EAPI unsigned char ///@return 1 on success, 0 on failure +EAPI Eina_Bool ///@return 1 on success, 0 on failure edje_edit_group_add( Evas_Object *obj, ///< The edje object const char *name ///< The name for the new empty group @@ -157,14 +158,14 @@ edje_edit_group_add( * All the parts and the programs inside the group will be deleted as well, * but not image or font embedded in the edje. */ -EAPI unsigned char ///@return 1 on success, 0 on failure +EAPI Eina_Bool ///@return 1 on success, 0 on failure edje_edit_group_del( Evas_Object *obj ///< The edje object ); /**Check if a group with the given name exist in the edje. */ -EAPI unsigned char ///< 1 if the group exist, 0 otherwise. +EAPI Eina_Bool ///< 1 if the group exist, 0 otherwise. edje_edit_group_exist( Evas_Object *obj, ///< The edje object const char *group ///< The name of the group @@ -174,7 +175,7 @@ edje_edit_group_exist( * You can only rename a group that is currently loaded * Note that the relative getter function don't exist as it don't make sense ;) */ -EAPI unsigned char ///@return 1 on success, 0 on failure +EAPI Eina_Bool ///@return 1 on success, 0 on failure edje_edit_group_name_set( Evas_Object *obj, ///< The edje object const char *new_name ///< The new name for the group @@ -241,7 +242,7 @@ edje_edit_data_list_get( /**Create a new data object in the given edje * If another data with the same name exists nothing is created and FALSE is returned. */ -EAPI unsigned char ///@return TRUE on success +EAPI Eina_Bool ///@return TRUE on success edje_edit_data_add( Evas_Object *obj, ///< The edje object const char *itemname, ///< The name for the new data @@ -249,7 +250,7 @@ edje_edit_data_add( ); /**Delete the given data object from edje */ -EAPI unsigned char ///@return TRUE on success +EAPI Eina_Bool ///@return TRUE on success edje_edit_data_del( Evas_Object *obj, ///< The edje object const char *itemname ///< The name of the data to remove @@ -263,7 +264,7 @@ edje_edit_data_value_get( ); /** Set the data associated with the given itemname **/ -EAPI unsigned char ///@return TRUE on success +EAPI Eina_Bool ///@return TRUE on success edje_edit_data_value_set( Evas_Object * obj, ///< The edje object const char *itemname, ///< The name of the data item @@ -271,7 +272,7 @@ edje_edit_data_value_set( ); /** Change the name of the given data object */ -EAPI unsigned char ///@return TRUE on success +EAPI Eina_Bool ///@return TRUE on success edje_edit_data_name_set( Evas_Object *obj, ///< The edje object const char *itemname, ///< The name of the data item @@ -297,14 +298,14 @@ edje_edit_color_classes_list_get( /** Create a new color class object in the given edje * If another class with the same name exists nothing is created and FALSE is returned. */ -EAPI unsigned char ///@return TRUE on success +EAPI Eina_Bool ///@return TRUE on success edje_edit_color_class_add( Evas_Object *obj, ///< The edje object const char *name ///< The name of the new color class ); /** Delete the given class object from edje */ -EAPI unsigned char ///@return TRUE on success +EAPI Eina_Bool ///@return TRUE on success edje_edit_color_class_del( Evas_Object *obj, ///< The edje object const char *name ///< The name of the color class to delete @@ -313,7 +314,7 @@ edje_edit_color_class_del( /** Get all the colors that compose the class. * You can pass NULL to colors you are not intrested in */ -EAPI unsigned char ///@return TRUE on success +EAPI Eina_Bool ///@return TRUE on success edje_edit_color_class_colors_get( Evas_Object *obj, ///< The edje object const char *class_name, ///< The name of the color class @@ -334,7 +335,7 @@ edje_edit_color_class_colors_get( /** Set the colors for the given color class. * If you set a color to -1 it will not be touched */ -EAPI unsigned char ///@return TRUE on success +EAPI Eina_Bool ///@return TRUE on success edje_edit_color_class_colors_set( Evas_Object *obj, ///< The edje object const char *class_name, ///< The name of the color class @@ -353,7 +354,7 @@ edje_edit_color_class_colors_set( ); /** Change the name of a color class */ -EAPI unsigned char ///@return TRUE on success +EAPI Eina_Bool ///@return TRUE on success edje_edit_color_class_name_set( Evas_Object *obj, ///< The edje object const char *name, ///< The name of the color class @@ -379,7 +380,7 @@ edje_edit_styles_list_get( /** Create a new text style object in the given edje * If another style with the same name exists nothing is created and FALSE is returned. */ -EAPI unsigned char ///@return TRUE on success, FALSE if the tag can't be created +EAPI Eina_Bool ///@return TRUE on success, FALSE if the tag can't be created edje_edit_style_add( Evas_Object *obj, ///< The edje object const char *style ///< The new name for the style @@ -432,7 +433,7 @@ edje_edit_style_tag_name_set( /** Add a new tag to the given text style. * If another tag with the same name exists nothing is created and FALSE is returned. */ -EAPI unsigned char ///@return TRUE on success, FALSE if the tag can't be created +EAPI Eina_Bool ///@return TRUE on success, FALSE if the tag can't be created edje_edit_style_tag_add( Evas_Object *obj, ///< The edje object const char *style, ///< The name of the style @@ -467,11 +468,11 @@ edje_edit_parts_list_get( * If another part with the same name just exists nothing is created and FALSE is returned. * Note that this function also create a default description for the part. */ -EAPI unsigned char ///@return TRUE on success, FALSE if the part can't be created +EAPI Eina_Bool ///@return TRUE on success, FALSE if the part can't be created edje_edit_part_add( Evas_Object *obj, ///< The edje object const char *name, ///< The name for the new part - unsigned char type ///< The type of the part to create (One of: EDJE_PART_TYPE_NONE, EDJE_PART_TYPE_RECTANGLE, EDJE_PART_TYPE_TEXT,EDJE_PART_TYPE_IMAGE, EDJE_PART_TYPE_SWALLOW, EDJE_PART_TYPE_TEXTBLOCK,EDJE_PART_TYPE_GRADIENT or EDJE_PART_TYPE_GROUP) + Edje_Part_Type type ///< The type of the part to create (One of: EDJE_PART_TYPE_NONE, EDJE_PART_TYPE_RECTANGLE, EDJE_PART_TYPE_TEXT,EDJE_PART_TYPE_IMAGE, EDJE_PART_TYPE_SWALLOW, EDJE_PART_TYPE_TEXTBLOCK,EDJE_PART_TYPE_GRADIENT or EDJE_PART_TYPE_GROUP) ); /**Delete the given part from the edje @@ -479,7 +480,7 @@ edje_edit_part_add( * A group must have at least one part, so it's not possible to * remove the last remaining part. */ -EAPI unsigned char ///@return 1 on success, 0 if the part can't be removed +EAPI Eina_Bool ///@return 1 on success, 0 if the part can't be removed edje_edit_part_del( Evas_Object *obj, ///< The edje object const char *part ///< The name of the part to remove @@ -487,21 +488,21 @@ edje_edit_part_del( /**Check if a part with the given name exist in the edje object. */ -EAPI unsigned char ///< 1 if the part exist, 0 otherwise. +EAPI Eina_Bool ///< 1 if the part exist, 0 otherwise. edje_edit_part_exist( Evas_Object *obj, ///< The edje object const char *part ///< The name of the part ); /**Move the given part below the previous one.*/ -EAPI unsigned char ///@return 1 on success, 0 on failure +EAPI Eina_Bool ///@return 1 on success, 0 on failure edje_edit_part_restack_below( Evas_Object *obj, ///< The edje object const char *part ///< The name of the part to restack ); /**Move the given part above the next one.*/ -EAPI unsigned char ///@return 1 on success, 0 on failure +EAPI Eina_Bool ///@return 1 on success, 0 on failure edje_edit_part_restack_above( Evas_Object *obj, ///< The edje object const char *part ///< The name of the part to restack @@ -510,7 +511,7 @@ edje_edit_part_restack_above( /**Set a new name for part. * Note that the relative getter function don't exist as it don't make sense ;) */ -EAPI unsigned char ///@return 1 on success, 0 on failure +EAPI Eina_Bool ///@return 1 on success, 0 on failure edje_edit_part_name_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part to rename @@ -518,7 +519,7 @@ edje_edit_part_name_set( ); /**Get the type of a part */ -EAPI unsigned char ///@return One of: EDJE_PART_TYPE_NONE, EDJE_PART_TYPE_RECTANGLE, EDJE_PART_TYPE_TEXT,EDJE_PART_TYPE_IMAGE, EDJE_PART_TYPE_SWALLOW, EDJE_PART_TYPE_TEXTBLOCK,EDJE_PART_TYPE_GRADIENT or EDJE_PART_TYPE_GROUP +EAPI Edje_Part_Type ///@return One of: EDJE_PART_TYPE_NONE, EDJE_PART_TYPE_RECTANGLE, EDJE_PART_TYPE_TEXT,EDJE_PART_TYPE_IMAGE, EDJE_PART_TYPE_SWALLOW, EDJE_PART_TYPE_TEXTBLOCK,EDJE_PART_TYPE_GRADIENT or EDJE_PART_TYPE_GROUP edje_edit_part_type_get( Evas_Object *obj, ///< The edje object const char *part ///< The name of the part @@ -536,7 +537,7 @@ edje_edit_part_clip_to_get( /**Set a part to clip part to. * If clip_to is NULL then the clipping value will be cancelled (unset clipping) */ -EAPI unsigned char ///@return 1 on success, 0 otherwise. +EAPI Eina_Bool ///@return 1 on success, 0 otherwise. edje_edit_part_clip_to_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -558,7 +559,7 @@ edje_edit_part_source_get( * 'autoswallow' inside the given part. * NOTE: This is not applied now. You must reload the edje to see the change. */ -EAPI unsigned char ///@return 1 on success, 0 otherwise. +EAPI Eina_Bool ///@return 1 on success, 0 otherwise. edje_edit_part_source_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -566,7 +567,7 @@ edje_edit_part_source_set( ); /**Get the effect for a given part. */ -EAPI unsigned char ///@return One of: EDJE_TEXT_EFFECT_NONE, _PLAIN, _OUTLINE, _SOFT_OUTLINE, _SHADOW, _SOFT_SHADOW, _OUTLINE_SHADOW, _OUTLINE_SOFT_SHADOW, _FAR_SHADOW, _FAR_SOFT_SHADOW, _GLOW. +EAPI Edje_Text_Effect ///@return One of: EDJE_TEXT_EFFECT_NONE, _PLAIN, _OUTLINE, _SOFT_OUTLINE, _SHADOW, _SOFT_SHADOW, _OUTLINE_SHADOW, _OUTLINE_SOFT_SHADOW, _FAR_SHADOW, _FAR_SOFT_SHADOW, _GLOW. edje_edit_part_effect_get( Evas_Object *obj, ///< The edje object const char *part ///< The name of the part @@ -577,7 +578,7 @@ EAPI void edje_edit_part_effect_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part - unsigned char effect ///< The effect to set. See edje_edit_part_effect_get() for possible value + Edje_Text_Effect effect ///< The effect to set. See edje_edit_part_effect_get() for possible value ); /**Get the current selected state in part. */ @@ -588,7 +589,7 @@ edje_edit_part_selected_state_get( ); /**Set the current state in part.*/ -EAPI unsigned char ///@return 1 on success, 0 otherwise. +EAPI Eina_Bool ///@return 1 on success, 0 otherwise. edje_edit_part_selected_state_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -596,7 +597,7 @@ edje_edit_part_selected_state_set( ); /**Get mouse_events for part.*/ -EAPI unsigned char ///@return 1 if part accept mouse events, 0 if not +EAPI Eina_Bool ///@return 1 if part accept mouse events, 0 if not edje_edit_part_mouse_events_get( Evas_Object *obj, ///< The edje object const char *part ///< The name of the part @@ -607,11 +608,11 @@ EAPI void edje_edit_part_mouse_events_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part - unsigned char mouse_events ///< If set to 1 part will accept mouse events, 0 to ignore all mouse events from part. + Eina_Bool mouse_events ///< If set to 1 part will accept mouse events, 0 to ignore all mouse events from part. ); /**Get repeat_events for part.*/ -EAPI unsigned char ///@return 1 if part will pass all events to the other parts, 0 if not +EAPI Eina_Bool ///@return 1 if part will pass all events to the other parts, 0 if not edje_edit_part_repeat_events_get( Evas_Object *obj, ///< The edje object const char *part ///< The name of the part @@ -622,7 +623,7 @@ EAPI void edje_edit_part_repeat_events_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part - unsigned char repeat_events /**< If set to 1 part will repeat + Eina_Bool repeat_events /**< If set to 1 part will repeat * all the received mouse events to other parts. * If set to 0 the events received will not propagate to other parts.*/ ); @@ -810,7 +811,7 @@ edje_edit_state_del( /**Check if a part state with the given name exist. */ -EAPI unsigned char ///< 1 if the part state exist, 0 otherwise. +EAPI Eina_Bool ///< 1 if the part state exist, 0 otherwise. edje_edit_state_exist( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1346,7 +1347,7 @@ edje_edit_state_fill_size_offset_y_set( ); /**Get the visibility of a part state.*/ -EAPI unsigned char ///@return TRUE if the state is visible +EAPI Eina_Bool ///@return TRUE if the state is visible edje_edit_state_visible_get( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1359,7 +1360,7 @@ edje_edit_state_visible_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part const char *state, ///< The name of the 'part state' (ex. "default 0.00") - unsigned char visible ///< TRUE to set the state visible + Eina_Bool visible ///< TRUE to set the state visible ); /**Get the color class of the given part state. Remember to free the string with edje_edit_string_free()*/ @@ -1474,7 +1475,7 @@ edje_edit_state_text_elipsis_set( ); /**Get if the text part fit it's container horizontally */ -EAPI unsigned char ///@return 1 If the part fit it's container horizontally +EAPI Eina_Bool ///@return 1 If the part fit it's container horizontally edje_edit_state_text_fit_x_get( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1487,11 +1488,11 @@ edje_edit_state_text_fit_x_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part const char *state, ///< The name of the 'part state' (ex. "default 0.00") - unsigned char fit ///< 1 to make the text fit it's container + Eina_Bool fit ///< 1 to make the text fit it's container ); /**Get if the text part fit it's container vertically */ -EAPI unsigned char ///@return 1 If the part fit it's container vertically +EAPI Eina_Bool ///@return 1 If the part fit it's container vertically edje_edit_state_text_fit_y_get( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1504,7 +1505,7 @@ edje_edit_state_text_fit_y_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part const char *state, ///< The name of the 'part state' (ex. "default 0.00") - unsigned char fit ///< 1 to make the text fit it's container + Eina_Bool fit ///< 1 to make the text fit it's container ); /**Get the list of all the fonts in the given edje. @@ -1519,7 +1520,7 @@ edje_edit_fonts_list_get( * The newly created font will be available to all the groups in the edje, not only the current one. * If font can't be load FALSE is returned. */ -EAPI unsigned char ///@return TRUE on success or FALSE on failure +EAPI Eina_Bool ///@return TRUE on success or FALSE on failure edje_edit_font_add( Evas_Object *obj, ///< The edje object const char* path ///< The file path to load the ttf font from @@ -1569,7 +1570,7 @@ edje_edit_images_list_get( * * The format of the image files that can be loaded depend on the evas engine on your system */ -EAPI unsigned char ///@return TRUE on success or FALSE on failure +EAPI Eina_Bool ///@return TRUE on success or FALSE on failure edje_edit_image_add( Evas_Object *obj, ///< The edje object const char* path ///< The name of the image file to include in the edje @@ -1583,7 +1584,7 @@ edje_edit_image_add( * "name". Note that all the parts in the edje share the same image collection, * thus you can/must use the same image for different part. */ -EAPI unsigned char /// @return TRUE on success or FALSE on failure +EAPI Eina_Bool /// @return TRUE on success or FALSE on failure edje_edit_image_data_add( Evas_Object *obj, ///< The edje object const char *name, ///< The image entry name @@ -1615,7 +1616,7 @@ edje_edit_image_id_get( ); /**Get compression type for the given image.*/ -EAPI int ///@return One of EDJE_EDIT_IMAGE_COMP_RAW, EDJE_EDIT_IMAGE_COMP_USER, EDJE_EDIT_IMAGE_COMP_COMP or EDJE_EDIT_IMAGE_COMP_LOSSY +EAPI Edje_Edit_Image_Comp ///@return One of EDJE_EDIT_IMAGE_COMP_RAW, EDJE_EDIT_IMAGE_COMP_USER, EDJE_EDIT_IMAGE_COMP_COMP or EDJE_EDIT_IMAGE_COMP_LOSSY edje_edit_image_compression_type_get( Evas_Object *obj, ///< The edje object const char *image ///< The name of the image @@ -1682,7 +1683,7 @@ edje_edit_state_tweens_list_get( /**Add a new tween frame to the given part state * The tween param must be the name of an existing image. */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_tween_add( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1694,7 +1695,7 @@ edje_edit_state_tween_add( * If none is removed the function return 0. * The image is not removed from the edje. */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_tween_del( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1719,21 +1720,21 @@ edje_edit_spectrum_list_get( ); /**Add a new spectra in the given edje object.*/ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_spectra_add( Evas_Object *obj, ///< The edje object const char* name ///< The name of the new spectra ); /**Delete the given spectra from the edje object.*/ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_spectra_del( Evas_Object *obj, ///< The edje object const char* spectra ///< The name of the spectra to delete ); /**Change the name of the given spectra.*/ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_spectra_name_set( Evas_Object *obj, ///< The edje object const char* spectra, ///< The current name of the spectra @@ -1748,7 +1749,7 @@ edje_edit_spectra_stop_num_get( ); /**Set the number of stops in the given spectra.*/ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_spectra_stop_num_set( Evas_Object *obj, ///< The edje object const char* spectra, ///< The name of the spectra @@ -1756,7 +1757,7 @@ edje_edit_spectra_stop_num_set( ); /**Get the colors of the given stop.*/ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_spectra_stop_color_get( Evas_Object *obj, ///< The edje object const char* spectra, ///< The name of the spectra @@ -1769,7 +1770,7 @@ edje_edit_spectra_stop_color_get( ); /**Set the colors of the given stop.*/ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_spectra_stop_color_set( Evas_Object *obj, ///< The edje object const char* spectra, ///< The name of the spectra @@ -1801,7 +1802,7 @@ edje_edit_state_gradient_type_get( /**Set the type of gradient. * Gradient type can be on of the following: linear, linear.diag, linear.codiag, radial, rectangular, angular, sinusoidal */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_type_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1810,7 +1811,7 @@ edje_edit_state_gradient_type_set( ); /**Get if the current gradient use the fill properties or the gradient_rel as params.*/ -EAPI unsigned char ///@return 1 if use fill, 0 if use gradient_rel +EAPI Eina_Bool ///@return 1 if use fill, 0 if use gradient_rel edje_edit_state_gradient_use_fill_get( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1826,7 +1827,7 @@ edje_edit_state_gradient_spectra_get( ); /**Set the spectra used by part state.*/ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_spectra_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1884,7 +1885,7 @@ edje_edit_state_gradient_rel2_relative_y_get( ); /**Set the gradien rel1 relative x value */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_rel1_relative_x_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1893,7 +1894,7 @@ edje_edit_state_gradient_rel1_relative_x_set( ); /**Set the gradien rel1 relative y value */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_rel1_relative_y_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1902,7 +1903,7 @@ edje_edit_state_gradient_rel1_relative_y_set( ); /**Set the gradien rel2 relative x value */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_rel2_relative_x_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1911,7 +1912,7 @@ edje_edit_state_gradient_rel2_relative_x_set( ); /**Set the gradien rel2 relative y value */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_rel2_relative_y_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1952,7 +1953,7 @@ edje_edit_state_gradient_rel2_offset_y_get( ); /**Set the gradien rel1 offset x value */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_rel1_offset_x_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1961,7 +1962,7 @@ edje_edit_state_gradient_rel1_offset_x_set( ); /**Set the gradien rel1 offset y value */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_rel1_offset_y_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1970,7 +1971,7 @@ edje_edit_state_gradient_rel1_offset_y_set( ); /**Set the gradien rel2 offset x value */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_rel2_offset_x_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -1979,7 +1980,7 @@ edje_edit_state_gradient_rel2_offset_x_set( ); /**Set the gradien rel2 offset y value */ -EAPI unsigned char ///@return 1 on success, 0 otherwise +EAPI Eina_Bool ///@return 1 on success, 0 otherwise edje_edit_state_gradient_rel2_offset_y_set( Evas_Object *obj, ///< The edje object const char *part, ///< The name of the part @@ -2008,7 +2009,7 @@ edje_edit_programs_list_get( /**Add a new program to the edje file * If a program with the same name just exist the function will fail. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_add( Evas_Object *obj, ///< The edje object const char *name ///< The name of the new program @@ -2016,7 +2017,7 @@ edje_edit_program_add( /**Remove the given program from the edje file. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_del( Evas_Object *obj, ///< The edje object const char *prog ///< The name of the program to remove @@ -2024,21 +2025,21 @@ edje_edit_program_del( /**Check if a program with the given name exist in the edje object. */ -EAPI unsigned char ///< 1 if the program exist, 0 otherwise. +EAPI Eina_Bool ///< 1 if the program exist, 0 otherwise. edje_edit_program_exist( Evas_Object *obj, ///< The edje object const char *prog ///< The name of the program ); /**Run the given program. */ -EAPI unsigned char ///< 1 on success, 0 otherwise. +EAPI Eina_Bool ///< 1 on success, 0 otherwise. edje_edit_program_run( Evas_Object *obj, ///< The edje object const char *prog ///< The name of the program to execute ); /**Set a new name for the given program */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_name_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2053,7 +2054,7 @@ edje_edit_program_source_get( ); /**Set source of the given program. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_source_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2068,7 +2069,7 @@ edje_edit_program_signal_get( ); /**Set signal of the given program. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_signal_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2083,7 +2084,7 @@ edje_edit_program_in_from_get( ); /**Set in.from of a given program.*/ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_in_from_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2098,7 +2099,7 @@ edje_edit_program_in_range_get( ); /**Set in.range of a given program.*/ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_in_range_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2108,7 +2109,7 @@ edje_edit_program_in_range_set( /**Get the action of a given program. * Action can be one of EDJE_ACTION_TYPE_NONE, _STATE_SET, ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, _DRAG_VAL_STEP, _DRAG_VAL_PAGE, _SCRIPT */ -EAPI int ///@return The action type, or -1 on errors +EAPI Edje_Action_Type ///@return The action type, or -1 on errors edje_edit_program_action_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name @@ -2117,11 +2118,11 @@ edje_edit_program_action_get( /**Set the action of a given program. * Action can be one of EDJE_ACTION_TYPE_NONE, _STATE_SET, ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, _DRAG_VAL_STEP, _DRAG_VAL_PAGE, _SCRIPT */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_action_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name - int action ///< The new action type + Edje_Action_Type action ///< The new action type ); /**Get the list of the targets for the given program @@ -2138,7 +2139,7 @@ edje_edit_program_targets_get( * If program action is EDJE_ACTION_TYPE_ACTION_STOP then 'target' must be an existing program name. * If action is EDJE_ACTION_TYPE_STATE_SET then 'target' must be an existing part name. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_target_add( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2146,7 +2147,7 @@ edje_edit_program_target_add( ); /**Clear the 'targets' list of the given program */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_targets_clear( Evas_Object *obj, ///< The edje object const char *prog ///< The program name @@ -2165,7 +2166,7 @@ edje_edit_program_afters_get( /**Add a new program name to the list of 'afters' in the given program. * All the programs listed in 'afters' will be executed after program execution. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_after_add( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2173,7 +2174,7 @@ edje_edit_program_after_add( ); /**Clear the 'afters' list of the given program */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_afters_clear( Evas_Object *obj, ///< The edje object const char *prog ///< The program name @@ -2193,7 +2194,7 @@ edje_edit_program_state_get( * In a STATE_SET action this is the name of state to set. * In a SIGNAL_EMIT action is the name of the signal to emit. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_state_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2214,7 +2215,7 @@ edje_edit_program_value_get( * In a STATE_SET action this is the value of state to set. * Not used on SIGNAL_EMIT action. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_value_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2235,7 +2236,7 @@ edje_edit_program_state2_get( * In a STATE_SET action is not used * In a SIGNAL_EMIT action is the source of the emitted signal. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_state2_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2254,7 +2255,7 @@ edje_edit_program_value2_get( /**Set the value2 of state for the given program. * This is used in DRAG_ACTION */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_value2_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name @@ -2264,7 +2265,7 @@ edje_edit_program_value2_set( /**Get the type of transition to use when apply animations. * Can be one of: EDJE_TWEEN_MODE_NONE, EDJE_TWEEN_MODE_LINEAR, EDJE_TWEEN_MODE_SINUSOIDAL, EDJE_TWEEN_MODE_ACCELERATE or EDJE_TWEEN_MODE_DECELERATE. */ -EAPI int ///@return The type of transition used by program +EAPI Edje_Tween_Mode ///@return The type of transition used by program edje_edit_program_transition_get( Evas_Object *obj, ///< The edje object const char *prog ///< The program name @@ -2273,11 +2274,11 @@ edje_edit_program_transition_get( /**Set the type of transition to use when apply animations. * Can be one of: EDJE_TWEEN_MODE_NONE, EDJE_TWEEN_MODE_LINEAR, EDJE_TWEEN_MODE_SINUSOIDAL, EDJE_TWEEN_MODE_ACCELERATE or EDJE_TWEEN_MODE_DECELERATE. */ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_transition_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name - int transition ///< The transition type to set + Edje_Tween_Mode transition ///< The transition type to set ); /**Get the duration of the transition in seconds.*/ @@ -2288,7 +2289,7 @@ edje_edit_program_transition_time_get( ); /**Set the duration of the transition in seconds.*/ -EAPI unsigned char ///@return 1 on success or 0 on errors +EAPI Eina_Bool ///@return 1 on success or 0 on errors edje_edit_program_transition_time_set( Evas_Object *obj, ///< The edje object const char *prog, ///< The program name diff --git a/src/lib/edje_edit.c b/src/lib/edje_edit.c index e6465d1..f8c7373 100644 --- a/src/lib/edje_edit.c +++ b/src/lib/edje_edit.c @@ -201,7 +201,7 @@ _edje_real_part_free(Edje_Real_Part *rp) eina_mempool_free(_edje_real_part_mp, rp); } -static unsigned char +static Eina_Bool _edje_import_image_file(Edje *ed, const char *path, int id) { char buf[256]; @@ -625,7 +625,7 @@ edje_edit_compiler_get(Evas_Object *obj) /* GROUPS API */ /****************/ -EAPI unsigned char +EAPI Eina_Bool edje_edit_group_add(Evas_Object *obj, const char *name) { Edje_Part_Collection_Directory_Entry *de; @@ -661,7 +661,7 @@ edje_edit_group_add(Evas_Object *obj, const char *name) search = 0; while (!id) { - unsigned char found = 0; + Eina_Bool found = 0; EINA_LIST_FOREACH(ed->file->collection_dir->entries, l, d) { @@ -704,7 +704,7 @@ edje_edit_group_add(Evas_Object *obj, const char *name) } -EAPI unsigned char +EAPI Eina_Bool edje_edit_group_del(Evas_Object *obj) { char buf[32]; @@ -772,7 +772,7 @@ edje_edit_group_del(Evas_Object *obj) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_group_exist(Evas_Object *obj, const char *group) { Eina_List *l; @@ -786,7 +786,7 @@ edje_edit_group_exist(Evas_Object *obj, const char *group) return 0; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_group_name_set(Evas_Object *obj, const char *new_name) { Eina_List *l; @@ -796,10 +796,13 @@ edje_edit_group_name_set(Evas_Object *obj, const char *new_name) GET_ED_OR_RETURN(0); if (!new_name) return 0; - if (edje_edit_group_exist(obj, new_name)) return 0; pc = ed->collection; + if (!strcmp(pc->part, new_name)) return 1; + + if (edje_edit_group_exist(obj, new_name)) return 0; + printf("Set name of current group: %s [id: %d][new name: %s]\n", pc->part, pc->id, new_name); @@ -918,7 +921,7 @@ edje_edit_data_list_get(Evas_Object * obj) return datas; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_data_add(Evas_Object *obj, const char *itemname, const char *value) { Eina_List *l; @@ -946,7 +949,7 @@ edje_edit_data_add(Evas_Object *obj, const char *itemname, const char *value) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_data_del(Evas_Object *obj, const char *itemname) { Eina_List *l; @@ -989,7 +992,7 @@ edje_edit_data_value_get(Evas_Object * obj, char *itemname) return NULL; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_data_value_set(Evas_Object *obj, const char *itemname, const char *value) { Eina_List *l; @@ -1011,7 +1014,7 @@ edje_edit_data_value_set(Evas_Object *obj, const char *itemname, const char *val return 0; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_data_name_set(Evas_Object *obj, const char *itemname, const char *newname) { Eina_List *l; @@ -1055,7 +1058,7 @@ edje_edit_color_classes_list_get(Evas_Object * obj) return classes; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_color_class_colors_get(Evas_Object *obj, const char *class_name, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3) { Eina_List *l; @@ -1089,7 +1092,7 @@ edje_edit_color_class_colors_get(Evas_Object *obj, const char *class_name, int * return 0; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_color_class_colors_set(Evas_Object *obj, const char *class_name, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3) { Eina_List *l; @@ -1123,7 +1126,7 @@ edje_edit_color_class_colors_set(Evas_Object *obj, const char *class_name, int r return 0; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_color_class_add(Evas_Object *obj, const char *name) { Eina_List *l; @@ -1152,7 +1155,7 @@ edje_edit_color_class_add(Evas_Object *obj, const char *name) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_color_class_del(Evas_Object *obj, const char *name) { Eina_List *l; @@ -1174,7 +1177,7 @@ edje_edit_color_class_del(Evas_Object *obj, const char *name) return 0; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_color_class_name_set(Evas_Object *obj, const char *name, const char *newname) { Eina_List *l; @@ -1220,7 +1223,7 @@ edje_edit_styles_list_get(Evas_Object * obj) return styles; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_style_add(Evas_Object * obj, const char* style) { Edje_Style *s; @@ -1348,7 +1351,7 @@ edje_edit_style_tag_value_set(Evas_Object * obj, const char* style, const char* t->value = eina_stringshare_add(new_value); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_style_tag_add(Evas_Object * obj, const char* style, const char* tag_name) { Edje_Style *s; @@ -1420,12 +1423,13 @@ edje_edit_parts_list_get(Evas_Object *obj) return parts; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_name_set(Evas_Object *obj, const char* part, const char* new_name) { GET_RP_OR_RETURN(0); if (!new_name) return 0; + if (!strcmp(part, new_name)) return 1; if (_edje_real_part_get(ed, new_name)) return 0; printf("Set name of part: %s [new name: %s]\n", part, new_name); @@ -1436,8 +1440,8 @@ edje_edit_part_name_set(Evas_Object *obj, const char* part, const char* new_name return 1; } -EAPI unsigned char -edje_edit_part_add(Evas_Object *obj, const char* name, unsigned char type) +EAPI Eina_Bool +edje_edit_part_add(Evas_Object *obj, const char* name, Edje_Part_Type type) { Edje_Part_Collection *pc; Edje_Part *ep; @@ -1449,18 +1453,18 @@ edje_edit_part_add(Evas_Object *obj, const char* name, unsigned char type) /* Check if part already exists */ if (_edje_real_part_get(ed, name)) - return FALSE; + return EINA_FALSE; /* Alloc Edje_Part or return */ ep = _alloc(sizeof(Edje_Part)); - if (!ep) return FALSE; + if (!ep) return EINA_FALSE; /* Alloc Edje_Real_Part or return */ rp = _alloc(sizeof(Edje_Real_Part)); if (!rp) { free(ep); - return FALSE; + return EINA_FALSE; } /* Init Edje_Part */ @@ -1556,10 +1560,10 @@ edje_edit_part_add(Evas_Object *obj, const char* name, unsigned char type) edje_object_calc_force(obj); - return TRUE; + return EINA_TRUE; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_del(Evas_Object *obj, const char* part) { Edje_Part *ep; @@ -1573,7 +1577,7 @@ edje_edit_part_del(Evas_Object *obj, const char* part) ep = rp->part; id = ep->id; - if (ed->table_parts_size <= 1) return FALSE; //don't remove the last part + if (ed->table_parts_size <= 1) return EINA_FALSE; //don't remove the last part /* Unlik Edje_Real_Parts that link to the removed one */ int i; @@ -1647,17 +1651,17 @@ edje_edit_part_del(Evas_Object *obj, const char* part) edje_object_calc_force(obj); - return TRUE; + return EINA_TRUE; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_exist(Evas_Object *obj, const char *part) { GET_RP_OR_RETURN(0); return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_restack_below(Evas_Object *obj, const char* part) { Edje_Part_Collection *group; @@ -1682,7 +1686,7 @@ edje_edit_part_restack_below(Evas_Object *obj, const char* part) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_restack_above(Evas_Object *obj, const char* part) { Edje_Part_Collection *group; @@ -1709,7 +1713,7 @@ edje_edit_part_restack_above(Evas_Object *obj, const char* part) return 1; } -EAPI unsigned char +EAPI Edje_Part_Type edje_edit_part_type_get(Evas_Object *obj, const char *part) { GET_RP_OR_RETURN(0); @@ -1734,7 +1738,7 @@ edje_edit_part_selected_state_get(Evas_Object *obj, const char *part) return eina_stringshare_add(name); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_selected_state_set(Evas_Object *obj, const char *part, const char *state) { Edje_Part_Description *pd; @@ -1767,7 +1771,7 @@ edje_edit_part_clip_to_get(Evas_Object *obj, const char *part) return eina_stringshare_add(clip->part->name); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_clip_to_set(Evas_Object *obj, const char *part, const char *clip_to) { Edje_Real_Part *clip; @@ -1813,7 +1817,7 @@ edje_edit_part_clip_to_set(Evas_Object *obj, const char *part, const char *clip_ return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_mouse_events_get(Evas_Object *obj, const char *part) { GET_RP_OR_RETURN(0); @@ -1822,7 +1826,7 @@ edje_edit_part_mouse_events_get(Evas_Object *obj, const char *part) } EAPI void -edje_edit_part_mouse_events_set(Evas_Object *obj, const char *part, unsigned char mouse_events) +edje_edit_part_mouse_events_set(Evas_Object *obj, const char *part, Eina_Bool mouse_events) { GET_RP_OR_RETURN(); @@ -1844,7 +1848,7 @@ edje_edit_part_mouse_events_set(Evas_Object *obj, const char *part, unsigned cha } } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_repeat_events_get(Evas_Object *obj, const char *part) { GET_RP_OR_RETURN(0); @@ -1854,7 +1858,7 @@ edje_edit_part_repeat_events_get(Evas_Object *obj, const char *part) } EAPI void -edje_edit_part_repeat_events_set(Evas_Object *obj, const char *part, unsigned char repeat_events) +edje_edit_part_repeat_events_set(Evas_Object *obj, const char *part, Eina_Bool repeat_events) { GET_RP_OR_RETURN(); @@ -1902,7 +1906,7 @@ edje_edit_part_source_get(Evas_Object *obj, const char *part) return eina_stringshare_add(rp->part->source); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_part_source_set(Evas_Object *obj, const char *part, const char *source) { GET_RP_OR_RETURN(0); @@ -2295,7 +2299,7 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name) pd->gradient.use_rel = 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_exist(Evas_Object *obj, const char *part, const char *state) { GET_PD_OR_RETURN(0); @@ -3007,7 +3011,7 @@ edje_edit_state_fill_size_offset_y_set(Evas_Object *obj, const char *part, const edje_object_calc_force(obj); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_visible_get(Evas_Object *obj, const char *part, const char *state) { GET_PD_OR_RETURN(0); @@ -3016,7 +3020,7 @@ edje_edit_state_visible_get(Evas_Object *obj, const char *part, const char *stat } EAPI void -edje_edit_state_visible_set(Evas_Object *obj, const char *part, const char *state, unsigned char visible) +edje_edit_state_visible_set(Evas_Object *obj, const char *part, const char *state, Eina_Bool visible) { GET_PD_OR_RETURN(); printf("Set state visible flag of part: %s state: %s to: %d\n", part, state, visible); @@ -3157,7 +3161,7 @@ edje_edit_state_text_elipsis_set(Evas_Object *obj, const char *part, const char edje_object_calc_force(obj); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_text_fit_x_get(Evas_Object *obj, const char *part, const char *state) { GET_PD_OR_RETURN(0); @@ -3166,7 +3170,7 @@ edje_edit_state_text_fit_x_get(Evas_Object *obj, const char *part, const char *s } EAPI void -edje_edit_state_text_fit_x_set(Evas_Object *obj, const char *part, const char *state, unsigned char fit) +edje_edit_state_text_fit_x_set(Evas_Object *obj, const char *part, const char *state, Eina_Bool fit) { GET_PD_OR_RETURN(); @@ -3176,7 +3180,7 @@ edje_edit_state_text_fit_x_set(Evas_Object *obj, const char *part, const char *s edje_object_calc_force(obj); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_text_fit_y_get(Evas_Object *obj, const char *part, const char *state) { GET_PD_OR_RETURN(0); @@ -3185,7 +3189,7 @@ edje_edit_state_text_fit_y_get(Evas_Object *obj, const char *part, const char *s } EAPI void -edje_edit_state_text_fit_y_set(Evas_Object *obj, const char *part, const char *state, unsigned char fit) +edje_edit_state_text_fit_y_set(Evas_Object *obj, const char *part, const char *state, Eina_Bool fit) { GET_PD_OR_RETURN(); @@ -3218,7 +3222,7 @@ edje_edit_fonts_list_get(Evas_Object *obj) return fonts; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_font_add(Evas_Object *obj, const char* path) { char buf[PATH_MAX]; @@ -3340,7 +3344,7 @@ edje_edit_state_font_set(Evas_Object *obj, const char *part, const char *state, edje_object_calc_force(obj); } -EAPI unsigned char +EAPI Edje_Text_Effect edje_edit_part_effect_get(Evas_Object *obj, const char *part) { GET_RP_OR_RETURN(0); @@ -3350,7 +3354,7 @@ edje_edit_part_effect_get(Evas_Object *obj, const char *part) } EAPI void -edje_edit_part_effect_set(Evas_Object *obj, const char *part, unsigned char effect) +edje_edit_part_effect_set(Evas_Object *obj, const char *part, Edje_Text_Effect effect) { GET_RP_OR_RETURN(); @@ -3388,7 +3392,7 @@ edje_edit_images_list_get(Evas_Object *obj) return images; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_image_add(Evas_Object *obj, const char* path) { Eina_List *l; @@ -3442,7 +3446,7 @@ edje_edit_image_add(Evas_Object *obj, const char* path) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_image_data_add(Evas_Object *obj, const char *name, int id) { Eina_List *l; @@ -3500,7 +3504,7 @@ edje_edit_image_id_get(Evas_Object *obj, const char *image_name) return _edje_image_id_find(obj, image_name); } -EAPI int +EAPI Edje_Edit_Image_Comp edje_edit_image_compression_type_get(Evas_Object *obj, const char *image) { Edje_Image_Directory_Entry *i = NULL; @@ -3612,7 +3616,7 @@ edje_edit_state_tweens_list_get(Evas_Object *obj, const char *part, const char * return tweens; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, const char *tween) { Edje_Part_Image_Id *i; @@ -3634,7 +3638,7 @@ edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_tween_del(Evas_Object *obj, const char *part, const char *state, const char *tween) { Eina_List *l; @@ -3735,7 +3739,7 @@ edje_edit_spectrum_list_get(Evas_Object *obj) return spectrum; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_spectra_add(Evas_Object *obj, const char* name) { GET_ED_OR_RETURN(0); @@ -3765,7 +3769,7 @@ edje_edit_spectra_add(Evas_Object *obj, const char* name) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_spectra_del(Evas_Object *obj, const char* spectra) { Edje_Spectrum_Directory_Entry *s; @@ -3792,7 +3796,7 @@ edje_edit_spectra_del(Evas_Object *obj, const char* spectra) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_spectra_name_set(Evas_Object *obj, const char* spectra, const char* name) { Edje_Spectrum_Directory_Entry *s; @@ -3825,7 +3829,7 @@ edje_edit_spectra_stop_num_get(Evas_Object *obj, const char* spectra) return eina_list_count(s->color_list); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_spectra_stop_num_set(Evas_Object *obj, const char* spectra, int num) { Edje_Spectrum_Directory_Entry *s; @@ -3864,7 +3868,7 @@ edje_edit_spectra_stop_num_set(Evas_Object *obj, const char* spectra, int num) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_spectra_stop_color_get(Evas_Object *obj, const char* spectra, int stop_number, int *r, int *g, int *b, int *a, int *d) { Edje_Spectrum_Directory_Entry *s; @@ -3886,7 +3890,7 @@ edje_edit_spectra_stop_color_get(Evas_Object *obj, const char* spectra, int stop return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_spectra_stop_color_set(Evas_Object *obj, const char* spectra, int stop_number, int r, int g, int b, int a, int d) { Edje_Spectrum_Directory_Entry *s; @@ -3928,7 +3932,7 @@ edje_edit_state_gradient_type_get(Evas_Object *obj, const char *part, const char return eina_stringshare_add(pd->gradient.type); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_type_set(Evas_Object *obj, const char *part, const char *state, const char *type) { GET_PD_OR_RETURN(0); @@ -3943,7 +3947,7 @@ edje_edit_state_gradient_type_set(Evas_Object *obj, const char *part, const char } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_use_fill_get(Evas_Object *obj, const char *part, const char *state) { GET_PD_OR_RETURN(-1); @@ -3970,7 +3974,7 @@ edje_edit_state_gradient_spectra_get(Evas_Object *obj, const char *part, const c return eina_stringshare_add(s->entry); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_spectra_set(Evas_Object *obj, const char *part, const char *state, const char* spectra) { Edje_Spectrum_Directory_Entry *s; @@ -4039,7 +4043,7 @@ edje_edit_state_gradient_rel2_relative_y_get(Evas_Object *obj, const char *part, return pd->gradient.rel2.relative_y; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_rel1_relative_x_set(Evas_Object *obj, const char *part, const char *state, double val) { GET_PD_OR_RETURN(0); @@ -4050,7 +4054,7 @@ edje_edit_state_gradient_rel1_relative_x_set(Evas_Object *obj, const char *part, return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_rel1_relative_y_set(Evas_Object *obj, const char *part, const char *state, double val) { GET_PD_OR_RETURN(0); @@ -4061,7 +4065,7 @@ edje_edit_state_gradient_rel1_relative_y_set(Evas_Object *obj, const char *part, return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_rel2_relative_x_set(Evas_Object *obj, const char *part, const char *state, double val) { GET_PD_OR_RETURN(0); @@ -4072,7 +4076,7 @@ edje_edit_state_gradient_rel2_relative_x_set(Evas_Object *obj, const char *part, return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_rel2_relative_y_set(Evas_Object *obj, const char *part, const char *state, double val) { GET_PD_OR_RETURN(0); @@ -4115,7 +4119,7 @@ edje_edit_state_gradient_rel2_offset_y_get(Evas_Object *obj, const char *part, c return pd->gradient.rel2.offset_y; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_rel1_offset_x_set(Evas_Object *obj, const char *part, const char *state, int val) { GET_PD_OR_RETURN(0); @@ -4126,7 +4130,7 @@ edje_edit_state_gradient_rel1_offset_x_set(Evas_Object *obj, const char *part, c return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_rel1_offset_y_set(Evas_Object *obj, const char *part, const char *state, int val) { GET_PD_OR_RETURN(0); @@ -4137,7 +4141,7 @@ edje_edit_state_gradient_rel1_offset_y_set(Evas_Object *obj, const char *part, c return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_rel2_offset_x_set(Evas_Object *obj, const char *part, const char *state, int val) { GET_PD_OR_RETURN(0); @@ -4148,7 +4152,7 @@ edje_edit_state_gradient_rel2_offset_x_set(Evas_Object *obj, const char *part, c return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_state_gradient_rel2_offset_y_set(Evas_Object *obj, const char *part, const char *state, int val) { GET_PD_OR_RETURN(0); @@ -4202,7 +4206,7 @@ edje_edit_programs_list_get(Evas_Object *obj) return progs; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_add(Evas_Object *obj, const char *name) { Edje_Program *epr; @@ -4260,7 +4264,7 @@ edje_edit_program_add(Evas_Object *obj, const char *name) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_del(Evas_Object *obj, const char *prog) { Eina_List *l; @@ -4380,7 +4384,7 @@ edje_edit_program_del(Evas_Object *obj, const char *prog) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_exist(Evas_Object *obj, const char *prog) { GET_EPR_OR_RETURN(0); @@ -4388,7 +4392,7 @@ edje_edit_program_exist(Evas_Object *obj, const char *prog) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_run(Evas_Object *obj, const char *prog) { GET_ED_OR_RETURN(0); @@ -4398,7 +4402,7 @@ edje_edit_program_run(Evas_Object *obj, const char *prog) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_name_set(Evas_Object *obj, const char *prog, const char* new_name) { GET_ED_OR_RETURN(0); @@ -4426,7 +4430,7 @@ edje_edit_program_source_get(Evas_Object *obj, const char *prog) return eina_stringshare_add(epr->source); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_source_set(Evas_Object *obj, const char *prog, const char *source) { GET_ED_OR_RETURN(0); @@ -4457,7 +4461,7 @@ edje_edit_program_signal_get(Evas_Object *obj, const char *prog) return eina_stringshare_add(epr->signal); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_signal_set(Evas_Object *obj, const char *prog, const char *signal) { GET_ED_OR_RETURN(0); @@ -4488,7 +4492,7 @@ edje_edit_program_state_get(Evas_Object *obj, const char *prog) return eina_stringshare_add(epr->state); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_state_set(Evas_Object *obj, const char *prog, const char *state) { GET_ED_OR_RETURN(0); @@ -4512,7 +4516,7 @@ edje_edit_program_state2_get(Evas_Object *obj, const char *prog) return eina_stringshare_add(epr->state2); } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_state2_set(Evas_Object *obj, const char *prog, const char *state2) { GET_ED_OR_RETURN(0); @@ -4535,7 +4539,7 @@ edje_edit_program_value_get(Evas_Object *obj, const char *prog) return epr->value; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_value_set(Evas_Object *obj, const char *prog, double value) { GET_EPR_OR_RETURN(0); @@ -4554,7 +4558,7 @@ edje_edit_program_value2_get(Evas_Object *obj, const char *prog) return epr->value2; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_value2_set(Evas_Object *obj, const char *prog, double value) { GET_EPR_OR_RETURN(0); @@ -4573,7 +4577,7 @@ edje_edit_program_in_from_get(Evas_Object *obj, const char *prog) return epr->in.from; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_in_from_set(Evas_Object *obj, const char *prog, double seconds) { GET_EPR_OR_RETURN(0); @@ -4592,7 +4596,7 @@ edje_edit_program_in_range_get(Evas_Object *obj, const char *prog) return epr->in.range; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_in_range_set(Evas_Object *obj, const char *prog, double seconds) { GET_EPR_OR_RETURN(0); @@ -4602,7 +4606,7 @@ edje_edit_program_in_range_set(Evas_Object *obj, const char *prog, double second return 1; } -EAPI int +EAPI Edje_Tween_Mode edje_edit_program_transition_get(Evas_Object *obj, const char *prog) { GET_EPR_OR_RETURN(-1); @@ -4611,8 +4615,8 @@ edje_edit_program_transition_get(Evas_Object *obj, const char *prog) return epr->tween.mode; } -EAPI unsigned char -edje_edit_program_transition_set(Evas_Object *obj, const char *prog, int transition) +EAPI Eina_Bool +edje_edit_program_transition_set(Evas_Object *obj, const char *prog, Edje_Tween_Mode transition) { GET_EPR_OR_RETURN(0); @@ -4630,7 +4634,7 @@ edje_edit_program_transition_time_get(Evas_Object *obj, const char *prog) return epr->tween.time; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_transition_time_set(Evas_Object *obj, const char *prog, double seconds) { GET_EPR_OR_RETURN(0); @@ -4640,7 +4644,7 @@ edje_edit_program_transition_time_set(Evas_Object *obj, const char *prog, double return 1; } -EAPI int +EAPI Edje_Action_Type edje_edit_program_action_get(Evas_Object *obj, const char *prog) { GET_EPR_OR_RETURN(-1); @@ -4649,8 +4653,8 @@ edje_edit_program_action_get(Evas_Object *obj, const char *prog) return epr->action; } -EAPI unsigned char -edje_edit_program_action_set(Evas_Object *obj, const char *prog, int action) +EAPI Eina_Bool +edje_edit_program_action_set(Evas_Object *obj, const char *prog, Edje_Action_Type action) { GET_EPR_OR_RETURN(0); @@ -4697,7 +4701,7 @@ edje_edit_program_targets_get(Evas_Object *obj, const char *prog) return targets; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_targets_clear(Evas_Object *obj, const char *prog) { GET_EPR_OR_RETURN(0); @@ -4714,7 +4718,7 @@ edje_edit_program_targets_clear(Evas_Object *obj, const char *prog) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_target_add(Evas_Object *obj, const char *prog, const char *target) { int id; @@ -4777,7 +4781,7 @@ edje_edit_program_afters_get(Evas_Object *obj, const char *prog) return afters; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_afters_clear(Evas_Object *obj, const char *prog) { GET_EPR_OR_RETURN(0); @@ -4794,7 +4798,7 @@ edje_edit_program_afters_clear(Evas_Object *obj, const char *prog) return 1; } -EAPI unsigned char +EAPI Eina_Bool edje_edit_program_after_add(Evas_Object *obj, const char *prog, const char *after) { Edje_Program *af; diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h index 844bb1e..6ae2639 100644 --- a/src/lib/edje_private.h +++ b/src/lib/edje_private.h @@ -148,50 +148,6 @@ typedef struct _Edje_Patterns Edje_Patterns; #define EDJE_IMAGE_SOURCE_TYPE_EXTERNAL 3 #define EDJE_IMAGE_SOURCE_TYPE_LAST 4 -#define EDJE_PART_TYPE_NONE 0 -#define EDJE_PART_TYPE_RECTANGLE 1 -#define EDJE_PART_TYPE_TEXT 2 -#define EDJE_PART_TYPE_IMAGE 3 -#define EDJE_PART_TYPE_SWALLOW 4 -#define EDJE_PART_TYPE_TEXTBLOCK 5 -#define EDJE_PART_TYPE_GRADIENT 6 -#define EDJE_PART_TYPE_GROUP 7 -#define EDJE_PART_TYPE_BOX 8 -#define EDJE_PART_TYPE_TABLE 9 -#define EDJE_PART_TYPE_LAST 10 - -#define EDJE_TEXT_EFFECT_NONE 0 -#define EDJE_TEXT_EFFECT_PLAIN 1 -#define EDJE_TEXT_EFFECT_OUTLINE 2 -#define EDJE_TEXT_EFFECT_SOFT_OUTLINE 3 -#define EDJE_TEXT_EFFECT_SHADOW 4 -#define EDJE_TEXT_EFFECT_SOFT_SHADOW 5 -#define EDJE_TEXT_EFFECT_OUTLINE_SHADOW 6 -#define EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW 7 -#define EDJE_TEXT_EFFECT_FAR_SHADOW 8 -#define EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW 9 -#define EDJE_TEXT_EFFECT_GLOW 10 -#define EDJE_TEXT_EFFECT_LAST 11 - -#define EDJE_ACTION_TYPE_NONE 0 -#define EDJE_ACTION_TYPE_STATE_SET 1 -#define EDJE_ACTION_TYPE_ACTION_STOP 2 -#define EDJE_ACTION_TYPE_SIGNAL_EMIT 3 -#define EDJE_ACTION_TYPE_DRAG_VAL_SET 4 -#define EDJE_ACTION_TYPE_DRAG_VAL_STEP 5 -#define EDJE_ACTION_TYPE_DRAG_VAL_PAGE 6 -#define EDJE_ACTION_TYPE_SCRIPT 7 -#define EDJE_ACTION_TYPE_FOCUS_SET 8 -#define EDJE_ACTION_TYPE_LUA_SCRIPT 9 -#define EDJE_ACTION_TYPE_LAST 10 - -#define EDJE_TWEEN_MODE_NONE 0 -#define EDJE_TWEEN_MODE_LINEAR 1 -#define EDJE_TWEEN_MODE_SINUSOIDAL 2 -#define EDJE_TWEEN_MODE_ACCELERATE 3 -#define EDJE_TWEEN_MODE_DECELERATE 4 -#define EDJE_TWEEN_MODE_LAST 5 - #define EDJE_VAR_NONE 0 #define EDJE_VAR_INT 1 #define EDJE_VAR_FLOAT 2 -- 2.7.4