diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-04-02 12:19:25 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-04-02 12:19:25 +0800 |
| commit | b5365bc587c99c0eb18293c4e70029782a185d56 (patch) | |
| tree | c28ff26a508bcb3195b7b74868540f3c9ffc1458 /mail/mail-config.glade | |
| parent | 7dd3f720c743488c2aac7b6a1cfcdb97b1c1ac70 (diff) | |
| download | gsoc2013-evolution-b5365bc587c99c0eb18293c4e70029782a185d56.tar.gz gsoc2013-evolution-b5365bc587c99c0eb18293c4e70029782a185d56.tar.zst gsoc2013-evolution-b5365bc587c99c0eb18293c4e70029782a185d56.zip | |
** Fixes bug #373116
2007-04-01 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #373116
* calendar/gui/calendar-component.c (ensure_sources):
* calendar/gui/e-cal-model.c (ecm_get_color_for_component):
* calendar/gui/memos-component.c (ensure_sources):
* calendar/gui/migration.c (create_calendar_contact_source),
(create_calendar_sources), (create_task_sources),
(create_memo_sources), (add_gw_esource):
* calendar/gui/tasks-component.c (ensure_sources):
* plugins/groupwise-account-setup/camel-gw-listener.c (add_esource):
Use the new ESource color API.
* calendar/gui/dialogs/cal-prefs-dialog.c:
* calendar/gui/dialogs/cal-prefs-dialog.glade:
* calendar/gui/dialogs/calendar-setup.c:
* calendar/gui/dialogs/calendar-setup.glade:
* filter-colour.c (get_widget):
* mail/em-composer-prefs.c:
* mail/em-composer-prefs.h:
* mail/em-mailer-prefs.c:
* mail/em-mailer-prefs.h:
* mail/mail-config.glade:
Migrate from GnomeColorPicker to GtkColorButton.
* filter/filter-colour.h:
Store color as a GdkColor instead of separate RGBA components.
* filter/filter-colour.c (color_eq):
Use gdk_color_equal() to compare colors.
* filter/filter-colour.c (xml_encode):
Encode color as a single property ("spec").
* filter/filter-colour.c (xml_decode):
Read the color from a single property ("spec").
Provide a migration path for old XML files.
* calendar/gui/calendar-component.c
(calendar_config_get_tasks_due_today_color),
(calendar_config_get_tasks_overdue_color):
Return a GdkColor instead of an X color specification.
* calendar/gui/calendar-component.c
(calendar_config_set_tasks_due_today_color),
(calendar_config_set_tasks_overdue_color):
Accept a GdkColor instead of an X color specification.
* calenar/gui/e-cal-model-tasks.c (ecmt_get_color_for_component):
Adapt to modified color API in calendar-component.c by converting
the GdkColor to an X color specification. This is an ugly hack to
be fixed later.
svn path=/trunk/; revision=33349
Diffstat (limited to 'mail/mail-config.glade')
| -rw-r--r-- | mail/mail-config.glade | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 9a14bd8881..6a1442b88b 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -5139,10 +5139,9 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GnomeColorPicker" id="colorpickerHighlightCitations"> + <widget class="GtkColorButton" id="colorButtonHighlightCitations"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> <property name="focus_on_click">True</property> @@ -6080,10 +6079,9 @@ For example: "Work" or "Personal"</property> <property name="column_spacing">6</property> <child> - <widget class="GnomeColorPicker" id="colorLabel0"> + <widget class="GtkColorButton" id="colorLabel0"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> <property name="focus_on_click">True</property> @@ -6099,10 +6097,9 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GnomeColorPicker" id="colorLabel1"> + <widget class="GtkColorButton" id="colorLabel1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> <property name="focus_on_click">True</property> @@ -6118,10 +6115,9 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GnomeColorPicker" id="colorLabel2"> + <widget class="GtkColorButton" id="colorLabel2"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> <property name="focus_on_click">True</property> @@ -6137,10 +6133,9 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GnomeColorPicker" id="colorLabel3"> + <widget class="GtkColorButton" id="colorLabel3"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> <property name="focus_on_click">True</property> @@ -6156,10 +6151,9 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GnomeColorPicker" id="colorLabel4"> + <widget class="GtkColorButton" id="colorLabel4"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> <property name="focus_on_click">True</property> @@ -8316,7 +8310,7 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">colorpickerSpellCheckColor</property> + <property name="mnemonic_widget">colorButtonSpellCheckColor</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="width_chars">-1</property> <property name="single_line_mode">False</property> @@ -8330,10 +8324,9 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GnomeColorPicker" id="colorpickerSpellCheckColor"> + <widget class="GtkColorButton" id="colorButtonSpellCheckColor"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> <property name="focus_on_click">True</property> |