Enlightenment CVS committal
Author : kiwi
Project : e_modules
Module : eveil
Dir : e_modules/eveil
Modified Files:
TODO e_mod_config.c e_mod_config_alarm.c e_mod_main.c
e_mod_main.h eveil.edc
Log Message:
* remove after the date per alarm and also a default setting
* default date is actual year
* memo description
* button to set date today and tomorow
* set initial size larger
===================================================================
RCS file: /cvs/e/e_modules/eveil/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- TODO 29 May 2006 09:38:23 -0000 1.2
+++ TODO 30 May 2006 11:48:16 -0000 1.3
@@ -3,6 +3,7 @@
-------------------------------------------
- MODULE_VERSION don't show up
+ - edje theme is not correct with text position
-------------------------------------------
@@ -22,8 +23,11 @@
* show date in alarms list
* show timer in realtime in theme
* launch program
-
- - set initial size larger (see also inset mode)
+ * remove after the date per alarm and also a default setting
+ * default date is actual year
+ * memo description
+ * button to set date today and tomorow
+ * set initial size larger (see also inset mode)
- popups
- snooze
@@ -33,4 +37,4 @@
- handle alarms wich happend when no E on come back
- 12h time format
- dont share state for icons and detail between instance
- and save it
\ No newline at end of file
+ and save it
===================================================================
RCS file: /cvs/e/e_modules/eveil/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 29 May 2006 08:42:20 -0000 1.1
+++ e_mod_config.c 30 May 2006 11:48:16 -0000 1.2
@@ -29,7 +29,7 @@
Evas_Object *alarms_ilist;
E_Config_Dialog *alarms_cfd;
int alarms_active;
- int alarms_date_autoremove;
+ int alarms_date_autoremove_default;
int alarms_icon_mode;
int alarms_detail_mode;
int alarms_open_popup_default;
@@ -159,7 +159,7 @@
cfdata->alarms_active = ALARMS_STATE_OFF;
else
cfdata->alarms_active = ALARMS_STATE_ON;
- cfdata->alarms_date_autoremove = eveil_config->alarms_date_autoremove;
+ cfdata->alarms_date_autoremove_default =
eveil_config->alarms_date_autoremove_default;
cfdata->alarms_icon_mode = eveil_config->alarms_icon_mode;
cfdata->alarms_detail_mode = eveil_config->alarms_detail_mode;
cfdata->alarms_open_popup_default = eveil_config->alarms_open_popup_default;
@@ -326,7 +326,7 @@
e_widget_min_size_set(ob, 110, 25);
e_widget_frametable_object_append(of, ob, 1, 5, 2, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Remove alarm after the date"),
&(cfdata->alarms_date_autoremove));
+ ob = e_widget_check_add(evas, _("Remove alarm after the date"),
&(cfdata->alarms_date_autoremove_default));
e_widget_frametable_object_append(of, ob, 0, 6, 3, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, _("Time format"));
@@ -403,7 +403,7 @@
evas_stringshare_del(eveil_config->timer_program_default);
eveil_config->timer_program_default =
evas_stringshare_add(cfdata->timer_program_default);
- eveil_config->alarms_date_autoremove = cfdata->alarms_date_autoremove;
+ eveil_config->alarms_date_autoremove_default =
cfdata->alarms_date_autoremove_default;
if (eveil_config->alarms_icon_mode != cfdata->alarms_icon_mode)
{
eveil_config->alarms_icon_mode = cfdata->alarms_icon_mode;
===================================================================
RCS file: /cvs/e/e_modules/eveil/e_mod_config_alarm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config_alarm.c 29 May 2006 08:42:20 -0000 1.1
+++ e_mod_config_alarm.c 30 May 2006 11:48:16 -0000 1.2
@@ -26,7 +26,13 @@
int day_saturday;
int day_sunday;
} sched;
+ struct
+ {
+ Evas_Object *date;
+ } sched_gui;
+ int autoremove;
+ char *description;
int open_popup;
int run_program;
char *program;
@@ -41,6 +47,8 @@
static int _advanced_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
static void _cb_alarm_test(void *data, void *data2);
+static void _cb_alarm_today(void *data, void *data2);
+static void _cb_alarm_tomorrow(void *data, void *data2);
void eveil_config_alarm(Alarm *al)
{
@@ -74,6 +82,7 @@
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
free(cfdata->name);
+ free(cfdata->description);
free(cfdata->program);
free(cfdata);
}
@@ -113,6 +122,11 @@
cfdata->sched.day_friday = al->sched.day_friday;
cfdata->sched.day_saturday = al->sched.day_saturday;
cfdata->sched.day_sunday = al->sched.day_sunday;
+ cfdata->autoremove = al->autoremove;
+ if (al->description)
+ cfdata->description = strdup(al->description);
+ else
+ cfdata->description = strdup("");
cfdata->open_popup = al->open_popup;
cfdata->run_program = al->run_program;
if (al->program)
@@ -122,13 +136,24 @@
}
else
{
+ struct tm *st;
+ time_t t;
+ char buf[20];
+
cfdata->new = 1;
cfdata->state = ALARM_STATE_ON;
cfdata->name = strdup("");
cfdata->sched.type = ALARM_SCHED_TYPE_DEFAULT;
- cfdata->sched.date = strdup("");
- cfdata->open_popup = eveil_config->alarms_open_popup_default;
- cfdata->run_program = ALARM_RUN_PROGRAM_DEFAULT;
+
+ t = time(NULL);
+ st = localtime(&t);
+ strftime(buf, sizeof(buf), "%Y/", st);
+ cfdata->sched.date = strdup(buf);
+
+ cfdata->autoremove = ALARM_AUTOREMOVE_PARENT;
+ cfdata->description = strdup("");
+ cfdata->open_popup = ALARM_OPEN_POPUP_PARENT;
+ cfdata->run_program = ALARM_RUN_PROGRAM_PARENT;
cfdata->program = strdup("");
}
}
@@ -148,6 +173,12 @@
ob = e_widget_entry_add(evas, &(cfdata->name));
e_widget_min_size_set(ob, 200, 25);
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_label_add(evas, _("Description"));
+ e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_entry_add(evas, &(cfdata->description));
+ e_widget_min_size_set(ob, 250, 25);
+ e_widget_frametable_object_append(of, ob, 0, 3, 2, 1, 1, 1, 1, 1);
+
e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -184,9 +215,13 @@
e_widget_frametable_object_append(of, ob, 3, 3, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, _("Date (YYYY/MM/DD)"));
e_widget_frametable_object_append(of, ob, 3, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_entry_add(evas, &(cfdata->sched.date));
- e_widget_min_size_set(ob, 100, 25);
- e_widget_frametable_object_append(of, ob, 3, 5, 1, 1, 1, 1, 1, 1);
+ cfdata->sched_gui.date = e_widget_entry_add(evas, &(cfdata->sched.date));
+ e_widget_min_size_set(cfdata->sched_gui.date, 100, 25);
+ e_widget_frametable_object_append(of, cfdata->sched_gui.date, 3, 5, 1, 1,
1, 1, 1, 1);
+ ob = e_widget_button_add(evas, _("Today"), NULL, _cb_alarm_today, cfdata,
NULL);
+ e_widget_frametable_object_append(of, ob, 3, 6, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_button_add(evas, _("Tomorow"), NULL, _cb_alarm_tomorrow,
cfdata, NULL);
+ e_widget_frametable_object_append(of, ob, 3, 7, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, of, 1, 1, 0.5);
}
@@ -207,6 +242,8 @@
cfdata->sched.day_saturday,
cfdata->sched.day_sunday,
cfdata->sched.hour, cfdata->sched.minute,
+ cfdata->autoremove,
+ cfdata->description,
cfdata->open_popup,
cfdata->run_program,
cfdata->program);
@@ -280,6 +317,18 @@
of = e_widget_frametable_add(evas, _("Ring Options"), 0);
+ ob = e_widget_label_add(evas, _("Remove alarm"));
+ e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
+
+ rg = e_widget_radio_group_new(&(cfdata->autoremove));
+
+ ob = e_widget_radio_add(evas, _("No"), ALARM_AUTOREMOVE_NO, rg);
+ e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_add(evas, _("Use general settings"),
ALARM_AUTOREMOVE_PARENT, rg);
+ e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_add(evas, _("Yes"), ALARM_AUTOREMOVE_YES, rg);
+ e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
+
ob = e_widget_label_add(evas, _("Open popup"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
@@ -342,4 +391,34 @@
return;
eveil_alarm_test(cfdata->al);
+}
+
+static void _cb_alarm_today(void *data, void *data2)
+{
+ E_Config_Dialog_Data *cfdata;
+ struct tm *st;
+ time_t t;
+ char buf[20];
+
+ cfdata = data;
+ t = time(NULL);
+ st = localtime(&t);
+ strftime(buf, sizeof(buf), "%Y/%m/%d", st);
+
+ e_widget_entry_text_set(cfdata->sched_gui.date, buf);
+}
+
+static void _cb_alarm_tomorrow(void *data, void *data2)
+{
+ E_Config_Dialog_Data *cfdata;
+ struct tm *st;
+ time_t t;
+ char buf[20];
+
+ cfdata = data;
+ t = time(NULL) + 3600*24;
+ st = localtime(&t);
+ strftime(buf, sizeof(buf), "%Y/%m/%d", st);
+
+ e_widget_entry_text_set(cfdata->sched_gui.date, buf);
}
===================================================================
RCS file: /cvs/e/e_modules/eveil/e_mod_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.c 30 May 2006 08:45:42 -0000 1.3
+++ e_mod_main.c 30 May 2006 11:48:16 -0000 1.4
@@ -126,10 +126,11 @@
inst = gcc->data;
- if (eveil_config->alarms_icon_mode)
+ if (eveil_config->alarms_icon_mode ||
+ eveil_config->timer_icon_mode)
{
- e_gadcon_client_aspect_set(gcc, 24, 16);
- e_gadcon_client_min_size_set(gcc, 24, 16);
+ e_gadcon_client_aspect_set(gcc, 40, 16);
+ e_gadcon_client_min_size_set(gcc, 40, 16);
}
else
{
@@ -162,7 +163,7 @@
* Eveil functions
*/
-Alarm *eveil_alarm_add(int state, char *name, int type, char *date, int
day_monday, int day_tuesday, int day_wenesday, int day_thursday, int
day_friday, int day_saturday, int day_sunday, int hour, int minute, int
open_popup, int run_program, char *program)
+Alarm *eveil_alarm_add(int state, char *name, int type, char *date, int
day_monday, int day_tuesday, int day_wenesday, int day_thursday, int
day_friday, int day_saturday, int day_sunday, int hour, int minute, int
autoremove, char *description, int open_popup, int run_program, char *program)
{
Alarm *al;
@@ -205,6 +206,9 @@
}
al->sched.hour = hour;
al->sched.minute = minute;
+ al->autoremove = autoremove;
+ if (description)
+ al->description = evas_stringshare_add(description);
al->open_popup = open_popup;
al->run_program = run_program;
if (program)
@@ -226,6 +230,8 @@
{
if (al->name)
evas_stringshare_del(al->name);
+ if (al->description)
+ evas_stringshare_del(al->description);
if (al->program)
evas_stringshare_del(al->program);
eveil_config->alarms = evas_list_remove(eveil_config->alarms, al);
@@ -431,7 +437,9 @@
return 0;
else
{
- if (eveil_config->alarms_date_autoremove)
+ if ((al->autoremove == ALARM_AUTOREMOVE_YES) ||
+ (al->autoremove == ALARM_AUTOREMOVE_PARENT &&
+ eveil_config->alarms_date_autoremove_default == 1))
eveil_alarm_del(al);
else
al->state = ALARM_STATE_OFF;
@@ -821,6 +829,8 @@
E_CONFIG_VAL(D, T, sched.hour, SHORT);
E_CONFIG_VAL(D, T, sched.minute, SHORT);
E_CONFIG_VAL(D, T, sched.day_next_epoch, DOUBLE);
+ E_CONFIG_VAL(D, T, autoremove, SHORT);
+ E_CONFIG_VAL(D, T, description, STR);
E_CONFIG_VAL(D, T, open_popup, SHORT);
E_CONFIG_VAL(D, T, run_program, SHORT);
E_CONFIG_VAL(D, T, program, STR);
@@ -838,7 +848,7 @@
E_CONFIG_VAL(D, T, timer_program_default, STR);
E_CONFIG_VAL(D, T, alarms_state, SHORT);
E_CONFIG_LIST(D, T, alarms, _alarms_edd);
- E_CONFIG_VAL(D, T, alarms_date_autoremove, SHORT);
+ E_CONFIG_VAL(D, T, alarms_date_autoremove_default, SHORT);
E_CONFIG_VAL(D, T, alarms_icon_mode, SHORT);
E_CONFIG_VAL(D, T, alarms_detail_mode, SHORT);
E_CONFIG_VAL(D, T, alarms_open_popup_default, SHORT);
@@ -890,7 +900,7 @@
eveil_config->timer_open_popup_default = TIMER_OPEN_POPUP_DEFAULT;
eveil_config->timer_run_program_default = TIMER_RUN_PROGRAM_DEFAULT;
eveil_config->alarms_state = ALARMS_STATE_OFF;
- eveil_config->alarms_date_autoremove = ALARMS_DATE_AUTOREMOVE_DEFAULT;
+ eveil_config->alarms_date_autoremove_default =
ALARMS_DATE_AUTOREMOVE_DEFAULT;
eveil_config->alarms_icon_mode = ALARMS_ICON_MODE_DEFAULT;
eveil_config->alarms_detail_mode = ALARMS_DETAIL_MODE_DEFAULT;
eveil_config->alarms_open_popup_default = ALARMS_OPEN_POPUP_DEFAULT;
@@ -903,7 +913,7 @@
E_CONFIG_LIMIT(eveil_config->timer_detail_mode, 0, 2);
E_CONFIG_LIMIT(eveil_config->timer_open_popup_default, 0, 1);
E_CONFIG_LIMIT(eveil_config->timer_run_program_default, 0, 1);
- E_CONFIG_LIMIT(eveil_config->alarms_date_autoremove, 0, 1);
+ E_CONFIG_LIMIT(eveil_config->alarms_date_autoremove_default, 0, 1);
E_CONFIG_LIMIT(eveil_config->alarms_icon_mode, 0, 2);
E_CONFIG_LIMIT(eveil_config->alarms_detail_mode, 0, 2);
E_CONFIG_LIMIT(eveil_config->alarms_open_popup_default, 0, 1);
===================================================================
RCS file: /cvs/e/e_modules/eveil/e_mod_main.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_main.h 29 May 2006 08:42:20 -0000 1.1
+++ e_mod_main.h 30 May 2006 11:48:16 -0000 1.2
@@ -4,7 +4,7 @@
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
-#define CONFIG_VERSION 5
+#define CONFIG_VERSION 6
#define TIME_FORMAT_12 0
#define TIME_FORMAT_24 1
@@ -48,6 +48,9 @@
#define ALARM_SCHED_TYPE_DAY 0
#define ALARM_SCHED_TYPE_WEEK 1
#define ALARM_SCHED_TYPE_DEFAULT 1
+#define ALARM_AUTOREMOVE_NO 0
+#define ALARM_AUTOREMOVE_YES 1
+#define ALARM_AUTOREMOVE_PARENT 2
#define ALARM_OPEN_POPUP_NO 0
#define ALARM_OPEN_POPUP_PARENT 1
#define ALARM_OPEN_POPUP_YES 2
@@ -98,7 +101,9 @@
int day_sunday;
double day_next_epoch;
} sched;
+ int autoremove;
+ const char *description;
int open_popup;
int run_program;
const char *program;
@@ -122,7 +127,7 @@
int alarms_state;
Evas_List *alarms;
Ecore_Timer *alarms_ring_etimer;
- int alarms_date_autoremove;
+ int alarms_date_autoremove_default;
int alarms_icon_mode;
int alarms_detail_mode;
int alarms_open_popup_default;
@@ -146,7 +151,7 @@
EAPI int e_modapi_about (E_Module *m);
EAPI int e_modapi_config (E_Module *m);
-Alarm *eveil_alarm_add(int state, char *name, int type, char *date, int
day_monday, int day_tuesday, int day_wenesday, int day_thursday, int
day_friday, int day_saturday, int day_sunday, int hour, int minute, int
open_popup, int run_program, char *program);
+Alarm *eveil_alarm_add(int state, char *name, int type, char *date, int
day_monday, int day_tuesday, int day_wenesday, int day_thursday, int
day_friday, int day_saturday, int day_sunday, int hour, int minute, int
autoremove, char *description, int open_popup, int run_program, char *program);
void eveil_alarm_del(Alarm *al);
int eveil_alarm_test(Alarm *al);
void eveil_timer_start(void);
===================================================================
RCS file: /cvs/e/e_modules/eveil/eveil.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eveil.edc 29 May 2006 08:42:20 -0000 1.1
+++ eveil.edc 30 May 2006 11:48:16 -0000 1.2
@@ -377,6 +377,7 @@
size: 12;
fit: 1 1;
align: 0.0 0.5;
+ text_class: "module_large";
}
}
}
@@ -605,6 +606,7 @@
size: 12;
fit: 1 1;
align: 0.0 0.5;
+ text_class: "module_small";
}
}
}
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
