Enlightenment CVS committal Author : nasa01 Project : e_modules Module : calendar
Dir : e_modules/calendar/src Modified Files: calendar_color_func.c otherfonts_editor.c today_editor.c weekend_editor.c weekday_editor.c Log Message: fix code so labels change correctly -- and more code cleanup =================================================================== RCS file: /cvsroot/enlightenment/e_modules/calendar/src/calendar_color_func.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- calendar_color_func.c 19 Dec 2005 02:02:28 -0000 1.1 +++ calendar_color_func.c 21 Dec 2005 22:17:45 -0000 1.2 @@ -363,7 +363,7 @@ YNC_Ptr->red_o,YNC_Ptr->green_o, YNC_Ptr->blue_o,YNC_Ptr->alpha_o, YNC_Ptr->red_s,YNC_Ptr->green_s, YNC_Ptr->blue_s,YNC_Ptr->alpha_s); - edje_object_color_class_set(face->label_object,"day_colors",DTC_Ptr->red, + edje_object_color_class_set(face->label_object,"Day_colors",DTC_Ptr->red, DTC_Ptr->green, DTC_Ptr->blue, DTC_Ptr->alpha, DTC_Ptr->red_o, DTC_Ptr->green_o, DTC_Ptr->blue_o,DTC_Ptr->alpha_o,DTC_Ptr->red_s, DTC_Ptr->green_s, DTC_Ptr->blue_s,DTC_Ptr->alpha_s); =================================================================== RCS file: /cvsroot/enlightenment/e_modules/calendar/src/otherfonts_editor.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- otherfonts_editor.c 20 Dec 2005 23:52:26 -0000 1.1 +++ otherfonts_editor.c 21 Dec 2005 22:17:45 -0000 1.2 @@ -167,27 +167,6 @@ calendar = cfd->data; int SwitchImage = 0; - if ((calendar->conf->ImageYes != cfdata->temp_ImageYes) || (calendar->conf->UserCS != - cfdata->temp_UserCS)) - { - SwitchImage = 1; - calendar->conf->ImageYes = cfdata->calendar->conf->ImageYes; - if (calendar->conf->ImageYes != cfdata->temp_ImageYes) - { - if (cfdata->temp_ImageYes == 0) - cfdata->temp_ImageYes = 1; - else - cfdata->temp_ImageYes = 0; - } - if (calendar->conf->UserCS != cfdata->temp_UserCS) - { - if (cfdata->temp_UserCS) - cfdata->temp_UserCS = FALSE; - else - cfdata->temp_UserCS = TRUE; - } - } - e_config_save_queue(); redraw_calendar(calendar,SwitchImage); e_border_button_bindings_grab_all(); @@ -211,27 +190,6 @@ calendar = cfd->data; int SwitchImage = 0; - if ((calendar->conf->ImageYes != cfdata->temp_ImageYes) || (calendar->conf->UserCS != - cfdata->temp_UserCS)) - { - SwitchImage = 1; - calendar->conf->ImageYes = cfdata->calendar->conf->ImageYes; - if (calendar->conf->ImageYes != cfdata->temp_ImageYes) - { - if (cfdata->temp_ImageYes == 0) - cfdata->temp_ImageYes = 1; - else - cfdata->temp_ImageYes = 0; - } - if (calendar->conf->UserCS != cfdata->temp_UserCS) - { - if (cfdata->temp_UserCS) - cfdata->temp_UserCS = FALSE; - else - cfdata->temp_UserCS = TRUE; - } - } - e_config_save_queue(); redraw_calendar(calendar,SwitchImage); e_border_button_bindings_grab_all(); =================================================================== RCS file: /cvsroot/enlightenment/e_modules/calendar/src/today_editor.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- today_editor.c 20 Dec 2005 23:52:26 -0000 1.1 +++ today_editor.c 21 Dec 2005 22:17:45 -0000 1.2 @@ -164,27 +164,6 @@ calendar = cfd->data; int SwitchImage = 0; - if ((calendar->conf->ImageYes != cfdata->temp_ImageYes) || (calendar->conf->UserCS != - cfdata->temp_UserCS)) - { - SwitchImage = 1; - calendar->conf->ImageYes = cfdata->calendar->conf->ImageYes; - if (calendar->conf->ImageYes != cfdata->temp_ImageYes) - { - if (cfdata->temp_ImageYes == 0) - cfdata->temp_ImageYes = 1; - else - cfdata->temp_ImageYes = 0; - } - if (calendar->conf->UserCS != cfdata->temp_UserCS) - { - if (cfdata->temp_UserCS) - cfdata->temp_UserCS = FALSE; - else - cfdata->temp_UserCS = TRUE; - } - } - e_config_save_queue(); redraw_calendar(calendar,SwitchImage); e_border_button_bindings_grab_all(); @@ -208,27 +187,6 @@ calendar = cfd->data; int SwitchImage = 0; - if ((calendar->conf->ImageYes != cfdata->temp_ImageYes) || (calendar->conf->UserCS != - cfdata->temp_UserCS)) - { - SwitchImage = 1; - calendar->conf->ImageYes = cfdata->calendar->conf->ImageYes; - if (calendar->conf->ImageYes != cfdata->temp_ImageYes) - { - if (cfdata->temp_ImageYes == 0) - cfdata->temp_ImageYes = 1; - else - cfdata->temp_ImageYes = 0; - } - if (calendar->conf->UserCS != cfdata->temp_UserCS) - { - if (cfdata->temp_UserCS) - cfdata->temp_UserCS = FALSE; - else - cfdata->temp_UserCS = TRUE; - } - } - e_config_save_queue(); redraw_calendar(calendar,SwitchImage); e_border_button_bindings_grab_all(); =================================================================== RCS file: /cvsroot/enlightenment/e_modules/calendar/src/weekend_editor.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- weekend_editor.c 20 Dec 2005 23:52:26 -0000 1.1 +++ weekend_editor.c 21 Dec 2005 22:17:45 -0000 1.2 @@ -168,27 +168,6 @@ calendar = cfd->data; int SwitchImage = 0; - if ((calendar->conf->ImageYes != cfdata->temp_ImageYes) || (calendar->conf->UserCS != - cfdata->temp_UserCS)) - { - SwitchImage = 1; - calendar->conf->ImageYes = cfdata->calendar->conf->ImageYes; - if (calendar->conf->ImageYes != cfdata->temp_ImageYes) - { - if (cfdata->temp_ImageYes == 0) - cfdata->temp_ImageYes = 1; - else - cfdata->temp_ImageYes = 0; - } - if (calendar->conf->UserCS != cfdata->temp_UserCS) - { - if (cfdata->temp_UserCS) - cfdata->temp_UserCS = FALSE; - else - cfdata->temp_UserCS = TRUE; - } - } - e_config_save_queue(); redraw_calendar(calendar,SwitchImage); e_border_button_bindings_grab_all(); @@ -212,27 +191,6 @@ calendar = cfd->data; int SwitchImage = 0; - if ((calendar->conf->ImageYes != cfdata->temp_ImageYes) || (calendar->conf->UserCS != - cfdata->temp_UserCS)) - { - SwitchImage = 1; - calendar->conf->ImageYes = cfdata->calendar->conf->ImageYes; - if (calendar->conf->ImageYes != cfdata->temp_ImageYes) - { - if (cfdata->temp_ImageYes == 0) - cfdata->temp_ImageYes = 1; - else - cfdata->temp_ImageYes = 0; - } - if (calendar->conf->UserCS != cfdata->temp_UserCS) - { - if (cfdata->temp_UserCS) - cfdata->temp_UserCS = FALSE; - else - cfdata->temp_UserCS = TRUE; - } - } - e_config_save_queue(); redraw_calendar(calendar,SwitchImage); e_border_button_bindings_grab_all(); =================================================================== RCS file: /cvsroot/enlightenment/e_modules/calendar/src/weekday_editor.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- weekday_editor.c 20 Dec 2005 23:52:26 -0000 1.1 +++ weekday_editor.c 21 Dec 2005 22:17:45 -0000 1.2 @@ -167,27 +167,6 @@ calendar = cfd->data; int SwitchImage = 0; - if ((calendar->conf->ImageYes != cfdata->temp_ImageYes) || (calendar->conf->UserCS != - cfdata->temp_UserCS)) - { - SwitchImage = 1; - calendar->conf->ImageYes = cfdata->calendar->conf->ImageYes; - if (calendar->conf->ImageYes != cfdata->temp_ImageYes) - { - if (cfdata->temp_ImageYes == 0) - cfdata->temp_ImageYes = 1; - else - cfdata->temp_ImageYes = 0; - } - if (calendar->conf->UserCS != cfdata->temp_UserCS) - { - if (cfdata->temp_UserCS) - cfdata->temp_UserCS = FALSE; - else - cfdata->temp_UserCS = TRUE; - } - } - e_config_save_queue(); redraw_calendar(calendar,SwitchImage); e_border_button_bindings_grab_all(); @@ -211,27 +190,6 @@ calendar = cfd->data; int SwitchImage = 0; - if ((calendar->conf->ImageYes != cfdata->temp_ImageYes) || (calendar->conf->UserCS != - cfdata->temp_UserCS)) - { - SwitchImage = 1; - calendar->conf->ImageYes = cfdata->calendar->conf->ImageYes; - if (calendar->conf->ImageYes != cfdata->temp_ImageYes) - { - if (cfdata->temp_ImageYes == 0) - cfdata->temp_ImageYes = 1; - else - cfdata->temp_ImageYes = 0; - } - if (calendar->conf->UserCS != cfdata->temp_UserCS) - { - if (cfdata->temp_UserCS) - cfdata->temp_UserCS = FALSE; - else - cfdata->temp_UserCS = TRUE; - } - } - e_config_save_queue(); redraw_calendar(calendar,SwitchImage); e_border_button_bindings_grab_all(); ------------------------------------------------------- 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