From: Enlightenment C. <no...@cv...> - 2006-08-12 09:07:54
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Log Message: Directory /cvs/e/e17/proto/entrance_edit_gui added to the repository |
From: Enlightenment C. <no...@cv...> - 2006-08-12 09:08:34
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src Log Message: Directory /cvs/e/e17/proto/entrance_edit_gui/src added to the repository |
From: Enlightenment C. <no...@cv...> - 2006-08-12 09:13:44
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Log Message: Directory /cvs/e/e17/proto/entrance_edit_gui/src/gui added to the repository |
From: Enlightenment C. <no...@cv...> - 2006-08-12 09:14:09
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Log Message: Directory /cvs/e/e17/proto/entrance_edit_gui/src/widgets added to the repository |
From: Enlightenment C. <no...@cv...> - 2006-08-12 09:42:14
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Added Files: AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README autogen.sh configure.in entrance_config.png Log Message: Initial checkin of entrance_edit_gui into CVS. entrance_edit_gui (the entrance config panel), is currently being built in a funky way. With Codewarrior's help we came up with a basic idea in etk. I've gone ahead to refactor out (if you will), an easier and higher level api ontop of what we have. Basically, the api is focusing on converging a _very_ limited subset of etk (initially), to allow quickly putting together the entrance config panel. I'm not under any illusions of grandoise plans for this api, its strictly my personal bitch in the entrance gui config building industry, and by that definition its exposed api is supposed to be simple (even naively so). With LinuxTitan's help, we hope to spread the thin layer over ewl eventually. I've checking this into proto for a couple of reasons: - The whole code is going to be in a constant state of flux for the next couple of days/weeks. I don't want to move it to entrance in this state of flux, currently, its leaking everywhere... no frees, no error checks, nothing, its just a piece of scape code (or goat?), that will be eventually beaten into shape. Once things naturally slow down, I'll make that move. - xcomp doesn't want entrance to have a hard dependency on any toolkit. So the only config mechanism that will _always_ be there is entrance_edit (commandline). Once you have the neccessary toolkit installed, then the gui can also be built. I assume most ppl will want this anyhoo. To help us to keep things very loosely coupled, we'll be workign out of proto till things are a bit more stable. - This design is not final. Things can still change _drastically_. ok... i need to sleep... :) |
From: Enlightenment C. <no...@cv...> - 2006-08-12 09:42:14
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src Added Files: Makefile.am Log Message: Initial checkin of entrance_edit_gui into CVS. entrance_edit_gui (the entrance config panel), is currently being built in a funky way. With Codewarrior's help we came up with a basic idea in etk. I've gone ahead to refactor out (if you will), an easier and higher level api ontop of what we have. Basically, the api is focusing on converging a _very_ limited subset of etk (initially), to allow quickly putting together the entrance config panel. I'm not under any illusions of grandoise plans for this api, its strictly my personal bitch in the entrance gui config building industry, and by that definition its exposed api is supposed to be simple (even naively so). With LinuxTitan's help, we hope to spread the thin layer over ewl eventually. I've checking this into proto for a couple of reasons: - The whole code is going to be in a constant state of flux for the next couple of days/weeks. I don't want to move it to entrance in this state of flux, currently, its leaking everywhere... no frees, no error checks, nothing, its just a piece of scape code (or goat?), that will be eventually beaten into shape. Once things naturally slow down, I'll make that move. - xcomp doesn't want entrance to have a hard dependency on any toolkit. So the only config mechanism that will _always_ be there is entrance_edit (commandline). Once you have the neccessary toolkit installed, then the gui can also be built. I assume most ppl will want this anyhoo. To help us to keep things very loosely coupled, we'll be workign out of proto till things are a bit more stable. - This design is not final. Things can still change _drastically_. ok... i need to sleep... :) |
From: Enlightenment C. <no...@cv...> - 2006-08-12 09:42:14
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Added Files: Entrance_Widgets.h Makefile.am _ew_list.c _ew_list.h ew.c ew.h ew_dialog.c ew_dialog.h ew_edjelist.c ew_edjelist.h ew_group.c ew_group.h ew_image.c ew_image.h ew_textlist.c ew_textlist.h Log Message: Initial checkin of entrance_edit_gui into CVS. entrance_edit_gui (the entrance config panel), is currently being built in a funky way. With Codewarrior's help we came up with a basic idea in etk. I've gone ahead to refactor out (if you will), an easier and higher level api ontop of what we have. Basically, the api is focusing on converging a _very_ limited subset of etk (initially), to allow quickly putting together the entrance config panel. I'm not under any illusions of grandoise plans for this api, its strictly my personal bitch in the entrance gui config building industry, and by that definition its exposed api is supposed to be simple (even naively so). With LinuxTitan's help, we hope to spread the thin layer over ewl eventually. I've checking this into proto for a couple of reasons: - The whole code is going to be in a constant state of flux for the next couple of days/weeks. I don't want to move it to entrance in this state of flux, currently, its leaking everywhere... no frees, no error checks, nothing, its just a piece of scape code (or goat?), that will be eventually beaten into shape. Once things naturally slow down, I'll make that move. - xcomp doesn't want entrance to have a hard dependency on any toolkit. So the only config mechanism that will _always_ be there is entrance_edit (commandline). Once you have the neccessary toolkit installed, then the gui can also be built. I assume most ppl will want this anyhoo. To help us to keep things very loosely coupled, we'll be workign out of proto till things are a bit more stable. - This design is not final. Things can still change _drastically_. ok... i need to sleep... :) |
From: Enlightenment C. <no...@cv...> - 2006-08-12 09:42:14
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Added Files: Egui.h Makefile.am main.c theme.c Log Message: Initial checkin of entrance_edit_gui into CVS. entrance_edit_gui (the entrance config panel), is currently being built in a funky way. With Codewarrior's help we came up with a basic idea in etk. I've gone ahead to refactor out (if you will), an easier and higher level api ontop of what we have. Basically, the api is focusing on converging a _very_ limited subset of etk (initially), to allow quickly putting together the entrance config panel. I'm not under any illusions of grandoise plans for this api, its strictly my personal bitch in the entrance gui config building industry, and by that definition its exposed api is supposed to be simple (even naively so). With LinuxTitan's help, we hope to spread the thin layer over ewl eventually. I've checking this into proto for a couple of reasons: - The whole code is going to be in a constant state of flux for the next couple of days/weeks. I don't want to move it to entrance in this state of flux, currently, its leaking everywhere... no frees, no error checks, nothing, its just a piece of scape code (or goat?), that will be eventually beaten into shape. Once things naturally slow down, I'll make that move. - xcomp doesn't want entrance to have a hard dependency on any toolkit. So the only config mechanism that will _always_ be there is entrance_edit (commandline). Once you have the neccessary toolkit installed, then the gui can also be built. I assume most ppl will want this anyhoo. To help us to keep things very loosely coupled, we'll be workign out of proto till things are a bit more stable. - This design is not final. Things can still change _drastically_. ok... i need to sleep... :) |
From: Enlightenment C. <no...@cv...> - 2006-08-13 00:55:02
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Modified Files: _ew_list.c _ew_list.h ew.c ew.h ew_dialog.c ew_dialog.h Log Message: Cleanup all them funky struct typedefs. This looks neater. Thnx rhapsodhy =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- _ew_list.c 12 Aug 2006 15:23:53 -0000 1.2 +++ _ew_list.c 13 Aug 2006 00:54:58 -0000 1.3 @@ -6,7 +6,7 @@ Entrance_List __ew_list_new(void) { - Entrance_List el = calloc(1, sizeof(_Entrance_List_Data)); + Entrance_List el = calloc(1, sizeof(*el)); if(el) { el->owner = NULL; @@ -64,7 +64,7 @@ Entrance_List_Data ew_listdata_new(void) { - Entrance_List_Data ewld = calloc(1, sizeof(_Entrance_List_Data)); + Entrance_List_Data ewld = calloc(1, sizeof(*ewld)); if(ewld) { ewld->func = NULL; =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- _ew_list.h 12 Aug 2006 09:42:13 -0000 1.1 +++ _ew_list.h 13 Aug 2006 00:54:58 -0000 1.2 @@ -1,22 +1,18 @@ #ifndef _EW_LIST_H #define _EW_LIST_H -struct __Entrance_List_Data { +typedef struct _Entrance_List_Data { void (*func)(void); void *data; -}; +} *Entrance_List_Data; -typedef struct __Entrance_List_Data _Entrance_List_Data; -typedef struct __Entrance_List_Data *Entrance_List_Data; -struct __Entrance_List { +typedef struct _Entrance_List { Etk_Widget *owner; Etk_Widget *box; Etk_Tree_Col *col; -}; +} *Entrance_List; -typedef struct __Entrance_List _Entrance_List; -typedef struct __Entrance_List *Entrance_List; #define EW_LIST_FREE(ew) if(1) \ { \ =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ew.c 12 Aug 2006 09:42:13 -0000 1.1 +++ ew.c 13 Aug 2006 00:54:58 -0000 1.2 @@ -29,7 +29,7 @@ Entrance_Widget ew_new(void) { - Entrance_Widget ew = calloc(1, sizeof(_Entrance_Widget)); + Entrance_Widget ew = calloc(1, sizeof(*ew)); if(ew) { ew->owner = NULL; =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ew.h 12 Aug 2006 09:42:13 -0000 1.1 +++ ew.h 13 Aug 2006 00:54:58 -0000 1.2 @@ -1,13 +1,10 @@ #ifndef _EW_H #define _EW_H -struct __Entrance_Widget { +typedef struct _Entrance_Widget { Etk_Widget *owner; Etk_Widget *box; -}; - -typedef struct __Entrance_Widget _Entrance_Widget; -typedef struct __Entrance_Widget *Entrance_Widget; +} *Entrance_Widget; #define EW_FREE(ew) if(1) \ =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_dialog.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ew_dialog.c 12 Aug 2006 15:23:53 -0000 1.2 +++ ew_dialog.c 13 Aug 2006 00:54:58 -0000 1.3 @@ -6,7 +6,7 @@ Entrance_Dialog _ew_dialog_new() { - Entrance_Dialog ed = calloc(1, sizeof(_Entrance_Dialog)); + Entrance_Dialog ed = calloc(1, sizeof(*ed)); if(ed) { ed->owner = NULL; =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_dialog.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ew_dialog.h 12 Aug 2006 09:42:13 -0000 1.1 +++ ew_dialog.h 13 Aug 2006 00:54:58 -0000 1.2 @@ -1,14 +1,11 @@ #ifndef _EW_DIALOG_H #define _EW_DIALOG_H -struct __Entrance_Dialog { +typedef struct _Entrance_Dialog { Etk_Widget *owner; Etk_Widget *box; Etk_Widget *hbox; -}; - -typedef struct __Entrance_Dialog _Entrance_Dialog; -typedef struct __Entrance_Dialog *Entrance_Dialog; +} *Entrance_Dialog; #define EW_DIALOG_FREE(ew) if(1) \ { \ |
From: Enlightenment C. <no...@cv...> - 2006-08-13 00:58:09
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/m4 Log Message: Directory /cvs/e/e17/proto/entrance_edit_gui/m4 added to the repository |
From: Enlightenment C. <no...@cv...> - 2006-08-13 01:00:34
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/m4 Added Files: ac_path_generic.m4 Log Message: autoKUNGfoo started. Currently things don't build anymore because of deps. I'm fixing that now. Also, now that i understand the use of MAINTAINERCLEANFILES, i'm stuffing it everywhere. The new moto... "Where there is a Makefile.am, there is a MAINTAINERCLEANFILE!" :) |
From: Enlightenment C. <no...@cv...> - 2006-08-13 01:00:35
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Modified Files: Makefile.am theme.c Log Message: autoKUNGfoo started. Currently things don't build anymore because of deps. I'm fixing that now. Also, now that i understand the use of MAINTAINERCLEANFILES, i'm stuffing it everywhere. The new moto... "Where there is a Makefile.am, there is a MAINTAINERCLEANFILE!" :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 12 Aug 2006 14:54:42 -0000 1.2 +++ Makefile.am 13 Aug 2006 01:00:33 -0000 1.3 @@ -1,4 +1,4 @@ - +MAINTAINERCLEANFILES = Makefile.in bin_PROGRAMS=entrance_edit_gui entrance_edit_gui_SOURCES=main.c \ =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/theme.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- theme.c 12 Aug 2006 15:23:53 -0000 1.3 +++ theme.c 13 Aug 2006 01:00:33 -0000 1.4 @@ -1,9 +1,7 @@ #include <limits.h> #include <Ecore_File.h> #include <Ecore_Data.h> -#include <Etk.h> #include <Entrance_Widgets.h> -//#include "Egui.h" static void _egui_theme_cb_selected(void); static void _egui_theme_cb_ok(void *object, void *data); |
From: Enlightenment C. <no...@cv...> - 2006-08-13 01:00:35
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Modified Files: Makefile.am Log Message: autoKUNGfoo started. Currently things don't build anymore because of deps. I'm fixing that now. Also, now that i understand the use of MAINTAINERCLEANFILES, i'm stuffing it everywhere. The new moto... "Where there is a Makefile.am, there is a MAINTAINERCLEANFILE!" :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 12 Aug 2006 09:42:13 -0000 1.1 +++ Makefile.am 13 Aug 2006 01:00:33 -0000 1.2 @@ -1,4 +1,4 @@ - +MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES=libentrance_widgets.la |
From: Enlightenment C. <no...@cv...> - 2006-08-13 01:01:04
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: Makefile.am autogen.sh configure.in Log Message: autoKUNGfoo started. Currently things don't build anymore because of deps. I'm fixing that now. Also, now that i understand the use of MAINTAINERCLEANFILES, i'm stuffing it everywhere. The new moto... "Where there is a Makefile.am, there is a MAINTAINERCLEANFILE!" :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 12 Aug 2006 17:20:39 -0000 1.3 +++ Makefile.am 13 Aug 2006 01:00:32 -0000 1.4 @@ -1,7 +1,11 @@ SUBDIRS = data src MAINTAINERCLEANFILES = \ - debian/changelog + Makefile.in aclocal.m4 config.guess \ + config.h.in config.sub configure install-sh \ + ltconfig ltmain.sh missing mkinstalldirs depcomp \ + stamp-h.in compile \ + debian/changelog EXTRA_DIST = \ debian/changelog \ =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/autogen.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- autogen.sh 12 Aug 2006 09:42:12 -0000 1.1 +++ autogen.sh 13 Aug 2006 01:00:32 -0000 1.2 @@ -1,11 +1,9 @@ #!/bin/sh -rm -rf autom4te.cache || echo "No cache" -rm -f aclocal.m4 ltmain.sh || echo "not run yet" +rm -rf autom4te.cache +rm -f aclocal.m4 ltmain.sh -touch README - -echo "Running aclocal..." ; aclocal || exit 1 +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- configure.in 12 Aug 2006 17:20:39 -0000 1.4 +++ configure.in 13 Aug 2006 01:00:32 -0000 1.5 @@ -1,27 +1,120 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. +dnl Process this file with autoconf to produce a configure script. -#AC_PREREQ(2.60) -AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) -AM_INIT_AUTOMAKE(entrance_edit_gui, 0.0.1, Essien Ita Essien <es...@wa...>) -AC_PROG_LIBTOOL +# get rid of that stupid cache mechanism +rm -f config.cache -AC_CONFIG_HEADER([config.h]) +AC_INIT(configure.in) -# Checks for programs. -AC_PROG_CC +AC_CANONICAL_BUILD +AC_CANONICAL_HOST +AC_CANONICAL_TARGET -# Checks for libraries. +AM_INIT_AUTOMAKE(entrance_edit_gui, 0.0.1) -# Checks for header files. -AC_CHECK_HEADERS([ ]) +AC_PREREQ(2.52) -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST +AM_CONFIG_HEADER(config.h) -# Checks for library functions. +AC_ISC_POSIX +AC_PROG_CC +AM_PROG_CC_STDC +AC_HEADER_STDC +AC_C_CONST +AM_ENABLE_SHARED +AM_PROG_LIBTOOL +LIBS="" + +if test "x${exec_prefix}" = "xNONE"; then + if test "x${prefix}" = "xNONE"; then + bindir="${ac_default_prefix}/bin"; + else + bindir="${prefix}/bin"; + fi +else + if test "x${prefix}" = "xNONE"; then + bindir="${ac_default_prefix}/bin"; + else + bindir="${prefix}/bin"; + fi +fi + +if test "x${exec_prefix}" = "xNONE"; then + if test "x${prefix}" = "xNONE"; then + libdir="${ac_default_prefix}/lib"; + else + libdir="${prefix}/lib"; + fi +else + if test "x${prefix}" = "xNONE"; then + libdir="${ac_default_prefix}/lib"; + else + libdir="${prefix}/lib"; + fi +fi + +dnl Set PACKAGE_DATA_DIR in config.h. +if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory]) +else + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory]) +fi + +dnl Set PACKAGE_BIN_DIR in config.h. +if test "x${bindir}" = 'xNONE'; then + if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Installation Directory for User Executables]) + else + AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation Directory for User Executables]) + fi +else + AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation Directory for User Executables]) +fi + +dnl Set PACKAGE_LIB_DIR in config.h. +if test "x${libdir}" = 'xNONE'; then + if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation Directory for Libraries]) + else + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation Directory for Libraries]) + fi +else + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation Directory for Libraries]) +fi + +#dnl Set PACKAGE_SOURCE_DIR in config.h. +#packagesrcdir=`cd $srcdir && pwd` +#AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code Directory]) + +#check for ETK +AC_PATH_EFL( + etk, + 0.1.0.001, + [ + AC_DEFINE(HAVE_ETK, 1, have ETK) + etk="ETK " + AM_CONDITIONAL(HAVE_ETK, true) + have_etk="yes" + etk_libs=`etk-config --libs` + etk_cflags=`etk-config --cflags` + ], + [ + AC_MSG_ERROR([No Etk, can't build.]) + ] +) + +dnl Set ETK_PACKAGE_DATA_DIR in config.h. +etk_prefix="\"`etk-config --prefix`/share/etk\"" +AC_DEFINE_UNQUOTED(ETK_PACKAGE_DATA_DIR, $etk_prefix, [Data dir for etk lib.]) + +etk_libs=`etk-config --libs` +etk_cflags=`etk-config --cflags` + +# add required libs / include here +my_includes="$etk_cflags" +my_libs="$etk_libs" +AC_SUBST(my_includes) +AC_SUBST(my_libs) -AC_CONFIG_SUBDIRS([entrance.edit]) AC_OUTPUT([ Makefile \ src/Makefile \ @@ -36,4 +129,3 @@ data/icons/48x48/devices/Makefile \ debian/changelog ]) - |
From: Enlightenment C. <no...@cv...> - 2006-08-13 01:01:05
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src Modified Files: Makefile.am Log Message: autoKUNGfoo started. Currently things don't build anymore because of deps. I'm fixing that now. Also, now that i understand the use of MAINTAINERCLEANFILES, i'm stuffing it everywhere. The new moto... "Where there is a Makefile.am, there is a MAINTAINERCLEANFILE!" :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 12 Aug 2006 09:42:12 -0000 1.1 +++ Makefile.am 13 Aug 2006 01:00:33 -0000 1.2 @@ -1 +1,2 @@ +MAINTAINERCLEANFILES= Makefile.in SUBDIRS = widgets gui |
From: Enlightenment C. <no...@cv...> - 2006-08-13 02:17:16
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Modified Files: Makefile.am Log Message: After shamelessly copying estickies' configure.in, I've integrated the deps properly. Autofoo for entrance_edit_gui now works and looks like the rest of e. The next stage of autofoo will start as LinuxTitan begins to build the ewl backend for libentrance_widgets, then we'll have to build for etk or ewl. Happy times ahead ppls :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 13 Aug 2006 01:00:33 -0000 1.2 +++ Makefile.am 13 Aug 2006 02:17:14 -0000 1.3 @@ -1,16 +1,9 @@ MAINTAINERCLEANFILES = Makefile.in -lib_LTLIBRARIES=libentrance_widgets.la +lib_LTLIBRARIES=libentrance_widgets.la -libentrance_widgets_la_SOURCES = ew.c ew.h \ - ew_dialog.c ew_dialog.h \ - ew_group.c ew_group.h \ - _ew_list.c _ew_list.h \ - ew_textlist.c ew_textlist.h \ - ew_edjelist.c ew_edjelist.h \ - ew_image.c ew_image.h - -libentrance_widgets_la_HEADERS = Entrance_Widgets.h \ +libentrance_widgets_la_HEADERS = \ + Entrance_Widgets.h \ ew.h \ ew_dialog.h \ ew_group.h \ @@ -18,6 +11,19 @@ ew_textlist.h \ ew_edjelist.h \ ew_image.h + libentrance_widgets_ladir = $(prefix)/include -libentrance_widgets_la_LDFLAGS=`etk-config --libs` -libentrance_widgets_la_CFLAGS=`etk-config --cflags` + + +libentrance_widgets_la_SOURCES = \ + ew.c \ + ew_dialog.c \ + ew_group.c \ + _ew_list.c \ + ew_textlist.c \ + ew_edjelist.c \ + ew_image.c \ + $(libentrance_widgets_la_HEADERS) + +libentrance_widgets_la_LIBADD = @etk_libs@ +libentrance_widgets_la_CFLAGS = @etk_cflags@ |
From: Enlightenment C. <no...@cv...> - 2006-08-13 02:17:46
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: Makefile.am configure.in Log Message: After shamelessly copying estickies' configure.in, I've integrated the deps properly. Autofoo for entrance_edit_gui now works and looks like the rest of e. The next stage of autofoo will start as LinuxTitan begins to build the ewl backend for libentrance_widgets, then we'll have to build for etk or ewl. Happy times ahead ppls :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 13 Aug 2006 01:00:32 -0000 1.4 +++ Makefile.am 13 Aug 2006 02:17:14 -0000 1.5 @@ -4,7 +4,7 @@ Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ ltconfig ltmain.sh missing mkinstalldirs depcomp \ - stamp-h.in compile \ + stamp-h.in compile config.h.in~ \ debian/changelog EXTRA_DIST = \ =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- configure.in 13 Aug 2006 01:00:32 -0000 1.5 +++ configure.in 13 Aug 2006 02:17:14 -0000 1.6 @@ -98,22 +98,15 @@ etk_cflags=`etk-config --cflags` ], [ - AC_MSG_ERROR([No Etk, can't build.]) + AC_MSG_ERROR([No Etk, can't build. Check back when we support another toolkit, or just install etk already!]) ] ) -dnl Set ETK_PACKAGE_DATA_DIR in config.h. -etk_prefix="\"`etk-config --prefix`/share/etk\"" -AC_DEFINE_UNQUOTED(ETK_PACKAGE_DATA_DIR, $etk_prefix, [Data dir for etk lib.]) - etk_libs=`etk-config --libs` etk_cflags=`etk-config --cflags` -# add required libs / include here -my_includes="$etk_cflags" -my_libs="$etk_libs" -AC_SUBST(my_includes) -AC_SUBST(my_libs) +AC_SUBST(etk_libs) +AC_SUBST(etk_cflags) AC_OUTPUT([ Makefile \ |
From: Enlightenment C. <no...@cv...> - 2006-08-13 02:17:46
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Modified Files: Makefile.am Log Message: After shamelessly copying estickies' configure.in, I've integrated the deps properly. Autofoo for entrance_edit_gui now works and looks like the rest of e. The next stage of autofoo will start as LinuxTitan begins to build the ewl backend for libentrance_widgets, then we'll have to build for etk or ewl. Happy times ahead ppls :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 13 Aug 2006 01:00:33 -0000 1.3 +++ Makefile.am 13 Aug 2006 02:17:14 -0000 1.4 @@ -1,4 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in + bin_PROGRAMS=entrance_edit_gui entrance_edit_gui_SOURCES=main.c \ @@ -9,6 +10,16 @@ theme.c \ x_settings.c \ Egui.h -entrance_edit_gui_CFLAGS=-I../widgets -entrance_edit_gui_LDFLAGS=-L../widgets -entrance_edit_gui_LDADD=-lentrance_widgets -lentrance_edit + +entrance_edit_gui_CFLAGS = \ + -I$(top_srcdir)/src/widgets \ + @etk_cflags@ + +entrance_edit_gui_LDFLAGS = \ + -L$(top_srcdir)/src/widgets + +entrance_edit_gui_LDADD = \ + -lentrance_widgets \ + -lentrance_edit \ + @etk_libs@ + |
From: Enlightenment C. <no...@cv...> - 2006-08-13 02:48:20
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Modified Files: Makefile.am background.c behavior.c layout.c main.c sessions.c x_settings.c Log Message: We're now using our own edje theme file. No more direct etk dependency except in the backend. Also, make those place holder handlers actually printf by appending newlines. =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 13 Aug 2006 02:17:14 -0000 1.4 +++ Makefile.am 13 Aug 2006 02:48:19 -0000 1.5 @@ -12,14 +12,11 @@ Egui.h entrance_edit_gui_CFLAGS = \ - -I$(top_srcdir)/src/widgets \ - @etk_cflags@ + -I$(top_srcdir)/src/widgets entrance_edit_gui_LDFLAGS = \ -L$(top_srcdir)/src/widgets entrance_edit_gui_LDADD = \ -lentrance_widgets \ - -lentrance_edit \ - @etk_libs@ - + -lentrance_edit =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- background.c 12 Aug 2006 14:54:42 -0000 1.1 +++ background.c 13 Aug 2006 02:48:19 -0000 1.2 @@ -3,5 +3,5 @@ void egui_background_dialog_show() { -printf("Background clicked"); +printf("Background clicked\n"); } =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/behavior.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- behavior.c 12 Aug 2006 14:54:42 -0000 1.1 +++ behavior.c 13 Aug 2006 02:48:19 -0000 1.2 @@ -3,5 +3,5 @@ void egui_behavior_dialog_show() { - printf("Behavior clicked"); + printf("Behavior clicked\n"); } =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/layout.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- layout.c 12 Aug 2006 14:54:42 -0000 1.1 +++ layout.c 13 Aug 2006 02:48:19 -0000 1.2 @@ -3,6 +3,6 @@ void egui_layout_dialog_show() { - printf("Layout clicked"); + printf("Layout clicked\n"); } =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- main.c 12 Aug 2006 15:23:53 -0000 1.3 +++ main.c 13 Aug 2006 02:48:19 -0000 1.4 @@ -1,6 +1,7 @@ #include <Etk.h> #include <Entrance_Widgets.h> #include "Egui.h" +#include "config.h" static void _main_dialog_show(void); static void _close_button_cb(void *, void *); @@ -27,15 +28,15 @@ _main_dialog_show() { dialog = ew_dialog_new(_("Entrance Configuration"), EW_TRUE); - const char* edjefile = etk_theme_icon_theme_get(); + const char* edjefile = PACKAGE_DATA_DIR"/icons/icons.edj"; Entrance_List tree = ew_edjelist_new("<b>Configuration</b>", 320, 240, 52, 90); - ew_edjelist_add(tree, _("Theme"), edjefile, "apps/preferences-desktop-theme_48", NULL, 0, egui_theme_dialog_show); - ew_edjelist_add(tree, _("Background"), edjefile, "apps/preferences-desktop-wallpaper_48", NULL, 0, egui_background_dialog_show); - ew_edjelist_add(tree, _("Layout"), edjefile, "categories/preferences-desktop_48", NULL, 0, egui_layout_dialog_show); - ew_edjelist_add(tree, _("Behavior"), edjefile, "categories/preferences-system_48", NULL, 0, egui_behavior_dialog_show); - ew_edjelist_add(tree, _("Sessions"),edjefile, "apps/preferences-system-session_48", NULL, 0, egui_sessions_dialog_show); - ew_edjelist_add(tree, _("X settings"), edjefile, "devices/video-display_48",NULL, 0, egui_x_settings_dialog_show); + ew_edjelist_add(tree, _("Theme"), edjefile, "icons/main/theme", NULL, 0, egui_theme_dialog_show); + ew_edjelist_add(tree, _("Background"), edjefile, "icons/main/background", NULL, 0, egui_background_dialog_show); + ew_edjelist_add(tree, _("Layout"), edjefile, "icons/main/layout", NULL, 0, egui_layout_dialog_show); + ew_edjelist_add(tree, _("Behavior"), edjefile, "icons/main/behavior", NULL, 0, egui_behavior_dialog_show); + ew_edjelist_add(tree, _("Sessions"),edjefile, "icons/main/sessions", NULL, 0, egui_sessions_dialog_show); + ew_edjelist_add(tree, _("X settings"), edjefile, "icons/main/xsettings",NULL, 0, egui_x_settings_dialog_show); Entrance_Widget group = ew_dialog_group_add(dialog, _("Configuration")); ew_group_add(group, tree); =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/sessions.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- sessions.c 12 Aug 2006 14:54:42 -0000 1.1 +++ sessions.c 13 Aug 2006 02:48:19 -0000 1.2 @@ -3,6 +3,6 @@ void egui_sessions_dialog_show() { - printf("Sessions clicked"); + printf("Sessions clicked\n"); } =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/x_settings.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- x_settings.c 12 Aug 2006 14:54:42 -0000 1.1 +++ x_settings.c 13 Aug 2006 02:48:19 -0000 1.2 @@ -3,6 +3,6 @@ void egui_x_settings_dialog_show() { - printf("X settings dialog clicked"); + printf("X settings dialog clicked\n"); } |
From: Enlightenment C. <no...@cv...> - 2006-08-13 04:39:01
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: configure.in Log Message: - Add entrance deps (or actually libentrance_edit) to configure.in. Its not yet properly done, as I think it would be better for it to provide an entrance_edit-config like other e libs do. - Make src/gui build again by adding etk deps back to libentrance_widgets. libentrance_widgets eventually should also have its own entrance_widgets-config, so that when we're changing backends, it will drag in its proper dependencies via autoKUNGfoo =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- configure.in 13 Aug 2006 02:17:14 -0000 1.6 +++ configure.in 13 Aug 2006 04:38:58 -0000 1.7 @@ -85,6 +85,23 @@ #packagesrcdir=`cd $srcdir && pwd` #AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code Directory]) +#check for ENTRANCE which contains libentrance_edit +#AC_PATH_EFL( +# entrance, +# 0.1.0.001, +# [ +# AC_DEFINE(HAVE_ENTRANCE, 1, have ENTRANCE) +# entrance="ENTRANCE " +# AM_CONDITIONAL(HAVE_ENTRANCE, true) +# have_entrance="yes" +# entrance_libs=-lentrance_edit +# entrance_cflags=/usr/include/ +# ], +# [ +# AC_MSG_ERROR([No Entrance, entrance_edit_gui is an entrance utility. Install entrance first]) +# ] +#) + #check for ETK AC_PATH_EFL( etk, @@ -98,13 +115,15 @@ etk_cflags=`etk-config --cflags` ], [ - AC_MSG_ERROR([No Etk, can't build. Check back when we support another toolkit, or just install etk already!]) + AC_MSG_ERROR([No Etk, can't build. Check back when we support another toolkit or just install etk already!]) ] ) -etk_libs=`etk-config --libs` -etk_cflags=`etk-config --cflags` +entrance_libs=-lentrance_edit +entrance_cflags=/usr/include/ +AC_SUBST(entrance_libs) +AC_SUBST(entrance_cflags) AC_SUBST(etk_libs) AC_SUBST(etk_cflags) |
From: Enlightenment C. <no...@cv...> - 2006-08-13 04:39:01
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Modified Files: Makefile.am main.c Log Message: - Add entrance deps (or actually libentrance_edit) to configure.in. Its not yet properly done, as I think it would be better for it to provide an entrance_edit-config like other e libs do. - Make src/gui build again by adding etk deps back to libentrance_widgets. libentrance_widgets eventually should also have its own entrance_widgets-config, so that when we're changing backends, it will drag in its proper dependencies via autoKUNGfoo =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 13 Aug 2006 02:48:19 -0000 1.5 +++ Makefile.am 13 Aug 2006 04:38:58 -0000 1.6 @@ -12,11 +12,13 @@ Egui.h entrance_edit_gui_CFLAGS = \ - -I$(top_srcdir)/src/widgets + -I$(top_srcdir)/src/widgets \ +@etk_cflags@ \ +@entrance_cflags@ entrance_edit_gui_LDFLAGS = \ -L$(top_srcdir)/src/widgets entrance_edit_gui_LDADD = \ -lentrance_widgets \ - -lentrance_edit + @entrance_libs@ =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- main.c 13 Aug 2006 02:48:19 -0000 1.4 +++ main.c 13 Aug 2006 04:38:58 -0000 1.5 @@ -1,4 +1,3 @@ -#include <Etk.h> #include <Entrance_Widgets.h> #include "Egui.h" #include "config.h" |
From: Enlightenment C. <no...@cv...> - 2006-08-13 06:17:29
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Modified Files: _ew_list.c _ew_list.h Log Message: - Theme dialog works now. - I have a problem selecting the first row adding to the list. This should be done in the widget such that after adding to a list, the first row is always selected will make our lives easier. Anyone wanting to do this *hint* *hint* should look in src/widgets/ew_txtlist.c/ew_txtlist_add() and src/widgets/ew_edjelist.c/ew_edjelist_add() - I've cleaned up theme.c a bit more... it *looks* better. It still leaks like a basket though. *hint* *hint* - i need to sleep now :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- _ew_list.c 13 Aug 2006 00:54:58 -0000 1.3 +++ _ew_list.c 13 Aug 2006 06:17:27 -0000 1.4 @@ -74,10 +74,21 @@ return ewld; } +void +ew_list_first_row_select(Entrance_List el) +{ + Etk_Tree_Row *row = etk_tree_first_row_get(ETK_TREE(el->owner)); + etk_tree_row_select(row); +} + void* ew_list_selected_data_get(Entrance_List el) { Etk_Tree_Row *row = etk_tree_selected_row_get(ETK_TREE(el->owner)); + if(!row) { + return NULL; + } + Entrance_List_Data ewld = etk_tree_row_data_get(row); return ewld->data; } =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- _ew_list.h 13 Aug 2006 00:54:58 -0000 1.2 +++ _ew_list.h 13 Aug 2006 06:17:27 -0000 1.3 @@ -53,5 +53,6 @@ Entrance_List _ew_list_buildtree(Entrance_List); Entrance_List_Data ew_listdata_new(void); void* ew_list_selected_data_get(Entrance_List); +void ew_list_first_row_select(Entrance_List); #endif |
From: Enlightenment C. <no...@cv...> - 2006-08-13 06:17:29
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Modified Files: main.c theme.c Log Message: - Theme dialog works now. - I have a problem selecting the first row adding to the list. This should be done in the widget such that after adding to a list, the first row is always selected will make our lives easier. Anyone wanting to do this *hint* *hint* should look in src/widgets/ew_txtlist.c/ew_txtlist_add() and src/widgets/ew_edjelist.c/ew_edjelist_add() - I've cleaned up theme.c a bit more... it *looks* better. It still leaks like a basket though. *hint* *hint* - i need to sleep now :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- main.c 13 Aug 2006 04:38:58 -0000 1.5 +++ main.c 13 Aug 2006 06:17:27 -0000 1.6 @@ -1,4 +1,5 @@ #include <Entrance_Widgets.h> +#include <Entrance_Edit.h> #include "Egui.h" #include "config.h" =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/theme.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- theme.c 13 Aug 2006 01:00:33 -0000 1.4 +++ theme.c 13 Aug 2006 06:17:27 -0000 1.5 @@ -2,11 +2,16 @@ #include <Ecore_File.h> #include <Ecore_Data.h> #include <Entrance_Widgets.h> +#include <Entrance_Edit.h> -static void _egui_theme_cb_selected(void); -static void _egui_theme_cb_ok(void *object, void *data); -static void _egui_theme_cb_apply(void *object, void *data); -static void _egui_theme_cb_close(void *object, void *data); +static void _theme_cb_selected(void); +static void _theme_cb_ok(void *, void *); +static void _theme_cb_apply(void *, void *); +static void _theme_cb_close(void *, void *); + +static char* _theme_get_path(const char *); +static void _theme_close(void); +static void _theme_apply(void); static Entrance_Dialog win; static Entrance_Widget img_preview; @@ -20,31 +25,35 @@ { Ecore_List *themes; char *theme; - char theme_file[PATH_MAX]; win = ew_dialog_new(_("Entrance - Theme Chooser"), EW_FALSE); group_preview = ew_dialog_group_add(win, _("Preview")); + img_preview = ew_image_new(320, 240); - /* ew_image_edje_load(img_preview, "/usr/share/entrance/themes/default.edj", "Preview");*/ ew_group_add(group_preview, img_preview); group_themes = ew_dialog_group_add(win, _("Themes")); - + list_thumbs = ew_textlist_new(NULL, 320, 140, 20, 90); /* scan for themes and add them to the list */ themes = ecore_file_ls("/usr/share/entrance/themes"); if(!themes || ecore_list_is_empty(themes)) return; + + theme = ecore_list_first(themes); + char *theme_file = _theme_get_path(theme); + ew_image_edje_load(img_preview, theme_file, "Preview"); + free(theme_file); + /*FIXME: selecting the first row doesn't work - maybe we select first row while adding elements to the list:(*/ + ew_list_first_row_select(list_thumbs); + ecore_list_goto_first(themes); while((theme = ecore_list_next(themes))) { - char *theme_no_ext; - - theme_no_ext = ecore_file_strip_ext(theme); - snprintf(theme_file, sizeof(theme_file), "/usr/share/entrance/themes/%s", theme); - ew_textlist_add(list_thumbs, theme_no_ext, theme_file, strlen(theme_file) + 1, _egui_theme_cb_selected); + char *theme_no_ext = ecore_file_strip_ext(theme); + ew_textlist_add(list_thumbs, theme_no_ext, theme, strlen(theme) + 1, _theme_cb_selected); free(theme_no_ext); } @@ -54,37 +63,71 @@ /*Entrance_Widget group_options = ew_dialog_group_add(win, _("Options"));*/ - ew_dialog_close_button_add(win, _egui_theme_cb_close, NULL); - ew_dialog_apply_button_add(win, _egui_theme_cb_apply, NULL); - ew_dialog_ok_button_add(win, _egui_theme_cb_ok, NULL); + ew_dialog_close_button_add(win, _theme_cb_close, NULL); + ew_dialog_apply_button_add(win, _theme_cb_apply, NULL); + ew_dialog_ok_button_add(win, _theme_cb_ok, NULL); ew_dialog_show(win); } static void -_egui_theme_cb_selected() +_theme_cb_selected() { - char* themefile = ew_list_selected_data_get(list_thumbs); - ew_image_edje_load(img_preview, themefile, "Preview"); + char* theme = ew_list_selected_data_get(list_thumbs); + char* theme_path = _theme_get_path(theme); + ew_image_edje_load(img_preview, theme_path, "Preview"); + + free(theme_path); } static void -_egui_theme_cb_ok(void *object, void *data) +_theme_cb_ok(void *object, void *data) { - printf("ok pressed!\n"); - ew_dialog_destroy(win); + _theme_apply(); + _theme_close(); } static void -_egui_theme_cb_apply(void *object, void *data) +_theme_cb_apply(void *object, void *data) +{ + _theme_apply(); +} + +static void +_theme_cb_close(void *object, void *data) +{ + _theme_close(); +} + +static char* +_theme_get_path(const char *t) +{ + char *path = calloc(PATH_MAX, sizeof(*path)); + snprintf(path, PATH_MAX, "/usr/share/entrance/themes/%s", t); + + return path; +} + +static void +_theme_apply(void) { - char *themefile = ew_list_selected_data_get(list_thumbs); - printf("apply pressed - %s!\n", themefile); + char *theme = ew_list_selected_data_get(list_thumbs); + if(!theme) + { + printf("Error. Please select a theme first\n"); + return; + } + + entrance_edit_string_set(ENTRANCE_EDIT_KEY_CLIENT_THEME_STR, theme); + if(!entrance_edit_save()) + { + printf("Error setting theme - %s. Please check your permissions\n", theme); + } } static void -_egui_theme_cb_close(void *object, void *data) +_theme_close(void) { ew_dialog_destroy(win); } |
From: Enlightenment C. <no...@cv...> - 2006-08-13 13:46:49
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: configure.in Log Message: Meh! Missed out a -I for entrance_cflags - Thnx to Jonathan Protzenko for catching that. =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- configure.in 13 Aug 2006 04:38:58 -0000 1.7 +++ configure.in 13 Aug 2006 13:46:45 -0000 1.8 @@ -120,7 +120,7 @@ ) entrance_libs=-lentrance_edit -entrance_cflags=/usr/include/ +entrance_cflags=-I/usr/include/ AC_SUBST(entrance_libs) AC_SUBST(entrance_cflags) |
From: Enlightenment C. <no...@cv...> - 2006-08-13 19:58:47
|
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Modified Files: background.c Log Message: Use the proper libentrance_edit key for setting the background value. Previously, it was still setting the theme instead :) =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- background.c 13 Aug 2006 17:00:15 -0000 1.3 +++ background.c 13 Aug 2006 19:58:45 -0000 1.4 @@ -119,7 +119,7 @@ return; } - entrance_edit_string_set(ENTRANCE_EDIT_KEY_CLIENT_THEME_STR, background); + entrance_edit_string_set(ENTRANCE_EDIT_KEY_CLIENT_BACKGROUND_STR, background); if(!entrance_edit_save()) { printf("Error setting background - %s. Please check your permissions\n", background); |