---
Bryan Taylor
On 10/12/05, Andrew Williams <[EMAIL PROTECTED]> wrote:
On Tue, Oct 11, 2005 at 07:00:36PM -0500, Bryan Taylor wrote:
> HandyAndE,
>
> No, the ANALOG_STYLE_ENABLED is handled by the 'else' portion of the 'if'
> statement. Still, I can put ANALOG_STYLE_ENABLED in the script if you would
> like me to. I am currently using this modification and haven't noticed any
> problems with making the analog clock disappear and reappear correctly. Let
> me know if you encounter any other problems with this patch.
Yes, I can see that it works - but I worry - if you want to SET it to
ENABLED you have no identifier...
i.e. if this was correct there would be no need for DIGITAL_STYLE_NONE
either, cos it could be an else...
no?
A
>
> Thanks,
> Bryan Taylor
>
> On 10/11/05, Andrew Williams <[EMAIL PROTECTED]> wrote:
> >
> > Do we not want ANALOG_STYLE_ENABLED too? =0 perhaps?
> >
> > Bryan Taylor wrote:
> > > Hi all,
> > >
> > > I've created a patch that allows you to hide the analog clock while
> > > still showing the digital clock. This work is just a small extension of
> > > the patch in this thread:
> > > http://sourceforge.net/mailarchive/message.php?msg_id=12329813
> > >
> > > --- default_clock.edc.old 2005-10-10 20:33:31.000000000 -0500
> > > +++ default_clock.edc 2005-10-10 20:32:32.000000000 -0500
> > > @@ -195,16 +195,23 @@
> > > new v;
> > > new isAfternoon;
> > > new digiBuf[2];
> > > + new alogBuf[2];
> > > new digitalStyle;
> > > new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_24HOUR;
> > > + new analogStyle;
> > > + new ANALOG_STYLE_DISABLED;
> > >
> > > DIGITAL_STYLE_NONE = 0;
> > > DIGITAL_STYLE_NORMAL = 1;
> > > DIGITAL_STYLE_24HOUR = 2;
> > >
> > > + ANALOG_STYLE_DISABLED = 1;
> > > +
> > > get_text(PART:"digitalStyle", digiBuf, 2);
> > > + get_text(PART:"analogStyle", alogBuf, 2);
> > >
> > > digitalStyle = atoi(digiBuf);
> > > + analogStyle = atoi(alogBuf);
> > >
> > > date(year, month, day, yearday, weekday, hour, minute, second);
> > > v = round(second);
> > > @@ -281,6 +288,19 @@
> > > set_state(PART:"digital_bg", "hidden", 0.0);
> > > set_state(PART:"digital_bg_overlay", "hidden", 0.0);
> > > }
> > > +
> > > + if (analogStyle == ANALOG_STYLE_DISABLED) {
> > > + set_state(PART:"bg", "hidden", 0.0)
> > > + set_state(PART:"fg", "hidden", 0.0)
> > > +
> > > + set_state(PART:"seconds", "hidden", 0.0);
> > > + set_state(PART:"minutes", "hidden", 0.0);
> > > + set_state(PART:"hour", "hidden", 0.0);
> > > + }
> > > + else {
> > > + set_state(PART:"bg", "default", 0.0)
> > > + set_state(PART:"fg", "default", 0.0)
> > > + }
> > > }
> > > }
> > > parts {
> > > @@ -293,6 +313,14 @@
> > > normal: "e17_clock_bg.png";
> > > }
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > }
> > > #ifdef IND
> > > # undef IND
> > > @@ -325,6 +353,14 @@
> > > normal: "e17_clock_"IND"_"num".png"; \
> > > } \
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > HAND("00")
> > > HAND("01")
> > > HAND("02")
> > > @@ -417,6 +453,14 @@
> > > normal: "e17_clock_"IND"_"num".png"; \
> > > } \
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > HAND("00")
> > > HAND("01")
> > > HAND("02")
> > > @@ -509,6 +553,14 @@
> > > normal: "e17_clock_"IND"_"num".png"; \
> > > } \
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > HAND("00")
> > > HAND("01")
> > > HAND("02")
> > > @@ -585,6 +637,14 @@
> > > normal: "e17_clock_fg.png";
> > > }
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > }
> > > part {
> > > name: "digital_bg_area";
> > > @@ -687,7 +747,7 @@
> > > text {
> > > text: "00:00:00 AM";
> > > font: "Edje-Vera";
> > > - size: 15;
> > > + size: 16;
> > > fit: 0 1;
> > > align: 0.5 0.5;
> > > }
> > > @@ -705,6 +765,14 @@
> > > visible: 0;
> > > }
> > > }
> > > + part {
> > > + name: "analogStyle";
> > > + type: TEXT;
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + }
> > > + }
> > > }
> > > programs {
> > > program {
> > >
> > >
> > >
> > > --- cvs/e17/apps/e/src/modules/clock/e_mod_main.h 2005-09-24
> > > 08:42:05.000000000 -0500
> > > +++ e_mod_main.h 2005-10-10 20:31: 44.000000000 -0500
> > > @@ -20,6 +20,9 @@
> > > int
> > > digitalStyle
> > > ;
> > > + int
> > > + analogStyle
> > > + ;
> > > };
> > >
> > > struct _Clock
> > > @@ -35,6 +38,7 @@
> > > E_Container *con;
> > > E_Menu *menu;
> > > E_Menu *digital_menu;
> > > + E_Menu *analog_menu;
> > > Config_Face *conf;
> > >
> > > struct {
> > >
> > >
> > >
> > > --- cvs/e17/apps/e/src/modules/clock/e_mod_main.c 2005-09-24
> > > 08:42: 05.000000000 -0500
> > > +++ e_mod_main.c 2005-10-10 20:31:52.000000000 -0500
> > > @@ -25,6 +25,8 @@
> > > 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_analog_disabled(void *data, E_Menu *m,
> > > E_Menu_Item *mi);
> > > +static void _clock_face_cb_analog_enabled(void *data, E_Menu *m,
> > > E_Menu_Item *mi);
> > >
> > > static int _clock_count;
> > >
> > > @@ -37,6 +39,11 @@
> > > DIGITAL_STYLE_24HOUR = 2
> > > ;
> > >
> > > +const int
> > > + ANALOG_STYLE_DISABLED = 0,
> > > + ANALOG_STYLE_ENABLED = 1
> > > +;
> > > +
> > > /* public module routines. all modules must have these */
> > > E_Module_Api e_modapi =
> > > {
> > > @@ -94,7 +101,7 @@
> > > e_modapi_about(E_Module *module)
> > > {
> > > e_module_dialog_show(_("Enlightenment Clock Module"),
> > > - _("A simple module to give E17 a clock."));
> > > + _("A custom module to give E17 a clock."));
> > > return 1;
> > > }
> > >
> > > @@ -117,6 +124,7 @@
> > > #define D conf_face_edd
> > > E_CONFIG_VAL(D, T, enabled, UCHAR);
> > > E_CONFIG_VAL(D, T, digitalStyle, INT);
> > > + E_CONFIG_VAL(D, T, analogStyle, INT);
> > >
> > > conf_edd = E_CONFIG_DD_NEW("Clock_Config", Config);
> > > #undef T
> > > @@ -156,6 +164,7 @@
> > > face->conf = E_NEW(Config_Face, 1);
> > > face->conf->enabled = 1;
> > > face->conf->digitalStyle = DIGITAL_STYLE_NONE;
> > > + face->conf->analogStyle = ANALOG_STYLE_ENABLED;
> > > clock->conf->faces =
> > > evas_list_append(clock->conf->faces, face->conf);
> > > }
> > > else
> > > @@ -373,6 +382,38 @@
> > > e_menu_item_submenu_set(mi, face->digital_menu);
> > >
> > >
> > > + /*
> > > + * Create an Analog submenu
> > > + */
> > > + smn = e_menu_new();
> > > +
> > > + /* Show analog time */
> > > + mi = e_menu_item_new(smn);
> > > + e_menu_item_label_set(mi, _("Enable"));
> > > + e_menu_item_radio_set(mi, 1);
> > > + e_menu_item_radio_group_set(mi, 1);
> > > + if (face->conf->analogStyle == ANALOG_STYLE_DISABLED) {
> > > + e_menu_item_toggle_set(mi, 1);
> > > + _clock_face_cb_analog_disabled(face, smn, mi);
> > > + }
> > > + e_menu_item_callback_set(mi, _clock_face_cb_analog_disabled, face);
> > > +
> > > + /* Hide analog time */
> > > + mi = e_menu_item_new(smn);
> > > + e_menu_item_label_set(mi, _("Disable"));
> > > + e_menu_item_radio_set(mi, 1);
> > > + e_menu_item_radio_group_set(mi, 1);
> > > + if (face->conf->analogStyle == ANALOG_STYLE_ENABLED) {
> > > + e_menu_item_toggle_set(mi, 1);
> > > + _clock_face_cb_analog_enabled(face, smn, mi);
> > > + }
> > > + e_menu_item_callback_set(mi, _clock_face_cb_analog_enabled, face);
> > > +
> > > + face->analog_menu = smn;
> > > +
> > > + mi = e_menu_item_new(mn);
> > > + e_menu_item_label_set(mi, _("Analog Display"));
> > > + e_menu_item_submenu_set(mi, face->analog_menu);
> > > }
> > >
> > > static void
> > > @@ -497,6 +538,44 @@
> > > }
> > >
> > > static void
> > > +_clock_face_cb_analog_disabled(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", ANALOG_STYLE_DISABLED);
> > > +
> > > + edje_object_part_text_set(face->clock_object, "analogStyle", buf);
> > > +
> > > + face->conf->analogStyle = ANALOG_STYLE_DISABLED;
> > > +
> > > + e_config_save_queue();
> > > +}
> > > +
> > > +static void
> > > +_clock_face_cb_analog_enabled(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", ANALOG_STYLE_ENABLED);
> > > +
> > > + edje_object_part_text_set(face->clock_object, "analogStyle", buf);
> > > +
> > > + face->conf->analogStyle = ANALOG_STYLE_ENABLED;
> > > +
> > > + e_config_save_queue();
> > > +}
> > > +
> > > +static void
> > > _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
> > > {
> > > Clock_Face *face;
> > >
> > >
> > > ------------------------------------------------------------------------
> > >
> > > --- default_clock.edc.old 2005-10-10 20:33: 31.000000000 -0500
> > > +++ default_clock.edc 2005-10-10 20:32:32.000000000 -0500
> > > @@ -195,16 +195,23 @@
> > > new v;
> > > new isAfternoon;
> > > new digiBuf[2];
> > > + new alogBuf[2];
> > > new digitalStyle;
> > > new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_24HOUR;
> > > + new analogStyle;
> > > + new ANALOG_STYLE_DISABLED;
> > >
> > > DIGITAL_STYLE_NONE = 0;
> > > DIGITAL_STYLE_NORMAL = 1;
> > > DIGITAL_STYLE_24HOUR = 2;
> > >
> > > + ANALOG_STYLE_DISABLED = 1;
> > > +
> > > get_text(PART:"digitalStyle", digiBuf, 2);
> > > + get_text(PART:"analogStyle", alogBuf, 2);
> > >
> > > digitalStyle = atoi(digiBuf);
> > > + analogStyle = atoi(alogBuf);
> > >
> > > date(year, month, day, yearday, weekday, hour, minute, second);
> > > v = round(second);
> > > @@ -281,6 +288,19 @@
> > > set_state(PART:"digital_bg", "hidden", 0.0);
> > > set_state(PART:"digital_bg_overlay", "hidden", 0.0);
> > > }
> > > +
> > > + if (analogStyle == ANALOG_STYLE_DISABLED) {
> > > + set_state(PART:"bg", "hidden", 0.0)
> > > + set_state(PART:"fg", "hidden", 0.0)
> > > +
> > > + set_state(PART:"seconds", "hidden", 0.0);
> > > + set_state(PART:"minutes", "hidden", 0.0);
> > > + set_state(PART:"hour", "hidden", 0.0);
> > > + }
> > > + else {
> > > + set_state(PART:"bg", "default", 0.0)
> > > + set_state(PART:"fg", "default", 0.0)
> > > + }
> > > }
> > > }
> > > parts {
> > > @@ -293,6 +313,14 @@
> > > normal: "e17_clock_bg.png";
> > > }
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > }
> > > #ifdef IND
> > > # undef IND
> > > @@ -325,6 +353,14 @@
> > > normal: "e17_clock_"IND"_"num".png"; \
> > > } \
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > HAND("00")
> > > HAND("01")
> > > HAND("02")
> > > @@ -417,6 +453,14 @@
> > > normal: "e17_clock_"IND"_"num".png"; \
> > > } \
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > HAND("00")
> > > HAND("01")
> > > HAND("02")
> > > @@ -509,6 +553,14 @@
> > > normal: "e17_clock_"IND"_"num".png"; \
> > > } \
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > HAND("00")
> > > HAND("01")
> > > HAND("02")
> > > @@ -585,6 +637,14 @@
> > > normal: "e17_clock_fg.png";
> > > }
> > > }
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + image {
> > > + normal: "e17_ibox_over_h.png";
> > > + middle: 0;
> > > + }
> > > + }
> > > }
> > > part {
> > > name: "digital_bg_area";
> > > @@ -687,7 +747,7 @@
> > > text {
> > > text: "00:00:00 AM";
> > > font: "Edje-Vera";
> > > - size: 15;
> > > + size: 16;
> > > fit: 0 1;
> > > align: 0.5 0.5;
> > > }
> > > @@ -705,6 +765,14 @@
> > > visible: 0;
> > > }
> > > }
> > > + part {
> > > + name: "analogStyle";
> > > + type: TEXT;
> > > + description {
> > > + state: "hidden" 0.0;
> > > + visible: 0;
> > > + }
> > > + }
> > > }
> > > programs {
> > > program {
> > >
> > >
> > > ------------------------------------------------------------------------
> > >
> > > --- cvs/e17/apps/e/src/modules/clock/e_mod_main.h 2005-09-24 08:42:
> > 05.000000000 -0500
> > > +++ e_mod_main.h 2005-10-10 20:31:44.000000000 -0500
> > > @@ -20,6 +20,9 @@
> > > int
> > > digitalStyle
> > > ;
> > > + int
> > > + analogStyle
> > > + ;
> > > };
> > >
> > > struct _Clock
> > > @@ -35,6 +38,7 @@
> > > E_Container *con;
> > > E_Menu *menu;
> > > E_Menu *digital_menu;
> > > + E_Menu *analog_menu;
> > > Config_Face *conf;
> > >
> > > struct {
> > >
> > >
> > > ------------------------------------------------------------------------
> > >
> > > --- cvs/e17/apps/e/src/modules/clock/e_mod_main.c 2005-09-24 08:42:
> > 05.000000000 -0500
> > > +++ e_mod_main.c 2005-10-10 20:31:52.000000000 -0500
> > > @@ -25,6 +25,8 @@
> > > 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_analog_disabled(void *data, E_Menu *m,
> > E_Menu_Item *mi);
> > > +static void _clock_face_cb_analog_enabled(void *data, E_Menu *m,
> > E_Menu_Item *mi);
> > >
> > > static int _clock_count;
> > >
> > > @@ -37,6 +39,11 @@
> > > DIGITAL_STYLE_24HOUR = 2
> > > ;
> > >
> > > +const int
> > > + ANALOG_STYLE_DISABLED = 0,
> > > + ANALOG_STYLE_ENABLED = 1
> > > +;
> > > +
> > > /* public module routines. all modules must have these */
> > > E_Module_Api e_modapi =
> > > {
> > > @@ -94,7 +101,7 @@
> > > e_modapi_about(E_Module *module)
> > > {
> > > e_module_dialog_show(_("Enlightenment Clock Module"),
> > > - _("A simple module to give E17 a clock."));
> > > + _("A custom module to give E17 a clock."));
> > > return 1;
> > > }
> > >
> > > @@ -117,6 +124,7 @@
> > > #define D conf_face_edd
> > > E_CONFIG_VAL(D, T, enabled, UCHAR);
> > > E_CONFIG_VAL(D, T, digitalStyle, INT);
> > > + E_CONFIG_VAL(D, T, analogStyle, INT);
> > >
> > > conf_edd = E_CONFIG_DD_NEW("Clock_Config", Config);
> > > #undef T
> > > @@ -156,6 +164,7 @@
> > > face->conf = E_NEW(Config_Face, 1);
> > > face->conf->enabled = 1;
> > > face->conf->digitalStyle = DIGITAL_STYLE_NONE;
> > > + face->conf->analogStyle = ANALOG_STYLE_ENABLED;
> > > clock->conf->faces = evas_list_append(clock->conf->faces, face->conf);
> > > }
> > > else
> > > @@ -373,6 +382,38 @@
> > > e_menu_item_submenu_set(mi, face->digital_menu);
> > >
> > >
> > > + /*
> > > + * Create an Analog submenu
> > > + */
> > > + smn = e_menu_new();
> > > +
> > > + /* Show analog time */
> > > + mi = e_menu_item_new(smn);
> > > + e_menu_item_label_set(mi, _("Enable"));
> > > + e_menu_item_radio_set(mi, 1);
> > > + e_menu_item_radio_group_set(mi, 1);
> > > + if (face->conf->analogStyle == ANALOG_STYLE_DISABLED) {
> > > + e_menu_item_toggle_set(mi, 1);
> > > + _clock_face_cb_analog_disabled(face, smn, mi);
> > > + }
> > > + e_menu_item_callback_set(mi, _clock_face_cb_analog_disabled, face);
> > > +
> > > + /* Hide analog time */
> > > + mi = e_menu_item_new(smn);
> > > + e_menu_item_label_set(mi, _("Disable"));
> > > + e_menu_item_radio_set(mi, 1);
> > > + e_menu_item_radio_group_set(mi, 1);
> > > + if (face->conf->analogStyle == ANALOG_STYLE_ENABLED) {
> > > + e_menu_item_toggle_set(mi, 1);
> > > + _clock_face_cb_analog_enabled(face, smn, mi);
> > > + }
> > > + e_menu_item_callback_set(mi, _clock_face_cb_analog_enabled, face);
> > > +
> > > + face->analog_menu = smn;
> > > +
> > > + mi = e_menu_item_new(mn);
> > > + e_menu_item_label_set(mi, _("Analog Display"));
> > > + e_menu_item_submenu_set(mi, face->analog_menu);
> > > }
> > >
> > > static void
> > > @@ -497,6 +538,44 @@
> > > }
> > >
> > > static void
> > > +_clock_face_cb_analog_disabled(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", ANALOG_STYLE_DISABLED);
> > > +
> > > + edje_object_part_text_set(face->clock_object, "analogStyle", buf);
> > > +
> > > + face->conf->analogStyle = ANALOG_STYLE_DISABLED;
> > > +
> > > + e_config_save_queue();
> > > +}
> > > +
> > > +static void
> > > +_clock_face_cb_analog_enabled(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", ANALOG_STYLE_ENABLED);
> > > +
> > > + edje_object_part_text_set(face->clock_object, "analogStyle", buf);
> > > +
> > > + face->conf->analogStyle = ANALOG_STYLE_ENABLED;
> > > +
> > > + e_config_save_queue();
> > > +}
> > > +
> > > +static void
> > > _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
> > > {
> > > Clock_Face *face;
> >
> >
