added a 'Time zone' setting. Also rearranged a little, adding a new

2001-06-19  Damon Chaplin  <damon@ximian.com>

	* gui/dialogs/cal-prefs-dialog.c: added a 'Time zone' setting. Also
	rearranged a little, adding a new 'General' page, since we had too
	many settings on the 'Calendar' page.

	* gui/e-timezone-entry.[hc]:
	* gui/dialogs/e-timezone-dialog.[hc]:
	* gui/dialogs/comp-editor.c:
	* gui/dialogs/comp-editor-page.[hc]:
	* gui/dialogs/event-page.c:
	* gui/dialogs/task-details-page.c:
	* gui/dialogs/task-page.c: removed CalClient stuff. The timezone dialog
	now uses the timezone data directly from the client's libical library.

svn path=/trunk/; revision=10321

1 files changed, 215 insertions, 119 deletions

diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index f6eccb163d..bf45b072ce 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -98,13 +98,163 @@
 
       <widget>
 	<class>GtkVBox</class>
-	<name>vbox8</name>
+	<name>vbox10</name>
 	<border_width>4</border_width>
 	<homogeneous>False</homogeneous>
 	<spacing>6</spacing>
 
 	<widget>
 	  <class>GtkFrame</class>
+	  <name>frame12</name>
+	  <label>Time</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>True</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkTable</class>
+	    <name>table5</name>
+	    <border_width>4</border_width>
+	    <rows>2</rows>
+	    <columns>2</columns>
+	    <homogeneous>False</homogeneous>
+	    <row_spacing>4</row_spacing>
+	    <column_spacing>4</column_spacing>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label22</name>
+	      <label>Time zone:</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>Custom</class>
+	      <name>timezone</name>
+	      <creation_function>make_timezone_entry</creation_function>
+	      <int1>0</int1>
+	      <int2>0</int2>
+	      <last_modification_time>Wed, 20 Jun 2001 02:22:46 GMT</last_modification_time>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>True</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label20</name>
+	      <label>Time format:</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHBox</class>
+	      <name>hbox10</name>
+	      <homogeneous>True</homogeneous>
+	      <spacing>4</spacing>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>True</yfill>
+	      </child>
+
+	      <widget>
+		<class>GtkRadioButton</class>
+		<name>use_12_hour</name>
+		<can_focus>True</can_focus>
+		<label>12 hour (am/pm)</label>
+		<active>False</active>
+		<draw_indicator>True</draw_indicator>
+		<group>time_format_group</group>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkRadioButton</class>
+		<name>use_24_hour</name>
+		<can_focus>True</can_focus>
+		<label>24 hour</label>
+		<active>False</active>
+		<draw_indicator>True</draw_indicator>
+		<group>time_format_group</group>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>True</fill>
+		</child>
+	      </widget>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
 	  <name>frame9</name>
 	  <label>Work week</label>
 	  <label_xalign>0</label_xalign>
@@ -358,6 +508,31 @@ Sunday
 	</widget>
 
 	<widget>
+	  <class>Placeholder</class>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>label21</name>
+	<label>General</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+
+      <widget>
+	<class>GtkVBox</class>
+	<name>vbox8</name>
+	<border_width>4</border_width>
+	<homogeneous>False</homogeneous>
+	<spacing>6</spacing>
+
+	<widget>
 	  <class>GtkFrame</class>
 	  <name>frame10</name>
 	  <label>Display options</label>
@@ -373,8 +548,8 @@ Sunday
 	    <class>GtkTable</class>
 	    <name>table4</name>
 	    <border_width>4</border_width>
-	    <rows>4</rows>
-	    <columns>3</columns>
+	    <rows>3</rows>
+	    <columns>7</columns>
 	    <homogeneous>False</homogeneous>
 	    <row_spacing>0</row_spacing>
 	    <column_spacing>4</column_spacing>
@@ -392,8 +567,8 @@ Sunday
 	      <child>
 		<left_attach>0</left_attach>
 		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
 		<xexpand>False</xexpand>
@@ -406,46 +581,56 @@ Sunday
 	    </widget>
 
 	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label20</name>
-	      <label>Time format:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
+	      <class>GtkAlignment</class>
+	      <name>alignment4</name>
+	      <xalign>7.45058e-09</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
+	      <xscale>0</xscale>
+	      <yscale>1</yscale>
 	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
 		<top_attach>0</top_attach>
 		<bottom_attach>1</bottom_attach>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
-		<xexpand>False</xexpand>
+		<xexpand>True</xexpand>
 		<yexpand>False</yexpand>
 		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
 		<xfill>True</xfill>
 		<yfill>False</yfill>
 	      </child>
+
+	      <widget>
+		<class>GtkOptionMenu</class>
+		<name>time_divisions</name>
+		<can_focus>True</can_focus>
+		<items>60 minutes
+30 minutes
+15 minutes
+10 minutes
+05 minutes
+</items>
+		<initial_choice>0</initial_choice>
+	      </widget>
 	    </widget>
 
 	    <widget>
 	      <class>GtkCheckButton</class>
 	      <name>show_end_times</name>
 	      <can_focus>True</can_focus>
-	      <label>Show appointment end times</label>
+	      <label>Show appointment end times in week and month views</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <child>
 		<left_attach>0</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
+		<right_attach>7</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
-		<xexpand>True</xexpand>
+		<xexpand>False</xexpand>
 		<yexpand>False</yexpand>
 		<xshrink>False</xshrink>
 		<yshrink>False</yshrink>
@@ -458,35 +643,14 @@ Sunday
 	      <class>GtkCheckButton</class>
 	      <name>compress_weekend</name>
 	      <can_focus>True</can_focus>
-	      <label>Compress weekends</label>
+	      <label>Compress weekends in month view</label>
 	      <active>False</active>
 	      <draw_indicator>True</draw_indicator>
 	      <child>
 		<left_attach>0</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox10</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
+		<right_attach>7</right_attach>
+		<top_attach>2</top_attach>
+		<bottom_attach>3</bottom_attach>
 		<xpad>0</xpad>
 		<ypad>0</ypad>
 		<xexpand>False</xexpand>
@@ -496,72 +660,6 @@ Sunday
 		<xfill>True</xfill>
 		<yfill>True</yfill>
 	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>use_12_hour</name>
-		<can_focus>True</can_focus>
-		<label>12 hour (am/pm)</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>use_24_hour</name>
-		<can_focus>True</can_focus>
-		<label>24 hour</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment4</name>
-	      <xalign>7.45058e-09</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>0</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>time_divisions</name>
-		<can_focus>True</can_focus>
-		<items>60 minutes
-30 minutes
-15 minutes
-10 minutes
-05 minutes
-</items>
-		<initial_choice>0</initial_choice>
-	      </widget>
 	    </widget>
 	  </widget>
 	</widget>
@@ -963,18 +1061,18 @@ Sunday
       <widget>
 	<class>GtkVBox</class>
 	<name>vbox6</name>
+	<border_width>4</border_width>
 	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
+	<spacing>6</spacing>
 
 	<widget>
 	  <class>GtkFrame</class>
 	  <name>frame6</name>
-	  <border_width>4</border_width>
 	  <label>Defaults</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
-	    <padding>4</padding>
+	    <padding>0</padding>
 	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
@@ -1046,12 +1144,11 @@ Sunday
 	<widget>
 	  <class>GtkFrame</class>
 	  <name>frame7</name>
-	  <border_width>4</border_width>
 	  <label>Visual Alarms</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
-	    <padding>4</padding>
+	    <padding>0</padding>
 	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
@@ -1070,12 +1167,11 @@ Sunday
 	<widget>
 	  <class>GtkFrame</class>
 	  <name>frame8</name>
-	  <border_width>4</border_width>
 	  <label>Audio Alarms</label>
 	  <label_xalign>0</label_xalign>
 	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	  <child>
-	    <padding>4</padding>
+	    <padding>0</padding>
 	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>