From b6313289303f2263649c70ea477e04aea4a994ec Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 4 Aug 2009 15:04:02 +0200
Subject: Bug #205137 - Configurable date formats in components

---
 calendar/gui/dialogs/cal-prefs-dialog.c     |  8 ++-
 calendar/gui/dialogs/cal-prefs-dialog.glade | 79 +++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)

(limited to 'calendar/gui/dialogs')

diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 2c19acaadd..2fc17202cc 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -31,6 +31,7 @@
 #include "../calendar-config.h"
 #include "cal-prefs-dialog.h"
 #include <widgets/misc/e-dateedit.h>
+#include "e-util/e-datetime-format.h"
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-util-private.h>
 #include <glib/gi18n.h>
@@ -779,7 +780,7 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs)
 	ECalConfig *ec;
 	ECalConfigTargetPrefs *target;
 	gint i;
-	GtkWidget *toplevel;
+	GtkWidget *toplevel, *table;
 	GSList *l;
 	const gchar *working_day_names[] = {
 		"sun_button",
@@ -859,6 +860,11 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs)
 	toplevel = e_config_create_widget ((EConfig *)ec);
 	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
 
+	/* date/time format */
+	table = glade_xml_get_widget (gui, "datetime_format_table");
+	e_datetime_format_add_setup_widget (table, 0, "calendar", "table",  DTFormatKindDateTime, _("Time and date:"));
+	e_datetime_format_add_setup_widget (table, 1, "calendar", "table",  DTFormatKindDate, _("Date only:"));
+
 	show_config (prefs);
 	/* FIXME: weakref? */
 	setup_changes (prefs);
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 63e9e6092f..984e509b64 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -1024,6 +1024,85 @@ Days</property>
                 <property name="position">3</property>
               </packing>
             </child>
+
+	    <child>
+	      <widget class="GtkLabel" id="label65">
+		<property name="visible">True</property>
+		<property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Date/Time Format&lt;/span&gt;</property>
+		<property name="use_underline">False</property>
+		<property name="use_markup">True</property>
+		<property name="justify">GTK_JUSTIFY_LEFT</property>
+		<property name="wrap">False</property>
+		<property name="selectable">False</property>
+		<property name="xalign">0</property>
+		<property name="yalign">0.5</property>
+		<property name="xpad">0</property>
+		<property name="ypad">0</property>
+		<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		<property name="width_chars">-1</property>
+		<property name="single_line_mode">False</property>
+		<property name="angle">0</property>
+	      </widget>
+	      <packing>
+		<property name="padding">0</property>
+		<property name="expand">False</property>
+		<property name="fill">False</property>
+	      </packing>
+	    </child>
+
+	    <child>
+	      <widget class="GtkHBox" id="hbox27">
+		<property name="visible">True</property>
+		<property name="homogeneous">False</property>
+		<property name="spacing">12</property>
+
+		<child>
+		  <widget class="GtkLabel" id="label66">
+		    <property name="visible">True</property>
+		    <property name="label" translatable="yes"></property>
+		    <property name="use_underline">False</property>
+		    <property name="use_markup">False</property>
+		    <property name="justify">GTK_JUSTIFY_LEFT</property>
+		    <property name="wrap">False</property>
+		    <property name="selectable">False</property>
+		    <property name="xalign">0.5</property>
+		    <property name="yalign">0.5</property>
+		    <property name="xpad">0</property>
+		    <property name="ypad">0</property>
+		    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		    <property name="width_chars">-1</property>
+		    <property name="single_line_mode">False</property>
+		    <property name="angle">0</property>
+		  </widget>
+		  <packing>
+		    <property name="padding">0</property>
+		    <property name="expand">False</property>
+		    <property name="fill">False</property>
+		  </packing>
+		</child>
+
+		<child>
+		  <widget class="GtkTable" id="datetime_format_table">
+                    <property name="visible">True</property>
+                    <property name="n_rows">1</property>
+                    <property name="n_columns">3</property>
+                    <property name="homogeneous">False</property>
+                    <property name="row_spacing">0</property>
+                    <property name="column_spacing">0</property>
+		  </widget>
+		  <packing>
+		    <property name="padding">0</property>
+		    <property name="expand">True</property>
+		    <property name="fill">True</property>
+		  </packing>
+	        </child>
+	      </widget>
+	      <packing>
+		<property name="padding">0</property>
+		<property name="expand">True</property>
+		<property name="fill">True</property>
+	      </packing>
+	    </child>
           </widget>
           <packing>
             <property name="position">1</property>
-- 
cgit v1.2.3