Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/clock
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
damn - um... patches from mailing list - fix patch with layer number. da.po -
waiting for da.po i can use.. etc :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_mod_main.c 23 Apr 2005 05:16:24 -0000 1.30
+++ e_mod_main.c 12 Jul 2005 03:53:55 -0000 1.31
@@ -22,12 +22,21 @@
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_military(void *data, E_Menu *m,
E_Menu_Item *mi);
static int _clock_count;
static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
+const int
+ DIGITAL_STYLE_NONE = 0,
+ DIGITAL_STYLE_NORMAL = 1,
+ DIGITAL_STYLE_MILITARY = 2
+;
+
/* public module routines. all modules must have these */
void *
e_modapi_init(E_Module *module)
@@ -115,6 +124,7 @@
#define T Config_Face
#define D conf_face_edd
E_CONFIG_VAL(D, T, enabled, UCHAR);
+ E_CONFIG_VAL(D, T, digitalStyle, INT);
conf_edd = E_CONFIG_DD_NEW("Clock_Config", Config);
#undef T
@@ -153,6 +163,7 @@
{
face->conf = E_NEW(Config_Face, 1);
face->conf->enabled = 1;
+ face->conf->digitalStyle = DIGITAL_STYLE_NONE;
clock->conf->faces =
evas_list_append(clock->conf->faces, face->conf);
}
else
@@ -289,7 +300,7 @@
static void
_clock_face_menu_new(Clock_Face *face)
{
- E_Menu *mn;
+ E_Menu *mn, *smn;
E_Menu_Item *mi;
mn = e_menu_new();
@@ -308,6 +319,52 @@
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 Time"));
+ 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 military time */
+ mi = e_menu_item_new(smn);
+ e_menu_item_label_set(mi, _("Military Time"));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 1);
+ if (face->conf->digitalStyle == DIGITAL_STYLE_MILITARY) {
+ e_menu_item_toggle_set(mi, 1);
+ _clock_face_cb_digital_military(face, smn, mi);
+ }
+ e_menu_item_callback_set(mi, _clock_face_cb_digital_military, 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
@@ -375,6 +432,63 @@
}
static void
+_clock_face_cb_digital_none(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;
+
+ e_config_save_queue();
+}
+
+static void
+_clock_face_cb_digital_normal(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;
+
+ e_config_save_queue();
+}
+
+static void
+_clock_face_cb_digital_military(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_MILITARY);
+
+ edje_object_part_text_set(face->clock_object, "digitalStyle", buf);
+
+ face->conf->digitalStyle = DIGITAL_STYLE_MILITARY;
+
+ e_config_save_queue();
+}
+
+static void
_clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
{
Clock_Face *face;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.h 12 Apr 2005 03:34:28 -0000 1.8
+++ e_mod_main.h 12 Jul 2005 03:53:56 -0000 1.9
@@ -17,6 +17,9 @@
struct _Config_Face
{
unsigned char enabled;
+ int
+ digitalStyle
+ ;
};
struct _Clock
@@ -31,6 +34,7 @@
{
E_Container *con;
E_Menu *menu;
+ E_Menu *digital_menu;
Config_Face *conf;
Evas_Object *clock_object;
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
