Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/clock
Modified Files:
e_mod_main.h e_mod_main.c Makefile.am
Added Files:
e_mod_config.c e_mod_config.h
Log Message:
Clock Config Dialog
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.h 24 Sep 2005 13:42:05 -0000 1.12
+++ e_mod_main.h 14 Dec 2005 23:26:10 -0000 1.13
@@ -17,9 +17,7 @@
struct _Config_Face
{
unsigned char enabled;
- int
- digitalStyle
- ;
+ int digitalStyle;
};
struct _Clock
@@ -55,4 +53,6 @@
EAPI int e_modapi_info (E_Module *module);
EAPI int e_modapi_about (E_Module *module);
+EAPI void _clock_face_cb_config_updated(void *data);
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- e_mod_main.c 24 Sep 2005 13:42:05 -0000 1.39
+++ e_mod_main.c 14 Dec 2005 23:26:10 -0000 1.40
@@ -22,9 +22,7 @@
static void _clock_face_cb_mouse_down(void *data, Evas *e, Evas_Object
*obj, void *event_info);
static void _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _clock_face_cb_digital_normal(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _clock_face_cb_digital_24hour(void *data, E_Menu *m,
E_Menu_Item *mi);
+static void _clock_face_cb_menu_configure(void *data, E_Menu *m,
E_Menu_Item *mi);
static int _clock_count;
@@ -32,23 +30,23 @@
static E_Config_DD *conf_face_edd;
const int
- DIGITAL_STYLE_NONE = 0,
- DIGITAL_STYLE_NORMAL = 1,
- DIGITAL_STYLE_24HOUR = 2
-;
+ DIGITAL_STYLE_NONE = 0,
+ DIGITAL_STYLE_NORMAL = 1,
+ DIGITAL_STYLE_24HOUR = 2
+ ;
/* public module routines. all modules must have these */
-E_Module_Api e_modapi =
+E_Module_Api e_modapi =
{
E_MODULE_API_VERSION,
- "Clock"
+ "Clock"
};
void *
e_modapi_init(E_Module *module)
{
Clock *clock;
-
+
/* actually init clock */
clock = _clock_new();
module->config_menu = clock->config_menu;
@@ -84,7 +82,7 @@
e_modapi_info(E_Module *module)
{
char buf[4096];
-
+
snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(module));
module->icon_file = strdup(buf);
return 1;
@@ -93,8 +91,8 @@
int
e_modapi_about(E_Module *module)
{
- e_module_dialog_show(_("Enlightenment Clock Module"),
- _("A simple module to give E17 a clock."));
+ e_module_dialog_show(_("Enlightenment Clock Module"),
+ _("A simple module to give E17 a clock."));
return 1;
}
@@ -105,7 +103,7 @@
Clock *clock;
Evas_List *managers, *l, *l2, *cl;
E_Menu_Item *mi;
-
+
_clock_count = 0;
clock = E_NEW(Clock, 1);
if (!clock) return NULL;
@@ -138,13 +136,13 @@
for (l = managers; l; l = l->next)
{
E_Manager *man;
-
+
man = l->data;
for (l2 = man->containers; l2; l2 = l2->next)
{
E_Container *con;
Clock_Face *face;
-
+
con = l2->data;
face = _clock_face_new(con);
if (face)
@@ -169,6 +167,10 @@
_clock_face_menu_new(face);
mi = e_menu_item_new(clock->config_menu);
+ e_menu_item_label_set(mi, _("Config Dialog"));
+ e_menu_item_callback_set(mi, _clock_face_cb_menu_configure,
face);
+
+ mi = e_menu_item_new(clock->config_menu);
e_menu_item_label_set(mi, con->name);
e_menu_item_submenu_set(mi, face->menu);
@@ -216,10 +218,10 @@
face = E_NEW(Clock_Face, 1);
if (!face) return NULL;
-
+
face->con = con;
e_object_ref(E_OBJECT(con));
-
+
evas_event_freeze(con->bg_evas);
o = edje_object_add(con->bg_evas);
face->clock_object = o;
@@ -227,7 +229,7 @@
e_theme_edje_object_set(o, "base/theme/modules/clock",
"modules/clock/main");
evas_object_show(o);
-
+
o = evas_object_rectangle_add(con->bg_evas);
face->event_object = o;
evas_object_layer_set(o, 2);
@@ -322,57 +324,17 @@
if (face->conf->enabled) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _clock_face_cb_menu_enabled, face);
*/
-
+
+ /* Config */
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Config Dialog"));
+ e_menu_item_callback_set(mi, _clock_face_cb_menu_configure, face);
+
/* Edit */
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Edit Mode"));
e_menu_item_callback_set(mi, _clock_face_cb_menu_edit, face);
- /*
- * Create a Digital submenu
- */
- smn = e_menu_new();
-
- /* Hide digital time */
- mi = e_menu_item_new(smn);
- e_menu_item_label_set(mi, _("No Digital Display"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (face->conf->digitalStyle == DIGITAL_STYLE_NONE) {
- e_menu_item_toggle_set(mi, 1);
- _clock_face_cb_digital_none(face, smn, mi);
- }
- e_menu_item_callback_set(mi, _clock_face_cb_digital_none, face);
-
- /* Show normal time */
- mi = e_menu_item_new(smn);
- e_menu_item_label_set(mi, _("Normal"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (face->conf->digitalStyle == DIGITAL_STYLE_NORMAL) {
- e_menu_item_toggle_set(mi, 1);
- _clock_face_cb_digital_normal(face, smn, mi);
- }
- e_menu_item_callback_set(mi, _clock_face_cb_digital_normal, face);
-
- /* Show 24hour time */
- mi = e_menu_item_new(smn);
- e_menu_item_label_set(mi, _("24 Hour"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (face->conf->digitalStyle == DIGITAL_STYLE_24HOUR) {
- e_menu_item_toggle_set(mi, 1);
- _clock_face_cb_digital_24hour(face, smn, mi);
- }
- e_menu_item_callback_set(mi, _clock_face_cb_digital_24hour, face);
-
- face->digital_menu = smn;
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Digital Display"));
- e_menu_item_submenu_set(mi, face->digital_menu);
-
-
}
static void
@@ -385,22 +347,22 @@
switch (change)
{
case E_GADMAN_CHANGE_MOVE_RESIZE:
- e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h);
- evas_object_move(face->clock_object, x, y);
- evas_object_move(face->event_object, x, y);
- evas_object_resize(face->clock_object, w, h);
- evas_object_resize(face->event_object, w, h);
- break;
+ e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h);
+ evas_object_move(face->clock_object, x, y);
+ evas_object_move(face->event_object, x, y);
+ evas_object_resize(face->clock_object, w, h);
+ evas_object_resize(face->event_object, w, h);
+ break;
case E_GADMAN_CHANGE_RAISE:
- evas_object_raise(face->clock_object);
- evas_object_raise(face->event_object);
- break;
+ evas_object_raise(face->clock_object);
+ evas_object_raise(face->event_object);
+ break;
case E_GADMAN_CHANGE_EDGE:
case E_GADMAN_CHANGE_ZONE:
/* FIXME
* Must we do something here?
*/
- break;
+ break;
}
}
@@ -409,7 +371,7 @@
{
Clock_Face *face;
Evas_Event_Mouse_Down *ev;
-
+
face = data;
ev = event_info;
if (ev->button == 3)
@@ -430,78 +392,47 @@
face = data;
enabled = e_menu_item_toggle_get(mi);
if ((face->conf->enabled) && (!enabled))
- {
+ {
_clock_face_disable(face);
}
else if ((!face->conf->enabled) && (enabled))
- {
+ {
_clock_face_enable(face);
}
}
static void
-_clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item *mi)
+_clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
{
- Clock_Face *face;
- char buf[2];
-
- face = data;
-
- memset(buf, 0, sizeof(buf));
-
- snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_NONE);
-
- edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
-
- face->conf->digitalStyle = DIGITAL_STYLE_NONE;
+ Clock_Face *face;
- e_config_save_queue();
+ face = data;
+ e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT);
}
static void
-_clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi)
+_clock_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
- Clock_Face *face;
- char buf[2];
-
- face = data;
-
- memset(buf, 0, sizeof(buf));
-
- snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_NORMAL);
-
- edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
-
- face->conf->digitalStyle = DIGITAL_STYLE_NORMAL;
+ Clock_Face *face;
+ E_Config_Dialog *cfd;
- e_config_save_queue();
+ face = data;
+ if (!face) return;
+ e_int_config_clock(face->con, face);
}
-static void
-_clock_face_cb_digital_24hour(void *data, E_Menu *m, E_Menu_Item *mi)
+void
+_clock_face_cb_config_updated(void *data)
{
- Clock_Face *face;
- char buf[2];
-
- face = data;
+ Clock_Face *face;
+ char buf[2];
- memset(buf, 0, sizeof(buf));
+ face = data;
- snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_24HOUR);
+ memset(buf, 0, sizeof(buf));
- edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
+ snprintf(buf, sizeof(buf), "%i", face->conf->digitalStyle);
- face->conf->digitalStyle = DIGITAL_STYLE_24HOUR;
+ edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
- e_config_save_queue();
}
-
-static void
-_clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Clock_Face *face;
-
- face = data;
- e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT);
-}
-
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 8 May 2005 22:34:44 -0000 1.4
+++ Makefile.am 14 Dec 2005 23:26:10 -0000 1.5
@@ -20,7 +20,9 @@
pkgdir =
$(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
- e_mod_main.h
+ e_mod_main.h \
+ e_mod_config.c \
+ e_mod_config.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
