Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor
Modified Files:
edje_edit.patch
Log Message:
update edje patch
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/edje_edit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_edit.patch 16 Feb 2008 01:22:20 -0000 1.2
+++ edje_edit.patch 16 Feb 2008 16:55:32 -0000 1.3
@@ -4,7 +4,7 @@
retrieving revision 1.4
diff -u -r1.4 Doxyfile
--- Doxyfile 6 Dec 2007 23:40:48 -0000 1.4
-+++ Doxyfile 16 Feb 2008 01:18:05 -0000
++++ Doxyfile 16 Feb 2008 16:53:14 -0000
@@ -1,7 +1,7 @@
PROJECT_NAME = Edje
PROJECT_NUMBER =
@@ -29,7 +29,7 @@
retrieving revision 1.93
diff -u -r1.93 configure.in
--- configure.in 25 Jan 2008 03:35:46 -0000 1.93
-+++ configure.in 16 Feb 2008 01:18:05 -0000
++++ configure.in 16 Feb 2008 16:53:14 -0000
@@ -66,6 +66,7 @@
evas >= 0.9.9
ecore-evas >= 0.9.9
@@ -44,7 +44,7 @@
retrieving revision 1.6
diff -u -r1.6 gendoc
--- gendoc 6 Dec 2007 23:42:38 -0000 1.6
-+++ gendoc 16 Feb 2008 01:18:05 -0000
++++ gendoc 16 Feb 2008 16:53:14 -0000
@@ -1,7 +1,7 @@
#!/bin/sh
cp ./edje.c.in ./edje.c
@@ -68,8 +68,8 @@
RCS file: src/lib/Edje_Edit.h
diff -N src/lib/Edje_Edit.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ src/lib/Edje_Edit.h 16 Feb 2008 01:18:06 -0000
-@@ -0,0 +1,1007 @@
++++ src/lib/Edje_Edit.h 16 Feb 2008 16:53:14 -0000
+@@ -0,0 +1,1090 @@
+#ifndef _EDJE_EDIT_H
+#define _EDJE_EDIT_H
+
@@ -1056,6 +1056,89 @@
+ Evas_Object *obj, ///< The edje object
+ const char *prog ///< The program name
+);
++/**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
++edje_edit_program_action_get(
++ Evas_Object *obj, ///< The edje object
++ const char *prog ///< The program name
++);
++
++/**Get the list of the targets for the given program
++ * Return a list of target name
++ * Use edje_edit_string_list_free() when you don't need it anymore.
++ */
++EAPI Evas_List* ///@return An Evas_List of char*, or NULL on error
++edje_edit_program_targets_get(
++ Evas_Object *obj, ///< The edje object
++ const char *prog ///< The program name
++);
++
++/**Get the list of action that will be run after the give program
++ * Return a list of program name.
++ * Use edje_edit_string_list_free() when you don't need it anymore.
++ */
++EAPI Evas_List* ///@return An Evas_List of char*, or NULL on error
++edje_edit_program_afters_get(
++ Evas_Object *obj, ///< The edje object
++ const char *prog ///< The program name
++);
++
++/**Get the state for the given program
++ * 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 const char* ///@return The name of state for prog
++edje_edit_program_state_get(
++ Evas_Object *obj, ///< The edje object
++ const char *prog ///< The program name
++);
++
++/**Get the value of state for the given program.
++ * In a STATE_SET action this is the value of state to set.
++ * Not used on SIGNAL_EMIT action.
++ */
++EAPI double ///@return The value of state for prog
++edje_edit_program_value_get(
++ Evas_Object *obj, ///< The edje object
++ const char *prog ///< The program name
++);
++
++/**Get the state2 for the given program
++ * In a STATE_SET action is not used
++ * In a SIGNAL_EMIT action is the source of the emitted signal.
++ */
++EAPI const char* ///@return The source to emit for prog
++edje_edit_program_state2_get(
++ Evas_Object *obj, ///< The edje object
++ const char *prog ///< The program name
++);
++
++/**Get the value of state2 for the given program.
++ * I don't know what this is used for. :P
++ */
++EAPI double ///@return The value of state2 for prog
++edje_edit_program_value2_get(
++ Evas_Object *obj, ///< The edje object
++ const char *prog ///< The program name
++);
++
++/**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
++edje_edit_program_transition_get(
++ Evas_Object *obj, ///< The edje object
++ const char *prog ///< The program name
++);
++
++/**Get the duration of the transition in seconds.*/
++EAPI double ///@return The duration of the transition
++edje_edit_program_transition_time_get(
++ Evas_Object *obj, ///< The edje object
++ const char *prog ///< The program name
++);
+
+//@}
+/******************************************************************************/
@@ -1083,7 +1166,7 @@
retrieving revision 1.39
diff -u -r1.39 Makefile.am
--- src/lib/Makefile.am 18 Jan 2008 06:38:46 -0000 1.39
-+++ src/lib/Makefile.am 16 Feb 2008 01:18:06 -0000
++++ src/lib/Makefile.am 16 Feb 2008 16:53:14 -0000
@@ -14,7 +14,8 @@
libedje.la
@@ -1109,8 +1192,8 @@
RCS file: src/lib/edje_edit.c
diff -N src/lib/edje_edit.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ src/lib/edje_edit.c 16 Feb 2008 01:18:06 -0000
-@@ -0,0 +1,2272 @@
++++ src/lib/edje_edit.c 16 Feb 2008 16:53:14 -0000
+@@ -0,0 +1,2392 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
@@ -3279,6 +3362,44 @@
+ return evas_stringshare_add(epr->signal);
+}
+
++EAPI const char*
++edje_edit_program_state_get(Evas_Object *obj, const char *prog)
++{
++ GET_EPR_OR_RETURN(NULL)
++
++ if (!epr->state) return NULL;
++ printf("GET STATE for program: %s [%s %.2f]\n", prog, epr->state,
epr->value);
++ return evas_stringshare_add(epr->state);
++}
++
++EAPI const char*
++edje_edit_program_state2_get(Evas_Object *obj, const char *prog)
++{
++ GET_EPR_OR_RETURN(NULL)
++
++ if (!epr->state2) return NULL;
++ printf("GET STATE2 for program: %s [%s %.2f]\n", prog, epr->state2,
epr->value2);
++ return evas_stringshare_add(epr->state2);
++}
++
++EAPI double
++edje_edit_program_value_get(Evas_Object *obj, const char *prog)
++{
++ GET_EPR_OR_RETURN(-1)
++
++ printf("GET VALUE for program: %s [%s %.2f]\n", prog, epr->state,
epr->value);
++ return epr->value;
++}
++
++EAPI double
++edje_edit_program_value2_get(Evas_Object *obj, const char *prog)
++{
++ GET_EPR_OR_RETURN(-1)
++
++ printf("GET VALUE2 for program: %s [%s %.2f]\n", prog, epr->state2,
epr->value2);
++ return epr->value2;
++}
++
+EAPI double
+edje_edit_program_in_from_get(Evas_Object *obj, const char *prog)
+{
@@ -3295,6 +3416,88 @@
+ return epr->in.range;
+}
+
++EAPI int
++edje_edit_program_transition_get(Evas_Object *obj, const char *prog)
++{
++ GET_EPR_OR_RETURN(-1)
++ printf("GET TRANSITION for program: %s [%d]\n", prog, epr->tween.mode);
++ return epr->tween.mode;
++}
++
++EAPI double
++edje_edit_program_transition_time_get(Evas_Object *obj, const char *prog)
++{
++ GET_EPR_OR_RETURN(-1)
++ printf("GET TRANSITION_TIME for program: %s [%.4f]\n", prog,
epr->tween.time);
++ return epr->tween.time;
++}
++
++EAPI int
++edje_edit_program_action_get(Evas_Object *obj, const char *prog)
++{
++ GET_EPR_OR_RETURN(-1)
++ printf("GET ACTION for program: %s [%d]\n", prog, epr->action);
++ return epr->action;
++}
++
++EAPI Evas_List*
++edje_edit_program_targets_get(Evas_Object *obj, const char *prog)
++{
++ Evas_List *l, *targets;
++
++ GET_ED_OR_RETURN(NULL)
++ GET_EPR_OR_RETURN(NULL)
++
++ printf("GET TARGETS for program: %s [count: %d]\n", prog,
evas_list_count(epr->targets));
++
++ l = epr->targets;
++ targets = NULL;
++ while (l)
++ {
++ Edje_Program_Target *t;
++ Edje_Real_Part *p = NULL;
++
++ t = l->data;
++ p = ed->table_parts[t->id % ed->table_parts_size];
++ if (p && p->part && p->part->name)
++ {
++ printf(" t: %d name: %s\n", t->id, p->part->name);
++ targets = evas_list_append(targets,
evas_stringshare_add(p->part->name));
++ }
++ l = l->next;
++ }
++ return targets;
++}
++
++EAPI Evas_List*
++edje_edit_program_afters_get(Evas_Object *obj, const char *prog)
++{
++ Evas_List *l, *afters;
++
++ GET_ED_OR_RETURN(NULL)
++ GET_EPR_OR_RETURN(NULL)
++
++ printf("GET AFTERS for program: %s [count: %d]\n", prog,
evas_list_count(epr->after));
++
++ l = epr->after;
++ afters = NULL;
++ while (l)
++ {
++ Edje_Program_After *a;
++ Edje_Program *p = NULL;
++
++ a = l->data;
++ p = ed->table_programs[a->id % ed->table_programs_size];
++ if (p && p->name)
++ {
++ printf(" a: %d name: %s\n", a->id, p->name);
++ afters = evas_list_append(afters, evas_stringshare_add(p->name));
++ }
++ l = l->next;
++ }
++ return afters;
++}
++
+/*************************/
+/* EMBRYO SCRIPTS API */
+/*************************/
@@ -3389,7 +3592,7 @@
retrieving revision 1.111
diff -u -r1.111 edje_load.c
--- src/lib/edje_load.c 18 Jan 2008 06:34:04 -0000 1.111
-+++ src/lib/edje_load.c 16 Feb 2008 01:18:06 -0000
++++ src/lib/edje_load.c 16 Feb 2008 16:53:14 -0000
@@ -5,7 +5,7 @@
#include "Edje.h"
#include "edje_private.h"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
