Enlightenment CVS committal
Author : nasa01
Project : e_modules
Module : calendar
Dir : e_modules/calendar/src
Modified Files:
add_event_dialog.c add_todo_dialog.c calendar_color_func.c
calendar_func.c calendar_text_fun.c cal_face_func.c
dialog_func.c e_mod_main.c main_editor.c otherfonts_editor.c
today_editor.c weekday_editor.c weekend_editor.c
Log Message:
Code cleanup
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/add_event_dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- add_event_dialog.c 19 Dec 2005 02:02:28 -0000 1.1
+++ add_event_dialog.c 8 Jan 2006 15:26:43 -0000 1.2
@@ -30,9 +30,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
void
add_event_show(void *con,void *DayToFix)
{
@@ -57,9 +55,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static void
_add_event_fill_data(CFData *cfdata)
{
@@ -72,9 +68,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+****************************************************/
static void *
_add_event_create_data(E_Config_Dialog *cfd)
{
@@ -94,9 +88,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static void
_add_event_free_data(E_Config_Dialog *cfd, void *data)
{
@@ -108,15 +100,11 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+****************************************************/
static int
_add_event_basic_apply_data(E_Config_Dialog *cfd, void *data)
{
CFData *cfdata;
- int AllGood;
-
cfdata = data;
e_config_save_queue();
@@ -131,14 +119,12 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_add_event_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check;
+ Evas_Object *o, *of, *ob, *of1;
E_Radio_Group *rg;
CFData *cfdata;
cfdata = data;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/add_todo_dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- add_todo_dialog.c 19 Dec 2005 02:02:28 -0000 1.1
+++ add_todo_dialog.c 8 Jan 2006 15:26:43 -0000 1.2
@@ -29,10 +29,7 @@
/ Purpose:
/ Returns: nothing
/ Takes:
-/
-/
-/
-/*****************************************************/
+*****************************************************/
void
add_todo_show(void *con,void *DayToFix)
{
@@ -57,9 +54,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static void
_add_todo_fill_data(CFData *cfdata)
{
@@ -72,9 +67,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static void *
_add_todo_create_data(E_Config_Dialog *cfd)
{
@@ -93,10 +86,7 @@
/ Purpose:
/ Returns: nothing
/ Takes:
-/
-/
-/
-/*****************************************************/
+*****************************************************/
static void
_add_todo_free_data(E_Config_Dialog *cfd, void *data)
{
@@ -108,15 +98,11 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static int
_add_todo_basic_apply_data(E_Config_Dialog *cfd, void *data)
{
CFData *cfdata;
- int AllGood;
-
cfdata = data;
e_config_save_queue();
@@ -130,16 +116,12 @@
/ Purpose:
/ Returns: nothing
/ Takes:
-/
-/
-/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_add_todo_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check;
- E_Radio_Group *rg;
+ Evas_Object *o,*of1;
CFData *cfdata;
cfdata = data;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/calendar_color_func.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- calendar_color_func.c 21 Dec 2005 22:17:45 -0000 1.2
+++ calendar_color_func.c 8 Jan 2006 15:26:43 -0000 1.3
@@ -8,13 +8,12 @@
/ Purpose: Read the config file and assign values to
/ to Calendar Config variables. Working...
/
-/*****************************************************/
+*****************************************************/
void
calendar_face_set_colors(Calendar *calendar)
{
- char read_line[120];
+ char read_line[120];
int r,g,b,a,r1,g1,b1,a1,r2,g2,b2,a2;
- int counter;
int UseDefault = 0;
char ValidName1[]={"Today_s_back_colors"};
char ValidName2[]={"Weekend_back_colors"};
@@ -303,10 +302,9 @@
/ Purpose: Assign Calendar Config color variable to
/ appropriate colorclass in edje.
/
-/*****************************************************/
+*****************************************************/
void update_colors(Calendar *calendar,Calendar_Face *face)
{
- int row = 1;
int x;
c_array *TBC_Ptr = calendar->conf->Today_s_back_colors->data;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/calendar_func.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- calendar_func.c 19 Dec 2005 02:46:28 -0000 1.1
+++ calendar_func.c 8 Jan 2006 15:26:43 -0000 1.2
@@ -7,8 +7,7 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void fill_in_caltable(int FirstDay, Calendar_Face *face, int StartUp)
{
int x = 0;
@@ -134,15 +133,13 @@
/ Purpose:
/
/
-/*****************************************************/
+*****************************************************/
int calculate_skew(Calendar *calendar)
{
//skew correction for month - http://klausler.com/new-dayofweek.html
int yearsfrom1900 = calendar->conf->view_year - 1900;
int onefourthyear = yearsfrom1900 / 4;
int onefourthyearmod = yearsfrom1900 % 4;
- int DayofMonth = 1;
- char Year[5];
int skew;
switch (calendar->conf->view_month)
@@ -233,16 +230,13 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void calendar_add_dates(Calendar_Face *face, Calendar *calendar, int skew)
{
time_t now;
struct tm date;
- int day = 0;
char buf[3];
int NumDayMon[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
- char TopBuf[256];
time(&now);
date = *localtime(&now);
int DayOfMonth = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/calendar_text_fun.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- calendar_text_fun.c 19 Dec 2005 02:02:28 -0000 1.1
+++ calendar_text_fun.c 8 Jan 2006 15:26:43 -0000 1.2
@@ -6,7 +6,7 @@
/ Purpose: Assign Calendar Config Fonts to appropriate
/ Font classes in edje
/
-/*****************************************************/
+*****************************************************/
void
calendar_update_text_fonts(Calendar *calendar, Calendar_Face *face)
{
@@ -39,7 +39,7 @@
/ Purpose: REad config file and assign values to
/ Calendar Config Variables -- working
/
-/*****************************************************/
+*****************************************************/
void
calendar_face_set_text(Calendar *calendar)
{
@@ -100,7 +100,7 @@
/ Purpose: Set Day/Month/Year text in the label.edje
/ Still needs to be tested.
/
-/*****************************************************/
+*****************************************************/
void
set_day_label(Evas_Object *label, int FirstDay, int month, int year)
{
@@ -224,7 +224,7 @@
/ Function:
/ Purpose: free text classes
/
-/*****************************************************/
+*****************************************************/
void free_Calfonts(Calendar *calendar)
{
Evas_List *list;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/cal_face_func.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- cal_face_func.c 21 Dec 2005 00:33:05 -0000 1.2
+++ cal_face_func.c 8 Jan 2006 15:26:43 -0000 1.3
@@ -7,11 +7,10 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void calendar_face_start(Calendar *calendar)
{
- Evas_List *cl, *managers, *l2, *l;
+ Evas_List *managers, *l2, *l;
E_Menu_Item *mi;
calendar_config_menu_new(calendar);
managers = e_manager_list();
@@ -45,7 +44,7 @@
/ Function: Start up the face
/ Purpose:
/
-/*****************************************************/
+*****************************************************/
Calendar_Face *
calendar_face_new(E_Container *con,Calendar *calendar)
{
@@ -57,8 +56,6 @@
int check,i;
Calendar_Face *face;
- Evas_Object *o3, *o_table, *o_table2;
- Evas_Object *today;
face = E_NEW(Calendar_Face, 1);
if (!face) return NULL;
@@ -273,7 +270,7 @@
/ Purpose:
/
/
-/*****************************************************/
+*****************************************************/
void calendar_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
@@ -298,20 +295,14 @@
E_MENU_POP_DIRECTION_DOWN,ev->timestamp);
e_util_container_fake_mouse_up_all_later(con);
}
-/* else if(ev->button == 1)
- {
- e_menu_activate_mouse(face->menu1, e_zone_current_get(con),
- ev->output.x, ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN,ev->timestamp);
- e_util_container_fake_mouse_up_all_later(con);
-} */
+
}
/***************************************************
/ Function:
/ Purpose:
/
/
-/*****************************************************/
+*****************************************************/
void calendar_face_prev_month(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
@@ -330,7 +321,7 @@
/ Purpose:
/
/
-/*****************************************************/
+*****************************************************/
void calendar_face_prev_year(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
@@ -344,7 +335,7 @@
/ Purpose:
/
/
-/*****************************************************/
+*****************************************************/
void calendar_face_next_year(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
Calendar *calendar;
@@ -357,7 +348,7 @@
/ Purpose:
/
/
-/*****************************************************/
+*****************************************************/
void calendar_face_next_month(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
@@ -379,7 +370,7 @@
/ Purpose:
/
/
-/*****************************************************/
+*****************************************************/
void calendar_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
{
Calendar_Face *face;
@@ -392,7 +383,7 @@
/ Purpose:
/ Returns: nothing
/
-/*****************************************************/
+*****************************************************/
void calendar_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change)
{
@@ -427,15 +418,11 @@
/ Purpose:
/ Returns: nothing
/
-/*****************************************************/
+*****************************************************/
void calendar_face_menu_new(Calendar_Face *face, Calendar *calendar)
{
E_Menu_Item *mi;
- E_Menu_Item *sub, *sub2, *sub3;
- Ecore_List* interfaces = NULL;
- int interface_count = 0;
- char* interface_name = NULL;
/* Setup Menus */
face->menu = e_menu_new();
/* Main Menu Items */
@@ -454,11 +441,10 @@
/ Purpose:
/ Returns: nothing
/
-/*****************************************************/
+*****************************************************/
void calendar_face_menu_day(day_face *face, Calendar *calendar)
{
E_Menu_Item *mi;
- E_Menu_Item *sub, *sub2, *sub3;
face->menu1 = e_menu_new();
/* Main Menu Items */
@@ -492,8 +478,7 @@
/ Function: calendar_face_free(Calendar_Face *face)
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void calendar_face_free(Calendar_Face *face)
{
int i = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/dialog_func.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- dialog_func.c 19 Dec 2005 02:02:28 -0000 1.1
+++ dialog_func.c 8 Jan 2006 15:26:43 -0000 1.2
@@ -7,8 +7,7 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void file_select_bk_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
Config *config;
@@ -26,8 +25,7 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void e_file_bk_select_cb(E_File_Dialog *dia, char *file, void *data)
{
char *ext;
@@ -63,8 +61,7 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void file_select_ti_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
Config *config;
@@ -82,8 +79,7 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void e_file_ti_select_cb(E_File_Dialog *dia, char *file, void *data)
{
char *ext;
@@ -118,8 +114,7 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void file_select_cf_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
Config *config;
@@ -136,11 +131,9 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void e_file_cf_select_cb(E_File_Dialog *dia, char *file, void *data)
{
- char *ext;
Config *config;
config->ConfigFile_path = (char *)evas_stringshare_add(file);
@@ -150,8 +143,7 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void config_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
Calendar *calendar;
@@ -162,8 +154,7 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void add_event_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
day_face *DayToFix;
@@ -174,21 +165,19 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
-void add_todo_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
+*****************************************************/
+void add_todo_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
day_face *DayToFix;
DayToFix = data;
- add_todo_show(m->zone->container,DayToFix);
+ //add_todo_show(m->zone->container,DayToFix);
}
/***************************************************
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
-void remove_event_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
+*****************************************************/
+void remove_event_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
day_face *DayToFix;
DayToFix = data;
@@ -198,9 +187,8 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
-void remove_todo_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
+*****************************************************/
+void remove_todo_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
day_face *DayToFix;
DayToFix = data;
@@ -210,9 +198,8 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
-void view_event_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
+*****************************************************/
+void view_event_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
day_face *DayToFix;
DayToFix = data;
@@ -222,8 +209,7 @@
/ Function:
/ Purpose:
/
-/
-/*****************************************************/
+*****************************************************/
void view_todo_dialog(void *data, E_Menu *m, E_Menu_Item *mi)
{
day_face *DayToFix;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/e_mod_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.c 21 Dec 2005 00:33:05 -0000 1.2
+++ e_mod_main.c 8 Jan 2006 15:26:43 -0000 1.3
@@ -32,7 +32,7 @@
/ Takes:
/
/
-/*****************************************************/
+******************************************************/
void *
e_modapi_init(E_Module *module)
{
@@ -58,7 +58,7 @@
/ Function:
/ Purpose:
/
-/*****************************************************/
+******************************************************/
/* * int e_modapi_shutdown(E_Module*) - Cleanup */
int
e_modapi_shutdown(E_Module *module)
@@ -82,7 +82,7 @@
/ Function:
/ Purpose:
/
-/*****************************************************/
+******************************************************/
/* * int e_modapi_save(E_Module*) - Save persistent data */
/* ie: the calendar->conf stuff */
int
@@ -98,7 +98,7 @@
/ Function:
/ Purpose:
/
-/*****************************************************/
+******************************************************/
/* * int e_modapi_info(E_Module*) - Setup module specific infomation */
int
e_modapi_info(E_Module *module)
@@ -111,7 +111,7 @@
/ Purpose:
/
/
-/*****************************************************/
+******************************************************/
/* * int e_modapi_about(E_Module*). - Called when Modules' About Menu is
invoked. */
int
e_modapi_about(E_Module *module)
@@ -125,7 +125,7 @@
/ Purpose:
/
/
-/*****************************************************/
+******************************************************/
int e_modapi_config(E_Module *m)
{
Calendar *calendar;
@@ -143,7 +143,7 @@
/ Purpose: create new calendar
/
/
-/*****************************************************/
+******************************************************/
static Calendar *
_calendar_new()
{
@@ -307,7 +307,7 @@
/ Purpose: shutdown calendar module
/
/
-/*****************************************************/
+******************************************************/
static void
_calendar_shutdown(Calendar *calendar)
{
@@ -356,7 +356,7 @@
/ Purpose: create new calender menu
/
/
-/*****************************************************/
+******************************************************/
void calendar_config_menu_new(Calendar *calendar)
{
calendar->config_menu = e_menu_new();
@@ -366,18 +366,13 @@
/ Purpose:
/
/
-/*****************************************************/
+******************************************************/
static int
_date_cb_check(void *data)
{
time_t now;
Calendar *calendar;
struct tm date;
- int x;
- int c = 1;
- int row = 1;
- char GridAddress[24];
- char buf[3];
time(&now);
date = *localtime(&now);
@@ -414,7 +409,7 @@
/ Purpose:
/
/
-/*****************************************************/
+******************************************************/
static void
_clear_dates(Calendar_Face *face)
{
@@ -436,7 +431,7 @@
/
/
/
-/*****************************************************/
+******************************************************/
void read_conf_files(void *data, E_Menu *m, E_Menu_Item *mi)
{
Calendar *calendar;
@@ -450,7 +445,7 @@
/ Purpose:
/
/
-/*****************************************************/
+******************************************************/
void
redraw_calendar(Calendar *calendar, int SwitchImage)
{
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/main_editor.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- main_editor.c 21 Dec 2005 04:06:01 -0000 1.4
+++ main_editor.c 8 Jan 2006 15:26:43 -0000 1.5
@@ -14,7 +14,7 @@
Calendar *calendar;
};
-static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
+//static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, void *data);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas
*evas, void *data);
@@ -31,7 +31,7 @@
/
/
/
-/*****************************************************/
+*****************************************************/
void
e_int_config_calendar(void *con, void *calendar)
{
@@ -56,7 +56,7 @@
/
/
/
-/*****************************************************/
+*****************************************************/
static void *
_create_data(E_Config_Dialog *cfd)
{
@@ -76,7 +76,7 @@
/
/
/
-/*****************************************************/
+*****************************************************/
static void
_free_data(E_Config_Dialog *cfd, void *data)
{
@@ -91,15 +91,13 @@
/
/
/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check;
+ Evas_Object *o, *of, *ob, *of2, *of1,*check;
E_Radio_Group *rg;
- E_Manager *man;
- E_Container *con;
CFData *cfdata;
cfdata = data;
@@ -145,9 +143,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
/**--APPLY--**/
static int
_basic_apply_data(E_Config_Dialog *cfd, void *data)
@@ -193,7 +189,7 @@
/ Purpose: Move data from dialog to config object
/ after "advanced" apply button presesed.
/
-/*****************************************************/
+*****************************************************/
static int
_color_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data)
{
@@ -237,20 +233,16 @@
/ Purpose: create widgets for advanced dialog
/
/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_color_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void
*data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check, *today, *weekend,
*weekday, *of_y, *o2;
- //Evas_Object *fonts, *Date_font;
+ Evas_Object *o, *of, *ob, *of2, *of_y;
Evas_Object *font_title;
- Evas_Object *slider_red, *slider_green, *slider_alpha, *slider_blue;
- Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *today_f,
*weekend_f, *weekday_f ;
- Evas_Object *ym, *day_text, *start_table;
+ Evas_Object *start_table;
Evas_Object *start_tableB, *ofB;
Evas_Object *entry;
- Evas_Object *entry2;
E_Radio_Group *rg;
E_Manager *man;
E_Container *con;
@@ -268,10 +260,10 @@
man = e_manager_current_get();
- if (!man) return;
+ if (!man) return NULL;
con = e_container_current_get(man);
- if (!con) return;
- if (con == NULL) return;
+ if (!con) return NULL;
+ if (con == NULL) return NULL;
if (cfdata->temp_UserCS != cfdata->calendar->conf->UserCS)
{
@@ -369,4 +361,4 @@
*/
return o;
-}
\ No newline at end of file
+}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/otherfonts_editor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- otherfonts_editor.c 21 Dec 2005 22:17:45 -0000 1.2
+++ otherfonts_editor.c 8 Jan 2006 15:26:43 -0000 1.3
@@ -14,7 +14,7 @@
Calendar *calendar;
};
-static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
+//static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, void *data);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas
*evas, void *data);
@@ -27,10 +27,7 @@
/ Purpose:
/ Returns: nothing
/ Takes:
-/
-/
-/
-/*****************************************************/
+*****************************************************/
void
e_int_config_calendar_other(void *con, void *calendar)
{
@@ -52,10 +49,7 @@
/ Purpose:
/ Returns: nothing
/ Takes:
-/
-/
-/
-/*****************************************************/
+*****************************************************/
static void *
_create_data(E_Config_Dialog *cfd)
{
@@ -73,9 +67,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static void
_free_data(E_Config_Dialog *cfd, void *data)
{
@@ -87,17 +79,14 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+****************************************************/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check, *today, *weekend,
*weekday, *of_y, *o2;
- Evas_Object *slider_red, *slider_green, *slider_alpha, *slider_blue;
- Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *today_f,
*weekend_f, *weekday_f ;
- Evas_Object *ym, *day_text, *start_table;
+ Evas_Object *o, *of;
+ Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf;
+ Evas_Object *ym, *day_text;
CFData *cfdata;
cfdata = data;
@@ -152,9 +141,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
/**--APPLY--**/
static int
_basic_apply_data(E_Config_Dialog *cfd, void *data)
@@ -177,8 +164,7 @@
/ Function:
/ Purpose: Move data from dialog to config object
/ after "advanced" apply button presesed.
-/
-/*****************************************************/
+*****************************************************/
static int
_color_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data)
{
@@ -200,16 +186,14 @@
/ Function:
/ Purpose: create widgets for advanced dialog
/
-/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_color_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void
*data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check, *today, *weekend,
*weekday, *of_y, *o2;
- Evas_Object *slider_red, *slider_green, *slider_alpha, *slider_blue;
- Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *today_f,
*weekend_f, *weekday_f ;
- Evas_Object *ym, *day_text, *start_table;
+ Evas_Object *o;
+ Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s;
+ Evas_Object *ym, *day_text;
CFData *cfdata;
cfdata = data;
@@ -325,4 +309,4 @@
e_widget_table_object_append(o, day_text, 0,3,1,1,1,1,1,1);
return o;
-}
\ No newline at end of file
+}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/today_editor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- today_editor.c 21 Dec 2005 22:17:45 -0000 1.2
+++ today_editor.c 8 Jan 2006 15:26:43 -0000 1.3
@@ -11,7 +11,7 @@
Calendar *calendar;
};
-static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
+//static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, void *data);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas
*evas, void *data);
@@ -25,9 +25,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
void
e_int_config_calendar_today(void *con, void *calendar)
{
@@ -50,9 +48,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+****************************************************/
static void *
_create_data(E_Config_Dialog *cfd)
{
@@ -70,9 +66,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static void
_free_data(E_Config_Dialog *cfd, void *data)
{
@@ -84,16 +78,14 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check, *today, *of_y, *o2;
+ Evas_Object *o, *of, *today;
Evas_Object *slider_red, *slider_green, *slider_alpha, *slider_blue;
- Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *today_f;
+ Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *today_f;
CFData *cfdata;
cfdata = data;
@@ -149,9 +141,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+****************************************************/
/**--APPLY--**/
static int
_basic_apply_data(E_Config_Dialog *cfd, void *data)
@@ -174,8 +164,7 @@
/ Function:
/ Purpose: Move data from dialog to config object
/ after "advanced" apply button presesed.
-/
-/*****************************************************/
+*****************************************************/
static int
_color_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data)
{
@@ -197,13 +186,12 @@
/ Function:
/ Purpose: create widgets for advanced dialog
/
-/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_color_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void
*data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check, *today, *of_y, *o2;
+ Evas_Object *o, *today;
Evas_Object *slider_red, *slider_green, *slider_alpha, *slider_blue;
Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *today_f;
@@ -289,4 +277,4 @@
e_widget_table_object_append(o, today_f, 1,0,1,1,1,1,1,1);
return o;
-}
\ No newline at end of file
+}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/weekday_editor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- weekday_editor.c 21 Dec 2005 22:17:45 -0000 1.2
+++ weekday_editor.c 8 Jan 2006 15:26:43 -0000 1.3
@@ -14,7 +14,7 @@
Calendar *calendar;
};
-static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
+//static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, void *data);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas
*evas, void *data);
@@ -30,7 +30,7 @@
/
/
/
-/*****************************************************/
+*****************************************************/
void
e_int_config_calendar_weekday(void *con, void *calendar)
{
@@ -55,7 +55,7 @@
/
/
/
-/*****************************************************/
+*****************************************************/
static void *
_create_data(E_Config_Dialog *cfd)
{
@@ -73,9 +73,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static void
_free_data(E_Config_Dialog *cfd, void *data)
{
@@ -87,17 +85,14 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check, *today, *weekend,
*weekday, *of_y, *o2;
+ Evas_Object *o, *weekday;
Evas_Object *slider_red, *slider_green, *slider_alpha, *slider_blue;
- Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *today_f,
*weekend_f, *weekday_f ;
- Evas_Object *ym, *day_text, *start_table;
+ Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *weekday_f ;
CFData *cfdata;
cfdata = data;
@@ -152,9 +147,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
/**--APPLY--**/
static int
_basic_apply_data(E_Config_Dialog *cfd, void *data)
@@ -178,7 +171,7 @@
/ Purpose: Move data from dialog to config object
/ after "advanced" apply button presesed.
/
-/*****************************************************/
+*****************************************************/
static int
_color_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data)
{
@@ -200,16 +193,14 @@
/ Function:
/ Purpose: create widgets for advanced dialog
/
-/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_color_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void
*data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check, *today, *weekend,
*weekday, *of_y, *o2;
+ Evas_Object *o,*weekday;
Evas_Object *slider_red, *slider_green, *slider_alpha, *slider_blue;
- Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *today_f,
*weekend_f, *weekday_f ;
- Evas_Object *ym, *day_text, *start_table;
+ Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *weekday_f ;
CFData *cfdata;
cfdata = data;
@@ -292,4 +283,4 @@
e_widget_table_object_append(o, weekday_f, 2,2,1,1,1,1,1,1);
return o;
-}
\ No newline at end of file
+}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/calendar/src/weekend_editor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- weekend_editor.c 21 Dec 2005 22:17:45 -0000 1.2
+++ weekend_editor.c 8 Jan 2006 15:26:43 -0000 1.3
@@ -14,7 +14,7 @@
Calendar *calendar;
};
-static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
+//static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas,
Config *cfdata);
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, void *data);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas
*evas, void *data);
@@ -30,7 +30,7 @@
/
/
/
-/*****************************************************/
+******************************************************/
void
e_int_config_calendar_weekend(void *con, void *calendar)
{
@@ -53,9 +53,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static void *
_create_data(E_Config_Dialog *cfd)
{
@@ -73,9 +71,7 @@
/ Returns: nothing
/ Takes:
/
-/
-/
-/*****************************************************/
+*****************************************************/
static void
_free_data(E_Config_Dialog *cfd, void *data)
{
@@ -87,18 +83,14 @@
/ Purpose:
/ Returns: nothing
/ Takes:
-/
-/
-/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check, *today, *weekend,
*weekday, *of_y, *o2;
+ Evas_Object *o,*weekend;
Evas_Object *slider_red, *slider_green, *slider_alpha, *slider_blue;
- Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *today_f,
*weekend_f, *weekday_f ;
-
+ Evas_Object *s_r_tf, *s_b_tf, *s_g_tf, *s_a_tf, *weekend_f;
CFData *cfdata;
cfdata = data;
@@ -152,10 +144,7 @@
/ Purpose:
/ Returns: nothing
/ Takes:
-/
-/
-/
-/*****************************************************/
+*****************************************************/
/**--APPLY--**/
static int
_basic_apply_data(E_Config_Dialog *cfd, void *data)
@@ -179,7 +168,7 @@
/ Purpose: Move data from dialog to config object
/ after "advanced" apply button presesed.
/
-/*****************************************************/
+*****************************************************/
static int
_color_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data)
{
@@ -201,16 +190,15 @@
/ Function:
/ Purpose: create widgets for advanced dialog
/
-/
-/*****************************************************/
+*****************************************************/
static Evas_Object *
_color_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void
*data)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *of, *ob, *of2, *of3, *fs, *of1,*check, *today, *weekend,
*weekday, *of_y, *o2;
+
+ Evas_Object *o,*weekend;
Evas_Object *slider_red, *slider_green, *slider_alpha, *slider_blue;
- Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s, *today_f,
*weekend_f, *weekday_f ;
- Evas_Object *ym, *day_text, *start_table;
+ Evas_Object *s_r_tf, *s_g_tf, *s_a_tf, *s_b_tf, *s_r_tf_o, *s_b_tf_o,
*s_g_tf_o, *s_a_tf_o, *s_r_tf_s, *s_b_tf_s, *s_g_tf_s, *s_a_tf_s,*weekend_f;
CFData *cfdata;
cfdata = data;
-------------------------------------------------------
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
