Enlightenment

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
engrave is fixed, don't need to set the font dir anymore

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- eapp_edit_main.c	23 Dec 2004 11:37:26 -0000	1.7
+++ eapp_edit_main.c	23 Dec 2004 12:45:22 -0000	1.8
@@ -44,7 +44,6 @@
 
     eet = engrave_file_new();
     engrave_file_image_dir_set(eet, idir);
-    engrave_file_font_dir_set(eet, idir);
     image = engrave_image_new(ifile, ENGRAVE_IMAGE_TYPE_COMP, 0);
     engrave_file_image_add(eet, image);

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils


Modified Files:
	Makefile.am 


Log Message:
- change spaces to a tab

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am	16 Dec 2004 11:13:27 -0000	1.1
+++ Makefile.am	20 Jan 2005 21:08:15 -0000	1.2
@@ -8,7 +8,7 @@
 		       stamp-h.in
 
 install-data-local:
-        @$(NORMAL_INSTALL)
+	@$(NORMAL_INSTALL)
 	if test -d $(srcdir)/data; then \
 	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \
 	  for d in $(srcdir)/data/*; do \

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/emblem added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/emblem/default added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/fonts




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/emblem/fonts added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default/images




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/emblem/default/images added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data


Added Files:
	Makefile.am 


Log Message:
- add emblem, a bg setting program, into e_utils

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem


Added Files:
	Makefile.am 


Log Message:
- add emblem, a bg setting program, into e_utils

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default/images


Added Files:
	bg.png e.png left.png logo.png panel.png right.png 
	text_sel.png 


Log Message:
- add emblem, a bg setting program, into e_utils

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default


Added Files:
	Makefile.am default.edc 


Log Message:
- add emblem, a bg setting program, into e_utils

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/fonts


Added Files:
	Vera.ttf VeraBd.ttf 


Log Message:
- add emblem, a bg setting program, into e_utils

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Added Files:
	.cvsignore Emblem.h Makefile.am emblem.c emblem_ui.c main.c 


Log Message:
- add emblem, a bg setting program, into e_utils

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils


Modified Files:
	Makefile.am configure.in 


Log Message:
- add emblem, a bg setting program, into e_utils

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am	20 Jan 2005 21:08:15 -0000	1.2
+++ Makefile.am	9 Feb 2005 16:39:13 -0000	1.3
@@ -1,21 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src
+SUBDIRS = src data
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
 		       ltconfig ltmain.sh missing mkinstalldirs \
 		       stamp-h.in
 
-install-data-local:
-	@$(NORMAL_INSTALL)
-	if test -d $(srcdir)/data; then \
-	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \
-	  for d in $(srcdir)/data/*; do \
-	    cp -pR $$d $(DESTDIR)$(pkgdatadir)/data; \
-          done \
-	fi
-
 dist-hook:
 	./gendoc; \
 	if test -d data; then \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in	24 Jan 2005 11:32:31 -0000	1.6
+++ configure.in	9 Feb 2005 16:39:14 -0000	1.7
@@ -83,6 +83,62 @@
 #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
 #AC_SUBST(dlopen_libs)
 
+AC_ARG_WITH(ecore-config,
+[  --with-ecore-config=ECORE_CONFIG      use ecore-config specified ],
+[
+  ECORE_CONFIG=$withval;
+  echo "using "$ECORE_CONFIG" for ecore-config";
+],[
+  PROG="ecore-config";
+  AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH)
+])
+ecore_cflags=`$ECORE_CONFIG --cflags`
+ecore_libs=`$ECORE_CONFIG --libs`
+AC_SUBST(ecore_cflags)
+AC_SUBST(ecore_libs)
+
+AC_ARG_WITH(evas-config,
+[  --with-evas-config=EVAS_CONFIG      use evas-config specified ],
+[
+  EVAS_CONFIG=$withval;
+  echo "using "$EVAS_CONFIG" for evas-config";
+],[
+  PROG="evas-config";
+  AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
+])
+evas_cflags=`$EVAS_CONFIG --cflags`
+evas_libs=`$EVAS_CONFIG --libs`
+AC_SUBST(evas_cflags)
+AC_SUBST(evas_libs)
+
+AC_ARG_WITH(esmart-config,
+[  --with-esmart-config=ESMART_CONFIG      use esmart-config specified ],
+[
+  ESMART_CONFIG=$withval;
+  echo "using "$ESMART_CONFIG" for esmart-config";
+],[
+  PROG="esmart-config";
+  AC_PATH_PROG(ESMART_CONFIG, $PROG, "", $PATH)
+])
+esmart_cflags=`$ESMART_CONFIG --cflags`
+esmart_libs=`$ESMART_CONFIG --libs`
+AC_SUBST(esmart_cflags)
+AC_SUBST(esmart_libs)
+
+AC_ARG_WITH(edje-config,
+[  --with-edje-config=EDJE_CONFIG      use edje-config specified ],
+[
+  EDJE_CONFIG=$withval;
+  echo "using "$EDJE_CONFIG" for edje-config";
+],[
+  PROG="edje-config";
+  AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH)
+])
+edje_cflags=`$EDJE_CONFIG --cflags`
+edje_libs=`$EDJE_CONFIG --libs`
+AC_SUBST(edje_cflags)
+AC_SUBST(edje_libs)
+
 AC_ARG_WITH(eet-config,
 [  --with-eet-config=EET_CONFIG      use eet-config specified ],
 [
@@ -156,9 +212,14 @@
 
 AC_OUTPUT([
 Makefile
+data/Makefile
+data/emblem/Makefile
+data/emblem/default/Makefile
 src/Makefile
 src/bin/Makefile
 src/bin/eapp_edit/Makefile
 src/bin/e17setroot/Makefile
+src/bin/emblem/Makefile
 ],[
 ])
+

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin


Modified Files:
	Makefile.am 


Log Message:
- add emblem, a bg setting program, into e_utils

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am	24 Jan 2005 11:16:21 -0000	1.2
+++ Makefile.am	9 Feb 2005 16:39:16 -0000	1.3
@@ -1,4 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = eapp_edit \
-e17setroot
+e17setroot \
+emblem

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/e17setroot


Modified Files:
	Makefile.am 


Log Message:
- add emblem, a bg setting program, into e_utils

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17setroot/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am	24 Jan 2005 23:38:26 -0000	1.6
+++ Makefile.am	9 Feb 2005 16:39:16 -0000	1.7
@@ -17,8 +17,4 @@
 
 e17setroot_LDADD = @ewl_libs@ @eet_libs@ @engrave_libs@ @imlib2_libs@ @e_libs@
 
-filesdir = $(datadir)/e_utils/data/e17setroot
-files_DATA = 
-
-

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils


Modified Files:
	AUTHORS 


Log Message:
- add myself

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- AUTHORS	16 Dec 2004 11:13:27 -0000	1.1
+++ AUTHORS	9 Feb 2005 16:43:11 -0000	1.2
@@ -1,3 +1,10 @@
 eapp_edit:
 Andrew (HandyAndE) Elcock
 
+emblem:
+ dan 'dj2' sinclair <zero@...>
+ 
+ Thanks to Raster for the help with the buffering stuff, and all the images
+ I stole from his projects.
+
+

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	emblem_ui.c 


Log Message:
- fix segv

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emblem_ui.c	9 Feb 2005 16:50:53 -0000	1.2
+++ emblem_ui.c	9 Feb 2005 17:01:18 -0000	1.3
@@ -158,13 +158,13 @@
         {
             edje_object_signal_emit(em->gui.edje, "arrows,show", "*");
             edje_object_signal_callback_add(em->gui.edje, "left,clicked", "*",
-                                                emblem_left_scroll_down_cb, NULL);
+                                            emblem_left_scroll_down_cb, em);
             edje_object_signal_callback_add(em->gui.edje, "right,clicked", "*",
-                                                emblem_right_scroll_down_cb, NULL);
+                                            emblem_right_scroll_down_cb, em);
             edje_object_signal_callback_add(em->gui.edje, "left,click,release", "*",
-                                                emblem_left_scroll_up_cb, NULL);
+                                            emblem_left_scroll_up_cb, em);
             edje_object_signal_callback_add(em->gui.edje, "right,click,release", "*",
-                                                emblem_right_scroll_up_cb, NULL);
+                                            emblem_right_scroll_up_cb, em);
         }
     }
 }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	emblem_ui.c 


Log Message:
- setting works again

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emblem_ui.c	9 Feb 2005 17:01:18 -0000	1.3
+++ emblem_ui.c	9 Feb 2005 17:03:25 -0000	1.4
@@ -284,7 +284,6 @@
         evas_object_del(o);
         return NULL;
     }
-    evas_object_data_set(o, "file", strdup(fname));
     evas_object_show(o);
 
     ev = evas_object_rectangle_add(em->gui.evas);
@@ -292,6 +291,7 @@
     evas_object_show(ev);
 
     evas_object_data_set(ob, "ev", ev);
+    evas_object_data_set(ob, "file", strdup(fname));
     evas_object_data_set(ev, "edje", ob);
 
     evas_object_intercept_move_callback_add(ob,

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default


Added Files:
	.cvsignore 


Log Message:
quieter

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data


Added Files:
	.cvsignore 


Log Message:
quieter

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	.cvsignore 


Log Message:
quieter

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore	9 Feb 2005 16:39:16 -0000	1.1
+++ .cvsignore	9 Feb 2005 17:06:37 -0000	1.2
@@ -2,3 +2,4 @@
 Makefile.in
 .deps
 .libs
+emblem

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem


Added Files:
	.cvsignore 


Log Message:
quieter

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils


Modified Files:
	.cvsignore 


Log Message:
quieter

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore	16 Dec 2004 11:13:27 -0000	1.1
+++ .cvsignore	9 Feb 2005 17:06:37 -0000	1.2
@@ -10,4 +10,7 @@
 install-sh
 libtool
 missing
-stamp-h1
+stamp-h
+stamp-h.in
+config.h.in
+mkinstalldirs

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	emblem_ui.c 


Log Message:
- this works, but there is a stange ghosting on resize of the main preview
  window.

- we dont' change the menu list when setting the preview anymore.
- cut out a lot of code now that we're using the buffer stuff, so we don't
  need the event tracking rects.
- don't change the actual current object on menu selection also kills a lot
  of code.

mmmm, simplification, mmm


===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- emblem_ui.c	9 Feb 2005 17:03:25 -0000	1.4
+++ emblem_ui.c	10 Feb 2005 06:52:39 -0000	1.5
@@ -31,7 +31,10 @@
 #define SCREEN_H 1200
 
 static int emblem_load_bgs(Emblem *em);
-static Evas_Object *emblem_evas_object_get(Emblem *em, const char *fname);
+static Evas_Object *emblem_evas_object_get(Emblem *em, const char *fname,
+                                                Evas_Coord w, Evas_Coord h);
+static int emblem_ui_e_bg_get(void *data, int type, void *ev);
+static void emblem_current_bg_set(Emblem *em, char *file);
 
 static void emblem_ui_init_job_cb(void *data);
 static void emblem_ui_resize_cb(Ecore_Evas *ee);
@@ -69,10 +72,10 @@
 emblem_ui_init(Emblem *em)
 {
     Ecore_Evas *ee;
-    Evas *evas;
     Evas_Object *o;
+    Evas_Coord w, h;
+    Evas *evas;
     double l;
-    Evas_Coord w;
 
     ee = ecore_evas_software_x11_new(em->display, 0, 0, 0, WIDTH, HEIGHT);
     ecore_evas_title_set(ee, PACKAGE);
@@ -105,6 +108,11 @@
     edje_object_part_swallow(em->gui.edje, "menu_bar", o);
     evas_object_show(o);
     em->gui.menu = o;
+    em->gui.current = NULL;
+
+    ecore_event_handler_add(E_RESPONSE_BACKGROUND_GET, 
+                                emblem_ui_e_bg_get, em);
+    e_background_get();
 
     ecore_job_add(emblem_ui_init_job_cb, em);
 
@@ -121,18 +129,27 @@
 {
     Emblem *em;
     Evas_Coord w, h;
+    Evas_Object *o;
     double l;
     const char *state;
+    char *file;
 
     em = ecore_evas_data_get(ee, "emblem");
 
     ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
     evas_object_resize(em->gui.edje, w, h);
 
-    edje_object_part_geometry_get(em->gui.edje, "current", NULL, NULL, &w, &h);
-    evas_object_resize(em->gui.current, w, h);
+    edje_object_part_geometry_get(em->gui.edje, "current", 
+                                            NULL, NULL, &w, &h);
+
+    evas_object_image_size_set(em->gui.current, w, h);
     evas_object_image_fill_set(em->gui.current, 0, 0, w, h);
 
+    o = evas_object_data_get(em->gui.current, "screen_buffer");
+    evas_object_resize(o, w, h);
+    evas_object_image_fill_set(o, 0, 0, w, h);
+    evas_object_resize(em->gui.current, w, h);
+
     edje_object_part_geometry_get(em->gui.edje, "menu_bar", NULL, NULL, &w, NULL);
     l = esmart_container_elements_length_get(em->gui.menu);
     state = edje_object_part_state_get(em->gui.edje, "left_arrow", NULL);
@@ -210,10 +227,6 @@
     dir = opendir(path);
     if (!dir) return 0;
 
-    /* get these from the system */
-    w = SCREEN_W;
-    h = SCREEN_H;
-
     while ((entry = readdir(dir)))
     {
         Evas_Object *o;
@@ -225,53 +238,39 @@
         snprintf(path, PATH_MAX, "%s/.e/e/backgrounds/%s", 
                                 getenv("HOME"), entry->d_name);
 
-        o = emblem_evas_object_get(em, path);
-        if (em->gui.current == NULL)
-        {
-            em->gui.current = o;
-
-            edje_object_part_geometry_get(em->gui.edje, "current", NULL, NULL, &w, &h);
-
-            edje_object_part_swallow(em->gui.edje, "current", o);
-
-            ev = evas_object_data_get(o, "ev");
-            evas_object_event_callback_add(ev, EVAS_CALLBACK_MOUSE_DOWN,
-                                                emblem_current_sel_cb, em);
-            continue;
-        }
+        o = emblem_evas_object_get(em, path, THUMB_W, THUMB_H);
         edje_object_part_geometry_get(em->gui.edje, "menu_bar", NULL, NULL, NULL, &h);
         evas_object_resize(o, 64, 48);
+        
+        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
+                                        emblem_menu_sel_cb, em);
 
-        ev = evas_object_data_get(o, "ev");
-        evas_object_event_callback_add(ev, EVAS_CALLBACK_MOUSE_DOWN,
-                                            emblem_menu_sel_cb, em);
         esmart_container_element_append(em->gui.menu, o);
     }
     return 1;
 }
 
 static Evas_Object *
-emblem_evas_object_get(Emblem *em, const char *fname)
-
+emblem_evas_object_get(Emblem *em, const char *fname,
+                            Evas_Coord w, Evas_Coord h)
 {
     Evas_Object *o, *o2, *ob, *ev;
     Ecore_Evas *ee2;
     Evas *evas2;
 
-    ob = o2 = ecore_evas_object_image_new(em->gui.ee);
-    ee2 = evas_object_data_get(o2, "Ecore_Evas");
-    evas2 = ecore_evas_get(ee2);
-    evas_object_image_size_set(o2, THUMB_W, THUMB_H); /* thumb res */
-    evas_object_image_fill_set(o2, 0, 0, THUMB_W, THUMB_H);
-    evas_object_show(o2);
+    ob = ecore_evas_object_image_new(em->gui.ee);
+    ee2 = evas_object_data_get(ob, "Ecore_Evas");
+    evas_object_image_size_set(ob, w, h);
+    evas_object_image_fill_set(ob, 0, 0, w, h);
+    evas_object_show(ob);
 
     o2 = ecore_evas_object_image_new(ee2);
     ee2 = evas_object_data_get(o2, "Ecore_Evas");
     evas2 = ecore_evas_get(ee2);
-    evas_object_image_size_set(o2, SCREEN_W, SCREEN_H); /* screen res */
+    evas_object_image_size_set(o2, SCREEN_W, SCREEN_H);
     evas_object_move(o2, 0, 0);
-    evas_object_resize(o2, THUMB_W, THUMB_H);
-    evas_object_image_fill_set(o2, 0, 0, THUMB_W, THUMB_H);
+    evas_object_resize(o2, w, h);
+    evas_object_image_fill_set(o2, 0, 0, w, h);
     evas_object_show(o2);
 
     o = edje_object_add(evas2);
@@ -286,56 +285,58 @@
     }
     evas_object_show(o);
 
-    ev = evas_object_rectangle_add(em->gui.evas);
-    evas_object_color_set(ev, 0, 0, 0, 0);
-    evas_object_show(ev);
-
-    evas_object_data_set(ob, "ev", ev);
+    evas_object_data_set(ob, "screen_buffer", o2);
     evas_object_data_set(ob, "file", strdup(fname));
-    evas_object_data_set(ev, "edje", ob);
-
-    evas_object_intercept_move_callback_add(ob, 
-                                emblem_intercept_move_cb, NULL);
-    evas_object_intercept_resize_callback_add(ob, 
-                                emblem_intercept_resize_cb, NULL);
-    evas_object_intercept_raise_callback_add(ob, 
-                                emblem_intercept_raise_cb, NULL);
-    evas_object_intercept_lower_callback_add(ob, 
-                                emblem_intercept_lower_cb, NULL);
-    evas_object_intercept_layer_set_callback_add(ob, 
-                                emblem_intercept_layer_set_cb, NULL);
-    evas_object_intercept_stack_above_callback_add(ob, 
-                                emblem_intercept_stack_above_cb, NULL);
-    evas_object_intercept_stack_below_callback_add(ob, 
-                                emblem_intercept_stack_below_cb, NULL);
-    evas_object_intercept_show_callback_add(ob, emblem_intercept_show_cb, NULL);
-    evas_object_intercept_hide_callback_add(ob, emblem_intercept_hide_cb, NULL);
 
     return ob;
 }
 
 static void
-emblem_current_sel_cb(void *data, Evas *evas, Evas_Object *obj, void *ev)
+emblem_current_bg_set(Emblem *em, char *file) 
+{
+    Evas_Coord w, h;
+
+    if (em->gui.current)
+    {
+        edje_object_part_unswallow(em->gui.edje, em->gui.current);
+        evas_object_hide(em->gui.current);
+        evas_object_del(em->gui.current);
+    }
+
+    edje_object_part_geometry_get(em->gui.edje, "current", 
+                                            NULL, NULL, &w, &h);
+
+    em->gui.current = emblem_evas_object_get(em, file, w, h);
+    evas_object_resize(em->gui.current, w, h);
+    edje_object_part_swallow(em->gui.edje, "current", em->gui.current);
+
+    evas_object_event_callback_add(em->gui.current, EVAS_CALLBACK_MOUSE_DOWN,
+                                                emblem_current_sel_cb, NULL);
+
+    evas_object_data_set(em->gui.current, "file", file);
+}
+
+static int
+emblem_ui_e_bg_get(void *data, int type, void *ev)
 {
     Emblem *em;
-    char *name; 
-    Evas_Event_Mouse_Down *e;
-    Evas_Coord x, y, w, h;
-    Evas_Object *o;
+    E_Response_Background_Get *e;
 
     e = ev;
     em = data;
+    emblem_current_bg_set(em, e->data);
 
-    /* make sure the click was actually inside the current. When we change
-     * the callbacks in the menu_sel_cb this cb will be called. so we need
-     * to verify they actually selected the item to be set as the bg)
-     */
-    edje_object_part_geometry_get(em->gui.edje, "current", &x, &y, &w, &h);
-    if ((e->canvas.x < x) || (e->canvas.y < y) 
-            || (e->canvas.x > (x + w)) || (e->canvas.y > (y + h)))
-        return;
+    return 1;
+    data = NULL;
+    type = 0;
+}
 
-    name = evas_object_data_get(em->gui.current, "file");
+static void
+emblem_current_sel_cb(void *data, Evas *evas, Evas_Object *obj, void *ev)
+{
+    char *name; 
+
+    name = evas_object_data_get(obj, "file");
     e_background_set(name);
 
     return;
@@ -347,40 +348,11 @@
 emblem_menu_sel_cb(void *data, Evas *evas, Evas_Object *obj, void *ev)
 {
     Emblem *em;
-    char *name, *cur_name;
-    Evas_Coord w, h;
-    Evas_Object *o, *cur_ev, *sel_obj;
+    char *name;
 
     em = data;
-
-    cur_ev = evas_object_data_get(em->gui.current, "ev");
-    sel_obj = evas_object_data_get(obj, "edje");
-
-    evas_object_event_callback_del(cur_ev, EVAS_CALLBACK_MOUSE_DOWN,
-                                            emblem_current_sel_cb);
-    evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_DOWN,
-                                            emblem_menu_sel_cb);
-
-    edje_object_part_unswallow(em->gui.edje, em->gui.current);
-    esmart_container_element_remove(em->gui.menu, sel_obj);
-
-    o = em->gui.current;
-    em->gui.current = sel_obj;
-
-    edje_object_part_geometry_get(em->gui.edje, "current", NULL, NULL, &w, &h);
-    evas_object_resize(em->gui.current, w, h);
-    evas_object_image_fill_set(em->gui.current, 0, 0, w, h);
-
-    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN,
-                                            emblem_current_sel_cb, em);
-    edje_object_part_swallow(em->gui.edje, "current", em->gui.current);
-
-    edje_object_part_geometry_get(em->gui.edje, "menu_bar", NULL, NULL, NULL, &h);
-    evas_object_resize(o, 64, 48);
-    evas_object_event_callback_add(cur_ev, EVAS_CALLBACK_MOUSE_DOWN,
-                                            emblem_menu_sel_cb, em);
-
-    esmart_container_element_append(em->gui.menu, o);
+    name = evas_object_data_get(obj, "file");
+    emblem_current_bg_set(em, name);
 
     return;
     data = NULL;
@@ -451,102 +423,4 @@
     src = NULL;
 }
 
-static void
-emblem_intercept_show_cb(void *data, Evas_Object *obj)
-{
-    Evas_Object *ev;
-
-    ev = evas_object_data_get(obj, "ev");
-    evas_object_show(ev);
-    evas_object_show(obj);
-}
-
-static void
-emblem_intercept_hide_cb(void *data, Evas_Object *obj)
-{
-    Evas_Object *ev;
-
-    ev = evas_object_data_get(obj, "ev");
-    evas_object_hide(ev);
-    evas_object_hide(obj);
-}
-
-static void
-emblem_intercept_move_cb(void *data, Evas_Object *obj,
-        Evas_Coord x, Evas_Coord y)
-{
-    Evas_Object *ev;
-
-    ev = evas_object_data_get(obj, "ev");
-    evas_object_move(ev, x, y);
-    evas_object_move(obj, x, y);
-}
-
-static void
-emblem_intercept_resize_cb(void *data, Evas_Object *obj,
-        Evas_Coord w, Evas_Coord h)
-{
-    Evas_Object *ev;
-
-    ev = evas_object_data_get(obj, "ev");
-    evas_object_resize(ev, w, h);
-    evas_object_resize(obj, w, h);
-    evas_object_image_fill_set(obj, 0, 0, w, h);
-}
-
-static void
-emblem_intercept_raise_cb(void *data, Evas_Object *obj)
-{
-    Evas_Object *ev;
-
-    ev = evas_object_data_get(obj, "ev");
-    evas_object_raise(obj);
-    evas_object_raise(ev);
-}
-
-static void
-emblem_intercept_lower_cb(void *data, Evas_Object *obj)
-{
-    Evas_Object *ev;
-
-
-    ev = evas_object_data_get(obj, "ev");
-    evas_object_lower(obj);
-    evas_object_lower(ev);
-}
-
-static void
-emblem_intercept_stack_above_cb(void *data, Evas_Object *obj,
-        Evas_Object *above)
-{
-    Evas_Object *ev;
-
-
-    ev = evas_object_data_get(obj, "ev");
-    evas_object_stack_above(obj, above);
-    evas_object_stack_above(ev, obj);
-}
-
-static void
-emblem_intercept_stack_below_cb(void *data, Evas_Object *obj,
-        Evas_Object *below)
-{
-    Evas_Object *ev;
-
-
-    ev = evas_object_data_get(obj, "ev");
-    evas_object_stack_below(obj, below);
-    evas_object_stack_below(ev, below);
-}
-
-static void
-emblem_intercept_layer_set_cb(void *data, Evas_Object *obj, int l)
-{
-    Evas_Object *ev;
-
-    ev = evas_object_data_get(obj, "ev");
-    evas_object_layer_set(obj, l);
-    evas_object_layer_set(ev, l);
-}
-

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	emblem_ui.c 


Log Message:
- cleanup warnings and todo
- I can't figure out how to fixup the ghosting of the preview on resize.
  Can't seem to get the buffers cleaned up correctly

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emblem_ui.c	10 Mar 2005 09:59:56 -0000	1.6
+++ emblem_ui.c	18 Mar 2005 18:24:58 -0000	1.7
@@ -1,16 +1,12 @@
 #include "Emblem.h"
 
 /* TODO
- *  * make current not change, just change the edje file and do a double
- *    buffer thing like the menu is doing
  *  * make the thumbs cache to disk, check the eet mtime againts a the time
  *    of the cached version. Each bg has one or more .eet thumb files. these
  *    files will need the screen size in there name and either the timestamp
  *    or an md5 in them (look at epsilon). Then for the menu only load these
  *    cached, so there is only one fs image around
  *  * need to calcluate SCREEN_W and SCREEN_H dynamically
- *  * seem to get a lot of space around the thumbs in the menu bar would be
- *    nice to get these more compact
  *  * need to put a border around the current menubar item that the mouse is
  *    over, like a beveled edge or something
  *  * make startup faster? ... (not sure what to do about it)
@@ -39,21 +35,6 @@
 static void emblem_ui_init_job_cb(void *data);
 static void emblem_ui_resize_cb(Ecore_Evas *ee);
 
-static void emblem_intercept_show_cb(void *data, Evas_Object *obj);
-static void emblem_intercept_hide_cb(void *data, Evas_Object *obj);
-static void emblem_intercept_move_cb(void *data, Evas_Object *obj,
-                                        Evas_Coord x, Evas_Coord y);
-static void emblem_intercept_resize_cb(void *data, Evas_Object *obj,
-                                        Evas_Coord w, Evas_Coord h);
-static void emblem_intercept_raise_cb(void *data, Evas_Object *obj);
-static void emblem_intercept_lower_cb(void *data, Evas_Object *obj);
-static void emblem_intercept_stack_above_cb(void *data, Evas_Object *obj,
-                                        Evas_Object *above);
-static void emblem_intercept_stack_below_cb(void *data, Evas_Object *obj,
-                                        Evas_Object *below);
-static void emblem_intercept_layer_set_cb(void *data, Evas_Object *obj, 
-                                        int l);
-
 static void emblem_current_sel_cb(void *data, Evas *evas, Evas_Object *obj,
                                                                 void *ev);
 static void emblem_menu_sel_cb(void *data, Evas *evas, Evas_Object *obj, 
@@ -73,9 +54,7 @@
 {
     Ecore_Evas *ee;
     Evas_Object *o;
-    Evas_Coord w, h;
     Evas *evas;
-    double l;
 
     ee = ecore_evas_software_x11_new(em->display, 0, 0, 0, WIDTH, HEIGHT);
     ecore_evas_name_class_set(ee, "Emblem", "Emblem");
@@ -133,7 +112,6 @@
     Evas_Object *o;
     double l;
     const char *state;
-    char *file;
 
     em = ecore_evas_data_get(ee, "emblem");
 
@@ -221,8 +199,6 @@
     DIR *dir;
     struct dirent *entry;
     char path[PATH_MAX];
-    Evas_Coord w, h;
-    Evas_Object *ev;
 
     snprintf(path, PATH_MAX, "%s/.e/e/backgrounds", getenv("HOME"));
     dir = opendir(path);
@@ -240,7 +216,6 @@
                                 getenv("HOME"), entry->d_name);
 
         o = emblem_evas_object_get(em, path, THUMB_W, THUMB_H);
-        edje_object_part_geometry_get(em->gui.edje, "menu_bar", NULL, NULL, NULL, &h);
         evas_object_resize(o, 64, 48);
         
         evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
@@ -255,7 +230,7 @@
 emblem_evas_object_get(Emblem *em, const char *fname,
                             Evas_Coord w, Evas_Coord h)
 {
-    Evas_Object *o, *o2, *ob, *ev;
+    Evas_Object *o, *o2, *ob;
     Ecore_Evas *ee2;
     Evas *evas2;
 
@@ -341,7 +316,8 @@
     e_background_set(name);
 
     return;
-    obj = NULL;
+    evas = NULL;
+    data = NULL;
     ev = NULL;
 }
 
@@ -356,6 +332,7 @@
     emblem_current_bg_set(em, name);
 
     return;
+    evas = NULL;
     data = NULL;
     ev = NULL;
 }
@@ -372,7 +349,7 @@
     return;
     data = NULL;
     obj = NULL;
-    em = NULL;
+    emission = NULL;
     src = NULL;
 }
 
@@ -388,7 +365,7 @@
     return;
     data = NULL;
     obj = NULL;
-    em = NULL;
+    emission = NULL;
     src = NULL;
 }
 
@@ -404,7 +381,7 @@
     return;
     data = NULL;
     obj = NULL;
-    em = NULL;
+    emission = NULL;
     src = NULL;
 }
 
@@ -420,7 +397,7 @@
     return;
     data = NULL;
     obj = NULL;
-    em = NULL;
+    emission = NULL;
     src = NULL;
 }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/e17setroot


Modified Files:
	e17setroot.c 


Log Message:
- fix to match libe name change

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17setroot/e17setroot.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e17setroot.c	23 Mar 2005 21:36:53 -0000	1.19
+++ e17setroot.c	9 Apr 2005 06:08:45 -0000	1.20
@@ -49,7 +49,7 @@
 static int _e_bg_bg_get(void *data, int type, void *event) {   
    E_Response_Background_Get *bg;   
    bg = event;   
-   printf("Current bg file: %s\n", bg->data);
+   printf("Current bg file: %s\n", bg->file);
    ecore_main_loop_quit();      
 }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	emblem_ui.c 


Log Message:
- update to use the background directory list returned from E17.
  - can now set the default background from the e17 theme back again

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- emblem_ui.c	23 Mar 2005 21:37:55 -0000	1.8
+++ emblem_ui.c	9 Apr 2005 06:10:46 -0000	1.9
@@ -26,13 +26,14 @@
 #define SCREEN_W 1600
 #define SCREEN_H 1200
 
-static int emblem_load_bgs(Emblem *em);
+static int emblem_load_bgs(Emblem *em, char *dir_path);
 static Evas_Object *emblem_evas_object_get(Emblem *em, const char *fname,
                                                 Evas_Coord w, Evas_Coord h);
 static int emblem_ui_e_bg_get(void *data, int type, void *ev);
+static int emblem_ui_e_bg_dirs_list(void *data, int type, void *ev);
 static void emblem_current_bg_set(Emblem *em, char *file);
 
-static void emblem_ui_init_job_cb(void *data);
+static void emblem_ui_init_dir(Emblem *em, char *dir);
 static void emblem_ui_resize_cb(Ecore_Evas *ee);
 
 static void emblem_current_sel_cb(void *data, Evas *evas, Evas_Object *obj,
@@ -92,9 +93,10 @@
 
     ecore_event_handler_add(E_RESPONSE_BACKGROUND_GET, 
                                 emblem_ui_e_bg_get, em);
+    ecore_event_handler_add(E_RESPONSE_BACKGROUND_DIRS_LIST,
+                                emblem_ui_e_bg_dirs_list, em);
     e_background_get();
-
-    ecore_job_add(emblem_ui_init_job_cb, em);
+    e_background_dirs_list();
 
     return 1;
 }
@@ -166,14 +168,12 @@
 }
 
 static void
-emblem_ui_init_job_cb(void *data)
+emblem_ui_init_dir(Emblem *em, char *dir)
 {
-    Emblem *em;
     Evas_Coord w;
     double l;
 
-    em = data;
-    emblem_load_bgs(em);
+    emblem_load_bgs(em, dir);
 
     edje_object_part_geometry_get(em->gui.edje, "menu_bar", NULL, NULL, &w, NULL);
     l = esmart_container_elements_length_get(em->gui.menu);
@@ -194,14 +194,13 @@
 }
 
 static int
-emblem_load_bgs(Emblem *em)
+emblem_load_bgs(Emblem *em, char *dir_path)
 {
     DIR *dir;
     struct dirent *entry;
     char path[PATH_MAX];
 
-    snprintf(path, PATH_MAX, "%s/.e/e/backgrounds", getenv("HOME"));
-    dir = opendir(path);
+    dir = opendir(dir_path);
     if (!dir) return 0;
 
     while ((entry = readdir(dir)))
@@ -212,9 +211,7 @@
         if (!strcmp(entry->d_name, ".")) continue;
         if (!strstr(entry->d_name, ".edj")) continue;
 
-        snprintf(path, PATH_MAX, "%s/.e/e/backgrounds/%s", 
-                                getenv("HOME"), entry->d_name);
-
+        snprintf(path, PATH_MAX, "%s/%s", dir_path, entry->d_name);
         o = emblem_evas_object_get(em, path, THUMB_W, THUMB_H);
         evas_object_resize(o, 64, 48);
         
@@ -223,6 +220,7 @@
 
         esmart_container_element_append(em->gui.menu, o);
     }
+    closedir(dir);
     return 1;
 }
 
@@ -300,10 +298,26 @@
 
     e = ev;
     em = data;
-    emblem_current_bg_set(em, e->data);
+    emblem_current_bg_set(em, e->file);
+
+    return 1;
+    type = 0;
+}
+
+static int
+emblem_ui_e_bg_dirs_list(void *data, int type, void *ev)
+{
+    Emblem *em;
+    E_Response_Background_Dirs_List *e;
+    int i;
+
+    e = ev;
+    em = data;
+
+    for (i = 0; i < e->count; i++)
+        emblem_ui_init_dir(em, e->dirs[i]);
 
     return 1;
-    data = NULL;
     type = 0;
 }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/entangle added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/fonts




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/fonts added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/images




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/images added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle


Added Files:
	.cvsignore Makefile.am 


Log Message:
- add entangle to e_utils

  Entangle is a simple menu editor for e17 menus. There are a few issues
  with the UI, but it seems to work. If it erases your menus, well, you get
  to keep both parts. Take a look at the README in src/bin/entangle to see
  how it works.

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default


Added Files:
	.cvsignore Makefile.am add_dir_box.edc button.edc 
	button_progs.edc default.edc 


Log Message:
- add entangle to e_utils

  Entangle is a simple menu editor for e17 menus. There are a few issues
  with the UI, but it seems to work. If it erases your menus, well, you get
  to keep both parts. Take a look at the README in src/bin/entangle to see
  how it works.

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/images


Added Files:
	bg.png down.png e.png e17_menu_arrow.png e17_menu_bg.png 
	e17_menu_bg_border.png e17_titlebar.png 
	e17_titlebar_glint1.png e17_titlebar_glint2.png 
	e17_titlebar_glint3.png e17_titlebar_outline.png 
	e17_titlebar_shadow1.png e17_titlebar_shadow2.png logo.png 
	panel.png text_sel.png up.png 


Log Message:
- add entangle to e_utils

  Entangle is a simple menu editor for e17 menus. There are a few issues
  with the UI, but it seems to work. If it erases your menus, well, you get
  to keep both parts. Take a look at the README in src/bin/entangle to see
  how it works.

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/m4


Added Files:
	ac_attribute.m4 


Log Message:
- add entangle to e_utils

  Entangle is a simple menu editor for e17 menus. There are a few issues
  with the UI, but it seems to work. If it erases your menus, well, you get
  to keep both parts. Take a look at the README in src/bin/entangle to see
  how it works.

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Added Files:
	.cvsignore Entangle.h Makefile.am README entangle_apps.c 
	entangle_eapps.c entangle_ui.c main.c 


Log Message:
- add entangle to e_utils

  Entangle is a simple menu editor for e17 menus. There are a few issues
  with the UI, but it seems to work. If it erases your menus, well, you get
  to keep both parts. Take a look at the README in src/bin/entangle to see
  how it works.

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/fonts


Added Files:
	Vera.ttf VeraBd.ttf 


Log Message:
- add entangle to e_utils

  Entangle is a simple menu editor for e17 menus. There are a few issues
  with the UI, but it seems to work. If it erases your menus, well, you get
  to keep both parts. Take a look at the README in src/bin/entangle to see
  how it works.

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data


Modified Files:
	Makefile.am 


Log Message:
- add entangle to e_utils

  Entangle is a simple menu editor for e17 menus. There are a few issues
  with the UI, but it seems to work. If it erases your menus, well, you get
  to keep both parts. Take a look at the README in src/bin/entangle to see
  how it works. 

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am	9 Feb 2005 16:39:14 -0000	1.1
+++ Makefile.am	29 Apr 2005 01:55:48 -0000	1.2
@@ -1,4 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = emblem
+SUBDIRS = emblem \
+entangle

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils


Modified Files:
	AUTHORS configure.in 


Log Message:
- add entangle to e_utils

  Entangle is a simple menu editor for e17 menus. There are a few issues
  with the UI, but it seems to work. If it erases your menus, well, you get
  to keep both parts. Take a look at the README in src/bin/entangle to see
  how it works. 

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/AUTHORS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- AUTHORS	9 Feb 2005 16:43:11 -0000	1.2
+++ AUTHORS	29 Apr 2005 01:55:48 -0000	1.3
@@ -2,9 +2,11 @@
 Andrew (HandyAndE) Elcock
 
 emblem:
+entangle:
  dan 'dj2' sinclair <zero@...>
  
  Thanks to Raster for the help with the buffering stuff, and all the images
  I stole from his projects.
 
 
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in	9 Feb 2005 16:39:14 -0000	1.7
+++ configure.in	29 Apr 2005 01:55:48 -0000	1.8
@@ -14,6 +14,7 @@
 AC_C_CONST
 AM_ENABLE_SHARED
 AM_PROG_LIBTOOL
+AC_C___ATTRIBUTE__
 
 if test "x${bindir}" = 'x${exec_prefix}/bin'; then
   if test "x${exec_prefix}" = "xNONE"; then
@@ -215,11 +216,14 @@
 data/Makefile
 data/emblem/Makefile
 data/emblem/default/Makefile
+data/entangle/Makefile
+data/entangle/default/Makefile
 src/Makefile
 src/bin/Makefile
 src/bin/eapp_edit/Makefile
 src/bin/e17setroot/Makefile
 src/bin/emblem/Makefile
+src/bin/entangle/Makefile
 ],[
 ])

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin


Modified Files:
	Makefile.am 


Log Message:
- add entangle to e_utils

  Entangle is a simple menu editor for e17 menus. There are a few issues
  with the UI, but it seems to work. If it erases your menus, well, you get
  to keep both parts. Take a look at the README in src/bin/entangle to see
  how it works. 

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am	9 Feb 2005 16:39:16 -0000	1.3
+++ Makefile.am	29 Apr 2005 01:55:49 -0000	1.4
@@ -1,5 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = eapp_edit \
 e17setroot \
+entangle \
 emblem

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	.cvsignore 


Log Message:
quieter

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore	29 Apr 2005 01:55:49 -0000	1.1
+++ .cvsignore	29 Apr 2005 02:00:03 -0000	1.2
@@ -1,3 +1,6 @@
 Makefile.in
 Makefile
 entangle
+.deps
+.libs
+

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Added Files:
	TODO 


Log Message:
- add a todo list

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	TODO 


Log Message:
-update

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- TODO	29 Apr 2005 02:11:52 -0000	1.1
+++ TODO	29 Apr 2005 03:34:44 -0000	1.2
@@ -7,4 +7,7 @@
 * directory renaming?
 * if an eapp is under the arrows in the left menu it will be clicked when
   you click the arrow
+* need to handle directories that aren't in the .order file. They come at
+  the end of the list
+

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	TODO entangle_ui.c 


Log Message:
- patch from Mathieu Lamar (Sativas) fixing up entangles UI. Thanks.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- TODO	29 Apr 2005 03:34:44 -0000	1.2
+++ TODO	16 May 2005 00:27:33 -0000	1.3
@@ -1,8 +1,6 @@
 Just the stuff I can think of...
 
 * need to add a scrollbar for the menu
-* need to fix the ui bugs...
-* maybe add engage support?
 * someway to attach .directory.eapp files to directories
 * directory renaming?
 * if an eapp is under the arrows in the left menu it will be clicked when
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/entangle_ui.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- entangle_ui.c	3 May 2005 15:27:46 -0000	1.3
+++ entangle_ui.c	16 May 2005 00:27:33 -0000	1.4
@@ -138,7 +138,7 @@
 
     o = esmart_container_new(evas);
     esmart_container_direction_set(o, CONTAINER_DIRECTION_HORIZONTAL);
-    esmart_container_fill_policy_set(o, CONTAINER_FILL_POLICY_NONE);
+    esmart_container_fill_policy_set(o, CONTAINER_FILL_POLICY_FILL_X);
     esmart_container_spacing_set(o, 10);
     esmart_container_padding_set(o, 0, 0, 0, 0);
     edje_object_part_swallow(edje, "button_bar", o);
@@ -149,7 +149,7 @@
     o = esmart_container_new(evas);
     esmart_container_direction_set(o, CONTAINER_DIRECTION_HORIZONTAL);
     esmart_container_alignment_set(o, CONTAINER_ALIGN_RIGHT);
-    esmart_container_fill_policy_set(o, CONTAINER_FILL_POLICY_NONE);
+    esmart_container_fill_policy_set(o, CONTAINER_FILL_POLICY_FILL_X);
     esmart_container_spacing_set(o, 10);
     esmart_container_padding_set(o, 0, 0, 0, 0);
     edje_object_part_swallow(edje, "cmd_bar", o);
@@ -630,7 +630,7 @@
     Evas *evas;
 
     evas = evas_object_evas_get(container);
-    o = entangle_ui_cmd_bar_button_get(evas, "Add Directory", 
+    o = entangle_ui_cmd_bar_button_get(evas, "Add Dir", 
                                     entangle_ui_cb_directory_add);
     esmart_container_element_append(container, o);

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/images


Added Files:
	e17_button.png e17_button2.png e17_ibar_bg_h.png 
	e17_ibar_bg_v.png e17_ibar_over_h.png e17_ibar_over_v.png 


Log Message:
- patch from Mathieu Lamar (Sativas) fixing up entangles UI. Thanks.

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default


Modified Files:
	button.edc button_progs.edc default.edc 
Added Files:
	menu_item.edc menu_item_progs.edc 


Log Message:
- patch from Mathieu Lamar (Sativas) fixing up entangles UI. Thanks.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/button.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- button.edc	29 Apr 2005 01:55:49 -0000	1.1
+++ button.edc	16 May 2005 00:27:32 -0000	1.2
@@ -1,190 +1,35 @@
-part {   
-    name, "title_outline";
-    mouse_events, 0; 
-    description {
-        state, "default" 0.0;
-        min, 14 14;
-        visible, 1;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 30 -1;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-        }  
-        image {
-            normal, "e17_titlebar_outline.png";
-            border, 8 8 8 8;
-            middle, 0;
-        }  
-        fill {
-            smooth, 0;
-        }  
-        color, 255 255 255 255;
-    }
-    description {
-        state, "active" 0.0;
-        min, 14 14;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 30 -1;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-        }
-        image {
-            normal, "e17_titlebar_outline.png";
-            border, 8 8 8 8;
-            middle, 0;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 0;
-    }
-}
 part {
-    name, "title_shadow2";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow2.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 0;
-    }
+    name:          "button";
+    mouse_events,  0;
+
     description {
-        state, "active" 0.0;
-        visible, 1;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow2.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 255;
-    }
-}     
-part {
-    name, "title_shadow1";
-    mouse_events, 0;
-    description {   
-        state, "default" 0.0;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow1.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 0;
-    }     
-    description {   
-        state, "active" 0.0;
-        visible, 1;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow1.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 255;
+	state,    "default" 0.0;
+	rel1.to, "text";
+	rel2.to, "text";
+	rel1 {
+	    relative, 0.0 0.0;
+	    offset, -8 -2;
+	}
+	
+	rel2 {
+	    relative, 1.0 1.0;
+	    offset, 6 -1;
+	}
+	
+	image {
+	    normal, "e17_button.png";
+	    border, 8 8 8 8;
+	}
+    }
+    description {
+	state,    "clicked" 0.0;
+	inherit,  "default" 0.0;
+	image {
+	    normal, "e17_button2.png";
+	}
     }
 }
 part {
-    name, "title_bar";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar.png";
-            border, 8 8 8 8;
-        }
-        color, 255 255 255 0;
-    }  
-    description {
-        state, "active" 0.0;
-        visible, 1; 
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }  
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }  
-        image {
-            normal, "e17_titlebar.png";
-            border, 8 8 8 8;
-        }  
-        color, 255 255 255 255;
-    }  
-}  
-part {
     name, "text";
     type, TEXT;
     effect, SHADOW;
@@ -193,12 +38,11 @@
         state, "default" 0.0;
         rel1 {
             relative, 0.0 0.0;
-            offset, 8 6; 
-            to, "title_outline";
+            offset, 8 2;
         }  
         rel2 {
             relative, 1.0 1.0;
-            offset, -8 -6;
+            offset, -6 -2;
         }  
         color, 0 0 0 255;
         color3, 255 255 255 128;
@@ -207,7 +51,7 @@
             font, "Vera";
             size, 10;
             min, 1 1;
-            align, 0.0 0.5;
+            align, 0.5 0.5;
         }
     }
 }
@@ -219,11 +63,11 @@
         state, "default" 0.0;
         rel1 {
             offset, 3 3;
-            to, "title_bar";
+            to, "button";
         }
         rel2 {
             offset, -4 -4;
-            to, "title_bar";
+            to, "button";
         }
         color, 255 255 255 255;
     }
@@ -240,12 +84,12 @@
         rel1 {
             relative, 0.0 0.0;
             offset, 2 2;
-            to, "title_bar";
+            to, "button";
         }
         rel2 {
             relative, 1.0 1.0;
             offset, -3 -3;
-            to, "title_bar";
+            to, "button";
         }
         image {
             normal, "e17_titlebar_glint1.png"; 
@@ -275,12 +119,12 @@
         rel1 {      
             relative, 0.0 0.0;
             offset, 3 3;
-            to, "title_bar";
+            to, "button";
         }
         rel2 {    
             relative, 0.0 1.0;
             offset, 3 -4;
-            to, "title_bar";
+            to, "button";
         }  
         image {
             normal, "e17_titlebar_glint2.png";
@@ -354,12 +198,12 @@
         rel1 {    
             relative, 0.0 0.0;
             offset, 2 2;
-            to, "title_bar";
+            to, "button";
         }
         rel2 {    
             relative, 1.0 1.0;
             offset, -3 -3;
-            to, "title_bar";
+            to, "button";
         }  
         image {
             normal, "e17_titlebar_glint3.png";
@@ -375,5 +219,4 @@
         visible, 1;
         color, 255 255 255 255;
     }  
-}     
-
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/button_progs.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- button_progs.edc	29 Apr 2005 01:55:49 -0000	1.1
+++ button_progs.edc	16 May 2005 00:27:33 -0000	1.2
@@ -1,38 +1,8 @@
+
  program {
-     name, "go_active_pre";
+     name, "go_active3b";
      signal, "mouse,in";
      source, "*";
-     action, STATE_SET "default" 0.0;
-     target, "title_outline";
-     target, "title_bar";
-     target, "title_shadow1";
-     target, "title_shadow2";
-     after, "go_active";
- }
- program {
-     name, "go_active";
-     action, STATE_SET "active" 0.0;
-     target, "title_outline";
-     target, "title_bar";
-     transition, LINEAR 0.05;
-     after, "go_active2";
- }
- program {
-     name, "go_active2";
-     action, STATE_SET "active" 0.0;
-     target, "title_shadow1";
-     transition, LINEAR 0.05;
-     after, "go_active3";
-     after, "go_active3b";
- }
- program {
-     name, "go_active3";
-     action, STATE_SET "active" 0.0;
-     target, "title_shadow2";
-     transition, LINEAR 0.05;
- }
- program {
-     name, "go_active3b";
      action, STATE_SET "active" 0.0;
      target, "title_glint_1";
      target, "title_glint_2";
@@ -75,36 +45,22 @@
      target, "title_glint_3";
  }
 
- program {   
-     name, "go_passive_pre";
-     signal, "mouse,out";
-     source, "*";
-     action, STATE_SET "active" 0.0;
-     target, "title_outline";
-     target, "title_bar";
-     target, "title_shadow1";
-     target, "title_shadow2";
-     after, "go_passive";
- }
- program {
-     name, "go_passive";
-     action, STATE_SET "default" 0.0;
-     target, "title_shadow2";
-     transition, LINEAR 0.1;
-     after, "go_passive2";
- }
- program {
-     name, "go_passive2";
-     action, STATE_SET "default" 0.0;
-     target, "title_shadow1";
-     transition, LINEAR 0.1;
-     after, "go_passive3";
- }
- program {
-     name, "go_passive3";
-     action, STATE_SET "default" 0.0;
-     target, "title_outline";
-     target, "title_bar";
-     transition, LINEAR 0.1;
- }
+program 
+{
+    name, "button_down";
+    signal, "mouse,down,1";
+    source, "overlay";
+    action, STATE_SET "clicked" 0.0;
+    target, "button";
+    
+}
 
+program 
+{
+    name, "button_up";
+    signal, "mouse,up,1";
+    source, "overlay";
+    action, STATE_SET "default" 0.0;
+    target, "button";
+    
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/default.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- default.edc	29 Apr 2005 01:55:49 -0000	1.1
+++ default.edc	16 May 2005 00:27:33 -0000	1.2
@@ -17,6 +17,12 @@
     image, "e17_titlebar_outline.png" COMP;
     image, "e17_titlebar_shadow1.png" COMP;
     image, "e17_titlebar_shadow2.png" COMP;
+    image: "e17_button.png" LOSSY 90;
+    image: "e17_button2.png" LOSSY 90;
+    image: "e17_ibar_bg_h.png" LOSSY 90;
+    image: "e17_ibar_over_h.png" LOSSY 90;
+    image: "e17_ibar_bg_v.png" LOSSY 90;
+    image: "e17_ibar_over_v.png" LOSSY 90;
 }
 
 fonts {
@@ -81,12 +87,12 @@
                     state, "default" 0.0;
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, -11 2;
+                        offset, -9 2;
                         to, "title";
                     }
                     rel2 {
                         relative, 0.0 0.0;
-                        offset, 0 16;
+                        offset, 3 17;
                         to, "title";
                     }
                     image {
@@ -131,6 +137,7 @@
                 name, "eapps_bar_body";
                 description {
                     state, "default" 0.0;
+		    color, 255 255 255 220;
                     rel1 {
                         relative, 0.0 0.0;
                         offset, 28 0;
@@ -140,21 +147,26 @@
                         offset, 80 -80;
                     }
                     image {
-                        normal, "panel.png";
-                        border, 3 3 3 3;
+			normal, "e17_ibar_bg_v.png";
+                        border, 13 13 13 13;
                     }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-            }
+		}
+	    }
+    	    part {
+		name: "eapps_bar_body_overlay";
+		mouse_events:  0;
+		description {
+		    state:    "default" 0.0;
+		    color, 255 255 255 255;
+		    rel1.to, "eapps_bar_body";
+		    rel2.to, "eapps_bar_body";
+		    
+		    image {
+			normal: "e17_ibar_over_v.png";
+			border: 13 13 13 13;
+		    }
+		}
+	    }
             part {
                 name, "eapps_bar";
                 type, SWALLOW;
@@ -162,11 +174,11 @@
                     state, "default" 0.0;
                     rel1 {
                         to, "eapps_bar_body";
-                        offset, 0 24;
+                        offset, 0 28;
                     }
                     rel2 {
                         to, "eapps_bar_body";
-                        offset, 0 -24;
+                        offset, 0 -28;
                     }
                 }
             }
@@ -178,14 +190,15 @@
                     state, "default" 0.0;
                     min, 29 21;
                     max, 29 21;
+		    color, 255 255 255 180;
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, 0 4;
+                        offset, 0 6;
                         to, "eapps_bar_body";
                     }
                     rel2 {
                         relative, 1.0 0.0;
-                        offset, 0 24;
+                        offset, 0 27;
                         to, "eapps_bar_body";
                     }
                     image {
@@ -221,14 +234,15 @@
                     state, "default" 0.0;
                     min, 29 21;
                     max, 29 21;
+		    color, 255 255 255 180;
                     rel1 {
                         relative, 0.0 1.0;
-                        offset, 0 -4;
+                        offset, 0 -6;
                         to, "eapps_bar_body";
                     }
                     rel2 {
                         relative, 1.0 1.0;
-                        offset, 0 -24;
+                        offset, 0 -27;
                         to, "eapps_bar_body";
                     }
                     image {
@@ -265,25 +279,15 @@
                     visible, 0;
                     rel1 {
                         relative, 0.0 1.0;
-                        offset, 28 -75;
+                        offset, 28 -79;
                     }
                     rel2 {
                         relative, 0.0 1.0;
-                        offset, 200 -46;
+                        offset, 200 -40;
                     }
-                    image {
-                        normal, "panel.png";
-                        border, 3 3 3 3;
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
+		    image {
+			normal, "e17_ibar_bg_v.png";
+                        border, 13 13 13 13;
                     }
                 }
                 description {
@@ -292,6 +296,26 @@
                     visible, 1;
                 }
             }
+	    part {
+		name:          "eapp_info_overlay";
+		mouse_events:  0;
+		description {
+		    state:    "default" 0.0;
+		    visible, 0;
+		    rel1.to, "eapp_info";
+		    rel2.to, "eapp_info";
+		    
+		    image {
+			normal: "e17_ibar_over_v.png";
+			border: 13 13 13 13;
+		    }
+		}
+		description {
+                    state, "show" 0.0;
+                    inherit, "default" 0.0;
+                    visible, 1;
+                }
+	    }
             part {
                 name, "eapp_info_name";
                 type, TEXT;
@@ -300,7 +324,7 @@
                     visible, 0;
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, 2 2;
+                        offset, 2 14;
                         to, "eapp_info";
                     }
                     rel2 {
@@ -329,12 +353,12 @@
                     visible, 0;
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, 2 16;
+                        offset, 2 20;
                         to, "eapp_info";
                     }
                     rel2 {
                         relative, 1.0 0.0;
-                        offset, 2 28;
+                        offset, 2 32;
                         to, "eapp_info";
                     }
                     text {
@@ -372,12 +396,13 @@
             }
             part {
                 name, "button_bar";
-                type, SWALLOW;
+                type, RECT;
                 description {
                     state, "default" 0.0;
+		    color, 0 0 0 0;
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, 0 0;
+                        offset, 5 0;
                         to, "button_bar_body";
                     }
                     rel2 {
@@ -397,15 +422,15 @@
                     state, "default" 0.0;
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, 1 0;
+                        offset, 4 4;
                         to, "menu_base";
                     }
                     rel2 {
                         relative, 1.0 1.0;
-                        offset, -2 -2;
+                        offset, -4 -4;
                         to, "menu_base";
                     }
-                    color, 221 221 221 225;
+                    color, 221 221 221 0;
                 }
             }
             part {
@@ -425,13 +450,27 @@
                         to_y, "eapps_bar_body";
                     }
                     image {
-                        normal, "e17_menu_bg.png";
-                    }
-                    fill {
-                        smooth: 0;
+                        normal, "e17_ibar_bg_h.png";
+			border, 6 6 6 6;
                     }
                 }
             }
+	    part {
+		name:          "menu_base_overlay";
+		mouse_events:  0;
+		description {
+		    state:    "default" 0.0;
+		    color, 255 255 255 255;
+		    rel1.to, "menu_base";
+		    rel2.to, "menu_base";
+		    
+		    image {
+			normal: "e17_ibar_over_h.png";
+			border: 13 13 13 13;
+		    }
+		}
+	    }
+	    
             part {
                 name, "base3";
                 mouse_events, 0;
@@ -460,20 +499,20 @@
             part {
                 name, "menu_items";
                 mouse_events, 0;
-                type, SWALLOW;
+                type, RECT;
                 description {
                     state, "default" 0.0;
                     rel1 {
                         relative, 0.0 0.0;
-                        offset, 1 1;
+                        offset, 13 13;
                         to, "menu_base";
                     }
                     rel2 {
                         relative, 1.0 1.0;
-                        offset, -1 -1;
+                        offset, -13 -13;
                         to, "menu_base";
                     }
-                    color, 0 0 0 255;
+                    color, 0 0 0 0;
                 }
             }
 
@@ -485,7 +524,7 @@
                     state, "default" 0.0;
                     rel1 {
                         relative, 1.0 1.0;
-                        offset, 120 0;
+                        offset, 125 0;
                         to, "eapps_bar_body";
                     }
                     rel2 {
@@ -573,6 +612,7 @@
                 signal, "eapp,info,hide";
                 action, STATE_SET "default" 0.0;
                 target, "eapp_info";
+		target, "eapp_info_overlay";
                 target, "eapp_info_name";
                 target, "eapp_info_class";
                 transition, LINEAR 0.25;
@@ -583,6 +623,7 @@
                 signal, "eapp,info,show";
                 action, STATE_SET "show" 0.0;
                 target, "eapp_info";
+		target, "eapp_info_overlay";
                 target, "eapp_info_name";
                 target, "eapp_info_class";
                 transition, LINEAR 0.25;
@@ -609,7 +650,7 @@
                 }
             }
 
-#include "button.edc"
+#include "menu_item.edc"
 
             part {
                 name, "arrow";
@@ -685,7 +726,7 @@
                 signal, "mouse,down,3";
                 action, SIGNAL_EMIT "move,start" "*";
             }
-#include "button_progs.edc"
+#include "menu_item_progs.edc"
         }
     }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	main.c 


Log Message:
- add some help text
- fix code formatting
- try checking for the theme by appending .edj before giving up
- add short options for -display, -help and -theme

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- main.c	14 May 2005 10:33:47 -0000	1.2
+++ main.c	16 May 2005 00:45:47 -0000	1.3
@@ -1,5 +1,7 @@
 #include "Emblem.h"
 
+static void usage(void);
+
 static int
 exit_cb(void *data, int type, void *ev)
 {
@@ -35,51 +37,71 @@
     /* arg handling */
     for (i = 1; i < argc; i++)
     {
-        if (!strcmp(argv[i], "-display"))
+        if ((!strcmp(argv[i], "-display")) || (!strcmp(argv[i], "-d")))
         {
             if (++i < argc)
+            {
                 em->display = strdup(argv[i]);
+            }
             else
             {
                 printf("Missing argument to -display\n");
                 goto ECORE_SHUTDOWN;
             }
         }      
-
-       if (!strcmp(argv[i], "-theme"))
-       {
-	   if (++i < argc)
-	       em->theme = strdup(argv[i]);
-	   else
-	   {
-	        printf("Missing argument to -theme\n");
-	        goto ECORE_SHUTDOWN;
-	   }
-       }
+        else if ((!strcmp(argv[i], "-theme")) || (!strcmp(argv[i], "-t")))
+        {
+            if (++i < argc)
+            {
+                em->theme = strdup(argv[i]);
+            }
+            else
+            {
+                printf("Missing argument to -theme\n");
+                goto ECORE_SHUTDOWN;
+            }
+        }
+        else if ((!strcmp(argv[i], "-help")) || (!strcmp(argv[i], "-h")))
+        {
+            usage();
+            return 0;
+        }
     }
-
+    
+    /* make sure theme exists */
     if (!em->theme)
     {
-    	em->theme = strdup(PACKAGE_DATA_DIR"/data/emblem/default.edj");
+        em->theme = strdup(PACKAGE_DATA_DIR"/data/emblem/default.edj");
     }
     else
     {
-    	if(!ecore_file_exists(em->theme))
-	{
-		char theme[PATH_MAX];
-		snprintf(theme, sizeof(theme), PACKAGE_DATA_DIR"/data/emblem/%s", em->theme);
-		if(ecore_file_exists(theme))
-		{
-			em->theme = strdup(theme);
-		}
-		else
-		{
-			em->theme = strdup(PACKAGE_DATA_DIR"/data/emblem/default.edj");
-			fprintf(stderr, "Theme does not exist! Falling back to default theme\n");
-		}
-	}
-	
+        if (!ecore_file_exists(em->theme))
+        {
+            char theme[PATH_MAX];
+            snprintf(theme, sizeof(theme), PACKAGE_DATA_DIR"/data/emblem/%s", em->theme);
+            if (ecore_file_exists(theme))
+            {
+                FREE(em->theme);
+                em->theme = strdup(theme);
+            }
+            else
+            {
+                snprintf(theme, sizeof(theme), PACKAGE_DATA_DIR"/data/emblem/%s.edj", em->theme);
+                if (ecore_file_exists(theme))
+                {
+                    FREE(em->theme);
+                    em->theme = strdup(theme);
+                }
+                else
+                {
+                    IF_FREE(em->theme);
+                    em->theme = strdup(PACKAGE_DATA_DIR"/data/emblem/default.edj");
+                    fprintf(stderr, "Theme does not exist! Falling back to default theme\n");
+                }
+            }
+        }
     }
+
     /* if no display given grab the env var */
     if (!em->display)
     {
@@ -99,7 +121,6 @@
             snprintf(buf, sizeof(buf), "%s:0.0", em->display);
             free(em->display);
             em->display = strdup(buf);
-
         }
         else
         {
@@ -161,3 +182,16 @@
     return ret;
 }
 
+static
+void usage(void)
+{
+    printf("Emblem - Set the Enlightenment 17 Background\n\n"
+           "Usage: emblem [OPTIONS]\n\n"
+           "\tOPTIONS\n"
+           "  -theme <THEME>    \t - Use the given theme\n"
+           "  -display <STR>    \t - Use the given X display\n"
+           "  -help             \t - This help text\n"
+           "\n");
+}
+
+

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	entangle_ui.c 


Log Message:
- get the theme file from the edje object when we can

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/entangle_ui.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- entangle_ui.c	16 May 2005 00:27:33 -0000	1.4
+++ entangle_ui.c	16 May 2005 03:39:45 -0000	1.5
@@ -649,9 +649,13 @@
                                                     const char *source))
 {
     Evas_Object *o;
+    const char *file;
+
+    o = evas_object_name_find(evas, "edje");
+    edje_object_file_get(o, &file, NULL);
 
     o = edje_object_add(evas);
-    edje_object_file_set(o, PACKAGE_DATA_DIR"/data/entangle/default.edj", "button");
+    edje_object_file_set(o, file, "button");
     edje_object_part_text_set(o, "text", label);
     edje_object_signal_callback_add(o, "button,clicked", "*", func, NULL);
     evas_object_show(o);
@@ -692,9 +696,13 @@
 entangle_ui_button_get(Evas *evas, const char *label, const char *name)
 {
     Evas_Object *o;
+    const char *file;
+
+    o = evas_object_name_find(evas, "edje");
+    edje_object_file_get(o, &file, NULL);
 
     o = edje_object_add(evas);
-    edje_object_file_set(o, PACKAGE_DATA_DIR"/data/entangle/default.edj", "button");
+    edje_object_file_set(o, file, "button");
     edje_object_part_text_set(o, "text", label);
     edje_object_signal_callback_add(o, "button,clicked", "*", 
                                     entangle_ui_cb_menu_change, (void *)name);

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	Entangle.h entangle_ui.c main.c 


Log Message:
- entangle now takes some options
- -h for help
- -display STR to set the display
- -theme STR to set the theme (untested)

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/Entangle.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Entangle.h	29 Apr 2005 01:55:49 -0000	1.1
+++ Entangle.h	16 May 2005 04:03:50 -0000	1.2
@@ -57,7 +57,7 @@
 void entangle_apps_dump(void);
 Ecore_List *entangle_apps_list_get(const char *list);
 
-int entangle_ui_init(void);
+int entangle_ui_init(const char *display, const char *theme);
 void entangle_ui_shutdown(void);
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/entangle_ui.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- entangle_ui.c	16 May 2005 03:39:45 -0000	1.5
+++ entangle_ui.c	16 May 2005 04:03:50 -0000	1.6
@@ -79,12 +79,12 @@
 static void entangle_ui_dir_add_name(void *data, const char *str);
 
 int
-entangle_ui_init(void)
+entangle_ui_init(const char *display, const char *theme)
 {
     Evas *evas;
     Evas_Object *o, *edje;
 
-    ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, WIDTH, HEIGHT);
+    ee = ecore_evas_software_x11_new(display, 0, 0, 0, WIDTH, HEIGHT);
     ecore_evas_title_set(ee, "entangle");
     ecore_evas_name_class_set(ee, "entangle", "entangle");
     ecore_evas_callback_resize_set(ee, entangle_ui_cb_resize);
@@ -93,8 +93,7 @@
     evas = ecore_evas_get(ee);
 
     edje = edje_object_add(evas);
-    if (!edje_object_file_set(edje,
-            PACKAGE_DATA_DIR"/data/entangle/default.edj", "Main"))
+    if (!edje_object_file_set(edje, theme, "Main"))
     {
         fprintf(stderr, "Unable to locate theme.\n");
         return 0;
@@ -438,7 +437,7 @@
     {
         Entangle_App *app;
         Evas_Object *obj;
-        Evas_Object *o;
+        Evas_Object *o = NULL;
 
         app = ecore_list_goto_index(apps, i);
         obj = edje_object_add(evas);
@@ -830,7 +829,7 @@
     Evas *evas;
     Entangle_App *app;
     Ecore_List *list;
-    char path[PATH_MAX], exe[PATH_MAX], *p;
+    char path[PATH_MAX], exe[PATH_MAX];
     const char *rel_path;
 
     o = data;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- main.c	29 Apr 2005 01:55:49 -0000	1.1
+++ main.c	16 May 2005 04:03:50 -0000	1.2
@@ -1,11 +1,15 @@
 #include "Entangle.h"
 
 static int entangle_cb_exit(void *data, int type, void *ev);
+static void entangle_usage(char ** argv);
 
 int
 main(int argc, char ** argv)
 {
+    char *display = NULL;
+    char *theme = NULL;
     int ret = 1;
+    int i;
 
     if (!ecore_init())
     {
@@ -15,6 +19,101 @@
     ecore_app_args_set(argc, (const char **)argv);
     ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, entangle_cb_exit, NULL);
 
+    for (i = 1; i < argc; i++)
+    {
+        if ((!strcmp(argv[i], "-display")) || (!strcmp(argv[i], "-d")))
+        {
+            if (++i < argc)
+            {
+                IF_FREE(display);
+                display = strdup(argv[i]);
+            }
+            else
+            {
+                fprintf(stderr, "ERROR: Missing argument to -display\n");
+                goto ECORE_SHUTDOWN;
+            }
+        }
+        else if ((!strcmp(argv[i], "-theme")) || (!strcmp(argv[i], "-t")))
+        {
+            if (++i < argc)
+            {
+                IF_FREE(theme);
+                theme = strdup(argv[i]);
+            }
+            else
+            {
+                fprintf(stderr, "ERROR: Missing argument to -theme\n");
+                goto ECORE_SHUTDOWN;
+            }
+        }
+        else if ((!strcmp(argv[i], "-help")) || (!strcmp(argv[i], "-h")))
+        {
+            entangle_usage(argv);
+            return 0;
+        }
+    }
+
+    /* make sure the theme is valid */
+    if (theme)
+    {
+        char *p;
+        p = strstr(theme, ".edj");
+
+        if (p && (strlen(theme) - (p - theme) == strlen(".edj")))
+        {
+            if (!ecore_file_exists(theme))
+            {
+                char tmp[PATH_MAX];
+                snprintf(tmp, PATH_MAX, PACKAGE_DATA_DIR"/data/entangle/%s", theme);
+                FREE(theme);
+
+                if (ecore_file_exists(tmp)) theme = strdup(tmp);
+            }
+        }
+        else
+        {
+            char tmp[PATH_MAX];
+            snprintf(tmp, PATH_MAX, PACKAGE_DATA_DIR"/data/entangle/%s.edj", theme);
+            FREE(theme);
+
+            if (ecore_file_exists(tmp)) theme = strdup(tmp);
+        }
+    }
+    if (!theme) theme = strdup(PACKAGE_DATA_DIR"/data/entangle/default.edj");
+
+    /* make sure the display is valid */
+    if (!display) 
+    {
+        char *tmp = getenv("DISPLAY");
+        if (tmp) display = strdup(tmp);
+    }
+    if (display)
+    {
+        char *p;
+        char buf[1024];
+
+        p = strrchr(display, ':');
+        if (!p)
+        {
+            snprintf(buf, sizeof(buf), "%s:0.0", display);
+            FREE(display);
+            display = strdup(buf);
+        }
+        else
+        {
+            p = strrchr(p, '.');
+            if (!p)
+            {
+                snprintf(buf, sizeof(buf), "%s.0", display);
+                FREE(display);
+                display = strdup(buf);
+            }
+        }
+    }
+    else
+        display = strdup(":0.0");
+
     if (!ecore_file_init())
     {
         fprintf(stderr, "Error initing Ecore_File.\n");
@@ -51,7 +150,7 @@
         goto ENTANGLE_EAPPS_SHUTDOWN;
     }
 
-    if (!entangle_ui_init())
+    if (!entangle_ui_init(display, theme))
     {
         fprintf(stderr, "Error initing Entangle_Ui.\n");
         goto ENTANGLE_APPS_SHUTDOWN;
@@ -76,6 +175,9 @@
 ECORE_SHUTDOWN:
     ecore_shutdown();
 SHUTDOWN:
+
+    IF_FREE(display);
+    IF_FREE(theme);
     return ret;
 }
 
@@ -87,3 +189,16 @@
     return 0;
 }
 
+static void
+entangle_usage(char ** argv)
+{
+    printf("%s -- Enlightenment 17 Menu Editor\n\n"
+            "Usage: %s [OPTIONS]\n"
+            "  OPTIONS:\n"
+            "   -display STR    \t - Use the given display variable\n"
+            "   -theme STR      \t - Use the given theme variable\n"
+            "   -help           \t - This help text\n"
+            "\n", argv[0], argv[0]);
+}
+
+

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	Emblem.h emblem_ui.c main.c 


Log Message:
- Include Ecore_File.h to remove warning
- use __UNUSED__ instead of the other way to shut up  warnings

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/Emblem.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Emblem.h	14 May 2005 10:33:47 -0000	1.2
+++ Emblem.h	16 May 2005 03:07:52 -0000	1.3
@@ -8,12 +8,20 @@
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Ecore_Job.h>
+#include <Ecore_File.h>
 #include <Evas.h>
 #include <Edje.h>
 #include <Esmart/Esmart_Container.h>
 
 #include "config.h"
 
+#undef __UNUSED__
+#if HAVE___ATTRIBUTE__
+#define __UNUSED__ __attribute__((unused))
+#else
+#define __UNUSED__
+#endif
+
 typedef struct Emblem Emblem;
 struct Emblem
 {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emblem_ui.c	14 May 2005 10:33:47 -0000	1.10
+++ emblem_ui.c	16 May 2005 03:07:53 -0000	1.11
@@ -290,7 +290,7 @@
 }
 
 static int
-emblem_ui_e_bg_get(void *data, int type, void *ev)
+emblem_ui_e_bg_get(void *data, int type __UNUSED__, void *ev)
 {
     Emblem *em;
     E_Response_Background_Get *e;
@@ -298,13 +298,11 @@
     e = ev;
     em = data;
     emblem_current_bg_set(em, e->file);
-
     return 1;
-    type = 0;
 }
 
 static int
-emblem_ui_e_bg_dirs_list(void *data, int type, void *ev)
+emblem_ui_e_bg_dirs_list(void *data, int type __UNUSED__, void *ev)
 {
     Emblem *em;
     E_Response_Background_Dirs_List *e;
@@ -317,25 +315,21 @@
         emblem_ui_init_dir(em, e->dirs[i]);
 
     return 1;
-    type = 0;
 }
 
 static void
-emblem_current_sel_cb(void *data, Evas *evas, Evas_Object *obj, void *ev)
+emblem_current_sel_cb(void *data __UNUSED__, Evas *evas __UNUSED__, 
+                        Evas_Object *obj, void *ev __UNUSED__)
 {
     char *name; 
-
     name = evas_object_data_get(obj, "file");
     e_background_set(name);
-
     return;
-    evas = NULL;
-    data = NULL;
-    ev = NULL;
 }
 
 static void
-emblem_menu_sel_cb(void *data, Evas *evas, Evas_Object *obj, void *ev)
+emblem_menu_sel_cb(void *data __UNUSED__, Evas *evas __UNUSED__, 
+                    Evas_Object *obj, void *ev __UNUSED__)
 {
     Emblem *em;
     char *name;
@@ -343,75 +337,47 @@
     em = data;
     name = evas_object_data_get(obj, "file");
     emblem_current_bg_set(em, name);
-
     return;
-    evas = NULL;
-    data = NULL;
-    ev = NULL;
 }
 
 static void
-emblem_left_scroll_down_cb(void *data, Evas_Object *obj, 
-        const char *emission, const char *src)
+emblem_left_scroll_down_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, 
+                const char *emission __UNUSED__, const char *src __UNUSED__)
 {
     Emblem *em;
-
     em = data;
     esmart_container_scroll_start(em->gui.menu, -2);
-
     return;
-    data = NULL;
-    obj = NULL;
-    emission = NULL;
-    src = NULL;
 }
 
 static void
-emblem_right_scroll_down_cb(void *data, Evas_Object *obj, 
-        const char *emission, const char *src)
+emblem_right_scroll_down_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, 
+                const char *emission __UNUSED__, const char *src __UNUSED__)
 {
     Emblem *em;
-
     em = data;
     esmart_container_scroll_start(em->gui.menu, 2);
-
     return;
-    data = NULL;
-    obj = NULL;
-    emission = NULL;
-    src = NULL;
 }
 
 static void
-emblem_left_scroll_up_cb(void *data, Evas_Object *obj,
-        const char *emission, const char *src)
+emblem_left_scroll_up_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+                const char *emission __UNUSED__, const char *src __UNUSED__)
 {
     Emblem *em;
-
     em = data;
     esmart_container_scroll_stop(em->gui.menu);
-
     return;
-    data = NULL;
-    obj = NULL;
-    emission = NULL;
-    src = NULL;
 }
 
 static void
-emblem_right_scroll_up_cb(void *data, Evas_Object *obj,
-        const char *emission, const char *src)
+emblem_right_scroll_up_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+                const char *emission __UNUSED__, const char *src __UNUSED__)
 {
     Emblem *em;
-
     em = data;
     esmart_container_scroll_stop(em->gui.menu);
-
     return;
-    data = NULL;
-    obj = NULL;
-    emission = NULL;
-    src = NULL;
 }
 
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- main.c	16 May 2005 00:45:47 -0000	1.3
+++ main.c	16 May 2005 03:07:53 -0000	1.4
@@ -3,14 +3,10 @@
 static void usage(void);
 
 static int
-exit_cb(void *data, int type, void *ev)
+exit_cb(void *data __UNUSED__, int type __UNUSED__, void *ev __UNUSED__)
 {
     ecore_main_loop_quit();
-
     return 0;
-    data = NULL;
-    type = 0;
-    ev = NULL;
 }
 
 int

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	emblem_ui.c 


Log Message:
- fix emblem to show theme directories again

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- emblem_ui.c	16 May 2005 03:07:53 -0000	1.11
+++ emblem_ui.c	22 May 2005 17:35:56 -0000	1.12
@@ -31,6 +31,7 @@
                                                 Evas_Coord w, Evas_Coord h);
 static int emblem_ui_e_bg_get(void *data, int type, void *ev);
 static int emblem_ui_e_bg_dirs_list(void *data, int type, void *ev);
+static int emblem_ui_e_theme_dirs_list(void *data, int type, void *ev);
 static void emblem_current_bg_set(Emblem *em, char *file);
 
 static void emblem_ui_init_dir(Emblem *em, char *dir);
@@ -94,7 +95,10 @@
                                 emblem_ui_e_bg_get, em);
     ecore_event_handler_add(E_RESPONSE_BACKGROUND_DIRS_LIST,
                                 emblem_ui_e_bg_dirs_list, em);
+    ecore_event_handler_add(E_RESPONSE_THEME_DIRS_LIST,
+                                emblem_ui_e_theme_dirs_list, em);
     e_background_get();
+    e_theme_dirs_list();
     e_background_dirs_list();
 
     return 1;
@@ -317,6 +321,22 @@
     return 1;
 }
 
+static int
+emblem_ui_e_theme_dirs_list(void *data, int type __UNUSED__, void *ev)
+{
+    Emblem *em;
+    E_Response_Theme_Dirs_List *e;
+    int i;
+
+    e = ev;
+    em = data;
+
+    for (i = 0; i < e->count; i++)
+        emblem_ui_init_dir(em, e->dirs[i]);
+
+    return 1;
+}
+
 static void
 emblem_current_sel_cb(void *data __UNUSED__, Evas *evas __UNUSED__, 
                         Evas_Object *obj, void *ev __UNUSED__)

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/macros




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/macros added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/programs




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/programs added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/parts




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/parts added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	entangle_ui.c 


Log Message:
- patch from Mathieu Lamar to:
   - add a scrollbar to the menu in entangle.
   - split the theme into multiple files

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/entangle_ui.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- entangle_ui.c	16 May 2005 04:03:50 -0000	1.6
+++ entangle_ui.c	26 May 2005 00:34:22 -0000	1.7
@@ -23,6 +23,18 @@
 static void entangle_ui_cb_down_released(void *data, Evas_Object *obj,
                                 const char *emission, const char *src);
 
+
+static void entangle_ui_cb_menu_up_pressed(void *data, Evas_Object *obj,
+                                const char *emission, const char *src);
+static void entangle_ui_cb_menu_up_released(void *data, Evas_Object *obj,
+                                const char *emission, const char *src);
+static void entangle_ui_cb_menu_down_pressed(void *data, Evas_Object *obj,
+                                const char *emission, const char *src);
+static void entangle_ui_cb_menu_down_released(void *data, Evas_Object *obj,
+                                const char *emission, const char *src);
+static void entangle_ui_cb_menu_drag(void *data, Evas_Object *obj,
+                                const char *emission, const char *src);
+
 /* container element mouse over/out callbacks */
 static void entangle_ui_cb_mouse_in(void *data, Evas *evas, 
                                     Evas_Object *obj, void *ev);
@@ -102,7 +114,18 @@
     evas_object_resize(edje, WIDTH, HEIGHT);
     evas_object_name_set(edje, "edje");
     evas_object_show(edje);
-
+    
+    edje_object_signal_callback_add(edje, "menu,down,clicked",
+                    "*", entangle_ui_cb_menu_down_pressed, NULL);
+    edje_object_signal_callback_add(edje, "menu,down,release",
+                    "*", entangle_ui_cb_menu_down_released, NULL);    
+    edje_object_signal_callback_add(edje, "menu,up,clicked",
+                    "*", entangle_ui_cb_menu_up_pressed, NULL);
+    edje_object_signal_callback_add(edje, "menu,up,release",
+                    "*", entangle_ui_cb_menu_up_released, NULL);
+    edje_object_signal_callback_add(edje, "drag", 
+                    "scroll_title_outline", entangle_ui_cb_menu_drag, NULL);
+    
     o = esmart_container_new(evas);
     esmart_container_direction_set(o, CONTAINER_DIRECTION_VERTICAL);
     esmart_container_alignment_set(o, CONTAINER_ALIGN_CENTER);
@@ -214,8 +237,27 @@
                                             entangle_ui_cb_down_released, NULL);
         }
     }
+
+    bar = evas_object_name_find(evas, "menu");
+    edje_object_part_geometry_get(edje, "menu_items", NULL, NULL, NULL, &h);
+    l = esmart_container_elements_length_get(bar);
+    state = edje_object_part_state_get(edje, "scroll_title_outline", NULL);
+
+    if (l < h)
+    {
+        if (!strcmp(state, "default"))
+            edje_object_signal_emit(edje, "scroll,buttons,hide", "*");
+    }
+    else
+    {
+        if (!strcmp(state, "hidden"))
+            edje_object_signal_emit(edje, "scroll,buttons,show", "*");
+    }
 }
 
+    
+            
+                
 static int
 entangle_ui_eapps_bar_populate(Evas_Object *container)
 {
@@ -278,7 +320,8 @@
     l = esmart_container_elements_length_get(container);
     state = edje_object_part_state_get(edje, "up_arrow", NULL);
 
-    if (l < h) edje_object_signal_emit(edje, "arrows,hide", "*");
+    if (l < h) 
+        edje_object_signal_emit(edje, "arrows,hide", "*");
     else  
     {
         edje_object_signal_emit(edje, "arrows,show", "*");
@@ -342,6 +385,93 @@
     esmart_container_scroll_stop(o);
 }
 
+
+static void
+entangle_ui_cb_menu_up_pressed(void *data __UNUSED__, Evas_Object *obj,
+                                const char *emission __UNUSED__, 
+                                const char *src __UNUSED__)
+{
+    Evas *evas;
+    Evas_Object *o, *o2;
+
+    evas = evas_object_evas_get(obj);
+    o = evas_object_name_find(evas, "menu");
+
+    esmart_container_scroll_start(o, 2);        
+}
+
+static void
+entangle_ui_cb_menu_up_released(void *data __UNUSED__, Evas_Object *obj,
+                                const char *emission __UNUSED__, 
+                                const char *src __UNUSED__)
+{
+    Evas *evas;
+    Evas_Object *o;
+    double y;
+    
+    evas = evas_object_evas_get(obj);
+    o = evas_object_name_find(evas, "menu");
+
+    esmart_container_scroll_stop(o);
+
+    y =  esmart_container_scroll_percent_get(o);
+
+    o = evas_object_name_find(evas, "edje");
+    edje_object_part_drag_value_set(o, "scroll_title_outline", 0, y);
+
+}
+
+static void
+entangle_ui_cb_menu_down_pressed(void *data __UNUSED__, Evas_Object *obj,
+                                const char *emission __UNUSED__, 
+                                const char *src __UNUSED__)
+{
+    Evas *evas;
+    Evas_Object *o;
+
+    evas = evas_object_evas_get(obj);
+    o = evas_object_name_find(evas, "menu");
+    esmart_container_scroll_start(o, -2);
+}
+
+static void
+entangle_ui_cb_menu_down_released(void *data __UNUSED__, Evas_Object *obj,
+                                const char *emission __UNUSED__, 
+                                const char *src __UNUSED__)
+{
+    Evas *evas;
+    Evas_Object *o;
+    double y;
+
+    evas = evas_object_evas_get(obj);
+    o = evas_object_name_find(evas, "menu");
+
+    esmart_container_scroll_stop(o);
+
+    y =  esmart_container_scroll_percent_get(o);
+
+    o = evas_object_name_find(evas, "edje");
+    edje_object_part_drag_value_set(o, "scroll_title_outline", 0, y);
+}
+
+static void
+entangle_ui_cb_menu_drag(void *data __UNUSED__, Evas_Object *obj,
+                                const char *emission __UNUSED__, 
+                                const char *src __UNUSED__)
+{
+    Evas *evas;
+    Evas_Object *o; 
+    double y;
+    
+    evas = evas_object_evas_get(obj);
+    o = evas_object_name_find(evas, "edje");
+
+    edje_object_part_drag_value_get(o, "scroll_title_outline", NULL, &y);
+
+    o = evas_object_name_find(evas, "menu");
+    esmart_container_scroll_percent_set(o, y);
+}
+
 static void
 entangle_ui_cb_mouse_in(void *data, Evas *evas, 
                         Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
@@ -423,13 +553,15 @@
     Evas *evas;
     int i;
     const char *file;
+    Evas_Coord h;
+    double l;
+    Evas_Object *o;
 
     evas = evas_object_evas_get(container);
-    {
-        Evas_Object *o;
-        o = evas_object_name_find(evas, "edje");
-        edje_object_file_get(o, &file, NULL);
-    }
+
+    o = evas_object_name_find(evas, "edje");
+    edje_object_file_get(o, &file, NULL);
+
     evas_object_data_set(container, "list", apps);
     evas_object_data_set(container, "list_rel_path", rel_path);
 
@@ -478,6 +610,20 @@
 
         esmart_container_element_append(container, obj);
     }
+    
+    o = evas_object_name_find(evas, "edje");
+    edje_object_part_geometry_get(o, "menu_items", NULL, NULL, NULL, &h);
+
+    l = esmart_container_elements_length_get(container);
+
+    if (l < h) 
+        edje_object_signal_emit(o, "scroll,buttons,hide", "*");
+    else
+    {
+        l =  esmart_container_scroll_percent_get(o);
+        edje_object_part_drag_value_set(o, "scroll_title_outline", 0, l);
+        edje_object_signal_emit(o, "scroll,buttons,show", "*");
+    }
     return 1;
 }
 
@@ -638,7 +784,6 @@
 
     o = entangle_ui_cmd_bar_button_get(evas, "Quit", entangle_ui_cb_quit);
     esmart_container_element_append(container, o);
-
 }
 
 static Evas_Object *
@@ -980,4 +1125,3 @@
 }
 
 
-

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/macros


Added Files:
	macros.inc 


Log Message:
- patch from Mathieu Lamar to:
   - add a scrollbar to the menu in entangle.
   - split the theme into multiple files

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/programs


Added Files:
	button_progs.edc main_programs.edc menu_item_progs.edc 


Log Message:
- patch from Mathieu Lamar to:
   - add a scrollbar to the menu in entangle.
   - split the theme into multiple files

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/parts


Added Files:
	bg_parts.edc button_bar_parts.edc button_parts.edc 
	cmd_buttons_parts.edc eapps_info_parts.edc eapps_parts.edc 
	menu_item_parts.edc menu_parts.edc 


Log Message:
- patch from Mathieu Lamar to:
   - add a scrollbar to the menu in entangle.
   - split the theme into multiple files

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default/images


Added Files:
	e17_button_detail_down.png e17_button_detail_up.png 
	e17_mini_button.png e17_mini_button_shadow1.png 
	e17_mini_button_shadow2.png images.edc 


Log Message:
- patch from Mathieu Lamar to:
   - add a scrollbar to the menu in entangle.
   - split the theme into multiple files

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/entangle/default


Modified Files:
	add_dir_box.edc button.edc button_progs.edc default.edc 
	menu_item.edc 
Added Files:
	main.edc 


Log Message:
- patch from Mathieu Lamar to:
   - add a scrollbar to the menu in entangle.
   - split the theme into multiple files

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/add_dir_box.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- add_dir_box.edc	29 Apr 2005 01:55:49 -0000	1.1
+++ add_dir_box.edc	26 May 2005 00:34:19 -0000	1.2
@@ -1,295 +1,36 @@
-
 group {
     name, "add_dir";
     parts {
-#if 0
-        part {
-            name, "dir_bg";
-            type, RECT;
-            description {
-                state, "default" 0.0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }
-                color, 255 255 255 255;
-            }
-        }
-
-        part {
-            name, "entry";
-            type, TEXT;
-            effect, NONE;
-            description {
-                state, "default" 0.0;
-                align, 0.0 0.5;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 4 1;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }
-                color, 0 0 0 255;
-                text {
-                    text, "text";
-                    font, "Vera";
-                    size, 10;
-                    min, 1 0;
-                    align, 0.0 0.5;
-                }
-            }
-        }
-#endif
-        part {
-            name, "menu_base";
-            mouse_events, 0;
-            description {
-                state, "default" 0.0;
-                align, 0.5 0.0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }
-                image {
-                    normal, "e17_menu_bg.png";
-                }
-                fill {
-                    smooth: 0;
-                }
-            }
-        }
-        part {
-            name, "base3";
-            mouse_events, 0;
-            description {
-                state, "default" 0.0;
-                rel1 {
-                    relative, 1.0 0.0;
-                    offset, 4 0;
-                    to, "menu_base";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -4 -1;
-                    to, "menu_base";
-                }
-                image {
-                    normal, "e17_menu_bg_border.png";
-                    border, 1 1 1 1;
-                    middle, 0;
-                }
-                fill {
-                    smooth, 0;
-                }
-            }
-        }
-        part {   
-            name, "title_outline";
-            mouse_events, 0; 
-            description {
-                state, "default" 0.0;
-                min, 14 14;
-                visible, 1;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }  
-                image {
-                    normal, "e17_titlebar_outline.png";
-                    border, 8 8 8 8;
-                    middle, 0;
-                }  
-                fill {
-                    smooth, 0;
-                }  
-                color, 255 255 255 255;
-            }
-            description {
-                state, "active" 0.0;
-                min, 14 14;
-                visible, 0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                }
-                image {
-                    normal, "e17_titlebar_outline.png";
-                    border, 8 8 8 8;
-                    middle, 0;
-                }
-                fill {
-                    smooth, 0;
-                }
-                color, 255 255 255 0;
-            }
-        }
         part {
-            name, "title_shadow2";
+            name, "entry_bg";
             mouse_events, 0;
             description {
                 state, "default" 0.0;
-                visible, 0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
-                image {
-                    normal, "e17_titlebar_shadow2.png";
-                    border, 8 8 8 8;
-                }
-                fill {
-                    smooth, 0;
-                }
-                color, 255 255 255 0;
-            }
-            description {
-                state, "active" 0.0;
-                visible, 1;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
-                image {
-                    normal, "e17_titlebar_shadow2.png";
-                    border, 8 8 8 8;
-                }
-                fill {
-                    smooth, 0;
-                }
-                color, 255 255 255 255;
-            }
-        }     
-        part {
-            name, "title_shadow1";
-            mouse_events, 0;
-            description {   
-                state, "default" 0.0;
-                visible, 0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
-                image {
-                    normal, "e17_titlebar_shadow1.png";
-                    border, 8 8 8 8;
-                }
-                fill {
-                    smooth, 0;
-                }
-                color, 255 255 255 0;
-            }     
-            description {   
-                state, "active" 0.0;
-                visible, 1;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
+                rel1.to, "entry";
+                rel1.offset, -15 0;
+                rel2.to, "entry";
+                rel2.offset, 15 -5;
+
                 image {
-                    normal, "e17_titlebar_shadow1.png";
-                    border, 8 8 8 8;
-                }
-                fill {
-                    smooth, 0;
+                    normal, "e17_ibar_bg_h.png";
+                    border, 6 6 6 6;
                 }
-                color, 255 255 255 255;
             }
         }
-        part {
-            name, "title_bar";
-            mouse_events, 0;
-            description {
-                state, "default" 0.0;
-                visible, 0;
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }
-                image {
-                    normal, "e17_titlebar.png";
-                    border, 8 8 8 8;
-                }
-                color, 255 255 255 0;
-            }  
-            description {
-                state, "active" 0.0;
-                visible, 1; 
-                rel1 {
-                    relative, 0.0 0.0;
-                    offset, 0 0;
-                    to, "title_outline";
-                }  
-                rel2 {
-                    relative, 1.0 1.0;
-                    offset, -1 -1;
-                    to, "title_outline";
-                }  
-                image {
-                    normal, "e17_titlebar.png";
-                    border, 8 8 8 8;
-                }  
-                color, 255 255 255 255;
-            }  
-        }  
+        ITEM_OVERLAY("entry_bg", "h");
+
         part {
             name, "entry";
             type, TEXT;
             effect, SHADOW;
             mouse_events, 0;
+
             description {
                 state, "default" 0.0;
+                min: 100 30;
                 rel1 {
                     relative, 0.0 0.0;
-                    offset, 8 6; 
-                    to, "title_outline";
+                    offset, 8 6;
                 }  
                 rel2 {
                     relative, 1.0 1.0;
@@ -309,4 +50,3 @@
     }
 }
 
-
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/button.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- button.edc	16 May 2005 00:27:32 -0000	1.2
+++ button.edc	26 May 2005 00:34:20 -0000	1.3
@@ -1,222 +1,11 @@
-part {
-    name:          "button";
-    mouse_events,  0;
-
-    description {
-	state,    "default" 0.0;
-	rel1.to, "text";
-	rel2.to, "text";
-	rel1 {
-	    relative, 0.0 0.0;
-	    offset, -8 -2;
-	}
-	
-	rel2 {
-	    relative, 1.0 1.0;
-	    offset, 6 -1;
-	}
-	
-	image {
-	    normal, "e17_button.png";
-	    border, 8 8 8 8;
-	}
-    }
-    description {
-	state,    "clicked" 0.0;
-	inherit,  "default" 0.0;
-	image {
-	    normal, "e17_button2.png";
-	}
-    }
-}
-part {
-    name, "text";
-    type, TEXT;
-    effect, SHADOW;
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 8 2;
-        }  
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -6 -2;
-        }  
-        color, 0 0 0 255;
-        color3, 255 255 255 128;
-        text {
-            text, "Item Label";
-            font, "Vera";
-            size, 10;
-            min, 1 1;
-            align, 0.5 0.5;
-        }
-    }
-}
-part {
-    name, "title_glint_clip";
-    type, RECT;
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        rel1 {
-            offset, 3 3;
-            to, "button";
-        }
-        rel2 {
-            offset, -4 -4;
-            to, "button";
-        }
-        color, 255 255 255 255;
-    }
-}
-part {
-    name, "title_glint_1";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        align, 0.0 0.0;
-        max, 34 13;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 2 2;
-            to, "button";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -3 -3;
-            to, "button";
-        }
-        image {
-            normal, "e17_titlebar_glint1.png"; 
-            border, 5 0 5 0;
-        }  
-        fill {
-            smooth, 0;
-        }
-    } 
-    description {   
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-    }  
-}        
-part {   
-    name, "title_glint_2";
-    mouse_events, 0;
-    clip_to, "title_glint_clip";
-    description {   
-        state, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        align, 1.0 0.5;
-        max, 0 0;
-        rel1 {      
-            relative, 0.0 0.0;
-            offset, 3 3;
-            to, "button";
+    group {
+        name, "button";
+        parts {
+#include "parts/button_parts.edc"
         }
-        rel2 {    
-            relative, 0.0 1.0;
-            offset, 3 -4;
-            to, "button";
-        }  
-        image {
-            normal, "e17_titlebar_glint2.png";
-            border, 0 0 5 5;
-        }
-        fill {
-            smooth, 0;
-        }  
-    }  
-    description {
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.5 0.5;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 3 3;
-        }
-        rel2 {
-            relative, 0.0 1.0;
-            offset, 3 -4;
-        }
-    }
-    description {
-        state, "active2" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 128;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.5 0.5;
-        rel1 {
-            relative, 1.0 0.0;
-            offset, -4 3;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -4 -4;
+
+        programs {
+#include "programs/button_progs.edc"
         }
     }
-    description {
-        state, "active3" 0.0;
-        inherit, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.0 0.5;
-        rel1 {
-            relative, 1.0 0.0;
-            offset, -4 3;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -4 -4;
-        }
-    }  
-}     
-part {   
-    name, "title_glint_3";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0; 
-        color, 255 255 255 0;
-        align, 1.0 1.0;
-        max, 34 13;
-        rel1 {    
-            relative, 0.0 0.0;
-            offset, 2 2;
-            to, "button";
-        }
-        rel2 {    
-            relative, 1.0 1.0;
-            offset, -3 -3;
-            to, "button";
-        }  
-        image {
-            normal, "e17_titlebar_glint3.png";
-            border, 0 5 0 5;
-        }  
-        fill {
-            smooth, 0;
-        }
-    }  
-    description {
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-    }  
-}
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/button_progs.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- button_progs.edc	16 May 2005 00:27:33 -0000	1.2
+++ button_progs.edc	26 May 2005 00:34:20 -0000	1.3
@@ -43,10 +43,9 @@
      target, "title_glint_1";
      target, "title_glint_2";
      target, "title_glint_3";
- }
+}
 
-program 
-{
+program {
     name, "button_down";
     signal, "mouse,down,1";
     source, "overlay";
@@ -54,9 +53,7 @@
     target, "button";
     
 }
-
-program 
-{
+program {
     name, "button_up";
     signal, "mouse,up,1";
     source, "overlay";
@@ -64,3 +61,4 @@
     target, "button";
     
 }
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/default.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- default.edc	16 May 2005 00:27:33 -0000	1.2
+++ default.edc	26 May 2005 00:34:20 -0000	1.3
@@ -1,770 +1,18 @@
-
-images {
-    image, "e.png" COMP;
-    image, "logo.png" COMP;
-    image, "bg.png" COMP;
-    image, "text_sel.png" COMP;
-    image, "panel.png" COMP;
-    image, "up.png" COMP;
-    image, "down.png" COMP;
-    image, "e17_menu_bg.png" COMP;
-    image, "e17_menu_arrow.png" COMP;
-    image, "e17_menu_bg_border.png" COMP;
-    image, "e17_titlebar.png" COMP;
-    image, "e17_titlebar_glint1.png" COMP;
-    image, "e17_titlebar_glint2.png" COMP;
-    image, "e17_titlebar_glint3.png" COMP;
-    image, "e17_titlebar_outline.png" COMP;
-    image, "e17_titlebar_shadow1.png" COMP;
-    image, "e17_titlebar_shadow2.png" COMP;
-    image: "e17_button.png" LOSSY 90;
-    image: "e17_button2.png" LOSSY 90;
-    image: "e17_ibar_bg_h.png" LOSSY 90;
-    image: "e17_ibar_over_h.png" LOSSY 90;
-    image: "e17_ibar_bg_v.png" LOSSY 90;
-    image: "e17_ibar_over_v.png" LOSSY 90;
-}
+#include "images/images.edc"
 
 fonts {
     font, "Vera.ttf" "Vera";
     font, "VeraBd.ttf" "VeraBd";
 }
 
-collections {
-    group {
-        name, "Main";
-
-        parts {
-            /* generic bg stuff */
-            part {
-                name, "bg";
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 0;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                    }
-                    image {
-                        normal, "bg.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, -1 -1;
-                        }
-                    }
-                }
-            }
-            part {
-                name, "e_logo";
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, -30 -40;
-                    }
-                    rel2 {
-                        relative, 0.0 0.0;
-                        offset, 90 120;
-                    }
-                    image {
-                        normal, "logo.png";
-                    }
-                    color, 255 255 255 64;
-                }
-            }
-            part {
-                name, "e";
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, -9 2;
-                        to, "title";
-                    }
-                    rel2 {
-                        relative, 0.0 0.0;
-                        offset, 3 17;
-                        to, "title";
-                    }
-                    image {
-                        normal, "e.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-            }
-            part {
-                name, "title";
-                type, TEXT;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 1.0 1.0;
-                        offset, -80 -24;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -5 -2;
-                    }
-                    text {
-                        text, "NTANGLE";
-                        font, "VeraBd";
-                        size, 12;
-                    }
-                    color, 0 0 0 255;
-                }
-            }
-
-            /* the eapps bar */
-            part {
-                name, "eapps_bar_body";
-                description {
-                    state, "default" 0.0;
-		    color, 255 255 255 220;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 28 0;
-                    }
-                    rel2 {
-                        relative, 0.0 1.0;
-                        offset, 80 -80;
-                    }
-                    image {
-			normal, "e17_ibar_bg_v.png";
-                        border, 13 13 13 13;
-                    }
-		}
-	    }
-    	    part {
-		name: "eapps_bar_body_overlay";
-		mouse_events:  0;
-		description {
-		    state:    "default" 0.0;
-		    color, 255 255 255 255;
-		    rel1.to, "eapps_bar_body";
-		    rel2.to, "eapps_bar_body";
-		    
-		    image {
-			normal: "e17_ibar_over_v.png";
-			border: 13 13 13 13;
-		    }
-		}
-	    }
-            part {
-                name, "eapps_bar";
-                type, SWALLOW;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        to, "eapps_bar_body";
-                        offset, 0 28;
-                    }
-                    rel2 {
-                        to, "eapps_bar_body";
-                        offset, 0 -28;
-                    }
-                }
-            }
-            part {
-                name, "up_arrow";
-                mouse_events, 1;
-                repeat_events, 0;
-                description {
-                    state, "default" 0.0;
-                    min, 29 21;
-                    max, 29 21;
-		    color, 255 255 255 180;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 6;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, 0 27;
-                        to, "eapps_bar_body";
-                    }
-                    image {
-                        normal, "up.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-                description {
-                    state, "glow" 0.0;
-                    inherit, "default" 0.0;
-                    color, 246 207 135 255;
-                }
-                description {
-                    state, "hidden" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 0;
-                }
-            }
-            part {
-                name, "down_arrow";
-                mouse_events, 1;
-                repeat_events, 0;
-                description {
-                    state, "default" 0.0;
-                    min, 29 21;
-                    max, 29 21;
-		    color, 255 255 255 180;
-                    rel1 {
-                        relative, 0.0 1.0;
-                        offset, 0 -6;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, 0 -27;
-                        to, "eapps_bar_body";
-                    }
-                    image {
-                        normal, "down.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-                description {
-                    state, "glow" 0.0;
-                    inherit, "default" 0.0;
-                    color, 246 207 135 255;
-                }
-                description {
-                    state, "hidden" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 0;
-                }
-            }
-
-            /* eapp info box */
-            part {
-                name, "eapp_info";
-                description {
-                    state, "default" 0.0;
-                    visible, 0;
-                    rel1 {
-                        relative, 0.0 1.0;
-                        offset, 28 -79;
-                    }
-                    rel2 {
-                        relative, 0.0 1.0;
-                        offset, 200 -40;
-                    }
-		    image {
-			normal, "e17_ibar_bg_v.png";
-                        border, 13 13 13 13;
-                    }
-                }
-                description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-            }
-	    part {
-		name:          "eapp_info_overlay";
-		mouse_events:  0;
-		description {
-		    state:    "default" 0.0;
-		    visible, 0;
-		    rel1.to, "eapp_info";
-		    rel2.to, "eapp_info";
-		    
-		    image {
-			normal: "e17_ibar_over_v.png";
-			border: 13 13 13 13;
-		    }
-		}
-		description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-	    }
-            part {
-                name, "eapp_info_name";
-                type, TEXT;
-                description {
-                    state, "default" 0.0;
-                    visible, 0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 2 14;
-                        to, "eapp_info";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, 2 14;
-                        to, "eapp_info";
-                    }
-                    text {
-                        text, "name";
-                        font, "VeraBd";
-                        size, 10;
-                    }
-                    color, 0 0 0 255;
-                }
-                description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-            }
-            part {
-                name, "eapp_info_class";
-                type, TEXT;
-                description {
-                    state, "default" 0.0;
-                    visible, 0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 2 20;
-                        to, "eapp_info";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, 2 32;
-                        to, "eapp_info";
-                    }
-                    text {
-                        text, "class";
-                        font, "VeraBd";
-                        size, 10;
-                    }
-                    color, 0 0 0 255;
-                }
-                description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-            }
-
-            /* the button bar */
-            part {
-                name, "button_bar_body";
-                type, RECT;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 1.0 0.0;
-                        offset, 0 0;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, 0 0;
-                        to, "menu_base";
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-            part {
-                name, "button_bar";
-                type, RECT;
-                description {
-                    state, "default" 0.0;
-		    color, 0 0 0 0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 5 0;
-                        to, "button_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                        to, "button_bar_body";
-                    }
-                }
-            }
-
-            /* the menu */
-            part {
-                name, "base";
-                mouse_events, 0;
-                type, RECT;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 4 4;
-                        to, "menu_base";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -4 -4;
-                        to, "menu_base";
-                    }
-                    color, 221 221 221 0;
-                }
-            }
-            part {
-                name, "menu_base";
-                mouse_events, 0;
-                description {
-                    state, "default" 0.0;
-                    align, 0.5 0.0;
-                    rel1 {
-                        relative, 1.0 0.0;
-                        offset, 5 36;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -5 -2;
-                        to_y, "eapps_bar_body";
-                    }
-                    image {
-                        normal, "e17_ibar_bg_h.png";
-			border, 6 6 6 6;
-                    }
-                }
-            }
-	    part {
-		name:          "menu_base_overlay";
-		mouse_events:  0;
-		description {
-		    state:    "default" 0.0;
-		    color, 255 255 255 255;
-		    rel1.to, "menu_base";
-		    rel2.to, "menu_base";
-		    
-		    image {
-			normal: "e17_ibar_over_h.png";
-			border: 13 13 13 13;
-		    }
-		}
-	    }
-	    
-            part {
-                name, "base3";
-                mouse_events, 0;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 1.0 0.0;
-                        offset, 4 0;
-                        to, "menu_base";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -4 -1;
-                        to, "menu_base";
-                    }
-                    image {
-                        normal, "e17_menu_bg_border.png";
-                        border, 1 1 1 1;
-                        middle, 0;
-                    }
-                    fill {
-                        smooth, 0;
-                    }
-                }
-            }
-            part {
-                name, "menu_items";
-                mouse_events, 0;
-                type, RECT;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 13 13;
-                        to, "menu_base";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -13 -13;
-                        to, "menu_base";
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-
-            /* cmd buttons */
-            part {
-                name, "cmd_bar";
-                type, SWALLOW;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 1.0 1.0;
-                        offset, 125 0;
-                        to, "eapps_bar_body";
-                    }
-                    rel2 {
-                        relative, 1.0 0.0;
-                        offset, -1 -1;
-                        to, "title";
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-        }
+#include "macros/macros.inc"
 
-        programs {
-            program {   
-                name, "up_click";
-                source, "up_arrow";
-                signal, "mouse,down,*";
-                action, SIGNAL_EMIT "up,clicked" "*";
-            }               
-            program {   
-                name, "up_click_release";
-                source, "up_arrow"; 
-                signal, "mouse,up,*"; 
-                action, SIGNAL_EMIT "up,click,release" "*";
-            }       
-            program {
-                name, "down_click";
-                source, "down_arrow";
-                signal, "mouse,down,*";
-                action, SIGNAL_EMIT "down,clicked" "*";
-            }
-            program {
-                name, "down_click_release";
-                source, "down_arrow";
-                signal, "mouse,up,*";
-                action, SIGNAL_EMIT "down,click,release" "*";
-            }
-            program {
-                name, "hide";
-                source, "*";
-                signal, "arrows,hide";
-                action, STATE_SET "hidden" 0.0;
-                target, "up_arrow";
-                target, "down_arrow";
-            }
-            program {
-                name, "show";
-                source, "*";
-                signal, "arrows,show";
-                action, STATE_SET "default" 0.0;
-                target, "up_arrow";
-                target, "down_arrow";
-            }
-            program {
-                name, "up_glow";
-                source, "up_arrow";
-                signal, "mouse,in";
-                action, STATE_SET "glow" 0.0;
-                target, "up_arrow";
-            }
-            program {
-                name, "up_unglow";
-                source, "up_arrow";
-                signal, "mouse,out";
-                action, STATE_SET "default" 0.0;
-                target, "up_arrow";
-            }
-            program {
-                name, "down_glow";
-                source, "down_arrow";
-                signal, "mouse,in";
-                action, STATE_SET "glow" 0.0;
-                target, "down_arrow";
-            }
-            program {
-                name, "down_unglow";
-                source, "down_arrow";
-                signal, "mouse,out";
-                action, STATE_SET "default" 0.0;
-                target, "down_arrow";
-            }
-            program {
-                name, "eapp,info,hide";
-                source, "*";
-                signal, "eapp,info,hide";
-                action, STATE_SET "default" 0.0;
-                target, "eapp_info";
-		target, "eapp_info_overlay";
-                target, "eapp_info_name";
-                target, "eapp_info_class";
-                transition, LINEAR 0.25;
-            }
-            program {
-                name, "eapp,info,show";
-                source, "*";
-                signal, "eapp,info,show";
-                action, STATE_SET "show" 0.0;
-                target, "eapp_info";
-		target, "eapp_info_overlay";
-                target, "eapp_info_name";
-                target, "eapp_info_class";
-                transition, LINEAR 0.25;
-            }
-        }
-    }
-
-    group {
-        name, "menu_item";
-        parts {
-            part {
-                name, "icon";
-                type, SWALLOW;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 0;
-                    }
-                    rel2 {
-                        relative, 0.0 1.0;
-                        offset, 28 -1;
-                    }
-                }
-            }
+collections {
 
+#include "main.edc"
 #include "menu_item.edc"
-
-            part {
-                name, "arrow";
-                mouse_events, 0;
-                description {
-                    state, "default" 0.0;
-                    visible, 0;
-                    min, 6 12;
-                    max, 6 12;
-                    rel1 {
-                        relative, 1.0 0.0;
-                        offset, -12 0;
-                        to, text;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                        to, text;
-                    }
-                    image {
-                        normal, "e17_menu_arrow.png";
-                    }
-                }
-                description {
-                    state, "show" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 1;
-                }
-            }
-            part {
-                name, "overlay";
-                type, RECT;
-                mouse_events, 1;
-                description {
-                    state, "default" 0.0;
-                    visible, 1;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 0;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-        }
-
-        programs {
-            program {
-                name, "arrow,show";
-                source, "*";
-                signal, "arrow,show";
-                action, STATE_SET "show" 0.0;
-                target, "arrow";
-            }
-            program {
-                name, "dir,clicked";
-                source, "*";
-                signal, "mouse,up,1";
-                action, SIGNAL_EMIT "dir,clicked" "*";
-            }
-            program {
-                name, "del,clicked";
-                source, "*";
-                signal, "mouse,up,2";
-                action, SIGNAL_EMIT "del,clicked" "*";
-            }
-            program {
-                name, "move,down";
-                source, "*";
-                signal, "mouse,down,3";
-                action, SIGNAL_EMIT "move,start" "*";
-            }
-#include "menu_item_progs.edc"
-        }
-    }
-
-    group {
-        name, "button";
-        parts {
-#include "button.edc"
-            part {
-                name, "overlay";
-                type, RECT;
-                mouse_events, 1;
-                description {
-                    state, "default" 0.0;
-                    visible, 1;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 0;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                    }
-                    color, 0 0 0 0;
-                }
-            }
-        }
-
-        programs {
-#include "button_progs.edc"
-            program {
-                name, "button,clicked";
-                source, "*";
-                signal, "mouse,up,1";
-                action, SIGNAL_EMIT "button,clicked" "*";
-            }
-        }
-    }
-
 #include "add_dir_box.edc"
+#include "button.edc"    
+
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/menu_item.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- menu_item.edc	16 May 2005 00:27:33 -0000	1.1
+++ menu_item.edc	26 May 2005 00:34:20 -0000	1.2
@@ -1,379 +1,9 @@
-part {   
-    name, "title_outline";
-    mouse_events, 0; 
-    description {
-        state, "default" 0.0;
-        min, 14 14;
-        visible, 1;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 30 -1;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-        }  
-        image {
-            normal, "e17_titlebar_outline.png";
-            border, 8 8 8 8;
-            middle, 0;
-        }  
-        fill {
-            smooth, 0;
-        }  
-        color, 255 255 255 255;
+group {
+    name, "menu_item";
+    parts {
+       #include "parts/menu_item_parts.edc"
     }
-    description {
-        state, "active" 0.0;
-        min, 14 14;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 30 -1;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-        }
-        image {
-            normal, "e17_titlebar_outline.png";
-            border, 8 8 8 8;
-            middle, 0;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 0;
+    programs {
+        #include "programs/menu_item_progs.edc"
     }
 }
-part {
-    name, "title_shadow2";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow2.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 0;
-    }
-    description {
-        state, "active" 0.0;
-        visible, 1;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow2.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 255;
-    }
-}     
-part {
-    name, "title_shadow1";
-    mouse_events, 0;
-    description {   
-        state, "default" 0.0;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow1.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 0;
-    }     
-    description {   
-        state, "active" 0.0;
-        visible, 1;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar_shadow1.png";
-            border, 8 8 8 8;
-        }
-        fill {
-            smooth, 0;
-        }
-        color, 255 255 255 255;
-    }
-}
-part {
-    name, "title_bar";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }
-        image {
-            normal, "e17_titlebar.png";
-            border, 8 8 8 8;
-        }
-        color, 255 255 255 0;
-    }  
-    description {
-        state, "active" 0.0;
-        visible, 1; 
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 0 0;
-            to, "title_outline";
-        }  
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -1 -1;
-            to, "title_outline";
-        }  
-        image {
-            normal, "e17_titlebar.png";
-            border, 8 8 8 8;
-        }  
-        color, 255 255 255 255;
-    }  
-}  
-part {
-    name, "text";
-    type, TEXT;
-    effect, SHADOW;
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 8 6; 
-            to, "title_outline";
-        }  
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -8 -6;
-        }  
-        color, 0 0 0 255;
-        color3, 255 255 255 128;
-        text {
-            text, "Item Label";
-            font, "Vera";
-            size, 10;
-            min, 1 1;
-            align, 0.0 0.5;
-        }
-    }
-}
-part {
-    name, "title_glint_clip";
-    type, RECT;
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        rel1 {
-            offset, 3 3;
-            to, "title_bar";
-        }
-        rel2 {
-            offset, -4 -4;
-            to, "title_bar";
-        }
-        color, 255 255 255 255;
-    }
-}
-part {
-    name, "title_glint_1";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        align, 0.0 0.0;
-        max, 34 13;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 2 2;
-            to, "title_bar";
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -3 -3;
-            to, "title_bar";
-        }
-        image {
-            normal, "e17_titlebar_glint1.png"; 
-            border, 5 0 5 0;
-        }  
-        fill {
-            smooth, 0;
-        }
-    } 
-    description {   
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-    }  
-}        
-part {   
-    name, "title_glint_2";
-    mouse_events, 0;
-    clip_to, "title_glint_clip";
-    description {   
-        state, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        align, 1.0 0.5;
-        max, 0 0;
-        rel1 {      
-            relative, 0.0 0.0;
-            offset, 3 3;
-            to, "title_bar";
-        }
-        rel2 {    
-            relative, 0.0 1.0;
-            offset, 3 -4;
-            to, "title_bar";
-        }  
-        image {
-            normal, "e17_titlebar_glint2.png";
-            border, 0 0 5 5;
-        }
-        fill {
-            smooth, 0;
-        }  
-    }  
-    description {
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.5 0.5;
-        rel1 {
-            relative, 0.0 0.0;
-            offset, 3 3;
-        }
-        rel2 {
-            relative, 0.0 1.0;
-            offset, 3 -4;
-        }
-    }
-    description {
-        state, "active2" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 128;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.5 0.5;
-        rel1 {
-            relative, 1.0 0.0;
-            offset, -4 3;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -4 -4;
-        }
-    }
-    description {
-        state, "active3" 0.0;
-        inherit, "default" 0.0;
-        visible, 0;
-        color, 255 255 255 0;
-        max, 169 9999;
-        min, 169 8;
-        align, 0.0 0.5;
-        rel1 {
-            relative, 1.0 0.0;
-            offset, -4 3;
-        }
-        rel2 {
-            relative, 1.0 1.0;
-            offset, -4 -4;
-        }
-    }  
-}     
-part {   
-    name, "title_glint_3";
-    mouse_events, 0;
-    description {
-        state, "default" 0.0;
-        visible, 0; 
-        color, 255 255 255 0;
-        align, 1.0 1.0;
-        max, 34 13;
-        rel1 {    
-            relative, 0.0 0.0;
-            offset, 2 2;
-            to, "title_bar";
-        }
-        rel2 {    
-            relative, 1.0 1.0;
-            offset, -3 -3;
-            to, "title_bar";
-        }  
-        image {
-            normal, "e17_titlebar_glint3.png";
-            border, 0 5 0 5;
-        }  
-        fill {
-            smooth, 0;
-        }
-    }  
-    description {
-        state, "active" 0.0;
-        inherit, "default" 0.0;
-        visible, 1;
-        color, 255 255 255 255;
-    }  
-}     
-

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	TODO 


Log Message:
- update todo

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- TODO	16 May 2005 00:27:33 -0000	1.3
+++ TODO	26 May 2005 00:40:09 -0000	1.4
@@ -1,6 +1,5 @@
 Just the stuff I can think of...
 
-* need to add a scrollbar for the menu
 * someway to attach .directory.eapp files to directories
 * directory renaming?
 * if an eapp is under the arrows in the left menu it will be clicked when

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	TODO 


Log Message:
- todo updates

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- TODO	26 May 2005 00:40:09 -0000	1.4
+++ TODO	26 May 2005 01:23:55 -0000	1.5
@@ -6,5 +6,11 @@
   you click the arrow
 * need to handle directories that aren't in the .order file. They come at
   the end of the list
-
+* can also ahve .eapps in the directory that aren't in the .order file (I
+  think).
+* E17 will look for the .eapp in the directory first before checking the all
+  directory (i think).
+* need to add monitoring of the .order files and the top directories
+  - if something changes need to popup a warning to the user and ask if
+    they want to reload the .order file

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	emblem_ui.c 


Log Message:
- update todo list with bug from Nathan

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- emblem_ui.c	22 May 2005 17:35:56 -0000	1.12
+++ emblem_ui.c	31 May 2005 16:28:55 -0000	1.13
@@ -15,6 +15,9 @@
  *    for each container, you select the active one and it wills et the bg
  *    on that container?
  *  * disable the scroll arrow when your at the edge
+ *  * The calculation to turn on the scroll arrows seems to be a bit off.
+ *    Make the arrows diappear and then slowly resize down, seems to be
+ *    about a 10px delay before the arrows kick in
  */
 
 #define WIDTH 600

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	TODO entangle_ui.c 


Log Message:
- patch from Mathieu Lamar (sativas) to fixup the problem with clicking on the
  arrows and having the eapp be selected

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/TODO,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- TODO	26 May 2005 01:23:55 -0000	1.5
+++ TODO	3 Jun 2005 15:54:12 -0000	1.6
@@ -2,14 +2,11 @@
 
 * someway to attach .directory.eapp files to directories
 * directory renaming?
-* if an eapp is under the arrows in the left menu it will be clicked when
-  you click the arrow
 * need to handle directories that aren't in the .order file. They come at
   the end of the list
-* can also ahve .eapps in the directory that aren't in the .order file (I
-  think).
+* need to handle eapps that aren't in the .order file too
 * E17 will look for the .eapp in the directory first before checking the all
-  directory (i think).
+  directory.
 * need to add monitoring of the .order files and the top directories
   - if something changes need to popup a warning to the user and ask if
     they want to reload the .order file
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/entangle_ui.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- entangle_ui.c	26 May 2005 00:34:22 -0000	1.7
+++ entangle_ui.c	3 Jun 2005 15:54:12 -0000	1.8
@@ -676,25 +676,30 @@
     Evas_Object *o;
     Evas_Event_Mouse_Down *e;
     Entangle_Eapp *eapp;
+    Evas_Coord y, h;
 
     e = ev;
     eapp = data;
 
-    /* XXX check we're not over the arrows */
-
-    o = edje_object_add(evas);
-    edje_object_file_set(o, eapp->path, "icon");
-    evas_object_move(o, e->canvas.x - 18, e->canvas.y - 18);
-    evas_object_resize(o, 36, 36);
-    evas_object_layer_set(o, 2);
-    evas_object_color_set(o, 255, 255, 255, 198);
-    evas_object_show(o);
+    o = evas_object_name_find(evas, "edje");
+    edje_object_part_geometry_get(o, "eapps_bar", NULL, &y, NULL, &h);
 
-    evas_object_data_set(o, "eapp", eapp);
-    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE,
-                                        entangle_ui_cb_mouse_move, o);
-    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP,
-                                        entangle_ui_cb_mouse_up, o);
+    if ((e->canvas.y > y) && (e->canvas.y < (y + h)))
+    {
+        o = edje_object_add(evas);
+        edje_object_file_set(o, eapp->path, "icon");
+        evas_object_move(o, e->canvas.x - 18, e->canvas.y - 18);
+        evas_object_resize(o, 36, 36);
+        evas_object_layer_set(o, 2);
+        evas_object_color_set(o, 255, 255, 255, 198);
+        evas_object_show(o);
+
+        evas_object_data_set(o, "eapp", eapp);
+        evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE,
+                                            entangle_ui_cb_mouse_move, o);
+        evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP,
+                                            entangle_ui_cb_mouse_up, o);
+    }
 }
 
 static void

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default/macros




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/emblem/default/macros added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default/programs




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/emblem/default/programs added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default/parts




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/emblem/default/parts added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default/images


Added Files:
	e17_ibar_bg_h.png e17_ibar_over_h.png images.edc 
Removed Files:
	panel.png 


Log Message:
- theme update/cleanup from Mathieu Lamar (sativas) to make emblem match
  entangle better

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default/macros


Added Files:
	macros.inc 


Log Message:
- theme update/cleanup from Mathieu Lamar (sativas) to make emblem match
  entangle better

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default/parts


Added Files:
	bg_parts.edc current_bg_parts.edc menu_parts.edc 


Log Message:
- theme update/cleanup from Mathieu Lamar (sativas) to make emblem match
  entangle better

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default/programs


Added Files:
	main_programs.edc 


Log Message:
- theme update/cleanup from Mathieu Lamar (sativas) to make emblem match
  entangle better

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/emblem/default


Modified Files:
	default.edc 


Log Message:
- theme update/cleanup from Mathieu Lamar (sativas) to make emblem match
  entangle better
 

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/emblem/default/default.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- default.edc	9 Feb 2005 16:39:14 -0000	1.1
+++ default.edc	3 Jun 2005 16:10:15 -0000	1.2
@@ -1,11 +1,5 @@
 images {
-    image, "e.png" COMP;
-    image, "logo.png" COMP;
-    image, "bg.png" COMP;
-    image, "text_sel.png" COMP;
-    image, "panel.png" COMP;
-    image, "left.png" COMP;
-    image, "right.png" COMP;
+#include "images/images.edc"
 }
 
 fonts {
@@ -13,377 +7,20 @@
     font, "VeraBd.ttf" "VeraBold";
 }
 
+#include "macros/macros.inc"
+
 collections {
     group {
         name, "Main";
 
         parts {
-            part {
-                name, "background";
-
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 0;
-                    } 
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                    }
-                    image {
-                        normal, "bg.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-            }
-
-            part {
-                name, "e_logo";
-
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, -30 -40;
-                    }
-                    rel2 {
-                        relative, 0.0 0.0;
-                        offset, 90 120;
-                    }
-                    image {
-                        normal, "logo.png";
-                    }
-                    color, 255 255 255 64;
-                }
-            }
-
-            part {
-                name, "menu_body";
-
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 1.0;
-                        offset, 0 -80;
-                    } 
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, 0 -28;
-                    }
-                    image {
-                        normal, "panel.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-            }
-
-            part {
-                name, "menu_bar";
-                type, SWALLOW;
-
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        to, "menu_body";
-                        offset, 24 0;
-                    } 
-                    rel2 {
-                        to, "menu_body";
-                        offset, -24 -6;
-                    }
-                }
-            }
-
-            part {
-                name, "left_arrow";
-                mouse_events, 1;
-
-                description {
-                    state, "default" 0.0;
-
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 2 0;
-                        to, "menu_body";
-                    }
-                    rel2 {
-                        relative, 0.0 1.0;
-                        offset, 20 0;
-                        to, "menu_body";
-                    }
-
-                    image {
-                        normal, "left.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-                description {
-                    state, "glow" 0.0;
-                    inherit, "default" 0.0;
-                    color, 246 207 135 255;
-                }
-                description {
-                    state, "hidden" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 0;
-                }
-            }
-
-            part {
-                name, "right_arrow";
-                mouse_events, 1;
-
-                description {
-                    state, "default" 0.0;
-
-                    rel1 {
-                        relative, 1.0 0.0;
-                        offset, -22 0;
-                        to, "menu_body";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -2 0;
-                        to, "menu_body";
-                    }
-
-                    image {
-                        normal, "right.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-                description {
-                    state, "glow" 0.0;
-                    inherit, "default" 0.0;
-                    color, 246 207 135 255;
-                }
-                description {
-                    state, "hidden" 0.0;
-                    inherit, "default" 0.0;
-                    visible, 0;
-                }
-            }
-
-            part {
-                name, "title";
-                type, TEXT;
-
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 1.0 1.0;
-                        offset, -60 -24;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -5 -2;
-                    }
-                    text {
-                        text, "MBLEM";
-                        font, "VeraBold";
-                        size, 12;
-                    }
-                    color, 0 0 0 255;
-                }
-            }
-
-            part {
-                name, "e";
-
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, -11 2;
-                        to, "title";
-                    }
-                    rel2 {
-                        relative, 0.0 0.0;
-                        offset, 0 16;
-                        to, "title";
-                    }
-                    image {
-                        normal, "e.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-            }
-
-            part {
-                name, "current_bg";
-
-                description {
-                    state, "default" 0.0;
-
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, -10 -10;
-                        to, "current";
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, 10 10;
-                        to, "current";
-                    }
-                    image {
-                        normal, "text_sel.png";
-                        border, 10 10 10 10;
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    } 
-                }
-            }
-
-            part {
-                name, "current";
-                type, SWALLOW;
-
-                description {
-                    state, "default" 0.0;
-                    aspect, 1 1.333333;
-
-                    rel1 {
-                        relative, 0 0;
-                        offset, 36 36;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -36 -100;
-                    }
-                }
-            }
+#include "parts/bg_parts.edc"
+#include "parts/menu_parts.edc"
+#include "parts/current_bg_parts.edc"
         }
-
         programs {
-            program {
-                name, "left_click";
-                source, "left_arrow";
-                signal, "mouse,down,*";
-                action, SIGNAL_EMIT "left,clicked" "*";
-            }
-
-            program {
-                name, "left_click_release";
-                source, "left_arrow";
-                signal, "mouse,up,*";
-                action, SIGNAL_EMIT "left,click,release" "*";
-            }
-
-            program {
-                name, "right_click";
-                source, "right_arrow";
-                signal, "mouse,down,*";
-                action, SIGNAL_EMIT "right,clicked" "*";
-            }
-
-            program {
-                name, "right_click_release";
-                source, "right_arrow";
-                signal, "mouse,up,*";
-                action, SIGNAL_EMIT "right,click,release" "*";
-            }
-
-            program {
-                name, "hide";
-                source, "*";
-                signal, "arrows,hide";
-                action, STATE_SET "hidden" 0.0;
-                target, "left_arrow";
-                target, "right_arrow";
-            }
-
-            program {
-                name, "show";
-                source, "*";
-                signal, "arrows,show";
-                action, STATE_SET "default" 0.0;
-                target, "left_arrow";
-                target, "right_arrow";
-            }
-
-            program {
-                name, "left_glow";
-                source, "left_arrow";
-                signal, "mouse,in";
-                action, STATE_SET "glow" 0.0;
-                target, "left_arrow";
-            }
-            program {
-                name, "left_unglow";
-                source, "left_arrow";
-                signal, "mouse,out";
-                action, STATE_SET "default" 0.0;
-                target, "left_arrow";
-            }
-            program {
-                name, "right_glow";
-                source, "right_arrow";
-                signal, "mouse,in";
-                action, STATE_SET "glow" 0.0;
-                target, "right_arrow";
-            }
-            program {
-                name, "right_unglow";
-                source, "right_arrow";
-                signal, "mouse,out";
-                action, STATE_SET "default" 0.0;
-                target, "right_arrow";
-            }
-        }
+#include "programs/main_programs.edc"
+    	}
     }
 }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/exige/default


Added Files:
	.cvsignore default.edc 
Removed Files:
	default.edj 


Log Message:
- add the default.edc file and remvoe the default.edj file
- add .cvsignore

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	emblem.c 


Log Message:
- cleanup memory, thanks caro

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emblem.c	9 Feb 2005 16:39:16 -0000	1.1
+++ emblem.c	12 Jun 2005 18:41:42 -0000	1.2
@@ -15,6 +15,7 @@
     if (!em) return;
 
     if (em->display) free(em->display);
+    if (em->theme) free(em->theme);
     free(em);
 }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils


Modified Files:
	configure.in 


Log Message:
- convert emblem to use Epsilon for its thumbnail creation. The initial load
  will still be slow, but after that subsequent restarts of emblem should be
  quick.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- configure.in	9 Jun 2005 22:26:32 -0000	1.11
+++ configure.in	20 Jul 2005 02:10:38 -0000	1.12
@@ -212,6 +212,19 @@
 AC_SUBST(e_libs)
 AC_SUBST(e_config_apps_dir)
 	
+AC_ARG_WITH(epsilon-config,
+[  --with-epsilon-config=EPSILON_CONFIG    use epsilon-config specified ],
+[
+  EPSILON_CONFIG=$withval;
+  echo "using "$EPSILON_CONFIG" for epsilon-config";
+    ],[
+  PROG="epsilon-config";
+  AC_PATH_PROG(EPSILON_CONFIG, $PROG, "", $PATH)
+])
+epsilon_cflags=`$EPSILON_CONFIG --cflags`
+epsilon_libs=`$EPSILON_CONFIG --libs`
+AC_SUBST(epsilon_cflags)
+AC_SUBST(epsilon_libs)
 
 AC_OUTPUT([
 Makefile

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	entangle_ui.c 


Log Message:
- convert emblem to use Epsilon for its thumbnail creation. The initial load
  will still be slow, but after that subsequent restarts of emblem should be
  quick.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/entangle_ui.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- entangle_ui.c	28 Jun 2005 13:27:42 -0000	1.11
+++ entangle_ui.c	20 Jul 2005 02:10:38 -0000	1.12
@@ -23,7 +23,6 @@
 static void entangle_ui_cb_down_released(void *data, Evas_Object *obj,
                                 const char *emission, const char *src);
 
-
 static void entangle_ui_cb_menu_up_pressed(void *data, Evas_Object *obj,
                                 const char *emission, const char *src);
 static void entangle_ui_cb_menu_up_released(void *data, Evas_Object *obj,
@@ -396,7 +395,6 @@
 
     evas = evas_object_evas_get(obj);
     o = evas_object_name_find(evas, "menu");
-
     esmart_container_scroll_start(o, 2);        
 }
 
@@ -411,11 +409,9 @@
     
     evas = evas_object_evas_get(obj);
     o = evas_object_name_find(evas, "menu");
-
     esmart_container_scroll_stop(o);
 
     y =  esmart_container_scroll_percent_get(o);
-
     o = evas_object_name_find(evas, "edje");
     edje_object_part_drag_value_set(o, "scroll_title_outline", 0, y);
 
@@ -445,11 +441,9 @@
 
     evas = evas_object_evas_get(obj);
     o = evas_object_name_find(evas, "menu");
-
     esmart_container_scroll_stop(o);
 
-    y =  esmart_container_scroll_percent_get(o);
-
+    y = esmart_container_scroll_percent_get(o);
     o = evas_object_name_find(evas, "edje");
     edje_object_part_drag_value_set(o, "scroll_title_outline", 0, y);
 }
@@ -465,7 +459,6 @@
     
     evas = evas_object_evas_get(obj);
     o = evas_object_name_find(evas, "edje");
-
     edje_object_part_drag_value_get(o, "scroll_title_outline", NULL, &y);
 
     o = evas_object_name_find(evas, "menu");

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	Emblem.h Makefile.am emblem_ui.c main.c 


Log Message:
- convert emblem to use Epsilon for its thumbnail creation. The initial load
  will still be slow, but after that subsequent restarts of emblem should be
  quick.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/Emblem.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Emblem.h	5 Jun 2005 05:08:29 -0000	1.4
+++ Emblem.h	20 Jul 2005 02:10:38 -0000	1.5
@@ -12,6 +12,7 @@
 #include <Edje.h>
 #include <Esmart/Esmart_Container.h>
 #include <E_Lib.h>
+#include <Epsilon.h>
 
 #include "config.h"
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am	27 Jun 2005 14:31:12 -0000	1.3
+++ Makefile.am	20 Jul 2005 02:10:38 -0000	1.4
@@ -9,6 +9,7 @@
 	@ecore_cflags@ \
 	@evas_cflags@ \
 	@edje_cflags@ \
+	@epsilon_cflags@ \
 	@esmart_cflags@
 
 bin_PROGRAMS = emblem
@@ -24,5 +25,6 @@
 	@evas_libs@ \
 	@esmart_libs@ \
 	@edje_libs@ \
+	@epsilon_libs@ \
 	-lesmart_container
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- emblem_ui.c	5 Jun 2005 05:08:29 -0000	1.16
+++ emblem_ui.c	20 Jul 2005 02:10:38 -0000	1.17
@@ -104,6 +104,14 @@
     e_lib_theme_dirs_list();
     e_lib_background_dirs_list();
 
+    edje_object_signal_callback_add(em->gui.edje, "left,clicked", "*",
+                                            emblem_left_scroll_down_cb, em);
+    edje_object_signal_callback_add(em->gui.edje, "right,clicked", "*",
+                                            emblem_right_scroll_down_cb, em);
+    edje_object_signal_callback_add(em->gui.edje, "left,click,release", "*",
+                                            emblem_left_scroll_up_cb, em);
+    edje_object_signal_callback_add(em->gui.edje, "right,click,release", "*",
+                                            emblem_right_scroll_up_cb, em);
     return 1;
 }
 
@@ -117,9 +125,9 @@
 {
     Emblem *em;
     Evas_Coord w, h;
-    Evas_Object *o;
     double l;
     const char *state;
+    Evas_Object *o;
 
     em = ecore_evas_data_get(ee, "emblem");
 
@@ -141,36 +149,10 @@
     l = esmart_container_elements_length_get(em->gui.menu);
     state = edje_object_part_state_get(em->gui.edje, "left_arrow", NULL);
 
-    if (l < w)
-    {
-        if (!strcmp(state, "default"))
-        {
+    if ((l < w) && (!strcmp(state, "default")))
             edje_object_signal_emit(em->gui.edje, "arrows,hide", "*");
-            edje_object_signal_callback_del(em->gui.edje, "left,clicked", "*",
-                                                    emblem_left_scroll_down_cb);
-            edje_object_signal_callback_del(em->gui.edje, "right,clicked", "*",
-                                                    emblem_right_scroll_down_cb);
-            edje_object_signal_callback_del(em->gui.edje, "left,click,release", "*",
-                                                    emblem_left_scroll_up_cb);
-            edje_object_signal_callback_del(em->gui.edje, "right,click,release", "*",
-                                                    emblem_right_scroll_up_cb);
-        }
-    }
-    else 
-    {
-        if (!strcmp(state, "hidden"))
-        {
+    else if (!strcmp(state, "hidden"))
             edje_object_signal_emit(em->gui.edje, "arrows,show", "*");
-            edje_object_signal_callback_add(em->gui.edje, "left,clicked", "*",
-                                            emblem_left_scroll_down_cb, em);
-            edje_object_signal_callback_add(em->gui.edje, "right,clicked", "*",
-                                            emblem_right_scroll_down_cb, em);
-            edje_object_signal_callback_add(em->gui.edje, "left,click,release", "*",
-                                            emblem_left_scroll_up_cb, em);
-            edje_object_signal_callback_add(em->gui.edje, "right,click,release", "*",
-                                            emblem_right_scroll_up_cb, em);
-        }
-    }
 }
 
 static void
@@ -185,18 +167,9 @@
     l = esmart_container_elements_length_get(em->gui.menu);
 
     if (l < w)
-        edje_object_signal_emit(em->gui.edje, "arrows,hide", "*");
+            edje_object_signal_emit(em->gui.edje, "arrows,hide", "*");
     else 
-    {
-        edje_object_signal_callback_add(em->gui.edje, "left,clicked", "*",
-                                                emblem_left_scroll_down_cb, em);
-        edje_object_signal_callback_add(em->gui.edje, "right,clicked", "*",
-                                                emblem_right_scroll_down_cb, em);
-        edje_object_signal_callback_add(em->gui.edje, "left,click,release", "*",
-                                                emblem_left_scroll_up_cb, em);
-        edje_object_signal_callback_add(em->gui.edje, "right,click,release", "*",
-                                                emblem_right_scroll_up_cb, em);
-    }
+            edje_object_signal_emit(em->gui.edje, "arrows,show", "*");
 }
 
 static int
@@ -234,11 +207,51 @@
 emblem_evas_object_get(Emblem *em, const char *fname,
                             Evas_Coord w, Evas_Coord h)
 {
+    Epsilon *e;
+    Evas_Object *o;
+
+    if (!(e = epsilon_new(fname)))
+        return NULL;
+
+    epsilon_key_set(e, "desktop/background");
+    epsilon_resolution_set(e, SCREEN_W, SCREEN_H);
+
+    if (epsilon_exists(e) == EPSILON_FAIL)
+        epsilon_generate(e);
+
+    o = evas_object_image_add(ecore_evas_get(em->gui.ee));
+    evas_object_image_file_set(o, epsilon_thumb_file_get(e), NULL);
+    evas_object_move(o, 0, 0);
+    evas_object_resize(o, SCREEN_W, SCREEN_H);
+    evas_object_data_set(o, "file", strdup(fname));
+    evas_object_show(o);
+
+    epsilon_free(e);
+
+    return o;
+}
+
+static void
+emblem_current_bg_set(Emblem *em, char *file) 
+{
+    Evas_Coord w, h;
     Evas_Object *o, *o2, *ob;
     Ecore_Evas *ee2;
     Evas *evas2;
 
-    ob = ecore_evas_object_image_new(em->gui.ee);
+    if (em->gui.current)
+    {
+        edje_object_part_unswallow(em->gui.edje, em->gui.current);
+        evas_object_hide(em->gui.current);
+        evas_object_del(em->gui.current);
+    }
+
+    edje_object_part_geometry_get(em->gui.edje, "current", 
+                                            NULL, NULL, &w, &h);
+
+    em->gui.current = ecore_evas_object_image_new(em->gui.ee);  
+    ob = em->gui.current;
+
     ee2 = evas_object_data_get(ob, "Ecore_Evas");
     evas_object_image_size_set(ob, w, h);
     evas_object_image_fill_set(ob, 0, 0, w, h);
@@ -257,36 +270,17 @@
     evas_object_move(o, 0, 0);
     evas_object_resize(o, SCREEN_W, SCREEN_H);
 
-    if (!edje_object_file_set(o, fname, "desktop/background"))
+    if (!edje_object_file_set(o, file, "desktop/background"))
     {
-        printf("Unable to load file, %s\n", fname);
+        printf("Unable to load file, %s\n", file);
         evas_object_del(o);
-        return NULL;
+        return;
     }
     evas_object_show(o);
 
     evas_object_data_set(ob, "screen_buffer", o2);
-    evas_object_data_set(ob, "file", strdup(fname));
-
-    return ob;
-}
-
-static void
-emblem_current_bg_set(Emblem *em, char *file) 
-{
-    Evas_Coord w, h;
-
-    if (em->gui.current)
-    {
-        edje_object_part_unswallow(em->gui.edje, em->gui.current);
-        evas_object_hide(em->gui.current);
-        evas_object_del(em->gui.current);
-    }
-
-    edje_object_part_geometry_get(em->gui.edje, "current", 
-                                            NULL, NULL, &w, &h);
-
-    em->gui.current = emblem_evas_object_get(em, file, w, h);
+    evas_object_data_set(ob, "file", strdup(file));  
+        
     evas_object_resize(em->gui.current, w, h);
     edje_object_part_swallow(em->gui.edje, "current", em->gui.current);
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- main.c	5 Jun 2005 05:08:29 -0000	1.5
+++ main.c	20 Jul 2005 02:10:38 -0000	1.6
@@ -150,6 +150,8 @@
         goto EDJE_SHUTDOWN;
     }
 
+    epsilon_init();
+
     if (!emblem_ui_init(em))
     {
         printf("Unable to setup UI\n");

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/entangle


Modified Files:
	entangle_ui.c 


Log Message:
- clean this up a bit. Remove some incorrect __UNUSED__ tags.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/entangle/entangle_ui.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- entangle_ui.c	20 Jul 2005 02:10:38 -0000	1.12
+++ entangle_ui.c	20 Jul 2005 14:47:40 -0000	1.13
@@ -253,9 +253,6 @@
             edje_object_signal_emit(edje, "scroll,buttons,show", "*");
     }
 }
-
-    
-            
                 
 static int
 entangle_ui_eapps_bar_populate(Evas_Object *container)
@@ -467,7 +464,7 @@
 
 static void
 entangle_ui_cb_mouse_in(void *data, Evas *evas, 
-                        Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
+                        Evas_Object *obj __UNUSED__, void *ev)
 {
     Entangle_Eapp *eapp;
     Evas_Object *edje;
@@ -509,7 +506,7 @@
 }
 
 static void
-entangle_ui_cb_resize_intercept(void *data, Evas_Object *obj __UNUSED__,
+entangle_ui_cb_resize_intercept(void *data, Evas_Object *obj,
                                     Evas_Coord w, Evas_Coord h)
 {
     Evas_Object *over;
@@ -938,7 +935,7 @@
 }
 
 static void
-entangle_ui_cb_directory_add(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+entangle_ui_cb_directory_add(void *data __UNUSED__, Evas_Object *obj,
                                 const char *emission __UNUSED__,
                                 const char *src __UNUSED__)
 {
@@ -1047,7 +1044,7 @@
 }
 
 static void
-entangle_ui_cb_menu_item_move_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
+entangle_ui_cb_menu_item_move_start(void *data, Evas_Object *obj,
                                     const char *emission __UNUSED__, 
                                     const char *src __UNUSED__)
 {

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	emblem_ui.c 


Log Message:
- change the scroll directions of the buttons. this is the same as entangle
  works. (and it seems more intuitive this way)

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/emblem_ui.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- emblem_ui.c	20 Jul 2005 02:10:38 -0000	1.17
+++ emblem_ui.c	21 Jul 2005 04:48:49 -0000	1.18
@@ -363,7 +363,7 @@
 {
     Emblem *em;
     em = data;
-    esmart_container_scroll_start(em->gui.menu, -2);
+    esmart_container_scroll_start(em->gui.menu, 2);
     return;
 }
 
@@ -373,7 +373,7 @@
 {
     Emblem *em;
     em = data;
-    esmart_container_scroll_start(em->gui.menu, 2);
+    esmart_container_scroll_start(em->gui.menu, -2);
     return;
 }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- clean this up a bit more, break the engrave stuff out to its own function

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- eapp_edit_main.c	20 Aug 2005 14:28:59 -0000	1.19
+++ eapp_edit_main.c	20 Aug 2005 15:07:22 -0000	1.20
@@ -10,6 +10,7 @@
 static int eapp_populate(Ewl_Tree *tree, char *file, char *lang);
 static char *eapp_eet_read(Eet_File *ef, char *key, char *lang);
 static void eapp_eet_write(Eet_File *ef, char *key, char *lang, char *val, int size);
+static void eapp_engrave_write(char *file);
 
 static void eapp_cb_quit(Ewl_Widget *w, void *ev, void *data);
 static void eapp_cb_save(Ewl_Widget *w, void *ev, void *data);
@@ -147,7 +148,6 @@
     tree = ewl_tree_new(TREE_COLS);
     ewl_container_child_append(EWL_CONTAINER(vbox), tree);
     ewl_tree_headers_visible_set(EWL_TREE(tree), FALSE);
-    ewl_tree_mode_set(EWL_TREE(tree), EWL_TREE_MODE_NONE);
     ewl_widget_show(tree);
 
     if (!eapp_populate(EWL_TREE(tree), file, lang))
@@ -242,32 +242,6 @@
     return 1;
 }
 
-static char *
-eapp_eet_read(Eet_File *ef, char *key, char *lang)
-{
-    if (ef)
-    {
-        int size;
-        char buf[4096];
-        char *ret, *r;
-
-        if (lang)
-            snprintf(buf, sizeof(buf), "%s[%s]", key, lang);
-        else
-            snprintf(buf, sizeof(buf), "%s", key);
-
-        r = eet_read(ef, buf, &size);
-        if (r)
-        {
-            ret = malloc(sizeof(char) * (size + 1));
-            snprintf(ret, size + 1, "%s", r);
-            free(r);
-            return ret;
-        }
-    }
-    return strdup("");
-}
-
 static void
 eapp_cb_fd_show(Ewl_Widget *w, void *ev, void *data)
 {
@@ -336,22 +310,115 @@
 {
     Eet_File *ef;
     Ewl_Widget *o;
-    char *icon = NULL, *file = NULL, *lang = NULL;
+    char *file = NULL, *lang = NULL;
     int i;
 
     file = ewl_widget_data_get(w, "file");
     lang = ewl_widget_data_get(w, "lang");
 
+    eapp_engrave_write(file);
+
+    ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
+    if (!ef)
+    {
+        fprintf(stderr, "Error opening file for READ/WRITE.\n");
+        return;
+    }
+
+    /* add all the eet data */
+    for (i = 0; i < (sizeof(keys) / sizeof(keys[0])); i++)
+    {
+        Ewl_Widget *o;
+        char *v = NULL;
+        int s = 0;
+        char c;
+
+        o = ewl_widget_name_find(keys[i].key);
+        if (keys[i].checkbox)
+        {
+            s = 1;
+            c = ewl_checkbutton_is_checked(EWL_CHECKBUTTON(o));
+            v = &c;
+        }
+        else
+        {
+            v = ewl_text_text_get(EWL_TEXT(o));
+            if (v) s = strlen(v);
+        }
+
+        eapp_eet_write(ef, keys[i].key, lang, v, s);
+    }
+
+    eet_close(ef);
+    eapp_cb_quit(NULL, NULL, NULL);
+}
+
+static char *
+eapp_eet_read(Eet_File *ef, char *key, char *lang)
+{
+    if (ef)
+    {
+        int size;
+        char buf[4096];
+        char *ret, *r;
+
+        if (lang)
+            snprintf(buf, sizeof(buf), "%s[%s]", key, lang);
+        else
+            snprintf(buf, sizeof(buf), "%s", key);
+
+        r = eet_read(ef, buf, &size);
+        if (r)
+        {
+            ret = malloc(sizeof(char) * (size + 1));
+            if (ret)
+            {
+                snprintf(ret, size + 1, "%s", r);
+            }
+            else ret = strdup("");
+
+            free(r);
+            return ret;
+        }
+    }
+    return strdup("");
+}
+
+static void
+eapp_eet_write(Eet_File *ef, char *key, char *lang, char *val, int size)
+{
+    char buf[4096];
+
+    if (ef)
+    {
+        if (lang)
+            snprintf(buf, sizeof(buf), "%s[%s]", key, lang);
+        else
+            snprintf(buf, sizeof(buf), "%s", key);
+
+        if (size == 0)
+            eet_delete(ef, buf);
+        else
+            eet_write(ef, buf, val, size, 0);
+    }
+}
+
+static void
+eapp_engrave_write(char *file)
+{
+    Engrave_File *eet;
+    Ewl_Widget *o;
+    char *icon;
+
     o = ewl_widget_name_find("icon");
     icon = ewl_widget_data_get(o, "file");
     if (icon)
     {
-        Engrave_File *eet;
+        char *icon_dir, *icon_file;
         Engrave_Image *image;
         Engrave_Group *grp;
         Engrave_Part *part;
         Engrave_Part_State *ps;
-        char *icon_dir, *icon_file;
 
         icon_file = strrchr(icon, '/');
         *icon_file = '\0';
@@ -388,8 +455,6 @@
     }
     else
     {
-        Engrave_File *eet;
-
         /* if the file dosen't exist, create it */
         if (!ecore_file_exists(file))
         {
@@ -398,57 +463,5 @@
             engrave_file_free(eet);
         }
     }
-
-    ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
-    if (!ef)
-    {
-        fprintf(stderr, "Error opening file for READ/WRITE.\n");
-        return;
-    }
-
-    /* add all the eet data */
-    for (i = 0; i < (sizeof(keys) / sizeof(keys[0])); i++)
-    {
-        Ewl_Widget *o;
-        char *v = NULL;
-        int s = 0;
-        char c;
-
-        o = ewl_widget_name_find(keys[i].key);
-        if (keys[i].checkbox)
-        {
-            s = 1;
-            c = ewl_checkbutton_is_checked(EWL_CHECKBUTTON(o));
-            v = &c;
-        }
-        else
-        {
-            v = ewl_text_text_get(EWL_TEXT(o));
-            if (v) s = strlen(v);
-        }
-
-        eapp_eet_write(ef, keys[i].key, lang, v, s);
-    }
-
-    eet_close(ef);
-    eapp_cb_quit(NULL, NULL, NULL);
 }
 
-static void
-eapp_eet_write(Eet_File *ef, char *key, char *lang, char *val, int size)
-{
-    char buf[4096];
-
-    if (lang)
-        snprintf(buf, sizeof(buf), "%s[%s]", key, lang);
-    else
-        snprintf(buf, sizeof(buf), "%s", key);
-
-    if (size == 0)
-        eet_delete(ef, buf);
-    else
-        eet_write(ef, buf, val, size, 0);
-}
-
-
-

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/eapp_edit added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/default




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/eapp_edit/default added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/fonts




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/eapp_edit/fonts added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/default/images




Log Message:
Directory /cvsroot/enlightenment/e17/apps/e_utils/data/eapp_edit/default/images added to the repository

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/default


Added Files:
	.cvsignore Makefile.am default.edc 


Log Message:
- add a bit of themeing to eapp_edit. This makes the background consistent
  with what is in entangle and emblem

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/fonts


Added Files:
	VeraBd.ttf 


Log Message:
- add a bit of themeing to eapp_edit. This makes the background consistent
  with what is in entangle and emblem

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/default/images


Added Files:
	bg.png e.png logo.png 


Log Message:
- add a bit of themeing to eapp_edit. This makes the background consistent
  with what is in entangle and emblem

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit


Added Files:
	.cvsignore Makefile.am 


Log Message:
- add a bit of themeing to eapp_edit. This makes the background consistent
  with what is in entangle and emblem

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- add a bit of themeing to eapp_edit. This makes the background consistent
  with what is in entangle and emblem

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- eapp_edit_main.c	20 Aug 2005 15:07:22 -0000	1.20
+++ eapp_edit_main.c	21 Aug 2005 05:51:28 -0000	1.21
@@ -3,6 +3,8 @@
 #include <Ecore_File.h>
 #include <Engrave.h>
 
+#include "config.h"
+
 #define TREE_COLS 2
 
 static void eapp_usage(void);
@@ -133,11 +135,16 @@
 eapp_ui_init(char *file, char *lang)
 {
     Ewl_Widget *win, *vbox, *hbox, *tree, *o;
+    char tmp[PATH_MAX];
 
+    snprintf(tmp, PATH_MAX, "%s/data/e_utils_eapp_edit/default.edj", 
+                                                    PACKAGE_DATA_DIR);
     win = ewl_window_new();
     ewl_window_title_set(EWL_WINDOW(win), "Eapp Editor");
     ewl_window_class_set(EWL_WINDOW(win), "Eapp Editor");
     ewl_window_name_set(EWL_WINDOW(win), "Eapp_Editor");
+    ewl_theme_data_str_set(win, "/window/file", tmp);
+    ewl_theme_data_str_set(win, "/window/group", "bg");
     ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, eapp_cb_quit, NULL);
     ewl_widget_show(win);
 
@@ -148,6 +155,8 @@
     tree = ewl_tree_new(TREE_COLS);
     ewl_container_child_append(EWL_CONTAINER(vbox), tree);
     ewl_tree_headers_visible_set(EWL_TREE(tree), FALSE);
+    ewl_theme_data_str_set(tree, "/cell/file", tmp);
+    ewl_theme_data_str_set(tree, "/cell/group", "cell");
     ewl_widget_show(tree);
 
     if (!eapp_populate(EWL_TREE(tree), file, lang))
@@ -217,7 +226,10 @@
     /* add all the eet data */
     for (i = 0; i < (sizeof(keys) / sizeof(keys[0])); i++)
     {
-        row[0] = ewl_text_new(keys[i].name);
+        row[0] = ewl_text_new(NULL);
+        ewl_text_styles_set(EWL_TEXT(row[0]), EWL_TEXT_STYLE_SOFT_SHADOW);
+        ewl_text_shadow_color_set(EWL_TEXT(row[0]), 128, 128, 128, 128);
+        ewl_text_text_set(EWL_TEXT(row[0]), keys[i].name);
         ewl_widget_show(row[0]);
 
         v = eapp_eet_read(ef, keys[i].key, lang);

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils


Modified Files:
	configure.in 


Log Message:
- add a bit of themeing to eapp_edit. This makes the background consistent
  with what is in entangle and emblem

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- configure.in	20 Jul 2005 02:10:38 -0000	1.12
+++ configure.in	21 Aug 2005 05:51:27 -0000	1.13
@@ -236,6 +236,8 @@
 data/entangle/default/Makefile
 data/exige/Makefile
 data/exige/default/Makefile
+data/eapp_edit/Makefile
+data/eapp_edit/default/Makefile
 src/Makefile
 src/bin/Makefile
 src/bin/eapp_edit/Makefile

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin


Modified Files:
	Makefile.am 


Log Message:
- add a bit of themeing to eapp_edit. This makes the background consistent
  with what is in entangle and emblem

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am	5 Jun 2005 14:55:57 -0000	1.5
+++ Makefile.am	21 Aug 2005 05:51:28 -0000	1.6
@@ -3,5 +3,5 @@
 e17setroot \
 entangle \
 emblem \
-exige
+exige

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data


Modified Files:
	Makefile.am 


Log Message:
- actually build the theme

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am	5 Jun 2005 14:55:56 -0000	1.3
+++ Makefile.am	21 Aug 2005 06:01:06 -0000	1.4
@@ -2,5 +2,6 @@
 
 SUBDIRS = emblem \
 entangle \
+eapp_edit \
 exige

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- honour the old -c/--win-class flags to set the window class

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- eapp_edit_main.c	21 Aug 2005 05:51:28 -0000	1.21
+++ eapp_edit_main.c	24 Aug 2005 15:53:45 -0000	1.22
@@ -8,8 +8,8 @@
 #define TREE_COLS 2
 
 static void eapp_usage(void);
-static int eapp_ui_init(char *file, char *lang);
-static int eapp_populate(Ewl_Tree *tree, char *file, char *lang);
+static int eapp_ui_init(char *file, char *lang, char *winclass);
+static int eapp_populate(Ewl_Tree *tree, char *file, char *lang, char *winclass);
 static char *eapp_eet_read(Eet_File *ef, char *key, char *lang);
 static void eapp_eet_write(Eet_File *ef, char *key, char *lang, char *val, int size);
 static void eapp_engrave_write(char *file);
@@ -44,6 +44,7 @@
 {
     char *file = NULL;
     char *lang = NULL;
+    char *winclass = NULL;
     int ret = 1;
     int i;
 
@@ -73,6 +74,19 @@
                 goto ARGS_SHUTDOWN;
             }
         }
+        else if ((!strcmp(argv[i], "-c")) || (!strcmp(argv[i], "--win-class")))
+        {
+            if (++i < argc)
+            {
+                if (winclass) free(winclass);
+                winclass = strdup(argv[i]);
+            }
+            else
+            {
+                fprintf(stderr, "Error, missing argument for win-class.\n");
+                goto ARGS_SHUTDOWN;
+            }
+        }
         else
         {
             if (file) free(file);
@@ -93,7 +107,7 @@
         goto ARGS_SHUTDOWN;
     }
 
-    if (!eapp_ui_init(file, lang))
+    if (!eapp_ui_init(file, lang, winclass))
     {
         fprintf(stderr, "Error initializing e_utils_eapp_edit.\n");
         goto EET_SHUTDOWN;
@@ -107,6 +121,7 @@
 ARGS_SHUTDOWN:
     if (file) free(file);
     if (lang) free(lang);
+    if (winclass) free(winclass);
 EWL_SHUTDOWN:
     ewl_shutdown();
 SHUTDOWN:
@@ -132,7 +147,7 @@
 }
 
 static int
-eapp_ui_init(char *file, char *lang)
+eapp_ui_init(char *file, char *lang, char *winclass)
 {
     Ewl_Widget *win, *vbox, *hbox, *tree, *o;
     char tmp[PATH_MAX];
@@ -159,7 +174,7 @@
     ewl_theme_data_str_set(tree, "/cell/group", "cell");
     ewl_widget_show(tree);
 
-    if (!eapp_populate(EWL_TREE(tree), file, lang))
+    if (!eapp_populate(EWL_TREE(tree), file, lang, winclass))
     {
         fprintf(stderr, "Error getting eap info.\n");
         return 0;
@@ -192,7 +207,7 @@
 }
 
 static int
-eapp_populate(Ewl_Tree *tree, char *file, char *lang)
+eapp_populate(Ewl_Tree *tree, char *file, char *lang, char *winclass)
 {
     Ewl_Widget *row[TREE_COLS];
     Eet_File *ef = NULL;
@@ -240,11 +255,17 @@
         }
         else
         {
+            if (!strcmp(keys[i].key, "app/window/class"))
+            {
+                if (winclass) v = winclass;
+            }
+
             row[1] = ewl_entry_new(v);
         }
         ewl_widget_name_set(row[1], keys[i].key);
         ewl_widget_show(row[1]);
         if (v) free(v);
+        v = NULL;
 
         ewl_tree_row_add(tree, NULL, row);
     }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- patch from ngc.for.life at gmail dot com to add the missing features from
  enlightenment_eapp to eapp_edit

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- eapp_edit_main.c	24 Aug 2005 15:53:45 -0000	1.22
+++ eapp_edit_main.c	24 Aug 2005 15:57:27 -0000	1.23
@@ -34,7 +34,10 @@
             {"app/info/comment", "Comment", 0},
             {"app/info/exe", "Executable", 0},
             {"app/window/name", "Window name", 0},
+            {"app/window/title", "Window title", 0},
+            {"app/window/role", "Window role", 0},
             {"app/window/class", "Window class", 0},
+            {"app/icon/class", "Icon class", 0},
             {"app/info/startup_notify", "Startup notify", 1},
             {"app/info/wait_exit", "Wait exit", 1}
         };

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- update to ewl changes

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- eapp_edit_main.c	8 Oct 2005 22:49:00 -0000	1.29
+++ eapp_edit_main.c	10 Oct 2005 16:10:40 -0000	1.30
@@ -334,7 +334,7 @@
     click = (int *)ev;
     switch(*click)
     {
-        case EWL_RESPONSE_OPEN:
+        case EWL_STOCK_OPEN:
             {
                 char *icon;
 
@@ -346,7 +346,7 @@
             }
             break;
 
-        case EWL_RESPONSE_CANCEL:
+        case EWL_STOCK_CANCEL:
         default:
             break;
     }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/emblem


Modified Files:
	main.c 


Log Message:
- patch from Marcus (suse-tux at gmx dot de) to make emblem a bit friendlier
  when it dosen't recognize an option

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/emblem/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- main.c	13 Sep 2005 04:32:17 -0000	1.9
+++ main.c	12 Oct 2005 03:46:05 -0000	1.10
@@ -69,6 +69,12 @@
             usage();
             return 0;
         }
+        else
+        {
+            printf("%s - unrecognized option\n", argv[i]);
+            usage();
+            return 0;
+        }
     }
     
     /* make sure theme exists */

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/default/images


Removed Files:
	bg.png e.png logo.png 


Log Message:
- remove the background themeing as it didn't look too good
- get rid of the shadow on the labels (easier to read now)

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/default


Modified Files:
	default.edc 


Log Message:
- remove the background themeing as it didn't look too good
- get rid of the shadow on the labels (easier to read now)

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/data/eapp_edit/default/default.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- default.edc	21 Aug 2005 05:51:27 -0000	1.1
+++ default.edc	14 Oct 2005 14:55:24 -0000	1.2
@@ -1,126 +1,7 @@
-images {
-    image, "bg.png" COMP;
-    image, "logo.png" COMP;
-    image, "e.png" COMP;
-}
-
-fonts {
-    font, "VeraBd.ttf" "VeraBold";
-}
 
 collections {
     group {
-        name, "bg";
-
-        parts {
-            part {
-                name, "background";
-                mouse_events, 0;
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, 0 0;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -1 -1;
-                    }
-                    image {
-                        normal, "bg.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-            }
-
-            part {
-                name, "e_logo";
-
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, -30 -40;
-                    }
-                    rel2 {
-                        relative, 0.0 0.0;
-                        offset, 90 120;
-                    }
-                    image {
-                        normal, "logo.png";
-                    }
-                    color, 255 255 255 64;
-                }
-            }
-
-            part {
-                name, "title";
-                type, TEXT;
-
-                description {
-                    state, "defaut" 0.0;
-                    rel1 {
-                        relative, 1.0 1.0;
-                        offset, -70 -24;
-                    }
-                    rel2 {
-                        relative, 1.0 1.0;
-                        offset, -5 -2;
-                    }
-                    text {
-                        text, "AP EDIT";
-                        font, "VeraBold";
-                        size, 12;
-                    }
-                    color, 0 0 0 255;
-                }
-            }
-
-            part {
-                name, "e";
-
-                description {
-                    state, "default" 0.0;
-                    rel1 {
-                        relative, 0.0 0.0;
-                        offset, -11 2;
-                        to, "title";
-                    }
-                    rel2 {
-                        relative, 0.0 0.0;
-                        offset, 0 16;
-                        to, "title";
-                    }
-                    image {
-                        normal, "e.png";
-                    }
-                    fill {
-                        origin {
-                            relative, 0.0 0.0;
-                            offset, 0 0;
-                        }
-                        size {
-                            relative, 1.0 1.0;
-                            offset, 0 0;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    group {
         name, "cell";
-    
         parts {
             part {
                 name, "background";

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- remove the background themeing as it didn't look too good
- get rid of the shadow on the labels (easier to read now)

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- eapp_edit_main.c	10 Oct 2005 16:10:40 -0000	1.30
+++ eapp_edit_main.c	14 Oct 2005 14:55:24 -0000	1.31
@@ -34,17 +34,17 @@
 };
 
 static Eapp_Item keys[] = {
-            {"app/info/name", "App name", 0},
-            {"app/info/generic", "Generic info", 0},
+            {"app/info/name", "App Name", 0},
+            {"app/info/generic", "Generic Info", 0},
             {"app/info/comment", "Comment", 0},
             {"app/info/exe", "Executable", 0},
-            {"app/window/name", "Window name", 0},
-            {"app/window/title", "Window title", 0},
-            {"app/window/role", "Window role", 0},
-            {"app/window/class", "Window class", 0},
-            {"app/icon/class", "Icon class", 0},
-            {"app/info/startup_notify", "Startup notify", 1},
-            {"app/info/wait_exit", "Wait exit", 1}
+            {"app/window/name", "Window Name", 0},
+            {"app/window/title", "Window Title", 0},
+            {"app/window/role", "Window Role", 0},
+            {"app/window/class", "Window Class", 0},
+            {"app/icon/class", "Icon Class", 0},
+            {"app/info/startup_notify", "Startup Notify", 1},
+            {"app/info/wait_exit", "Wait Exit", 1}
         };
 
 int
@@ -166,8 +166,6 @@
     ewl_window_title_set(EWL_WINDOW(win), "Eapp Editor");
     ewl_window_class_set(EWL_WINDOW(win), "Eapp Editor");
     ewl_window_name_set(EWL_WINDOW(win), "Eapp_Editor");
-    ewl_theme_data_str_set(win, "/window/file", tmp);
-    ewl_theme_data_str_set(win, "/window/group", "bg");
     ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, eapp_cb_quit, NULL);
     ewl_widget_show(win);
 
@@ -255,7 +253,7 @@
     {
         row[0] = ewl_text_new();
         ewl_text_text_set(EWL_TEXT(row[0]), NULL);
-        ewl_text_styles_set(EWL_TEXT(row[0]), EWL_TEXT_STYLE_SOFT_SHADOW);
+        ewl_text_styles_set(EWL_TEXT(row[0]), EWL_TEXT_STYLE_OUTLINE);
         ewl_text_shadow_color_set(EWL_TEXT(row[0]), 128, 128, 128, 128);
         ewl_text_text_set(EWL_TEXT(row[0]), keys[i].name);
         ewl_widget_show(row[0]);

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- update to ewl filedialog change

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- eapp_edit_main.c	16 Oct 2005 04:52:25 -0000	1.33
+++ eapp_edit_main.c	21 Oct 2005 04:15:04 -0000	1.34
@@ -327,27 +327,19 @@
 static void
 eapp_cb_fd_changed(Ewl_Widget *w, void *ev, void *data)
 {
-    int *click;
+    Ewl_Filedialog_Event *e;
     Ewl_Widget *o;
     
-    click = (int *)ev;
-    switch(*click)
+    e = EWL_FILEDIALOG_EVENT(ev);
+    if (e->response == EWL_STOCK_OPEN)
     {
-        case EWL_STOCK_OPEN:
-            {
-                char *icon;
-
-                icon = ewl_filedialog_file_get(EWL_FILEDIALOG(w));
+        char *icon;
 
-                o = ewl_widget_name_find("icon");
-                ewl_widget_data_set(o, "file", icon);
-                ewl_image_file_set(EWL_IMAGE(o), icon, "");
-            }
-            break;
+        icon = ewl_filedialog_file_get(EWL_FILEDIALOG(w));
 
-        case EWL_STOCK_CANCEL:
-        default:
-            break;
+        o = ewl_widget_name_find("icon");
+        ewl_widget_data_set(o, "file", icon);
+        ewl_image_file_set(EWL_IMAGE(o), icon, "");
     }
 
     o = ewl_widget_name_find("fd");

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- convert to ewl api change

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- eapp_edit_main.c	21 Oct 2005 04:15:04 -0000	1.34
+++ eapp_edit_main.c	4 Dec 2005 17:00:10 -0000	1.35
@@ -297,23 +297,13 @@
     fd = ewl_widget_name_find("fd");
     if (!fd)
     {
-        Ewl_Widget *dialog;
-
-        fd = ewl_window_new();
-        ewl_window_title_set(EWL_WINDOW(fd), "Eapp Editor Icon Selection");
-        ewl_window_name_set(EWL_WINDOW(fd), "Eapp Editor");
-        ewl_window_class_set(EWL_WINDOW(fd), "Eapp Editor");
-        ewl_widget_name_set(fd, "fd");
-        ewl_callback_append(fd, EWL_CALLBACK_DELETE_WINDOW,
-                                eapp_cb_fd_hide, NULL);
-
-        dialog = ewl_filedialog_new();
-        ewl_filedialog_type_set(EWL_FILEDIALOG(dialog),
+        fd = ewl_filedialog_new();
+    	ewl_widget_name_set(fd, "fd");
+        ewl_filedialog_type_set(EWL_FILEDIALOG(fd),
                                 EWL_FILEDIALOG_TYPE_OPEN);
-        ewl_callback_append(dialog, EWL_CALLBACK_VALUE_CHANGED,
+        ewl_callback_append(fd, EWL_CALLBACK_VALUE_CHANGED,
                                 eapp_cb_fd_changed, NULL);
-        ewl_container_child_append(EWL_CONTAINER(fd), dialog);
-        ewl_widget_show(dialog);
+        ewl_widget_show(fd);
     }
     ewl_widget_show(fd);
 }
@@ -327,10 +317,10 @@
 static void
 eapp_cb_fd_changed(Ewl_Widget *w, void *ev, void *data)
 {
-    Ewl_Filedialog_Event *e;
+    Ewl_Dialog_Event *e;
     Ewl_Widget *o;
     
-    e = EWL_FILEDIALOG_EVENT(ev);
+    e = ev;
     if (e->response == EWL_STOCK_OPEN)
     {
         char *icon;

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils


Modified Files:
	AUTHORS 


Log Message:
- it's like that for a _reason_

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e_utils/AUTHORS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- AUTHORS	7 Mar 2006 21:58:23 -0000	1.5
+++ AUTHORS	7 Mar 2006 22:03:19 -0000	1.6
@@ -6,7 +6,6 @@
 Andrew (HandyAndE) Elcock
 
 emblem:
-
 entangle:
  dan 'dj2' sinclair <zero@...>

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- update to ewl api changes

===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- eapp_edit_main.c	9 Mar 2006 22:43:43 -0000	1.41
+++ eapp_edit_main.c	10 Apr 2006 18:22:19 -0000	1.42
@@ -304,8 +304,6 @@
     {
         fd = ewl_filedialog_new();
     	ewl_widget_name_set(fd, "fd");
-        ewl_filedialog_type_set(EWL_FILEDIALOG(fd),
-                                EWL_FILEDIALOG_TYPE_OPEN);
         ewl_callback_append(fd, EWL_CALLBACK_VALUE_CHANGED,
                                 eapp_cb_fd_changed, NULL);
         ewl_widget_show(fd);
@@ -330,7 +328,7 @@
     {
         char *icon;
 
-        icon = ewl_filedialog_file_get(EWL_FILEDIALOG(w));
+        icon = ewl_filedialog_selected_file_get(EWL_FILEDIALOG(w));
 
         o = ewl_widget_name_find("icon");
         ewl_widget_data_set(o, "file", icon);

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- fix formatting
- make sure the icon name is strdup'd

===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- eapp_edit_main.c	17 May 2006 22:43:32 -0000	1.43
+++ eapp_edit_main.c	25 May 2006 17:50:34 -0000	1.44
@@ -260,8 +260,8 @@
     {
         row[0] = ewl_label_new();
         ewl_label_text_set(EWL_LABEL(row[0]), keys[i].name);
-	ewl_object_fill_policy_set(EWL_OBJECT(row[0]), EWL_FLAG_FILL_NONE);
-	ewl_object_alignment_set(EWL_OBJECT(row[0]), EWL_FLAG_ALIGN_LEFT);
+        ewl_object_fill_policy_set(EWL_OBJECT(row[0]), EWL_FLAG_FILL_NONE);
+        ewl_object_alignment_set(EWL_OBJECT(row[0]), EWL_FLAG_ALIGN_LEFT);
         ewl_widget_show(row[0]);
 
         v = eapp_eet_read(ef, keys[i].key, lang);
@@ -327,16 +327,16 @@
     if (e->response == EWL_STOCK_OK)
     {
         char *icon;
-	const char *icon2;
-	char icon3[PATH_MAX];
+        const char *icon2;
+        char icon3[PATH_MAX];
 	
         icon = ewl_filedialog_selected_file_get(EWL_FILEDIALOG(w));
-	icon2 = ewl_filedialog_directory_get(EWL_FILEDIALOG(w));
-	snprintf(icon3, PATH_MAX, "%s/%s", icon2, icon);
+        icon2 = ewl_filedialog_directory_get(EWL_FILEDIALOG(w));
+        snprintf(icon3, PATH_MAX, "%s/%s", icon2, icon);
 
         o = ewl_widget_name_find("icon");
-        ewl_widget_data_set(o, "file", icon3);
-	ewl_image_file_set(EWL_IMAGE(o), icon3, "");
+        ewl_widget_data_set(o, "file", strdup(icon3));
+        ewl_image_file_set(EWL_IMAGE(o), icon3, "");
     }
 
     o = ewl_widget_name_find("fd");

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils


Modified Files:
	configure.in 


Log Message:
- rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a
  e_utils prefix
- remove the eapp_edit files from the data/ directory as it dosen't use
  custom themeing anymore

===================================================================
RCS file: /cvs/e/e17/apps/e_utils/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- configure.in	20 Apr 2006 02:34:40 -0000	1.24
+++ configure.in	5 Jun 2006 17:02:08 -0000	1.25
@@ -138,7 +138,7 @@
 )
 
 build_e17genmenu="no"
-build_eapp_edit="no"
+build_eap_edit="no"
 build_e17setroot="no"
 build_entangle="no"
 build_emblem="no"
@@ -146,7 +146,7 @@
 build_ethemes="no"
 
 if test "x$have_ewl" = "xyes" -a "x$have_engrave" = "xyes"; then
-  build_eapp_edit="yes"
+  build_eap_edit="yes"
 fi
 
 if test "x$have_eet" = "xyes" -a "x$have_ecore" = "xyes" -a "x$have_engrave" = "xyes"; then
@@ -174,7 +174,7 @@
 fi
 
 AM_CONDITIONAL(BUILD_E17GENMENU, test "x$build_e17genmenu" = "xyes")
-AM_CONDITIONAL(BUILD_EAPP_EDIT, test "x$build_eapp_edit" = "xyes")
+AM_CONDITIONAL(BUILD_EAP_EDIT, test "x$build_eap_edit" = "xyes")
 AM_CONDITIONAL(BUILD_E17SETROOT, test "x$build_e17setroot" = "xyes")
 AM_CONDITIONAL(BUILD_ENTANGLE, test "x$build_entangle" = "xyes")
 AM_CONDITIONAL(BUILD_EMBLEM, test "x$build_emblem" = "xyes")
@@ -209,8 +209,6 @@
 data/entangle/default/Makefile
 data/exige/Makefile
 data/exige/default/Makefile
-data/eapp_edit/Makefile
-data/eapp_edit/default/Makefile
 src/Makefile
 src/bin/Makefile
 src/bin/e17genmenu/Makefile
@@ -250,7 +248,7 @@
 echo "Utilities that will be built:"
 echo
 echo "  e17genmenu......: "$build_e17genmenu
-echo "  Eapp_Edit.......: "$build_eapp_edit
+echo "  eap_edit........: "$build_eap_edit
 echo "  E17 Setroot.....: "$build_e17setroot
 echo "  Entangle........: "$build_entangle
 echo "  Emblem..........: "$build_emblem

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data


Modified Files:
	Makefile.am 


Log Message:
- rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a
  e_utils prefix
- remove the eapp_edit files from the data/ directory as it dosen't use
  custom themeing anymore

===================================================================
RCS file: /cvs/e/e17/apps/e_utils/data/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am	7 Mar 2006 21:58:24 -0000	1.6
+++ Makefile.am	5 Jun 2006 17:02:08 -0000	1.7
@@ -4,10 +4,6 @@
 e17genmenu_subdir = e17genmenu
 endif
 
-if BUILD_EAPP_EDIT
-eapp_edit_subdir = eapp_edit
-endif
-
 if BUILD_ENTANGLE
 entangle_subdir = entangle
 endif
@@ -20,5 +16,5 @@
 exige_subdir = exige
 endif
 
-SUBDIRS = $(e17genmenu_subdir) $(eapp_edit_subdir) $(entangle_subdir) $(emblem_subdir) $(exige_subdir)
+SUBDIRS = $(e17genmenu_subdir) $(entangle_subdir) $(emblem_subdir) $(exige_subdir)

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit


Removed Files:
	.cvsignore Makefile.am 


Log Message:
- rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a
  e_utils prefix
- remove the eapp_edit files from the data/ directory as it dosen't use
  custom themeing anymore

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/default


Removed Files:
	.cvsignore Makefile.am default.edc 


Log Message:
- rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a
  e_utils prefix
- remove the eapp_edit files from the data/ directory as it dosen't use
  custom themeing anymore

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/data/eapp_edit/fonts


Removed Files:
	VeraBd.ttf 


Log Message:
- rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a
  e_utils prefix
- remove the eapp_edit files from the data/ directory as it dosen't use
  custom themeing anymore

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	.cvsignore Makefile.am eapp_edit_main.c 


Log Message:
- rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a
  e_utils prefix
- remove the eapp_edit files from the data/ directory as it dosen't use
  custom themeing anymore

===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- .cvsignore	19 Dec 2005 20:13:54 -0000	1.3
+++ .cvsignore	5 Jun 2006 17:02:09 -0000	1.4
@@ -2,4 +2,4 @@
 .libs
 Makefile
 Makefile.in
-e_util_eapp_edit
+eap_edit
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am	19 Dec 2005 20:13:54 -0000	1.8
+++ Makefile.am	5 Jun 2006 17:02:09 -0000	1.9
@@ -9,10 +9,10 @@
 @ECORE_CFLAGS@ \
 @ENGRAVE_CFLAGS@
 
-bin_PROGRAMS = e_util_eapp_edit
+bin_PROGRAMS = eap_edit
 
-e_util_eapp_edit_SOURCES = \
+eap_edit_SOURCES = \
 eapp_edit_main.c
 
-e_util_eapp_edit_LDADD = @EWL_LIBS@ @EET_LIBS@ @ECORE_LIBS@ @ENGRAVE_LIBS@
+eap_edit_LDADD = @EWL_LIBS@ @EET_LIBS@ @ECORE_LIBS@ @ENGRAVE_LIBS@
 
===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- eapp_edit_main.c	5 Jun 2006 16:42:39 -0000	1.51
+++ eapp_edit_main.c	5 Jun 2006 17:02:09 -0000	1.52
@@ -98,7 +98,7 @@
             }
             else
             {
-                fprintf(stderr, "Error, missing argument for lang.\n");
+                fprintf(stderr, "Error, missing argument for --lang.\n");
                 goto ARGS_SHUTDOWN;
             }
         }
@@ -111,7 +111,7 @@
             }
             else
             {
-                fprintf(stderr, "Error, missing argument for win-class.\n");
+                fprintf(stderr, "Error, missing argument for --win-class.\n");
                 goto ARGS_SHUTDOWN;
             }
         }
@@ -137,7 +137,7 @@
 
     if (!eapp_ui_init(file, lang, winclass))
     {
-        fprintf(stderr, "Error initializing e_utils_eapp_edit.\n");
+        fprintf(stderr, "Error initializing eap_edit.\n");
         goto EET_SHUTDOWN;
     }
 
@@ -159,7 +159,7 @@
 static void
 eapp_usage(void)
 {
-    printf("usage: e_util_eapp_edit [OPTIONS] file.eap\n"
+    printf("usage: eap_edit [OPTIONS] <file.eap>\n"
             "\t if <file.eap> doesn't exist a new file will be created\n\n"
             " [OPTIONS]\n"
             "  -h           \t - view this help screen.\n"
@@ -180,9 +180,9 @@
     Ewl_Widget *win, *vbox, *hbox, *o;
     
     win = ewl_window_new();
-    ewl_window_title_set(EWL_WINDOW(win), "Eapp Editor");
-    ewl_window_class_set(EWL_WINDOW(win), "Eapp Editor");
-    ewl_window_name_set(EWL_WINDOW(win), "Eapp_Editor");
+    ewl_window_title_set(EWL_WINDOW(win), "Eap Editor");
+    ewl_window_class_set(EWL_WINDOW(win), "Eap Editor");
+    ewl_window_name_set(EWL_WINDOW(win), "Eap_Editor");
     ewl_object_size_request(EWL_OBJECT(win), 445, 315);
     ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, eapp_cb_quit, NULL);
     ewl_widget_show(win);

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin


Modified Files:
	Makefile.am 


Log Message:
- rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a
  e_utils prefix
- remove the eapp_edit files from the data/ directory as it dosen't use
  custom themeing anymore

===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am	7 Mar 2006 21:58:24 -0000	1.10
+++ Makefile.am	5 Jun 2006 17:02:09 -0000	1.11
@@ -4,7 +4,7 @@
 e17genmenu_subdir = e17genmenu
 endif
 
-if BUILD_EAPP_EDIT
+if BUILD_EAP_EDIT
 eapp_edit_subdir = eapp_edit
 endif

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- formatting
- make it more maintainable

===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- eapp_edit_main.c	5 Jun 2006 05:56:49 -0000	1.47
+++ eapp_edit_main.c	5 Jun 2006 06:00:23 -0000	1.48
@@ -10,7 +10,13 @@
 #include <string.h>
 #include <limits.h>
 
-#define TREE_COLS 2
+typedef struct Eapp_Item Eapp_Item;
+struct Eapp_Item
+{
+    char *key;
+    char *name;
+    int checkbox;
+};
 
 static void eapp_usage(void);
 static int eapp_ui_init(char *file, char *lang, char *winclass);
@@ -18,6 +24,7 @@
 static char *eapp_eet_read(Eet_File *ef, char *key, char *lang);
 static void eapp_eet_write(Eet_File *ef, char *key, char *lang, char *val, int size);
 static void eapp_engrave_write(char *file);
+static void eapp_write_keys(Eet_File *ef, Eapp_Item *keys, char *lang);
 
 static void eapp_cb_quit(Ewl_Widget *w, void *ev, void *data);
 static void eapp_cb_save(Ewl_Widget *w, void *ev, void *data);
@@ -25,26 +32,35 @@
 static void eapp_cb_fd_hide(Ewl_Widget *w, void *ev, void *data);
 static void eapp_cb_fd_changed(Ewl_Widget *w, void *ev, void *data);
 
-typedef struct Eapp_Item Eapp_Item;
-struct Eapp_Item
-{
-    char *key;
-    char *name;
-    int checkbox;
-};
+static Eapp_Item basic_keys[] = {
+            {"app/info/name", "App Name", 0},
+            {"app/info/exe", "Executable", 0},
+            {NULL, NULL, 0}
+        };
 
-static Eapp_Item keys[] = {
-            {"app/info/name",           "App Name", 0},
-	    {"app/info/exe",            "Executable", 0},
-            {"app/info/generic",        "Generic Info", 0},
-            {"app/info/comment",        "Comment", 0},
-	    {"app/icon/class",          "Icon Class", 0},
-            {"app/window/name",         "Window Name", 0},
-            {"app/window/class",        "Window Class", 0},
-            {"app/window/title",        "Window Title", 0},
-            {"app/window/role",         "Window Role", 0},
+static Eapp_Item general_keys[] = {
+            {"app/info/generic", "Generic Info", 0},
+            {"app/info/comment", "Comment", 0},
+            {NULL, NULL, 0}
+        };
+
+static Eapp_Item icon_theme_keys[] = {
+           {"app/icon/class", "Icon Class", 0},
+            {NULL, NULL, 0}
+        };
+
+static Eapp_Item window_keys[] = {
+            {"app/window/name", "Window Name", 0},
+            {"app/window/class", "Window Class", 0},
+            {"app/window/title", "Window Title", 0},
+            {"app/window/role", "Window Role", 0},
+            {NULL, NULL, 0}
+        };
+
+static Eapp_Item misc_keys[] = {
             {"app/info/startup_notify", "Startup Notify", 1},
-            {"app/info/wait_exit",      "Wait Exit", 1}
+            {"app/info/wait_exit", "Wait Exit", 1},
+            {NULL, NULL, 0}
         };
 
 int
@@ -158,10 +174,7 @@
 eapp_ui_init(char *file, char *lang, char *winclass)
 {
     Ewl_Widget *win, *vbox, *hbox, *o;
-    char tmp[PATH_MAX];
     
-    snprintf(tmp, PATH_MAX, "%s/data/e_utils_eapp_edit/default.edj", 
-                                                    PACKAGE_DATA_DIR);
     win = ewl_window_new();
     ewl_window_title_set(EWL_WINDOW(win), "Eapp Editor");
     ewl_window_class_set(EWL_WINDOW(win), "Eapp Editor");
@@ -212,8 +225,9 @@
 static int
 eapp_populate(Ewl_Widget *vbox, char *file, char *lang, char *winclass)
 {
-    Ewl_Widget *hbox, *icon_border, *icon, *basic, *o, *hsep, *label, *entry, *general, 
-		*icon_theme, *window, *misc, *checkbutton;
+    Ewl_Widget *hbox, *icon_border, *icon, *basic, *o;
+    Ewl_Widget *hsep, *label, *entry, *general;
+    Ewl_Widget *icon_theme, *window, *misc, *checkbutton;
     Eet_File *ef = NULL;
     char *v;
     int i = 0;
@@ -223,7 +237,7 @@
         ef = eet_open(file, EET_FILE_MODE_READ);
         if (!ef)
         {
-            fprintf(stderr, "Error, unable to open eap file.");
+            fprintf(stderr, "Error, unable to open eap file.\n");
             return 0;
         }
     }
@@ -262,34 +276,32 @@
     ewl_container_child_append(EWL_CONTAINER(vbox), hsep);
     ewl_widget_show(hsep);
 
-    /* add all the eet data */
-    while ( i <= 1 ) {
-	hbox = ewl_hbox_new();
-	ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
-	ewl_container_child_append(EWL_CONTAINER(basic), hbox);
-	ewl_widget_show(hbox);
+    for (i = 0; basic_keys[i].key; i++)
+    {
+        hbox = ewl_hbox_new();
+        ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
+        ewl_container_child_append(EWL_CONTAINER(basic), hbox);
+        ewl_widget_show(hbox);
 
-	v = eapp_eet_read(ef, keys[i].key, lang);
+        v = eapp_eet_read(ef, basic_keys[i].key, lang);
 
         label = ewl_label_new();
-        ewl_label_text_set(EWL_LABEL(label), keys[i].name);
+        ewl_label_text_set(EWL_LABEL(label), basic_keys[i].name);
         ewl_object_fill_policy_set(EWL_OBJECT(label), EWL_FLAG_FILL_NONE);
         ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_LEFT);
         ewl_container_child_append(EWL_CONTAINER(hbox), label);
-	ewl_object_minimum_size_set(EWL_OBJECT(label), 65, 15);
-	ewl_object_maximum_size_set(EWL_OBJECT(label), 65, 15);
-	ewl_widget_show(label);
-
-	entry = ewl_entry_new();
-	ewl_text_text_set(EWL_TEXT(entry), v);
-	ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
-	ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
-	ewl_container_child_append(EWL_CONTAINER(hbox), entry);
-        ewl_widget_name_set(entry, keys[i].key);	
-	ewl_widget_show(entry);
-	
-	i++;
-     }
+        ewl_object_minimum_size_set(EWL_OBJECT(label), 65, 15);
+        ewl_object_maximum_size_set(EWL_OBJECT(label), 65, 15);
+        ewl_widget_show(label);
+
+        entry = ewl_entry_new();
+        ewl_text_text_set(EWL_TEXT(entry), v);
+        ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
+        ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
+        ewl_container_child_append(EWL_CONTAINER(hbox), entry);
+        ewl_widget_name_set(entry, basic_keys[i].key);    
+        ewl_widget_show(entry);
+    }
 
     hbox = ewl_hbox_new();
     ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
@@ -327,17 +339,17 @@
     ewl_object_alignment_set(EWL_OBJECT(misc), EWL_FLAG_ALIGN_RIGHT);
     ewl_widget_show(misc);
 
-
-    while ( i <= 3 ) {
-	hbox = ewl_hbox_new();
-	ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
+    for (i = 0; general_keys[i].key; i++)
+    {
+        hbox = ewl_hbox_new();
+        ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
         ewl_container_child_append(EWL_CONTAINER(general), hbox);
         ewl_widget_show(hbox);
 
-        v = eapp_eet_read(ef, keys[i].key, lang);
+        v = eapp_eet_read(ef, general_keys[i].key, lang);
 
         label = ewl_label_new();
-        ewl_label_text_set(EWL_LABEL(label), keys[i].name);
+        ewl_label_text_set(EWL_LABEL(label), general_keys[i].name);
         ewl_object_fill_policy_set(EWL_OBJECT(label), EWL_FLAG_FILL_NONE);
         ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_LEFT);
         ewl_container_child_append(EWL_CONTAINER(hbox), label);
@@ -347,25 +359,24 @@
 
         entry = ewl_entry_new();
         ewl_text_text_set(EWL_TEXT(entry), v);
-	ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
-	ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
+        ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
+        ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
         ewl_container_child_append(EWL_CONTAINER(hbox), entry);
-        ewl_widget_name_set(entry, keys[i].key);
+        ewl_widget_name_set(entry, general_keys[i].key);
         ewl_widget_show(entry);
-
-        i++;
     }
 
-    while ( i <= 4 ) {
+    for (i = 0; icon_theme_keys[i].key; i++)
+    {
         hbox = ewl_hbox_new();
-	ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
+        ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
         ewl_container_child_append(EWL_CONTAINER(icon_theme), hbox);
         ewl_widget_show(hbox);
 
-	v = eapp_eet_read(ef, keys[i].key, lang);
+        v = eapp_eet_read(ef, icon_theme_keys[i].key, lang);
 
         label = ewl_label_new();
-        ewl_label_text_set(EWL_LABEL(label), keys[i].name);
+        ewl_label_text_set(EWL_LABEL(label), icon_theme_keys[i].name);
         ewl_object_fill_policy_set(EWL_OBJECT(label), EWL_FLAG_FILL_NONE);
         ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_LEFT);
         ewl_container_child_append(EWL_CONTAINER(hbox), label);
@@ -375,30 +386,29 @@
 
         entry = ewl_entry_new();
         ewl_text_text_set(EWL_TEXT(entry), v);
-	ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
+        ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
         ewl_container_child_append(EWL_CONTAINER(hbox), entry);
         ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
-	ewl_widget_name_set(entry, keys[i].key);
-	ewl_widget_show(entry);
-
-        i++;
+        ewl_widget_name_set(entry, icon_theme_keys[i].key);
+        ewl_widget_show(entry);
     }
 
-    while ( i <= 8 ) {
-	hbox = ewl_hbox_new();
-	ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
+    for (i = 0; window_keys[i].key; i++)
+    {
+        hbox = ewl_hbox_new();
+        ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
         ewl_container_child_append(EWL_CONTAINER(window), hbox);
         ewl_widget_show(hbox);
 
-	v = eapp_eet_read(ef, keys[i].key, lang);
+        v = eapp_eet_read(ef, window_keys[i].key, lang);
 
-	if (!strcmp(keys[i].key, "app/window/class"))
+        if (!strcmp(window_keys[i].key, "app/window/class"))
         {
             if (winclass) v = winclass;
         }
 
         label = ewl_label_new();
-        ewl_label_text_set(EWL_LABEL(label), keys[i].name);
+        ewl_label_text_set(EWL_LABEL(label), window_keys[i].name);
         ewl_object_fill_policy_set(EWL_OBJECT(label), EWL_FLAG_FILL_NONE);
         ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_LEFT);
         ewl_container_child_append(EWL_CONTAINER(hbox), label);
@@ -408,26 +418,23 @@
 
         entry = ewl_entry_new();
         ewl_text_text_set(EWL_TEXT(entry), v);
-	ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
+        ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
         ewl_container_child_append(EWL_CONTAINER(hbox), entry);
         ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
-	ewl_widget_name_set(entry, keys[i].key);
-	ewl_widget_show(entry);
-
-        i++;
+        ewl_widget_name_set(entry, window_keys[i].key);
+        ewl_widget_show(entry);
     }
 
-    while ( i <= 10 ) {
-	v = eapp_eet_read(ef, keys[i].key, lang);
+    for (i = 0; misc_keys[i].key; i++)
+    {
+        v = eapp_eet_read(ef, misc_keys[i].key, lang);
 
         checkbutton = ewl_checkbutton_new();
-        ewl_button_label_set(EWL_BUTTON(checkbutton), keys[i].name);
+        ewl_button_label_set(EWL_BUTTON(checkbutton), misc_keys[i].name);
         ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT);
         ewl_container_child_append(EWL_CONTAINER(misc), checkbutton);
-        ewl_widget_name_set(checkbutton, keys[i].key);
-	ewl_widget_show(checkbutton);
-
-        i++;
+        ewl_widget_name_set(checkbutton, misc_keys[i].key);
+        ewl_widget_show(checkbutton);
     }
 
     if (v) free(v);
@@ -447,7 +454,7 @@
     if (!fd)
     {
         fd = ewl_filedialog_new();
-    	ewl_widget_name_set(fd, "fd");
+        ewl_widget_name_set(fd, "fd");
         ewl_callback_append(fd, EWL_CALLBACK_VALUE_CHANGED,
                                 eapp_cb_fd_changed, NULL);
         ewl_widget_show(fd);
@@ -473,7 +480,7 @@
         char *icon;
         const char *icon2;
         char icon3[PATH_MAX];
-	
+    
         icon = ewl_filedialog_selected_file_get(EWL_FILEDIALOG(w));
         icon2 = ewl_filedialog_directory_get(EWL_FILEDIALOG(w));
         snprintf(icon3, PATH_MAX, "%s/%s", icon2, icon);
@@ -492,7 +499,6 @@
 {
     Eet_File *ef;
     char *file = NULL, *lang = NULL;
-    int i;
 
     file = ewl_widget_data_get(w, "file");
     lang = ewl_widget_data_get(w, "lang");
@@ -506,8 +512,24 @@
         return;
     }
 
+    eapp_write_keys(ef, basic_keys, lang);
+    eapp_write_keys(ef, general_keys, lang);
+    eapp_write_keys(ef, icon_theme_keys, lang);
+    eapp_write_keys(ef, window_keys, lang);
+    eapp_write_keys(ef, misc_keys, lang);
+
+    eet_close(ef);
+    eapp_cb_quit(NULL, NULL, NULL);
+}
+
+static void
+eapp_write_keys(Eet_File *ef, Eapp_Item *keys, char *lang)
+{
+    int i;
+
+
     /* add all the eet data */
-    for (i = 0; i < (sizeof(keys) / sizeof(keys[0])); i++)
+    for (i = 0; keys[i].key; i++)
     {
         Ewl_Widget *o;
         char *v = NULL;
@@ -529,9 +551,6 @@
 
         eapp_eet_write(ef, keys[i].key, lang, v, s);
     }
-
-    eet_close(ef);
-    eapp_cb_quit(NULL, NULL, NULL);
 }
 
 static char *

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- formatting and cleanups

===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- eapp_edit_main.c	5 Jun 2006 06:58:46 -0000	1.50
+++ eapp_edit_main.c	5 Jun 2006 16:42:39 -0000	1.51
@@ -31,9 +31,10 @@
 static void eapp_cb_fd_show(Ewl_Widget *w, void *ev, void *data);
 static void eapp_cb_fd_hide(Ewl_Widget *w, void *ev, void *data);
 static void eapp_cb_fd_changed(Ewl_Widget *w, void *ev, void *data);
-static void eapp_create_content(Eet_File *ef, char *key, char *name, char *lang, 
-						char *winclass, Ewl_Widget *parent);
-Ewl_Widget *eapp_border_get(Ewl_Widget *parent, char *title, char *align);
+static void eapp_create_content(Eet_File *ef, char *key, char *name, 
+                                        char *lang, char *winclass, 
+                                        Ewl_Widget *parent);
+Ewl_Widget *eapp_border_get(Ewl_Widget *parent, char *title, int left_align);
 
 static Eapp_Item basic_keys[] = {
             {"app/info/name", "App Name", 0},
@@ -268,7 +269,7 @@
     ewl_callback_append(icon, EWL_CALLBACK_CLICKED, eapp_cb_fd_show, NULL);
     ewl_widget_show(icon);
 
-    basic = eapp_border_get(hbox, "Basic Info", "right");
+    basic = eapp_border_get(hbox, "Basic Info", 0);
 
     hsep = ewl_hseparator_new();                 
     ewl_container_child_append(EWL_CONTAINER(vbox), hsep);
@@ -278,39 +279,32 @@
     ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
     ewl_widget_show(hbox);
 
-    general = eapp_border_get(hbox, "General", "left");
-
-    icon_theme = eapp_border_get(hbox, "Icon Theme", "right");
+    general = eapp_border_get(hbox, "General", 1);
+    icon_theme = eapp_border_get(hbox, "Icon Theme", 0);
 
     hbox = ewl_hbox_new();
     ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
     ewl_widget_show(hbox);
 
-    window = eapp_border_get(hbox, "Window", "left");
-
-    misc = eapp_border_get(hbox, "Misc", "Right");
+    window = eapp_border_get(hbox, "Window", 1);
+    misc = eapp_border_get(hbox, "Misc", 0);
 
     for (i = 0; basic_keys[i].key; i++)
-    {
-        eapp_create_content(ef, basic_keys[i].key, basic_keys[i].name, lang, winclass, basic);
-    }
+        eapp_create_content(ef, basic_keys[i].key, basic_keys[i].name, 
+                                                lang, winclass, basic);
 
     for (i = 0; general_keys[i].key; i++)
-    {
-        eapp_create_content(ef, general_keys[i].key, general_keys[i].name, lang, winclass, 
-										general);
-    }
+        eapp_create_content(ef, general_keys[i].key, general_keys[i].name, 
+                                                lang, winclass, general);
 
     for (i = 0; icon_theme_keys[i].key; i++)
-    {
-	eapp_create_content(ef, icon_theme_keys[i].key, icon_theme_keys[i].name, lang, 
-									winclass, icon_theme);
-    }
+        eapp_create_content(ef, icon_theme_keys[i].key, 
+                                    icon_theme_keys[i].name, lang, 
+                                    winclass, icon_theme);
 
     for (i = 0; window_keys[i].key; i++)
-    {
- 	eapp_create_content(ef, window_keys[i].key, window_keys[i].name, lang, winclass, window);
-    }
+     eapp_create_content(ef, window_keys[i].key, window_keys[i].name, 
+                                    lang, winclass, window);
 
     for (i = 0; misc_keys[i].key; i++)
     {
@@ -318,11 +312,11 @@
 
         checkbutton = ewl_checkbutton_new();
         ewl_button_label_set(EWL_BUTTON(checkbutton), misc_keys[i].name);
-	ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT);
+        ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT);
         ewl_container_child_append(EWL_CONTAINER(misc), checkbutton);
+        ewl_checkbutton_checked_set(EWL_CHECKBUTTON(checkbutton), v[0] == 1);
         ewl_widget_name_set(checkbutton, misc_keys[i].key);
         ewl_widget_show(checkbutton);
-	ewl_checkbutton_checked_set(EWL_CHECKBUTTON(checkbutton), v[0] == 1);
     }
 
     if (v) free(v);
@@ -334,7 +328,7 @@
 }
 
 Ewl_Widget *
-eapp_border_get(Ewl_Widget *parent, char *title, char *align)
+eapp_border_get(Ewl_Widget *parent, char *title, int left_align)
 {
     Ewl_Widget *border;
 
@@ -342,19 +336,21 @@
     ewl_border_text_set(EWL_BORDER(border), title);
     ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_LEFT);
     ewl_container_child_append(EWL_CONTAINER(parent), border);
-    ewl_widget_show(border);
-    if (strcmp(align, "left") == 0)
+
+    if (left_align)
         ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_LEFT);
     else
-	ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_RIGHT);
+        ewl_object_alignment_set(EWL_OBJECT(border), EWL_FLAG_ALIGN_RIGHT);
+
+    ewl_widget_show(border);
     
     return border;
 }
 
 
 static void
-eapp_create_content(Eet_File *ef, char *key, char *name, char *lang, char *winclass,
-								 Ewl_Widget *parent)
+eapp_create_content(Eet_File *ef, char *key, char *name, char *lang, 
+                                    char *winclass, Ewl_Widget *parent)
 {
     Ewl_Widget *hbox, *label, *entry;
     char *v;
@@ -366,10 +362,8 @@
 
     v = eapp_eet_read(ef, key, lang);
 
-    if (!strcmp(key, "app/window/class"))
-    {
-        if (winclass) v = winclass;
-    }
+    if ((!strcmp(key, "app/window/class")) && (winclass))
+        v = winclass;
 
     label = ewl_label_new();
     ewl_label_text_set(EWL_LABEL(label), name);
@@ -387,6 +381,7 @@
     ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
     ewl_widget_name_set(entry, key);
     ewl_widget_show(entry);
+
     return;
 }
 
@@ -472,7 +467,6 @@
 {
     int i;
 
-
     /* add all the eet data */
     for (i = 0; keys[i].key; i++)
     {
@@ -493,7 +487,6 @@
             v = ewl_text_text_get(EWL_TEXT(o));
             if (v) s = strlen(v);
         }
-
         eapp_eet_write(ef, keys[i].key, lang, v, s);
     }
 }
@@ -507,19 +500,14 @@
         char buf[4096];
         char *ret, *r;
 
-        if (lang)
-            snprintf(buf, sizeof(buf), "%s[%s]", key, lang);
-        else
-            snprintf(buf, sizeof(buf), "%s", key);
+        if (lang) snprintf(buf, sizeof(buf), "%s[%s]", key, lang);
+        else snprintf(buf, sizeof(buf), "%s", key);
 
         r = eet_read(ef, buf, &size);
         if (r)
         {
             ret = malloc(sizeof(char) * (size + 1));
-            if (ret)
-            {
-                snprintf(ret, size + 1, "%s", r);
-            }
+            if (ret) snprintf(ret, size + 1, "%s", r);
             else ret = strdup("");
 
             free(r);
@@ -536,15 +524,11 @@
 
     if (ef)
     {
-        if (lang)
-            snprintf(buf, sizeof(buf), "%s[%s]", key, lang);
-        else
-            snprintf(buf, sizeof(buf), "%s", key);
+        if (lang) snprintf(buf, sizeof(buf), "%s[%s]", key, lang);
+        else snprintf(buf, sizeof(buf), "%s", key);
 
-        if (size == 0)
-            eet_delete(ef, buf);
-        else
-            eet_write(ef, buf, val, size, 0);
+        if (size == 0) eet_delete(ef, buf);
+        else eet_write(ef, buf, val, size, 0);
     }
 }

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : apps/e_utils

Dir     : e17/apps/e_utils/src/bin/eapp_edit


Modified Files:
	eapp_edit_main.c 


Log Message:
- cleanup

===================================================================
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- eapp_edit_main.c	5 Jun 2006 18:32:47 -0000	1.54
+++ eapp_edit_main.c	5 Jun 2006 18:42:44 -0000	1.55
@@ -31,7 +31,7 @@
 static void eapp_cb_fd_show(Ewl_Widget *w, void *ev, void *data);
 static void eapp_cb_fd_hide(Ewl_Widget *w, void *ev, void *data);
 static void eapp_cb_fd_changed(Ewl_Widget *w, void *ev, void *data);
-static void eapp_create_content(Eet_File *ef, char *key, char *name, 
+static void eapp_create_content(Eet_File *ef, Eapp_Item *item,
                                         char *lang, char *winclass, 
                                         Ewl_Widget *parent);
 Ewl_Widget *eapp_border_get(Ewl_Widget *parent, char *title, int left_align);
@@ -231,7 +231,7 @@
 {
     Ewl_Widget *hbox, *icon_border, *icon, *basic, *o;
     Ewl_Widget *hsep, *general;
-    Ewl_Widget *icon_theme, *window, *misc, *checkbutton;
+    Ewl_Widget *icon_theme, *window, *misc;
     Eet_File *ef = NULL;
     char *v;
     int i;   
@@ -290,37 +290,20 @@
     misc = eapp_border_get(hbox, "Misc", 0);
 
     for (i = 0; basic_keys[i].key; i++)
-        eapp_create_content(ef, basic_keys[i].key, basic_keys[i].name, 
-                                                lang, winclass, basic);
+        eapp_create_content(ef, &(basic_keys[i]), lang, winclass, basic);
 
     for (i = 0; general_keys[i].key; i++)
-        eapp_create_content(ef, general_keys[i].key, general_keys[i].name, 
-                                                lang, winclass, general);
+        eapp_create_content(ef, &(general_keys[i]), lang, winclass, general);
 
     for (i = 0; icon_theme_keys[i].key; i++)
-        eapp_create_content(ef, icon_theme_keys[i].key, 
-                                    icon_theme_keys[i].name, lang, 
+        eapp_create_content(ef, &(icon_theme_keys[i]), lang, 
                                     winclass, icon_theme);
 
     for (i = 0; window_keys[i].key; i++)
-     eapp_create_content(ef, window_keys[i].key, window_keys[i].name, 
-                                    lang, winclass, window);
+     eapp_create_content(ef, &(window_keys[i]), lang, winclass, window);
 
     for (i = 0; misc_keys[i].key; i++)
-    {
-        v = eapp_eet_read(ef, misc_keys[i].key, lang);
-
-        checkbutton = ewl_checkbutton_new();
-        ewl_button_label_set(EWL_BUTTON(checkbutton), misc_keys[i].name);
-        ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT);
-        ewl_container_child_append(EWL_CONTAINER(misc), checkbutton);
-        ewl_checkbutton_checked_set(EWL_CHECKBUTTON(checkbutton), v[0] == 1);
-        ewl_widget_name_set(checkbutton, misc_keys[i].key);
-        ewl_widget_show(checkbutton);
- 
-        if (v) free(v);
-        v = NULL;
-    }
+        eapp_create_content(ef, &(misc_keys[i]), lang, winclass, misc);
 
     if (ef) eet_close(ef);
 
@@ -349,38 +332,55 @@
 
 
 static void
-eapp_create_content(Eet_File *ef, char *key, char *name, char *lang, 
+eapp_create_content(Eet_File *ef, Eapp_Item *item, char *lang, 
                                     char *winclass, Ewl_Widget *parent)
 {
     Ewl_Widget *hbox, *label, *entry;
     char *v;
 
-    hbox = ewl_hbox_new();
-    ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
-    ewl_container_child_append(EWL_CONTAINER(parent), hbox);
-    ewl_widget_show(hbox);
+    v = eapp_eet_read(ef, item->key, lang);
 
-    v = eapp_eet_read(ef, key, lang);
+    if (item->checkbox)
+    {
+        Ewl_Widget *checkbutton;
 
-    if ((!strcmp(key, "app/window/class")) && (winclass))
-        v = winclass;
+        v = eapp_eet_read(ef, item->key, lang);
 
-    label = ewl_label_new();
-    ewl_label_text_set(EWL_LABEL(label), name);
-    ewl_object_fill_policy_set(EWL_OBJECT(label), EWL_FLAG_FILL_NONE);
-    ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_LEFT);
-    ewl_container_child_append(EWL_CONTAINER(hbox), label);
-    ewl_object_minimum_size_set(EWL_OBJECT(label), 75, 15);
-    ewl_object_maximum_size_set(EWL_OBJECT(label), 75, 15);
-    ewl_widget_show(label);
- 
-    entry = ewl_entry_new();
-    ewl_text_text_set(EWL_TEXT(entry), v);
-    ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
-    ewl_container_child_append(EWL_CONTAINER(hbox), entry);
-    ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
-    ewl_widget_name_set(entry, key);
-    ewl_widget_show(entry);
+        checkbutton = ewl_checkbutton_new();
+        ewl_button_label_set(EWL_BUTTON(checkbutton), item->name);
+        ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT);
+        ewl_container_child_append(EWL_CONTAINER(parent), checkbutton);
+        ewl_checkbutton_checked_set(EWL_CHECKBUTTON(checkbutton), v[0] == 1);
+        ewl_widget_name_set(checkbutton, item->key);
+        ewl_widget_show(checkbutton);
+    }
+    else
+    {
+        hbox = ewl_hbox_new();
+        ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
+        ewl_container_child_append(EWL_CONTAINER(parent), hbox);
+        ewl_widget_show(hbox);
+
+        if ((!strcmp(item->key, "app/window/class")) && (winclass))
+            v = winclass;
+
+        label = ewl_label_new();
+        ewl_label_text_set(EWL_LABEL(label), item->name);
+        ewl_object_fill_policy_set(EWL_OBJECT(label), EWL_FLAG_FILL_NONE);
+        ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_LEFT);
+        ewl_container_child_append(EWL_CONTAINER(hbox), label);
+        ewl_object_minimum_size_set(EWL_OBJECT(label), 75, 15);
+        ewl_object_maximum_size_set(EWL_OBJECT(label), 75, 15);
+        ewl_widget_show(label);
+
+        entry = ewl_entry_new();
+        ewl_text_text_set(EWL_TEXT(entry), v);
+        ewl_object_maximum_size_set(EWL_OBJECT(entry), 99999, 8);
+        ewl_container_child_append(EWL_CONTAINER(hbox), entry);
+        ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
+        ewl_widget_name_set(entry, item->key);
+        ewl_widget_show(entry);
+    }
 
     if (v && v != winclass) free(v);
     v = NULL;