Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor
Modified Files:
edje_edit.patch
Log Message:
* manage swallow parts
* fix group max e min value
* some line cutted to fit 80col
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/edje_edit.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_edit.patch 23 Feb 2008 18:34:35 -0000 1.14
+++ edje_edit.patch 24 Feb 2008 03:52:58 -0000 1.15
@@ -4,7 +4,7 @@
retrieving revision 1.4
diff -u -r1.4 Doxyfile
--- Doxyfile 6 Dec 2007 23:40:48 -0000 1.4
-+++ Doxyfile 23 Feb 2008 18:30:58 -0000
++++ Doxyfile 24 Feb 2008 03:41:56 -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 23 Feb 2008 18:30:58 -0000
++++ configure.in 24 Feb 2008 03:41:56 -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 23 Feb 2008 18:30:58 -0000
++++ gendoc 24 Feb 2008 03:41:56 -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 23 Feb 2008 18:30:59 -0000
-@@ -0,0 +1,1342 @@
++++ src/lib/Edje_Edit.h 24 Feb 2008 03:41:57 -0000
+@@ -0,0 +1,1361 @@
+#ifndef _EDJE_EDIT_H
+#define _EDJE_EDIT_H
+
@@ -230,25 +230,44 @@
+ Evas_Object *obj, ///< The edje object
+ const char *new_name ///< The new name for the group
+);
-+
++/**Get the group min width*/
++EAPI int ///@return The minw value or -1 on errors
++edje_edit_group_min_w_get(
++ Evas_Object *obj ///< The edje object
++);
+/**Set the group min width*/
+EAPI void
+edje_edit_group_min_w_set(
+ Evas_Object *obj, ///< The edje object
+ int w ///< The new group minimum width in pixel
+);
++/**Get the group min height*/
++EAPI int ///@return The minh value or -1 on errors
++edje_edit_group_min_h_get(
++ Evas_Object *obj ///< The edje object
++);
+/**Set the group min height*/
+EAPI void
+edje_edit_group_min_h_set(
+ Evas_Object *obj, ///< The edje object
+ int h ///< The new group minimum height in pixel
+);
++/**Get the group max width*/
++EAPI int ///@return The maxw value or -1 on errors
++edje_edit_group_max_w_get(
++ Evas_Object *obj ///< The edje object
++);
+/**Set the group max width*/
+EAPI void
+edje_edit_group_max_w_set(
+ Evas_Object *obj, ///< The edje object
+ int w ///< The new group maximum width in pixel
+);
++/**Get the group max height*/
++EAPI int ///@return The maxh value or -1 on errors
++edje_edit_group_max_h_get(
++ Evas_Object *obj ///< The edje object
++);
+/**Set the group max height*/
+EAPI void
+edje_edit_group_max_h_set(
@@ -1418,7 +1437,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 23 Feb 2008 18:30:59 -0000
++++ src/lib/Makefile.am 24 Feb 2008 03:41:57 -0000
@@ -14,7 +14,8 @@
libedje.la
@@ -1444,22 +1463,20 @@
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 23 Feb 2008 18:30:59 -0000
-@@ -0,0 +1,3234 @@
++++ src/lib/edje_edit.c 24 Feb 2008 03:41:57 -0000
+@@ -0,0 +1,3264 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
-+/**
-+
-+ TODO / BUGS
-+-------------
-+
-+* globe.edj segfault if you insert a new image
-+* Can't have scripts source
-+* Write decompile info (print source) back to edje file
+
++/*
++ * TODO
++ * -----------------------------------------------------------------
++ * Modify edje so that also ebryo source is included in the eet file
++ * Write decompile info (print source) back to edje file
++ * Remove images/fonts
++ */
+
-+**/
+#include <locale.h>
+#include <errno.h>
+#include <Ecore_Evas.h>
@@ -2223,6 +2240,14 @@
+ }
+}
+
++EAPI int
++edje_edit_group_min_w_get(Evas_Object *obj)
++{
++ printf("Get min_w of group\n");
++ GET_ED_OR_RETURN(-1)
++ if (!ed->collection) return -1;
++ return ed->collection->prop.min.w;
++}
+EAPI void
+edje_edit_group_min_w_set(Evas_Object *obj, int w)
+{
@@ -2230,6 +2255,14 @@
+ GET_ED_OR_RETURN()
+ ed->collection->prop.min.w = w;
+}
++EAPI int
++edje_edit_group_min_h_get(Evas_Object *obj)
++{
++ printf("Get min_h of group\n");
++ GET_ED_OR_RETURN(-1)
++ if (!ed->collection) return -1;
++ return ed->collection->prop.min.h;
++}
+EAPI void
+edje_edit_group_min_h_set(Evas_Object *obj, int h)
+{
@@ -2237,6 +2270,14 @@
+ GET_ED_OR_RETURN()
+ ed->collection->prop.min.h = h;
+}
++EAPI int
++edje_edit_group_max_w_get(Evas_Object *obj)
++{
++ printf("Get max_w of group\n");
++ GET_ED_OR_RETURN(-1)
++ if (!ed->collection) return -1;
++ return ed->collection->prop.max.w;
++}
+EAPI void
+edje_edit_group_max_w_set(Evas_Object *obj, int w)
+{
@@ -2244,6 +2285,14 @@
+ GET_ED_OR_RETURN()
+ ed->collection->prop.max.w = w;
+}
++EAPI int
++edje_edit_group_max_h_get(Evas_Object *obj)
++{
++ printf("Get max_h of group\n");
++ GET_ED_OR_RETURN(-1)
++ if (!ed->collection) return -1;
++ return ed->collection->prop.max.h;
++}
+EAPI void
+edje_edit_group_max_h_set(Evas_Object *obj, int h)
+{
@@ -4686,7 +4735,7 @@
retrieving revision 1.58
diff -u -r1.58 edje_embryo.c
--- src/lib/edje_embryo.c 25 Jan 2008 03:35:46 -0000 1.58
-+++ src/lib/edje_embryo.c 23 Feb 2008 18:30:59 -0000
++++ src/lib/edje_embryo.c 24 Feb 2008 03:41:57 -0000
@@ -847,7 +847,7 @@
Edje *ed;
int part_id = 0;
@@ -4702,7 +4751,7 @@
retrieving revision 1.113
diff -u -r1.113 edje_load.c
--- src/lib/edje_load.c 22 Feb 2008 10:42:50 -0000 1.113
-+++ src/lib/edje_load.c 23 Feb 2008 18:30:59 -0000
++++ src/lib/edje_load.c 24 Feb 2008 03:41:58 -0000
@@ -5,7 +5,7 @@
#include "Edje.h"
#include "edje_private.h"
@@ -4727,7 +4776,7 @@
retrieving revision 1.138
diff -u -r1.138 edje_private.h
--- src/lib/edje_private.h 21 Feb 2008 18:48:36 -0000 1.138
-+++ src/lib/edje_private.h 23 Feb 2008 18:30:59 -0000
++++ src/lib/edje_private.h 24 Feb 2008 03:41:58 -0000
@@ -329,31 +329,31 @@
struct _Edje_Program /* a conditional program to be run */
-------------------------------------------------------------------------
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
