From bad8aff04f274c58c584bd5f7e8a396918aa9fb4 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 3 Nov 2010 16:35:02 +0100
Subject: Bug #612181 - Show recurring events in italic in date navigator

---
 calendar/gui/dialogs/cal-prefs-dialog.c  |  7 +++++++
 calendar/gui/dialogs/cal-prefs-dialog.ui | 17 ++++++++++++++++-
 calendar/gui/dialogs/recurrence-page.c   |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'calendar/gui/dialogs')

diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 266d699143..6316211c8a 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -789,6 +789,13 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 		G_BINDING_BIDIRECTIONAL |
 		G_BINDING_SYNC_CREATE);
 
+	widget = e_builder_get_widget (prefs->builder, "recur_events_italic");
+	g_object_bind_property (
+		shell_settings, "cal-recur-events-italic",
+		widget, "active",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
+
 	prefs->month_scroll_by_week = e_builder_get_widget (prefs->builder, "month_scroll_by_week");
 
 	widget = e_builder_get_widget (prefs->builder, "tasks_due_today_color");
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui
index 6b6218df70..7e581cf4ad 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.ui
+++ b/calendar/gui/dialogs/cal-prefs-dialog.ui
@@ -977,6 +977,21 @@
                     <property name="position">3</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkCheckButton" id="recur_events_italic">
+                    <property name="label" translatable="yes">Show r_ecurring events in italic in bottom left calendar</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkCheckButton" id="month_scroll_by_week">
                     <property name="label" translatable="yes">Sc_roll Month View by a week</property>
@@ -989,7 +1004,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">4</property>
+                    <property name="position">5</property>
                   </packing>
                 </child>
               </object>
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 4014cfbc92..f5ef574efd 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -271,7 +271,7 @@ preview_recur (RecurrencePage *rpage)
 	fill_component (rpage, comp);
 
 	tag_calendar_by_comp (E_CALENDAR (priv->preview_calendar), comp,
-			      client, zone, TRUE, FALSE);
+			      client, zone, TRUE, FALSE, FALSE);
 	g_object_unref (comp);
 }
 
-- 
cgit v1.2.3