From bf60b8fe359c3d9f26f45a25f38752d9290a3bca Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Mon, 23 Jan 2006 05:04:31 +0000 Subject: fixes #326478 svn path=/trunk/; revision=31268 --- calendar/ChangeLog | 9 + calendar/gui/dialogs/cal-prefs-dialog.c | 17 +- calendar/gui/dialogs/cal-prefs-dialog.glade | 440 +++++++++------------------- 3 files changed, 154 insertions(+), 312 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e0c55a9b7f..863e9acc37 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2006-01-16 Chenthill Palanisamy + + Fixes #326478 + * gui/dialogs/cal-prefs-dialog.c: (spec_from_picker), + (tasks_due_today_set_color), (tasks_overdue_set_color), + (set_color_picker): + * gui/dialogs/cal-prefs-dialog.glade: Changed the gtk color + button to gnome color picker. + 2006-01-20 Andre Klapper * gui/dialogs/task-page.c (field_changed_cb): Removed wrong parameter to be able compile again. diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 4bd19b15e2..2f548b66c1 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -31,6 +31,7 @@ #include "../e-timezone-entry.h" #include "../calendar-config.h" #include "cal-prefs-dialog.h" +#include #include #include #include @@ -101,10 +102,10 @@ static const char * spec_from_picker (GtkWidget *picker) { static char spec[8]; - GdkColor color; + guint8 r, g, b; - gtk_color_button_get_color (GTK_COLOR_BUTTON (picker), &color); - g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", color.red, color.green, color.blue); + gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (picker), &r, &g, &b, NULL); + g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", r, g, b); return spec; } @@ -259,13 +260,13 @@ hide_completed_tasks_units_changed (GtkWidget *widget, CalendarPrefsDialog *pref } static void -tasks_due_today_set_color (GtkColorButton *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) +tasks_due_today_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) { calendar_config_set_tasks_due_today_color (spec_from_picker (prefs->tasks_due_today_color)); } static void -tasks_overdue_set_color (GtkColorButton *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) +tasks_overdue_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) { calendar_config_set_tasks_overdue_color (spec_from_picker (prefs->tasks_overdue_color)); } @@ -358,7 +359,11 @@ set_color_picker (GtkWidget *picker, const char *spec) if (!spec || !gdk_color_parse (spec, &color)) color.red = color.green = color.blue = 0; - gtk_color_button_set_color (GTK_COLOR_BUTTON (picker), &color); + gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker), + color.red, + color.green, + color.blue, + 65535); } /* Shows the current Free/Busy settings in the dialog */ diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade index ac04905704..fbc149683a 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.glade +++ b/calendar/gui/dialogs/cal-prefs-dialog.glade @@ -2,6 +2,7 @@ + True @@ -16,6 +17,7 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True @@ -47,6 +49,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -74,6 +80,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -104,6 +114,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -128,6 +142,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -238,6 +256,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -265,6 +287,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -295,6 +321,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -319,6 +349,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -343,6 +377,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -367,6 +405,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -593,6 +635,8 @@ Thursday Friday Saturday Sunday + False + True 1 @@ -631,6 +675,10 @@ Sunday 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -658,6 +706,10 @@ Sunday 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -741,6 +793,8 @@ Sunday Minutes Hours Days + False + True 0 @@ -762,6 +816,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -810,6 +868,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -836,6 +898,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -863,6 +929,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -897,6 +967,10 @@ Days 0 0 time_divisions + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -913,6 +987,8 @@ Days 15 minutes 10 minutes 05 minutes + False + True 0 @@ -1012,6 +1088,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1039,6 +1119,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1076,6 +1160,10 @@ Days 0 0 tasks_due_today_color + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1101,6 +1189,10 @@ Days 0 0 tasks_overdue_color + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1113,10 +1205,12 @@ Days - + True True + True False + Color for tasks due today True @@ -1130,10 +1224,12 @@ Days - + True True + True False + Color for overdue tasks True @@ -1203,6 +1299,8 @@ Days Minutes Hours Days + False + True 0 @@ -1251,6 +1349,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -1277,6 +1379,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1294,310 +1400,20 @@ Days True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 12 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - Publishing Table - - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - GTK_BUTTONBOX_START - 6 - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - True - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - True - _Add URL - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - - True - False - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-properties - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Edit - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - - True - False - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - E_nable - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_START - 3 - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - - - - - - True - <b>Publishing</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1631,6 +1447,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1678,6 +1498,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1719,6 +1543,10 @@ Days 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab -- cgit