From: <enl...@li...> - 2005-12-19 22:36:53
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Log Message: Directory /cvsroot/enlightenment/e_modules/tclock added to the repository |
From: <enl...@li...> - 2005-12-19 22:39:17
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Added Files: .cvsignore AUTHORS autogen.sh ChangeLog configure.in COPYING e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h e_modules-tclock.spec INSTALL Makefile.am module_icon.png NEWS README tclock.edc Log Message: Add tclock module to e_modules |
From: <enl...@li...> - 2005-12-19 22:39:36
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock/fonts Log Message: Directory /cvsroot/enlightenment/e_modules/tclock/fonts added to the repository |
From: <enl...@li...> - 2005-12-19 22:40:01
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock/images Log Message: Directory /cvsroot/enlightenment/e_modules/tclock/images added to the repository |
From: <enl...@li...> - 2005-12-19 22:40:59
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock/fonts Added Files: vera.ttf Log Message: Add tclock to e_modules |
From: <enl...@li...> - 2005-12-19 22:41:38
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock/images Added Files: background.png Log Message: Add tclock to e_modules |
From: <enl...@li...> - 2005-12-20 03:56:50
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.c Log Message: Formatting =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.c 19 Dec 2005 22:39:11 -0000 1.1 +++ e_mod_main.c 20 Dec 2005 03:56:41 -0000 1.2 @@ -208,7 +208,7 @@ } static void -_tclock_shutdown (TClock *tclock) +_tclock_shutdown(TClock *tclock) { Evas_List *list; |
From: <enl...@li...> - 2005-12-21 10:36:12
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.h Log Message: Add missing config proto =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h 19 Dec 2005 22:39:11 -0000 1.1 +++ e_mod_main.h 21 Dec 2005 10:36:04 -0000 1.2 @@ -9,6 +9,7 @@ #define TCLOCK_DEBUG(X) (printf("tclock_debug: %s\n",X)) #undef TCLOCK_DEBUG #define TCLOCK_DEBUG(X) + typedef struct _Config { Evas_List *faces; @@ -51,7 +52,6 @@ E_Gadman_Client *gmc; }TClock_Face; - extern E_Module_Api e_modapi; EAPI void *e_modapi_init (E_Module *m); @@ -59,6 +59,7 @@ EAPI int e_modapi_save (E_Module *m); EAPI int e_modapi_info (E_Module *m); EAPI int e_modapi_about (E_Module *m); +EAPI int e_modapi_config (E_Module *m); EAPI void _tclock_cb_config_updated(void *data); |
From: <enl...@li...> - 2005-12-21 20:22:31
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.c Log Message: Change Include Search Path =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c 20 Dec 2005 03:56:41 -0000 1.2 +++ e_mod_main.c 21 Dec 2005 20:22:25 -0000 1.3 @@ -1,5 +1,5 @@ #include <time.h> -#include "e.h" +#include <e.h> #include "e_mod_main.h" #include "e_mod_config.h" |
From: <enl...@li...> - 2005-12-24 20:30:45
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.c Log Message: Remove unused protos. Cleanups =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.c 21 Dec 2005 20:22:25 -0000 1.3 +++ e_mod_main.c 24 Dec 2005 20:30:36 -0000 1.4 @@ -347,12 +347,13 @@ edje_object_part_text_set(face->tclock_object, "tclock_text", buf); e_config_save_queue(); } + return 1; } static void _tclock_face_menu_new(TClock_Face *face) { - E_Menu *mn, *smn; + E_Menu *mn; E_Menu_Item *mi; mn = e_menu_new(); |
From: <enl...@li...> - 2005-12-27 21:22:24
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.h Log Message: Following raster's commit frenzy. Make symbol hiding work =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.h 21 Dec 2005 10:36:04 -0000 1.2 +++ e_mod_main.h 27 Dec 2005 21:22:19 -0000 1.3 @@ -52,7 +52,7 @@ E_Gadman_Client *gmc; }TClock_Face; -extern E_Module_Api e_modapi; +EAPI extern E_Module_Api e_modapi; EAPI void *e_modapi_init (E_Module *m); EAPI int e_modapi_shutdown (E_Module *m); @@ -61,6 +61,6 @@ EAPI int e_modapi_about (E_Module *m); EAPI int e_modapi_config (E_Module *m); -EAPI void _tclock_cb_config_updated(void *data); +void _tclock_cb_config_updated(void *data); #endif |
From: <enl...@li...> - 2005-12-30 13:13:47
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.c Log Message: Fix Config Functions to check for current container. Thanks HandyAndE :) =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.c 24 Dec 2005 20:30:36 -0000 1.4 +++ e_mod_main.c 30 Dec 2005 13:13:38 -0000 1.5 @@ -90,7 +90,7 @@ for (l = t->faces; l; l = l->next) { tf = l->data; - if (tf->tclock == t) + if (tf->con == e_container_current_get(e_manager_current_get())) { /* Configure Clock */ _config_tclock_module(tf->con, tf); |
From: <enl...@li...> - 2005-12-30 14:42:43
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.c Log Message: Fix Config call for current container. Better trapping =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.c 30 Dec 2005 13:13:38 -0000 1.5 +++ e_mod_main.c 30 Dec 2005 14:42:33 -0000 1.6 @@ -84,12 +84,15 @@ { Evas_List *l; TClock *t; - TClock_Face *tf; t = module->data; + if (!t) return 0; + if (!t->faces) return 0; for (l = t->faces; l; l = l->next) { + TClock_Face *tf; tf = l->data; + if (!tf) return 0; if (tf->con == e_container_current_get(e_manager_current_get())) { /* Configure Clock */ |
From: <enl...@li...> - 2006-01-07 23:24:23
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.c e_mod_config.c Log Message: Fix EAPI warnings.Remove unused variables.General cleanups =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.c 30 Dec 2005 14:42:33 -0000 1.6 +++ e_mod_main.c 7 Jan 2006 23:24:17 -0000 1.7 @@ -25,13 +25,13 @@ static int _tclock_count; /*public code******************************/ -E_Module_Api e_modapi = +EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "TClock" }; -void +EAPI void *e_modapi_init(E_Module *module) { TClock *tclock; @@ -40,7 +40,7 @@ return tclock; } -int +EAPI int e_modapi_shutdown(E_Module *module) { TClock *tclock; @@ -55,14 +55,14 @@ return 1; } -int +EAPI int e_modapi_info(E_Module *module) { module->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png"); return 1; } -int +EAPI int e_modapi_save(E_Module *module) { TClock *tclock; @@ -72,14 +72,14 @@ return 1; } -int +EAPI int e_modapi_about(E_Module *module) { e_module_dialog_show("Simple Digital Clock", "Displays a digital clock on the desktop"); return 1; } -int +EAPI int e_modapi_config(E_Module *module) { Evas_List *l; =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 19 Dec 2005 22:39:11 -0000 1.1 +++ e_mod_config.c 7 Jan 2006 23:24:17 -0000 1.2 @@ -1,5 +1,6 @@ #include "e.h" #include "e_mod_main.h" +#include "e_mod_config.h" typedef struct _cfdata CFData; typedef struct _Cfg_File_Data Cfg_File_Data; @@ -21,7 +22,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -void +EAPI void _config_tclock_module(E_Container *con, TClock_Face *f) { E_Config_Dialog *cfd; |
From: <enl...@li...> - 2006-01-08 09:30:16
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_config.c Log Message: Set pointer to config dialogue to NULL when closing =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 7 Jan 2006 23:24:17 -0000 1.2 +++ e_mod_config.c 8 Jan 2006 09:29:42 -0000 1.3 @@ -44,8 +44,8 @@ cfdata->resolution = f->conf->resolution; } -static void -*_create_data(E_Config_Dialog *cfd) +static void * +_create_data(E_Config_Dialog *cfd) { CFData *cfdata; TClock_Face *f; @@ -59,11 +59,15 @@ static void _free_data(E_Config_Dialog *cfd, CFData *cfdata) { + TClock_Face *tf; + + tf = cfd->data; + tf->config_dialog = NULL; free(cfdata); } -static Evas_Object -*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { Evas_Object *o, *of, *ob; E_Radio_Group *rg; |
From: <enl...@li...> - 2006-01-08 10:33:31
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_config.h e_mod_config.c Log Message: Remove EAPI from function. Thanks Sebastian =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.h 19 Dec 2005 22:39:11 -0000 1.1 +++ e_mod_config.h 8 Jan 2006 10:33:23 -0000 1.2 @@ -3,6 +3,6 @@ #ifndef E_MOD_CONFIG_H #define E_MOD_CONFIG_H #include "e_mod_main.h" -EAPI void _config_tclock_module(E_Container *con, TClock_Face *f); +void _config_tclock_module(E_Container *con, TClock_Face *f); #endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 8 Jan 2006 09:29:42 -0000 1.3 +++ e_mod_config.c 8 Jan 2006 10:33:23 -0000 1.4 @@ -22,7 +22,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -EAPI void +void _config_tclock_module(E_Container *con, TClock_Face *f) { E_Config_Dialog *cfd; |
From: <enl...@li...> - 2006-01-08 10:42:14
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.h e_mod_main.c e_mod_config.c Log Message: Make this module compile =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.h 27 Dec 2005 21:22:19 -0000 1.3 +++ e_mod_main.h 8 Jan 2006 10:42:01 -0000 1.4 @@ -48,7 +48,6 @@ Evas_Object *tclock_object; Evas_Object *event_object; - E_Gadman_Client *gmc; }TClock_Face; =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_main.c 7 Jan 2006 23:24:17 -0000 1.7 +++ e_mod_main.c 8 Jan 2006 10:42:01 -0000 1.8 @@ -49,9 +49,10 @@ module->config_menu = NULL; tclock = module->data; - if (tclock) - _tclock_shutdown(tclock); - + if (tclock) + { + _tclock_shutdown(tclock); + } return 1; } =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config.c 8 Jan 2006 10:33:23 -0000 1.4 +++ e_mod_config.c 8 Jan 2006 10:42:01 -0000 1.5 @@ -59,10 +59,6 @@ static void _free_data(E_Config_Dialog *cfd, CFData *cfdata) { - TClock_Face *tf; - - tf = cfd->data; - tf->config_dialog = NULL; free(cfdata); } |
From: <enl...@li...> - 2006-01-14 11:18:16
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.c tclock.edc Log Message: Formatting. Should now be possible to use enlightenment_remote to set the theme. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_main.c 8 Jan 2006 10:42:01 -0000 1.8 +++ e_mod_main.c 14 Jan 2006 11:18:01 -0000 1.9 @@ -31,8 +31,8 @@ "TClock" }; -EAPI void -*e_modapi_init(E_Module *module) +EAPI void * +e_modapi_init(E_Module *module) { TClock *tclock; tclock = _tclock_new(); @@ -76,7 +76,8 @@ EAPI int e_modapi_about(E_Module *module) { - e_module_dialog_show("Simple Digital Clock", "Displays a digital clock on the desktop"); + e_module_dialog_show(_("Simple Digital Clock"), + _("Displays a digital clock on the desktop")); return 1; } @@ -107,8 +108,8 @@ /****************************************************************** * private functions ****************************************************************/ -static TClock -*_tclock_new() +static TClock * +_tclock_new() { TClock *tclock; Evas_List *managers, *l, *l2, *cl; @@ -204,7 +205,6 @@ mi = e_menu_item_new(tclock->config_menu); e_menu_item_label_set(mi, con->name); e_menu_item_submenu_set(mi, face->menu); - } } } @@ -238,13 +238,14 @@ tclock->config_menu = e_menu_new(); } -static TClock_Face -*_tclock_face_new(E_Container *con) +static TClock_Face * +_tclock_face_new(E_Container *con) { TClock_Face *face; Evas_Object *o; Evas_Coord x, y, w, h; - + char buff[4096]; + face = E_NEW(TClock_Face, 1); if (!face) return NULL; @@ -255,7 +256,9 @@ o = edje_object_add(con->bg_evas); face->tclock_object = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/tclock.edj", "tclock/main"); + snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR"/tclock.edj"); + if (!e_theme_edje_object_set(o, "base/theme/modules/tclock", "modules/tclock/main")) + edje_object_file_set(o, strdup(buff), "modules/tclock/main"); evas_object_show(o); o = evas_object_rectangle_add(con->bg_evas); @@ -333,8 +336,6 @@ current_time=time(NULL); local_time = localtime(¤t_time); - //strftime (buf,TIME_BUF, "%a %d,%b %H:%M", local_time); - tclock = data; for (l = tclock->faces; l; l = l->next) { =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/tclock.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- tclock.edc 19 Dec 2005 22:39:11 -0000 1.1 +++ tclock.edc 14 Jan 2006 11:18:01 -0000 1.2 @@ -4,7 +4,7 @@ } collections { group { - name, "tclock/main"; + name, "modules/tclock/main"; min, 32 32; max, 1024 768; |
From: <enl...@li...> - 2006-01-14 13:00:03
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.c Log Message: Removal of the strdup. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_mod_main.c 14 Jan 2006 11:18:01 -0000 1.9 +++ e_mod_main.c 14 Jan 2006 12:59:55 -0000 1.10 @@ -258,7 +258,7 @@ snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR"/tclock.edj"); if (!e_theme_edje_object_set(o, "base/theme/modules/tclock", "modules/tclock/main")) - edje_object_file_set(o, strdup(buff), "modules/tclock/main"); + edje_object_file_set(o, buff, "modules/tclock/main"); evas_object_show(o); o = evas_object_rectangle_add(con->bg_evas); |
From: <enl...@li...> - 2006-01-15 08:42:38
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_config.c Log Message: The great E_Config_Dialog_Data fix =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_config.c 8 Jan 2006 10:42:01 -0000 1.5 +++ e_mod_config.c 15 Jan 2006 08:42:32 -0000 1.6 @@ -1,11 +1,10 @@ -#include "e.h" +#include <e.h> #include "e_mod_main.h" #include "e_mod_config.h" -typedef struct _cfdata CFData; typedef struct _Cfg_File_Data Cfg_File_Data; -struct _cfdata +struct _E_Config_Dialog_Data { int resolution; }; @@ -18,9 +17,9 @@ /* Protos */ static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); -static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); -static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); void _config_tclock_module(E_Container *con, TClock_Face *f) @@ -39,7 +38,7 @@ } static void -_fill_data(TClock_Face *f, CFData *cfdata) +_fill_data(TClock_Face *f, E_Config_Dialog_Data *cfdata) { cfdata->resolution = f->conf->resolution; } @@ -47,23 +46,23 @@ static void * _create_data(E_Config_Dialog *cfd) { - CFData *cfdata; + E_Config_Dialog_Data *cfdata; TClock_Face *f; f = cfd->data; - cfdata = E_NEW(CFData, 1); + cfdata = E_NEW(E_Config_Dialog_Data, 1); _fill_data(f, cfdata); return cfdata; } static void -_free_data(E_Config_Dialog *cfd, CFData *cfdata) +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { free(cfdata); } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob; E_Radio_Group *rg; @@ -80,7 +79,7 @@ } static int -_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { TClock_Face *f; |
From: <enl...@li...> - 2006-01-22 14:17:49
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 15 Jan 2006 08:42:32 -0000 1.6 +++ e_mod_config.c 22 Jan 2006 14:17:43 -0000 1.7 @@ -25,16 +25,18 @@ _config_tclock_module(E_Container *con, TClock_Face *f) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Tclock Configuration"), NULL, 0, &v, f); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; + + cfd = e_config_dialog_new(con, _("Tclock Configuration"), NULL, 0, v, f); } static void |
From: <enl...@li...> - 2006-02-13 16:10:40
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_config.c Log Message: Fix bug where changing a config value then selecting a different page (Basic/Advanced) would reset the value to it's original state. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_mod_config.c 30 Jan 2006 03:16:42 -0000 1.9 +++ e_mod_config.c 13 Feb 2006 16:10:33 -0000 1.10 @@ -4,28 +4,29 @@ typedef struct _Cfg_File_Data Cfg_File_Data; -struct _E_Config_Dialog_Data { - int resolution; +struct _E_Config_Dialog_Data +{ + int resolution; }; -struct _Cfg_File_Data { - E_Config_Dialog *cfd; - char *file; +struct _Cfg_File_Data +{ + E_Config_Dialog *cfd; + char *file; }; /* Protos */ -static void *_create_data(E_Config_Dialog * cfd); -static void _free_data(E_Config_Dialog * cfd, - E_Config_Dialog_Data * cfdata); -static Evas_Object *_basic_create_widgets(E_Config_Dialog * cfd, Evas * evas, - E_Config_Dialog_Data * cfdata); -static int _basic_apply_data(E_Config_Dialog * cfd, - E_Config_Dialog_Data * cfdata); +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, + E_Config_Dialog_Data *cfdata); +static int _basic_apply_data(E_Config_Dialog *cfd, + E_Config_Dialog_Data *cfdata); void -_config_tclock_module(E_Container * con, TClock_Face * f) +_config_tclock_module(E_Container *con, TClock_Face * f) { - E_Config_Dialog *cfd; + E_Config_Dialog *cfd; E_Config_Dialog_View *v; v = E_NEW(E_Config_Dialog_View, 1); @@ -39,16 +40,16 @@ } static void -_fill_data(TClock_Face * f, E_Config_Dialog_Data * cfdata) +_fill_data(TClock_Face * f, E_Config_Dialog_Data *cfdata) { cfdata->resolution = f->conf->resolution; } -static void * -_create_data(E_Config_Dialog * cfd) +static void * +_create_data(E_Config_Dialog *cfd) { E_Config_Dialog_Data *cfdata; - TClock_Face *f; + TClock_Face *f; f = cfd->data; cfdata = E_NEW(E_Config_Dialog_Data, 1); @@ -57,17 +58,17 @@ } static void -_free_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { free(cfdata); } static Evas_Object * -_basic_create_widgets(E_Config_Dialog * cfd, Evas * evas, - E_Config_Dialog_Data * cfdata) +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, + E_Config_Dialog_Data *cfdata) { - Evas_Object *o, *of, *ob; - E_Radio_Group *rg; + Evas_Object *o, *of, *ob; + E_Radio_Group *rg; o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Resolution"), 0); @@ -81,9 +82,9 @@ } static int -_basic_apply_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) +_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - TClock_Face *f; + TClock_Face *f; f = cfd->data; e_border_button_bindings_ungrab_all(); |
From: <enl...@li...> - 2006-02-20 18:29:10
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_main.c Log Message: Nicer menus...shhh ! :) =================================================================== RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_main.c 30 Jan 2006 03:16:42 -0000 1.11 +++ e_mod_main.c 20 Feb 2006 18:29:05 -0000 1.12 @@ -389,11 +389,13 @@ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Configuration")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); e_menu_item_callback_set(mi, _tclock_face_cb_menu_configure, face); /* Edit */ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Edit Mode")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets"); e_menu_item_callback_set(mi, _tclock_face_cb_menu_edit, face); } |
From: Enlightenment C. <no...@cv...> - 2006-03-28 18:33:19
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_config.c Log Message: Remove unused typedef and struct =================================================================== RCS file: /cvs/e/e_modules/tclock/e_mod_config.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_config.c 13 Feb 2006 16:10:33 -0000 1.10 +++ e_mod_config.c 28 Mar 2006 18:33:12 -0000 1.11 @@ -2,17 +2,9 @@ #include "e_mod_main.h" #include "e_mod_config.h" -typedef struct _Cfg_File_Data Cfg_File_Data; - struct _E_Config_Dialog_Data { int resolution; -}; - -struct _Cfg_File_Data -{ - E_Config_Dialog *cfd; - char *file; }; /* Protos */ |
From: Enlightenment C. <no...@cv...> - 2006-04-02 22:06:42
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: configure.in Log Message: Remove checks for eet, evas, ecore and esmart. Not Needed. =================================================================== RCS file: /cvs/e/e_modules/tclock/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.in 1 Apr 2006 19:35:59 -0000 1.3 +++ configure.in 2 Apr 2006 22:06:28 -0000 1.4 @@ -103,48 +103,6 @@ #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 ], [ @@ -171,20 +129,6 @@ edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc" ]) AC_SUBST(edje_cc) - -AC_ARG_WITH(eet-config, -[ --with-eet-config=EET_CONFIG use eet-config specified ], -[ - EET_CONFIG=$withval; - echo "using "$EET_CONFIG" for eet-config"; -],[ - PROG="eet-config"; - AC_PATH_PROG(EET_CONFIG, $PROG, "", $PATH) -]) -eet_cflags=`$EET_CONFIG --cflags` -eet_libs=`$EET_CONFIG --libs` -AC_SUBST(eet_cflags) -AC_SUBST(eet_libs) AC_ARG_WITH(enlightenment-config, [ --with-enlightenment-config=E_CONFIG use enlightenment-config specified ], |