Enlightenment CVS committal
Author : nasa01
Project : e_modules
Module : calendar
Dir : e_modules/calendar/src
Modified Files:
calendar_func.c cal_face_func.c e_mod_main.c e_mod_main.h
main_editor.c
Log Message:
Fixing *106* problem & add option for overlap
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/calendar_func.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- calendar_func.c 30 Jan 2006 20:22:48 -0000 1.5
+++ calendar_func.c 11 Mar 2006 20:03:56 -0000 1.6
@@ -419,7 +419,7 @@
DayOfMonth);
if ((DayOfMonth == date.tm_mday)
&& (calendar->conf->view_month == date.tm_mon)
- && (calendar->conf->view_year == date.tm_year))
+ && (calendar->conf->view_year == date.tm_year + 1900))
{
edje_object_part_text_set(face->today_object[counter]->
obj, "date-text", DateBox);
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/cal_face_func.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- cal_face_func.c 30 Jan 2006 20:22:48 -0000 1.6
+++ cal_face_func.c 11 Mar 2006 20:03:56 -0000 1.7
@@ -59,6 +59,7 @@
int check, i;
Calendar_Face *face;
+ E_Gadman_Policy policy;
face = E_NEW(Calendar_Face, 1);
if (!face)
@@ -273,10 +274,18 @@
face->gmc = e_gadman_client_new(con->gadman);
e_gadman_client_domain_set(face->gmc, "module.calendar",
increment_cal_count());
- e_gadman_client_policy_set(face->gmc,
- E_GADMAN_POLICY_ANYWHERE | E_GADMAN_POLICY_HMOVE
|
- E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_HSIZE |
- E_GADMAN_POLICY_VSIZE);
+ policy = E_GADMAN_POLICY_ANYWHERE | E_GADMAN_POLICY_HMOVE |
+ E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_HSIZE |
+ E_GADMAN_POLICY_VSIZE;
+
+ if (calendar->conf->allow_overlap == 0)
+ policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
+ else
+ policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
+
+ e_gadman_client_policy_set(face->gmc, policy);
+
+
//e_gadman_client_min_size_set(face->gmc, 14, 7);
e_gadman_client_align_set(face->gmc, 1.0, 1.0);
e_gadman_client_resize(face->gmc, 240, 320);
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/e_mod_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.c 30 Jan 2006 20:22:48 -0000 1.7
+++ e_mod_main.c 11 Mar 2006 20:03:56 -0000 1.8
@@ -5,26 +5,41 @@
#include <libintl.h>
/* module private routines */
-static Calendar *_calendar_new();
-
static void _calendar_shutdown(Calendar * calendar);
-
static int _date_cb_check(void *calendar);
-
static void _clear_dates(Calendar_Face * face);
-
static int _calendar_count;
-
static E_Config_DD *conf_edd;
-
static E_Config_DD *conf_font_edd;
-
static E_Config_DD *conf_color_edd;
-
-
EAPI E_Module_Api e_modapi =
{
-
E_MODULE_API_VERSION,
"Calendar"
-};
+static Calendar *_calendar_new();
+
+static void _calendar_shutdown(Calendar * calendar);
+
+static int _date_cb_check(void *calendar);
+
+static void _clear_dates(Calendar_Face * face);
+
+static int _calendar_count;
+
+static E_Config_DD *conf_edd;
+
+static E_Config_DD *conf_font_edd;
+
+static E_Config_DD *conf_color_edd;
+
+
+
+EAPI E_Module_Api e_modapi =
+{
+
+E_MODULE_API_VERSION,
+"Calendar"
+};
/** Public function ***/
- int
+ int
increment_cal_count()
-{
-
_calendar_count++;
-
return _calendar_count;
-
}
+{
+
+_calendar_count++;
+
+return _calendar_count;
+
+}
/************ public module routines. all modules must have these
***************/
/***************************************************
@@ -36,26 +51,35 @@
******************************************************/
EAPI void *
e_modapi_init(E_Module *module)
-{
-
Calendar * calendar;
+{
+
+Calendar * calendar;
/* check module api version */
- if (module->api->version < E_MODULE_API_VERSION)
+ if (module->api->version < E_MODULE_API_VERSION)
- {
-
e_error_dialog_show
- ("Module API Error",
"Error initializing Module: calendar\n"
+ {
+
+e_error_dialog_show
+ ("Module API Error",
+"Error initializing Module: calendar\n"
"It requires a minimum module API version of: %i.\n"
"The module API advertized by Enlightenment is: %i.\n"
- "Aborting module.",
E_MODULE_API_VERSION, module->api->version);
-
return NULL;
-
}
+ "Aborting module.",
+E_MODULE_API_VERSION, module->api->version);
+
+return NULL;
+
+}
/* actually init buttons */
- calendar = _calendar_new();
-
module->config_menu = calendar->config_menu;
-
return calendar;
-
}
+ calendar = _calendar_new();
+
+module->config_menu = calendar->config_menu;
+
+return calendar;
+
+}
/***************************************************
/ Function:
@@ -65,20 +89,34 @@
/* * int e_modapi_shutdown(E_Module*) - Cleanup */
EAPI int
e_modapi_shutdown(E_Module *module)
-{
-
Calendar * calendar;
-
if (module->config_menu)
-
- {
-
e_menu_deactivate(module->config_menu);
-
e_object_del(E_OBJECT(module->config_menu));
-
module->config_menu = NULL;
-
}
-
calendar = module->data;
-
if (calendar)
-
_calendar_shutdown(calendar);
-
return 1;
-
}
+{
+
+Calendar * calendar;
+
+
+if (module->config_menu)
+
+ {
+
+e_menu_deactivate(module->config_menu);
+
+e_object_del(E_OBJECT(module->config_menu));
+
+module->config_menu = NULL;
+
+}
+
+
+calendar = module->data;
+
+if (calendar)
+
+_calendar_shutdown(calendar);
+
+
+return 1;
+
+}
/***************************************************
/ Function:
@@ -89,12 +127,18 @@
/* ie: the calendar->conf stuff */
EAPI int
e_modapi_save(E_Module *module)
-{
-
Calendar * calendar;
-
calendar = module->data;
-
e_config_domain_save("module.calendar", conf_edd, calendar->conf);
-
return 1;
-
}
+{
+
+Calendar * calendar;
+
+
+calendar = module->data;
+
+e_config_domain_save("module.calendar", conf_edd, calendar->conf);
+
+return 1;
+
+}
/***************************************************
/ Function:
@@ -104,10 +148,13 @@
/* * int e_modapi_info(E_Module*) - Setup module specific infomation */
EAPI int
e_modapi_info(E_Module *module)
-{
-
module->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
-
return 1;
-
}
+{
+
+module->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
+
+return 1;
+
+}
/***************************************************
/ Function:
@@ -118,11 +165,15 @@
/* * int e_modapi_about(E_Module*). - Called when Modules' About Menu is
invoked. */
EAPI int
e_modapi_about(E_Module *module)
-{
-
e_error_dialog_show(_("Enlightenment calendar Module"),
-
_("A simple module to give E17 a desktop calendar "));
-
return 1;
-
}
+{
+
+e_error_dialog_show(_("Enlightenment calendar Module"),
+
+_("A simple module to give E17 a desktop calendar "));
+
+return 1;
+
+}
/***************************************************
/ Function:
@@ -130,16 +181,23 @@
/
/
******************************************************/
- int
+ int
e_modapi_config(E_Module *m)
-{
-
Calendar * calendar;
-
calendar = m->data;
-
if (calendar)
- e_int_config_calendar(calendar->con, calendar);
-
return 1;
-
}
-
+{
+
+Calendar * calendar;
+
+
+calendar = m->data;
+
+if (calendar)
+ e_int_config_calendar(calendar->con, calendar);
+
+return 1;
+
+}
+
+
/************************ End of the required routines
******************************************/
/* module private routines */
@@ -151,186 +209,316 @@
******************************************************/
static Calendar *
_calendar_new()
-{
-
Calendar * calendar;
-
time_t now;
-
struct tm date;
-
-
time(&now);
-
date = *localtime(&now);
-
_calendar_count = 0;
-
calendar = E_NEW(Calendar, 1);
-
if (!calendar)
- return NULL;
-
conf_font_edd = E_CONFIG_DD_NEW("CalFonts", CalFonts);
+{
+
+Calendar * calendar;
+
+time_t now;
+
+struct tm date;
+
+
+time(&now);
+
+date = *localtime(&now);
+
+
+_calendar_count = 0;
+
+calendar = E_NEW(Calendar, 1);
+
+if (!calendar)
+ return NULL;
+
+
+conf_font_edd = E_CONFIG_DD_NEW("CalFonts", CalFonts);
#undef T
#undef D
#define T CalFonts
#define D conf_font_edd
- E_CONFIG_VAL(D, T, font, STR);
-
E_CONFIG_VAL(D, T, size, INT);
-
conf_color_edd = E_CONFIG_DD_NEW("c_array", c_array);
+ E_CONFIG_VAL(D, T, font, STR);
+
+E_CONFIG_VAL(D, T, size, INT);
+
+
+conf_color_edd = E_CONFIG_DD_NEW("c_array", c_array);
#undef T
#undef D
#define T c_array
#define D conf_color_edd
- E_CONFIG_VAL(D, T, red, INT);
-
E_CONFIG_VAL(D, T, green, INT);
-
E_CONFIG_VAL(D, T, blue, INT);
-
E_CONFIG_VAL(D, T, alpha, INT);
-
E_CONFIG_VAL(D, T, red_o, INT);
-
E_CONFIG_VAL(D, T, green_o, INT);
-
E_CONFIG_VAL(D, T, blue_o, INT);
-
E_CONFIG_VAL(D, T, alpha_o, INT);
-
E_CONFIG_VAL(D, T, red_s, INT);
-
E_CONFIG_VAL(D, T, green_s, INT);
-
E_CONFIG_VAL(D, T, blue_s, INT);
-
E_CONFIG_VAL(D, T, alpha_s, INT);
-
conf_edd = E_CONFIG_DD_NEW("calendar_Config", Config);
+ E_CONFIG_VAL(D, T, red, INT);
+
+E_CONFIG_VAL(D, T, green, INT);
+
+E_CONFIG_VAL(D, T, blue, INT);
+
+E_CONFIG_VAL(D, T, alpha, INT);
+
+E_CONFIG_VAL(D, T, red_o, INT);
+
+E_CONFIG_VAL(D, T, green_o, INT);
+
+E_CONFIG_VAL(D, T, blue_o, INT);
+
+E_CONFIG_VAL(D, T, alpha_o, INT);
+
+E_CONFIG_VAL(D, T, red_s, INT);
+
+E_CONFIG_VAL(D, T, green_s, INT);
+
+E_CONFIG_VAL(D, T, blue_s, INT);
+
+E_CONFIG_VAL(D, T, alpha_s, INT);
+
+
+conf_edd = E_CONFIG_DD_NEW("calendar_Config", Config);
#undef T
#undef D
#define T Config
#define D conf_edd
- E_CONFIG_VAL(D, T, ImageYes, INT);
-
E_CONFIG_VAL(D, T, config_version, INT);
-
E_CONFIG_VAL(D, T, DayofWeek_Start, INT);
-
E_CONFIG_VAL(D, T, TopImage_path, STR);
-
E_CONFIG_VAL(D, T, Background_path, STR);
-
E_CONFIG_VAL(D, T, ConfigFile_path, STR);
-
E_CONFIG_VAL(D, T, label_path, STR);
-
E_CONFIG_VAL(D, T, today_path, STR);
-
E_CONFIG_VAL(D, T, weekend_path, STR);
-
E_CONFIG_VAL(D, T, weekday_path, STR);
-
E_CONFIG_VAL(D, T, arrow_path, STR);
-
E_CONFIG_VAL(D, T, UserCS, INT);
+ E_CONFIG_VAL(D, T, ImageYes, INT);
+
+E_CONFIG_VAL(D, T, config_version, INT);
+E_CONFIG_VAL(D, T, DayofWeek_Start, INT);
+
+E_CONFIG_VAL(D, T, TopImage_path, STR);
+
+E_CONFIG_VAL(D, T, Background_path, STR);
+
+E_CONFIG_VAL(D, T, ConfigFile_path, STR);
+
+E_CONFIG_VAL(D, T, label_path, STR);
+
+E_CONFIG_VAL(D, T, today_path, STR);
+
+E_CONFIG_VAL(D, T, weekend_path, STR);
+
+E_CONFIG_VAL(D, T, weekday_path, STR);
+
+E_CONFIG_VAL(D, T, arrow_path, STR);
+
+E_CONFIG_VAL(D, T, UserCS, INT);
+
+E_CONFIG_VAL(D, T, allow_overlap, INT);
//Store colors
- E_CONFIG_LIST(D, T, Today_s_text_colors, conf_color_edd);
-
E_CONFIG_LIST(D, T, Today_s_back_colors, conf_color_edd);
-
E_CONFIG_LIST(D, T, Weekend_text_colors, conf_color_edd);
-
E_CONFIG_LIST(D, T, WeekDay_text_colors, conf_color_edd);
-
E_CONFIG_LIST(D, T, Weekend_back_colors, conf_color_edd);
-
E_CONFIG_LIST(D, T, WeekDay_back_colors, conf_color_edd);
-
E_CONFIG_LIST(D, T, YearMon_numb_colors, conf_color_edd);
-
E_CONFIG_LIST(D, T, DayWeek_text_colors, conf_color_edd);
+ E_CONFIG_LIST(D, T, Today_s_text_colors, conf_color_edd);
+
+E_CONFIG_LIST(D, T, Today_s_back_colors, conf_color_edd);
+
+E_CONFIG_LIST(D, T, Weekend_text_colors, conf_color_edd);
+
+E_CONFIG_LIST(D, T, WeekDay_text_colors, conf_color_edd);
+
+E_CONFIG_LIST(D, T, Weekend_back_colors, conf_color_edd);
+
+E_CONFIG_LIST(D, T, WeekDay_back_colors, conf_color_edd);
+
+E_CONFIG_LIST(D, T, YearMon_numb_colors, conf_color_edd);
+
+E_CONFIG_LIST(D, T, DayWeek_text_colors, conf_color_edd);
//Store fonts
- E_CONFIG_LIST(D, T, YM_text_class, conf_font_edd);
-
E_CONFIG_LIST(D, T, Day_text_class, conf_font_edd);
-
E_CONFIG_LIST(D, T, text_class, conf_font_edd);
-
calendar->conf = e_config_domain_load("module.calendar", conf_edd);
-
if (!calendar->conf)
-
- {
-
c_array * Temp_Ptr, *Temp_Ptr1, *Temp_Ptr2, *Temp_Ptr3, *Temp_Ptr4;
-
c_array * Temp_Ptr5, *Temp_Ptr6, *Temp_Ptr7;
-
Temp_Ptr = E_NEW(c_array, 1);
-
Temp_Ptr->red = -1;
-
Temp_Ptr1 = E_NEW(c_array, 1);
-
Temp_Ptr1->red = -1;
-
Temp_Ptr2 = E_NEW(c_array, 1);
-
Temp_Ptr2->red = -1;
-
Temp_Ptr3 = E_NEW(c_array, 1);
-
Temp_Ptr3->red = -1;
-
Temp_Ptr4 = E_NEW(c_array, 1);
-
Temp_Ptr4->red = -1;
-
Temp_Ptr5 = E_NEW(c_array, 1);
-
Temp_Ptr5->red = -1;
-
Temp_Ptr6 = E_NEW(c_array, 1);
-
Temp_Ptr6->red = -1;
-
Temp_Ptr7 = E_NEW(c_array, 1);
-
Temp_Ptr7->red = -1;
-
CalFonts * Temp_ClassPtr;
-
Temp_ClassPtr = E_NEW(CalFonts, 1);
-
Temp_ClassPtr->font = "";
-
CalFonts * Temp_ClassPtr1;
-
Temp_ClassPtr1 = E_NEW(CalFonts, 1);
-
Temp_ClassPtr1->font = "";
-
CalFonts * Temp_ClassPtr2;
-
Temp_ClassPtr2 = E_NEW(CalFonts, 1);
-
Temp_ClassPtr2->font = "";
-
calendar->conf = E_NEW(Config, 1);
-
-
calendar->conf->ImageYes = 0;
-
calendar->conf->TopImage_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/topimage.edj");
-
calendar->conf->Background_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/backimage.edj");
-
calendar->conf->today_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/today.edj");
-
calendar->conf->weekend_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/weekend.edj");
-
calendar->conf->weekday_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/weekday.edj");
-
calendar->conf->label_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/label.edj");
-
calendar->conf->arrow_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/arrow.edj");
-
calendar->conf->ConfigFile_path = "";
-
calendar->conf->Today_s_text_colors =
- evas_list_append(calendar->conf->Today_s_text_colors, Temp_Ptr);
-
calendar->conf->Today_s_back_colors =
- evas_list_append(calendar->conf->Today_s_back_colors, Temp_Ptr1);
-
calendar->conf->Weekend_text_colors =
- evas_list_append(calendar->conf->Weekend_text_colors, Temp_Ptr2);
-
calendar->conf->Weekend_back_colors =
- evas_list_append(calendar->conf->Weekend_back_colors, Temp_Ptr3);
-
calendar->conf->WeekDay_text_colors =
- evas_list_append(calendar->conf->WeekDay_text_colors, Temp_Ptr4);
-
calendar->conf->WeekDay_back_colors =
- evas_list_append(calendar->conf->WeekDay_back_colors, Temp_Ptr5);
-
calendar->conf->YearMon_numb_colors =
- evas_list_append(calendar->conf->YearMon_numb_colors, Temp_Ptr6);
-
calendar->conf->DayWeek_text_colors =
- evas_list_append(calendar->conf->DayWeek_text_colors, Temp_Ptr7);
-
calendar->conf->YM_text_class =
- evas_list_append(calendar->conf->YM_text_class, Temp_ClassPtr);
-
calendar->conf->Day_text_class =
- evas_list_append(calendar->conf->Day_text_class, Temp_ClassPtr1);
-
calendar->conf->text_class =
- evas_list_append(calendar->conf->text_class, Temp_ClassPtr2);
-
calendar->conf->DayofWeek_Start = 0;
-
calendar->conf->UserCS = FALSE;
-
calendar_face_set_colors(calendar);
-
calendar_face_set_text(calendar);
-
}
+ E_CONFIG_LIST(D, T, YM_text_class, conf_font_edd);
- else
+E_CONFIG_LIST(D, T, Day_text_class, conf_font_edd);
+
+E_CONFIG_LIST(D, T, text_class, conf_font_edd);
+
+
+calendar->conf = e_config_domain_load("module.calendar", conf_edd);
+
+if (!calendar->conf)
- {
-
if (strncmp(calendar->conf->TopImage_path, " ", 2) == 0)
+ {
+
+c_array * Temp_Ptr, *Temp_Ptr1, *Temp_Ptr2, *Temp_Ptr3, *Temp_Ptr4;
+
+c_array * Temp_Ptr5, *Temp_Ptr6, *Temp_Ptr7;
+
+Temp_Ptr = E_NEW(c_array, 1);
+
+Temp_Ptr->red = -1;
+
+Temp_Ptr1 = E_NEW(c_array, 1);
+
+Temp_Ptr1->red = -1;
+
+Temp_Ptr2 = E_NEW(c_array, 1);
+
+Temp_Ptr2->red = -1;
+
+Temp_Ptr3 = E_NEW(c_array, 1);
+
+Temp_Ptr3->red = -1;
+
+Temp_Ptr4 = E_NEW(c_array, 1);
+
+Temp_Ptr4->red = -1;
+
+Temp_Ptr5 = E_NEW(c_array, 1);
+
+Temp_Ptr5->red = -1;
+
+Temp_Ptr6 = E_NEW(c_array, 1);
+
+Temp_Ptr6->red = -1;
+
+Temp_Ptr7 = E_NEW(c_array, 1);
+
+Temp_Ptr7->red = -1;
+
+
+CalFonts * Temp_ClassPtr;
+
+Temp_ClassPtr = E_NEW(CalFonts, 1);
+
+Temp_ClassPtr->font = "";
+
+
+CalFonts * Temp_ClassPtr1;
+
+Temp_ClassPtr1 = E_NEW(CalFonts, 1);
+
+Temp_ClassPtr1->font = "";
+
+
+CalFonts * Temp_ClassPtr2;
+
+Temp_ClassPtr2 = E_NEW(CalFonts, 1);
+
+Temp_ClassPtr2->font = "";
+
+
+
+calendar->conf = E_NEW(Config, 1);
+
+
+calendar->conf->ImageYes = 0;
+
+calendar->conf->TopImage_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/topimage.edj");
+
+calendar->conf->Background_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/backimage.edj");
+
+calendar->conf->today_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/today.edj");
+
+calendar->conf->weekend_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/weekend.edj");
+
+calendar->conf->weekday_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/weekday.edj");
+
+calendar->conf->label_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/label.edj");
+
+calendar->conf->arrow_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/arrow.edj");
+
+calendar->conf->ConfigFile_path = "";
+
+
+calendar->conf->Today_s_text_colors =
+ evas_list_append(calendar->conf->Today_s_text_colors, Temp_Ptr);
+
+calendar->conf->Today_s_back_colors =
+ evas_list_append(calendar->conf->Today_s_back_colors, Temp_Ptr1);
+
+calendar->conf->Weekend_text_colors =
+ evas_list_append(calendar->conf->Weekend_text_colors, Temp_Ptr2);
+
+calendar->conf->Weekend_back_colors =
+ evas_list_append(calendar->conf->Weekend_back_colors, Temp_Ptr3);
+
+calendar->conf->WeekDay_text_colors =
+ evas_list_append(calendar->conf->WeekDay_text_colors, Temp_Ptr4);
+
+calendar->conf->WeekDay_back_colors =
+ evas_list_append(calendar->conf->WeekDay_back_colors, Temp_Ptr5);
+
+calendar->conf->YearMon_numb_colors =
+ evas_list_append(calendar->conf->YearMon_numb_colors, Temp_Ptr6);
+
+calendar->conf->DayWeek_text_colors =
+ evas_list_append(calendar->conf->DayWeek_text_colors, Temp_Ptr7);
+
+
+calendar->conf->YM_text_class =
+ evas_list_append(calendar->conf->YM_text_class, Temp_ClassPtr);
+
+calendar->conf->Day_text_class =
+ evas_list_append(calendar->conf->Day_text_class, Temp_ClassPtr1);
+
+calendar->conf->text_class =
+ evas_list_append(calendar->conf->text_class, Temp_ClassPtr2);
+
+
+calendar->conf->DayofWeek_Start = 0;
+
+calendar->conf->UserCS = FALSE;
+
+calendar->conf->allow_overlap = 0;
+
+calendar_face_set_colors(calendar);
+
+calendar_face_set_text(calendar);
+
+}
+
+ else
+
+ {
+
+if (strncmp(calendar->conf->TopImage_path, " ", 2) == 0)
- {
-
calendar->conf->TopImage_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/topimage.edj");
-
calendar->conf->Background_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR
"/backimage.edj");
-
calendar->conf->today_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/today.edj");
-
calendar->conf->weekend_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/weekend.edj");
-
calendar->conf->weekday_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/weekday.edj");
-
calendar->conf->label_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/label.edj");
-
calendar->conf->arrow_path =
- (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/arrow.edj");
-
}
-
}
calendar->conf->view_month = date.tm_mon;
-
calendar->conf->view_year = date.tm_year + 1900;
-
calendar->conf->Today = date.tm_mday;
+ {
+
+calendar->conf->TopImage_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/topimage.edj");
+
+calendar->conf->Background_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR
"/backimage.edj");
+
+calendar->conf->today_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/today.edj");
+
+calendar->conf->weekend_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/weekend.edj");
+
+calendar->conf->weekday_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/weekday.edj");
+
+calendar->conf->label_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/label.edj");
+
+calendar->conf->arrow_path =
+ (char *)evas_stringshare_add(PACKAGE_DATA_DIR "/arrow.edj");
+
+}
+
+
+}
+calendar->conf->view_month = date.tm_mon;
+
+calendar->conf->view_year = date.tm_year + 1900;
+
+calendar->conf->Today = date.tm_mday;
//Start up Face
- calendar_face_start(calendar);
+ calendar_face_start(calendar);
//Add Timer
- calendar->date_check_timer =
- ecore_timer_add(60, _date_cb_check, calendar);
-
return calendar;
-
}
+ calendar->date_check_timer =
+ ecore_timer_add(60, _date_cb_check, calendar);
+
+return calendar;
+
+}
/***************************************************
/ Function: _calendar_shutdown(Calendar *calendar)
@@ -340,41 +528,78 @@
******************************************************/
static void
_calendar_shutdown(Calendar * calendar)
-{
-
Evas_List *list;
-
-
E_CONFIG_DD_FREE(conf_edd);
-
E_CONFIG_DD_FREE(conf_font_edd);
-
E_CONFIG_DD_FREE(conf_color_edd);
-
ecore_timer_del(calendar->date_check_timer);
-
for (list = calendar->faces; list; list = list->next)
-
- {
-
calendar_face_free(list->data);
-
_calendar_count--;
-
}
-
evas_list_free(calendar->faces);
-
e_object_del(E_OBJECT(calendar->config_menu));
-
free_Calfonts(calendar);
-
+{
+
+Evas_List *list;
+
+
+
+E_CONFIG_DD_FREE(conf_edd);
+
+E_CONFIG_DD_FREE(conf_font_edd);
+
+E_CONFIG_DD_FREE(conf_color_edd);
+
+ecore_timer_del(calendar->date_check_timer);
+
+
+for (list = calendar->faces; list; list = list->next)
+
+ {
+
+calendar_face_free(list->data);
+
+_calendar_count--;
+
+}
+
+evas_list_free(calendar->faces);
+
+e_object_del(E_OBJECT(calendar->config_menu));
+
+
+free_Calfonts(calendar);
+
+
// need to free color list
- evas_list_free(calendar->conf->Today_s_text_colors);
-
evas_list_free(calendar->conf->Today_s_back_colors);
-
evas_list_free(calendar->conf->Weekend_text_colors);
-
evas_list_free(calendar->conf->Weekend_back_colors);
-
evas_list_free(calendar->conf->WeekDay_text_colors);
-
evas_list_free(calendar->conf->WeekDay_back_colors);
-
evas_list_free(calendar->conf->YearMon_numb_colors);
-
evas_list_free(calendar->conf->DayWeek_text_colors);
-
evas_stringshare_del(calendar->conf->TopImage_path);
-
evas_stringshare_del(calendar->conf->Background_path);
-
evas_stringshare_del(calendar->conf->today_path);
-
evas_stringshare_del(calendar->conf->weekend_path);
-
evas_stringshare_del(calendar->conf->weekday_path);
-
evas_stringshare_del(calendar->conf->label_path);
-
free(calendar->conf);
-
free(calendar);
-
}
+ evas_list_free(calendar->conf->Today_s_text_colors);
+
+evas_list_free(calendar->conf->Today_s_back_colors);
+
+evas_list_free(calendar->conf->Weekend_text_colors);
+
+evas_list_free(calendar->conf->Weekend_back_colors);
+
+evas_list_free(calendar->conf->WeekDay_text_colors);
+
+evas_list_free(calendar->conf->WeekDay_back_colors);
+
+evas_list_free(calendar->conf->YearMon_numb_colors);
+
+evas_list_free(calendar->conf->DayWeek_text_colors);
+
+
+
+evas_stringshare_del(calendar->conf->TopImage_path);
+
+evas_stringshare_del(calendar->conf->Background_path);
+
+evas_stringshare_del(calendar->conf->today_path);
+
+evas_stringshare_del(calendar->conf->weekend_path);
+
+evas_stringshare_del(calendar->conf->weekday_path);
+
+evas_stringshare_del(calendar->conf->label_path);
+
+
+
+
+free(calendar->conf);
+
+free(calendar);
+
+}
/***************************************************
/ Function: _calendar_config_menu_new(Calendar *calendar)
@@ -382,11 +607,13 @@
/
/
******************************************************/
- void
+ void
calendar_config_menu_new(Calendar * calendar)
-{
-
calendar->config_menu = e_menu_new();
-
}
+{
+
+calendar->config_menu = e_menu_new();
+
+}
/***************************************************
/ Function:
/ Purpose:
@@ -395,44 +622,74 @@
******************************************************/
static int
_date_cb_check(void *data)
-{
-
time_t now;
-
Calendar * calendar;
-
struct tm date;
-
-
time(&now);
-
date = *localtime(&now);
-
calendar = data;
-
if ((calendar->conf->Today == date.tm_mday)
- && (calendar->conf->view_month == date.tm_mon)
- &&
(calendar->conf->view_year == date.tm_year))
-
return 1;
-
- else
-
- {
-
Evas_List *l;
-
-
for (l = calendar->faces; l; l = l->next)
+{
+
+time_t now;
+
+Calendar * calendar;
+
+struct tm date;
+
+
+
+time(&now);
+
+date = *localtime(&now);
+
+
+calendar = data;
+
+
+if ((calendar->conf->Today == date.tm_mday)
+ && (calendar->conf->view_month == date.tm_mon)
+ &&
+(calendar->conf->view_year == date.tm_year + 1900))
+
+return 1;
+
+ else
+
+ {
+
+Evas_List *l;
+
+
+for (l = calendar->faces; l; l = l->next)
- {
-
Calendar_Face * face;
-
face = l->data;
-
fill_in_caltable(calendar->conf->DayofWeek_Start, face, 1);
-
_clear_dates(face);
-
if (calendar->conf->UserCS)
+ {
+
+Calendar_Face * face;
+
+face = l->data;
+
+fill_in_caltable(calendar->conf->DayofWeek_Start, face, 1);
+
+_clear_dates(face);
+
+if (calendar->conf->UserCS)
- {
-
update_colors(calendar, face);
-
}
-
int skew = calculate_skew(calendar);
-
-
calendar_add_dates(face, calendar, skew);
-
set_day_label(face->label_object, calendar->conf->DayofWeek_Start,
- date.tm_mon,
date.tm_year);
-
}
}
return 1;
-
}
-
+ {
+
+update_colors(calendar, face);
+
+}
+
+int skew = calculate_skew(calendar);
+
+
+calendar_add_dates(face, calendar, skew);
+
+set_day_label(face->label_object, calendar->conf->DayofWeek_Start,
+ date.tm_mon,
+date.tm_year);
+
+}
+}
+return 1;
+
+}
+
+
/***************************************************
/ Function:
/ Purpose:
@@ -441,19 +698,29 @@
******************************************************/
static void
_clear_dates(Calendar_Face * face)
-{
-
int x;
-
-
for (x = 0; x < 35; x++)
-
edje_object_part_text_set(face->weekday_object[x]->obj, "date-text",
- " ");
-
for (x = 0; x < 35; x++)
-
edje_object_part_text_set(face->weekend_object[x]->obj, "date-text",
- " ");
-
for (x = 0; x < 35; x++)
-
edje_object_part_text_set(face->today_object[x]->obj, "date-text", " ");
-
}
-
+{
+
+int x;
+
+
+
+for (x = 0; x < 35; x++)
+
+edje_object_part_text_set(face->weekday_object[x]->obj, "date-text",
+ " ");
+
+for (x = 0; x < 35; x++)
+
+edje_object_part_text_set(face->weekend_object[x]->obj, "date-text",
+ " ");
+
+for (x = 0; x < 35; x++)
+
+edje_object_part_text_set(face->today_object[x]->obj, "date-text", " ");
+
+}
+
+
/***************************************************
/ Function:
/ Purpose:
@@ -463,15 +730,21 @@
/
/
******************************************************/
- void
+ void
read_conf_files(void *data, E_Menu *m, E_Menu_Item *mi)
-{
-
Calendar * calendar;
-
calendar = data;
-
calendar_face_set_colors(calendar);
-
calendar_face_set_text(calendar);
-
redraw_calendar(calendar, 0);
-
}
+{
+
+Calendar * calendar;
+
+calendar = data;
+
+calendar_face_set_colors(calendar);
+
+calendar_face_set_text(calendar);
+
+redraw_calendar(calendar, 0);
+
+}
/***************************************************
/ Function:
/ Purpose:
@@ -480,50 +753,81 @@
******************************************************/
void
redraw_calendar(Calendar * calendar, int SwitchImage)
-{
-
Evas_List *l;
-
-
Calendar_Face * face;
-
int skew;
-
-
time_t now;
-
struct tm date;
-
-
time(&now);
-
date = *localtime(&now);
-
if (SwitchImage == 1) //Ok, so I need to redraw the whole calendar
- {
-
for (l = calendar->faces; l; l = l->next)
+{
+
+Evas_List *l;
+
+
+Calendar_Face * face;
+
+int skew;
+
+
+time_t now;
+
+struct tm date;
+
+
+time(&now);
+
+date = *localtime(&now);
+
+
+if (SwitchImage == 1) //Ok, so I need to redraw the whole calendar
+ {
+
+for (l = calendar->faces; l; l = l->next)
- {
-
face = l->data;
-
calendar_face_free(face);
-
calendar->faces = evas_list_remove(l, face);
-
}
-
calendar_face_start(calendar);
-
}
+ {
+
+face = l->data;
+
+calendar_face_free(face);
+
+calendar->faces = evas_list_remove(l, face);
+
+}
+
+calendar_face_start(calendar);
+
+}
- else
+ else
- {
-
for (l = calendar->faces; l; l = l->next)
+ {
+
+for (l = calendar->faces; l; l = l->next)
- {
-
face = l->data;
-
fill_in_caltable(calendar->conf->DayofWeek_Start, face, 1);
-
_clear_dates(face);
-
skew = calculate_skew(calendar);
-
calendar_add_dates(face, calendar, skew);
-
set_day_label(face->label_object, calendar->conf->DayofWeek_Start,
- calendar->conf->view_month,
- calendar->conf->view_year);
-
if (calendar->conf->UserCS)
+ {
+
+face = l->data;
+
+fill_in_caltable(calendar->conf->DayofWeek_Start, face, 1);
+
+_clear_dates(face);
+
+skew = calculate_skew(calendar);
+
+calendar_add_dates(face, calendar, skew);
+
+set_day_label(face->label_object, calendar->conf->DayofWeek_Start,
+ calendar->conf->view_month,
+ calendar->conf->view_year);
+
+if (calendar->conf->UserCS)
- {
-
calendar_update_text_fonts(calendar, face);
-
update_colors(calendar, face);
-
}
-
}
-
}
-
}
-
+ {
+
+calendar_update_text_fonts(calendar, face);
+
+update_colors(calendar, face);
+
+}
+
+}
+
+}
+
+}
+
+
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h 30 Jan 2006 20:22:48 -0000 1.7
+++ e_mod_main.h 11 Mar 2006 20:03:56 -0000 1.8
@@ -5,118 +5,229 @@
#include <Ecore.h>
#include "add_event_dialog.h"
#include "add_todo_dialog.h"
-
+
+
+
#define CALENDAR_CONFIG_VERSION 1000
-
typedef struct _Config Config;
-
typedef struct _calendar Calendar;
-
typedef struct _calendar_Face Calendar_Face;
-
typedef struct _calfonts CalFonts;
-
typedef struct _ColorArray c_array;
-
typedef struct _day_face weekday_face;
-
typedef struct _day_face weekend_face;
-
typedef struct _day_face today_face;
-
typedef struct _day_face day_face;
-
struct _calfonts
-{
-
int size;
-
char *font;
-
Calendar * calendar;
-
};
-
struct _ColorArray
-{
-
Calendar * calendar;
-
int red, red_o, red_s;
-
int green, green_o, green_s;
-
int blue, blue_o, blue_s;
-
int alpha, alpha_o, alpha_s;
-
};
-
+
+typedef struct _Config Config;
+
+typedef struct _calendar Calendar;
+
+typedef struct _calendar_Face Calendar_Face;
+
+typedef struct _calfonts CalFonts;
+
+typedef struct _ColorArray c_array;
+
+typedef struct _day_face weekday_face;
+
+typedef struct _day_face weekend_face;
+
+typedef struct _day_face today_face;
+
+typedef struct _day_face day_face;
+
+
+struct _calfonts
+{
+
+int size;
+
+char *font;
+
+Calendar * calendar;
+
+};
+
+struct _ColorArray
+{
+
+Calendar * calendar;
+
+int red, red_o, red_s;
+
+int green, green_o, green_s;
+
+int blue, blue_o, blue_s;
+
+int alpha, alpha_o, alpha_s;
+
+};
+
/* color list -> red, green, blue, alpha, outline red, green, blue, alpha,
shadow red, green, blue, alpha */
-
struct _Config
-{
-
Evas_List *faces;
-
int ImageYes;
-
int Today;
-
int config_version;
-
Evas_List *Today_s_text_colors;
-
Evas_List *Today_s_back_colors;
-
Evas_List *Weekend_text_colors;
-
Evas_List *Weekend_back_colors;
-
Evas_List *WeekDay_text_colors;
-
Evas_List *WeekDay_back_colors;
-
Evas_List *YearMon_numb_colors;
-
Evas_List *DayWeek_text_colors;
-
Evas_List *YM_text_class;
-
Evas_List *Day_text_class;
-
Evas_List *text_class;
-
int DayofWeek_Start;
-
char *TopImage_path;
-
char *Background_path;
-
char *ConfigFile_path;
-
char *weekend_path;
-
char *today_path;
-
char *weekday_path;
-
char *label_path;
-
char *arrow_path;
-
int UserCS;
-
int view_month;
-
int view_year;
-
};
-
struct _calendar
-{
-
Evas_List *faces;
-
E_Menu *config_menu;
-
Ecore_Timer * date_check_timer;
-
Config *conf;
-
E_Container *con;
-
};
-
struct _calendar_Face
-{
-
E_Container *con;
-
E_Menu *menu;
-
E_Menu *menu1; //for todo list & personnal events
- E_Menu *sub;
-
E_Menu *sub2;
-
E_Menu *sub3;
-
Evas_Object *calendar_object;
-
E_Gadman_Client *gmc;
-
Evas_Object *topimage_object;
-
Evas_Object *background_object;
-
Evas_Object *table_object;
-
Evas_Object *o_calendar_table;
-
weekday_face * weekday_object[35];
-
weekend_face * weekend_object[35];
-
today_face * today_object[35];
-
Evas_Object *label_object;
-
Evas_Object *next_month;
-
Evas_Object *prev_month;
-
Evas_Object *next_year;
-
Evas_Object *prev_year;
-
};
-
struct _day_face
-{
-
Evas_Object *obj;
-
E_Menu *menu;
-
E_Menu *menu1;
-
char events[50][256];
-
char todo[50][256];
-
char holiday[10][256];
-
int eventtype;
-
int holidaytype;
-
};
-
EAPI extern E_Module_Api e_modapi;
-
EAPI void *e_modapi_init(E_Module *m);
-
EAPI int e_modapi_shutdown(E_Module *m);
-
EAPI int e_modapi_save(E_Module *m);
-
EAPI int e_modapi_info(E_Module *m);
-
EAPI int e_modapi_about(E_Module *m);
-
void redraw_calendar(Calendar * calendar, int SwitchImage);
-
void read_conf_files(void *data, E_Menu *m, E_Menu_Item *mi);
-
void calendar_config_menu_new(Calendar * calendar);
-
int increment_cal_count();
-
-
+
+struct _Config
+{
+
+Evas_List *faces;
+
+int ImageYes;
+
+int Today;
+
+int config_version;
+
+Evas_List *Today_s_text_colors;
+
+Evas_List *Today_s_back_colors;
+
+Evas_List *Weekend_text_colors;
+
+Evas_List *Weekend_back_colors;
+
+Evas_List *WeekDay_text_colors;
+
+Evas_List *WeekDay_back_colors;
+
+Evas_List *YearMon_numb_colors;
+
+Evas_List *DayWeek_text_colors;
+
+Evas_List *YM_text_class;
+
+Evas_List *Day_text_class;
+
+Evas_List *text_class;
+
+int DayofWeek_Start;
+
+char *TopImage_path;
+
+char *Background_path;
+
+char *ConfigFile_path;
+
+char *weekend_path;
+
+char *today_path;
+
+char *weekday_path;
+
+char *label_path;
+
+char *arrow_path;
+
+int UserCS;
+
+int view_month;
+
+int view_year;
+
+int allow_overlap;
+
+};
+
+
+struct _calendar
+{
+
+Evas_List *faces;
+
+E_Menu *config_menu;
+
+Ecore_Timer * date_check_timer;
+
+Config *conf;
+
+E_Container *con;
+
+};
+
+
+struct _calendar_Face
+{
+
+E_Container *con;
+
+E_Menu *menu;
+
+E_Menu *menu1; //for todo list & personnal events
+ E_Menu *sub;
+
+E_Menu *sub2;
+
+E_Menu *sub3;
+
+Evas_Object *calendar_object;
+
+E_Gadman_Client *gmc;
+
+Evas_Object *topimage_object;
+
+Evas_Object *background_object;
+
+Evas_Object *table_object;
+
+Evas_Object *o_calendar_table;
+
+weekday_face * weekday_object[35];
+
+weekend_face * weekend_object[35];
+
+today_face * today_object[35];
+
+Evas_Object *label_object;
+
+Evas_Object *next_month;
+
+Evas_Object *prev_month;
+
+Evas_Object *next_year;
+
+Evas_Object *prev_year;
+
+};
+
+
+struct _day_face
+{
+
+Evas_Object *obj;
+
+E_Menu *menu;
+
+E_Menu *menu1;
+
+char events[50][256];
+
+char todo[50][256];
+
+char holiday[10][256];
+
+int eventtype;
+
+int holidaytype;
+
+};
+
+
+
+EAPI extern E_Module_Api e_modapi;
+
+
+EAPI void *e_modapi_init(E_Module *m);
+
+EAPI int e_modapi_shutdown(E_Module *m);
+
+EAPI int e_modapi_save(E_Module *m);
+
+EAPI int e_modapi_info(E_Module *m);
+
+EAPI int e_modapi_about(E_Module *m);
+
+
+void redraw_calendar(Calendar * calendar, int SwitchImage);
+
+void read_conf_files(void *data, E_Menu *m, E_Menu_Item *mi);
+
+void calendar_config_menu_new(Calendar * calendar);
+
+int increment_cal_count();
+
+
+
#include "calendar_color_func.h"
#include "calendar_text_fun.h"
#include "dialog_func.h"
@@ -128,4 +239,5 @@
#include "otherfonts_editor.h"
#include "main_editor.h"
-#endif /*
*/
+#endif /*
+ */
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/main_editor.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- main_editor.c 30 Jan 2006 20:22:48 -0000 1.9
+++ main_editor.c 11 Mar 2006 20:03:56 -0000 1.10
@@ -10,7 +10,7 @@
char *size2;
int temp_ImageYes;
int temp_UserCS;
-
+ int allow_overlap;
Calendar *calendar;
};
@@ -146,6 +146,11 @@
e_widget_framelist_object_append(of, ob);
e_widget_table_object_append(o, of, 0, 2, 1, 1, 1, 1, 1, 1);
+ of = e_widget_framelist_add(evas, _("Extras"), 0);
+ ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"),
&(cfdata->calendar->conf->allow_overlap));
+ e_widget_framelist_object_append(of, ob);
+ e_widget_table_object_append(o, of, 0, 3, 1, 1, 1, 1, 1, 1);
+
return o;
}
/***************************************************
@@ -258,7 +263,7 @@
Evas_Object *font_title;
Evas_Object *start_table;
Evas_Object *start_tableB, *ofB;
- Evas_Object *entry;
+ Evas_Object *entry, *s_table;
E_Radio_Group *rg;
E_Manager *man;
E_Container *con;
@@ -291,6 +296,7 @@
}
o = e_widget_table_add(evas, 0);
+ s_table = e_widget_table_add(evas, 0);
of2 = e_widget_framelist_add(evas, _("Top Image"), 1);
rg = e_widget_radio_group_new(&(cfdata->calendar->conf->ImageYes));
@@ -298,7 +304,14 @@
e_widget_framelist_object_append(of2, ob);
ob = e_widget_radio_add(evas, _("Without"), 1, rg);
e_widget_framelist_object_append(of2, ob);
- e_widget_table_object_append(o, of2, 0, 0, 1, 1, 1, 1, 1, 1);
+ e_widget_table_object_append(s_table, of2, 0, 0, 1, 1, 1, 1, 1, 1);
+
+ of = e_widget_framelist_add(evas, _("Extras"), 0);
+ ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"),
&(cfdata->calendar->conf->allow_overlap));
+ e_widget_framelist_object_append(of, ob);
+ e_widget_table_object_append(s_table, of, 0, 1, 1, 1, 1, 1, 1, 1);
+
+ e_widget_table_object_append(o, s_table, 0, 0, 1, 1, 1, 1, 1, 1);
start_table = e_widget_table_add(evas, 0);
of = e_widget_framelist_add(evas, _("First Day of Week"), 0);
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
