uses the new TaskEditor dialog.

2000-09-06  Damon Chaplin  <damon@helixcode.com>

	* gui/e-calendar-table.c (e_calendar_table_open_task): uses the new
	TaskEditor dialog.

	* gui/dialogs/task-editor.[hc]:
	* gui/dialogs/task-editor-dialog.glade: updated. Still need to fix the
	'Status' property (CalComponent doesn't support it yet), and use a
	replacement for GnomeDateEdit, since we need to support setting 'None'
	as the date.

2000-09-04  Damon Chaplin  <damon@helixcode.com>

	* gui/event-editor.c (obj_updated_cb):
	(obj_removed_cb): compare the updated object's uid with the one we
	are editing, and just return if it doesn't match.

2000-09-01  Damon Chaplin  <damon@helixcode.com>

	* gui/gnome-cal.c (gnome_calendar_tag_calendar): added check to see
	if the client has loaded successfully. Gets rid of a few warnings.

svn path=/trunk/; revision=5217

1 files changed, 135 insertions, 251 deletions

diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade
index 56f7f83422..8a8ca800d6 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade
+++ b/calendar/gui/dialogs/task-editor-dialog.glade
@@ -18,9 +18,11 @@
   <class>GnomeApp</class>
   <name>task-editor-dialog</name>
   <visible>False</visible>
+  <title>task-editor-dialog</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
+  <default_height>350</default_height>
   <allow_shrink>False</allow_shrink>
   <allow_grow>True</allow_grow>
   <auto_shrink>False</auto_shrink>
@@ -61,7 +63,7 @@
 	<widget>
 	  <class>GtkTable</class>
 	  <name>table3</name>
-	  <rows>2</rows>
+	  <rows>1</rows>
 	  <columns>2</columns>
 	  <homogeneous>False</homogeneous>
 	  <row_spacing>4</row_spacing>
@@ -75,19 +77,19 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label3</name>
-	    <label>S_ubject:</label>
+	    <label>S_ummary</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <default_focus_target>entry1</default_focus_target>
+	    <default_focus_target>summary</default_focus_target>
 	    <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>
@@ -101,7 +103,7 @@
 
 	  <widget>
 	    <class>GtkEntry</class>
-	    <name>entry1</name>
+	    <name>summary</name>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -110,63 +112,11 @@
 	    <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>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label10</name>
-	    <label>Owner:</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>GtkLabel</class>
-	    <name>label11</name>
-	    <label></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>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>
@@ -201,7 +151,7 @@
 	    <class>GtkTable</class>
 	    <name>table1</name>
 	    <rows>2</rows>
-	    <columns>2</columns>
+	    <columns>4</columns>
 	    <homogeneous>False</homogeneous>
 	    <row_spacing>2</row_spacing>
 	    <column_spacing>4</column_spacing>
@@ -213,9 +163,9 @@
 
 	    <widget>
 	      <class>GnomeDateEdit</class>
-	      <name>dateedit1</name>
+	      <name>due-date</name>
 	      <show_time>True</show_time>
-	      <use_24_format>False</use_24_format>
+	      <use_24_format>True</use_24_format>
 	      <week_start_monday>False</week_start_monday>
 	      <lower_hour>7</lower_hour>
 	      <upper_hour>19</upper_hour>
@@ -237,7 +187,7 @@
 
 	    <widget>
 	      <class>GnomeDateEdit</class>
-	      <name>dateedit2</name>
+	      <name>start-date</name>
 	      <show_time>True</show_time>
 	      <use_24_format>True</use_24_format>
 	      <week_start_monday>False</week_start_monday>
@@ -310,6 +260,66 @@
 		<yfill>False</yfill>
 	      </child>
 	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label9</name>
+	      <label>% Comp_lete:</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <default_focus_target>percent-complete</default_focus_target>
+	      <child>
+		<left_attach>2</left_attach>
+		<right_attach>3</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>False</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkSpinButton</class>
+	      <name>percent-complete</name>
+	      <width>60</width>
+	      <can_focus>True</can_focus>
+	      <climb_rate>1</climb_rate>
+	      <digits>0</digits>
+	      <numeric>False</numeric>
+	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+	      <snap>False</snap>
+	      <wrap>False</wrap>
+	      <value>0</value>
+	      <lower>0</lower>
+	      <upper>100</upper>
+	      <step>10</step>
+	      <page>10</page>
+	      <page_size>10</page_size>
+	      <child>
+		<left_attach>3</left_attach>
+		<right_attach>4</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>False</yfill>
+	      </child>
+	    </widget>
 	  </widget>
 	</widget>
 
@@ -344,7 +354,7 @@
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <default_focus_target>combo-entry1</default_focus_target>
+	    <default_focus_target>status</default_focus_target>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -353,35 +363,20 @@
 	  </widget>
 
 	  <widget>
-	    <class>GtkCombo</class>
-	    <name>combo1</name>
-	    <value_in_list>False</value_in_list>
-	    <ok_if_empty>True</ok_if_empty>
-	    <case_sensitive>False</case_sensitive>
-	    <use_arrows>True</use_arrows>
-	    <use_arrows_always>False</use_arrows_always>
+	    <class>GtkOptionMenu</class>
+	    <name>status</name>
+	    <can_focus>True</can_focus>
 	    <items>Not Started
 In Progress
 Completed
 Cancelled
 </items>
+	    <initial_choice>0</initial_choice>
 	    <child>
 	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
+	      <expand>False</expand>
+	      <fill>False</fill>
 	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <child_name>GtkCombo:entry</child_name>
-	      <name>combo-entry1</name>
-	      <width>60</width>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text>Not Started</text>
-	    </widget>
 	  </widget>
 
 	  <widget>
@@ -394,7 +389,7 @@ Cancelled
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <default_focus_target>combo-entry2</default_focus_target>
+	    <default_focus_target>priority</default_focus_target>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -403,47 +398,32 @@ Cancelled
 	  </widget>
 
 	  <widget>
-	    <class>GtkCombo</class>
-	    <name>combo2</name>
-	    <value_in_list>False</value_in_list>
-	    <ok_if_empty>True</ok_if_empty>
-	    <case_sensitive>False</case_sensitive>
-	    <use_arrows>True</use_arrows>
-	    <use_arrows_always>False</use_arrows_always>
+	    <class>GtkOptionMenu</class>
+	    <name>priority</name>
+	    <can_focus>True</can_focus>
 	    <items>High
 Normal
 Low
 </items>
+	    <initial_choice>0</initial_choice>
 	    <child>
 	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
+	      <expand>False</expand>
+	      <fill>False</fill>
 	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <child_name>GtkCombo:entry</child_name>
-	      <name>combo-entry2</name>
-	      <width>60</width>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text>High</text>
-	    </widget>
 	  </widget>
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>label9</name>
-	    <label>% Comp_lete:</label>
+	    <name>label18</name>
+	    <label>C_lassification:</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <default_focus_target>spinbutton1</default_focus_target>
+	    <default_focus_target>classification</default_focus_target>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -452,25 +432,18 @@ Low
 	  </widget>
 
 	  <widget>
-	    <class>GtkSpinButton</class>
-	    <name>spinbutton1</name>
+	    <class>GtkOptionMenu</class>
+	    <name>classification</name>
 	    <can_focus>True</can_focus>
-	    <climb_rate>1</climb_rate>
-	    <digits>0</digits>
-	    <numeric>False</numeric>
-	    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	    <snap>False</snap>
-	    <wrap>False</wrap>
-	    <value>0</value>
-	    <lower>0</lower>
-	    <upper>100</upper>
-	    <step>10</step>
-	    <page>10</page>
-	    <page_size>10</page_size>
+	    <items>Public
+Private
+Confidential
+</items>
+	    <initial_choice>0</initial_choice>
 	    <child>
 	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
+	      <expand>False</expand>
+	      <fill>False</fill>
 	    </child>
 	  </widget>
 	</widget>
@@ -490,8 +463,7 @@ Low
 
 	  <widget>
 	    <class>GtkText</class>
-	    <name>text1</name>
-	    <height>150</height>
+	    <name>description</name>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text></text>
@@ -513,17 +485,30 @@ Low
 	    <class>GtkButton</class>
 	    <name>button3</name>
 	    <can_focus>True</can_focus>
-	    <label>_Contacts...</label>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
 	      <fill>False</fill>
 	    </child>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label16</name>
+	      <sensitive>False</sensitive>
+	      <label>_Contacts...</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>4</xpad>
+	      <ypad>0</ypad>
+	    </widget>
 	  </widget>
 
 	  <widget>
 	    <class>GtkEntry</class>
-	    <name>entry2</name>
+	    <name>contacts</name>
+	    <sensitive>False</sensitive>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -540,17 +525,30 @@ Low
 	    <class>GtkButton</class>
 	    <name>button4</name>
 	    <can_focus>True</can_focus>
-	    <label>Ca_tegories...</label>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
 	      <fill>False</fill>
 	    </child>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label17</name>
+	      <sensitive>False</sensitive>
+	      <label>Ca_tegories...</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>4</xpad>
+	      <ypad>0</ypad>
+	    </widget>
 	  </widget>
 
 	  <widget>
 	    <class>GtkEntry</class>
-	    <name>entry3</name>
+	    <name>categories</name>
+	    <sensitive>False</sensitive>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -562,20 +560,6 @@ Low
 	      <fill>True</fill>
 	    </child>
 	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton1</name>
-	    <can_focus>True</can_focus>
-	    <label>Private</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
 	</widget>
       </widget>
 
@@ -596,7 +580,7 @@ Low
 	<class>GtkTable</class>
 	<name>table4</name>
 	<border_width>4</border_width>
-	<rows>4</rows>
+	<rows>2</rows>
 	<columns>2</columns>
 	<homogeneous>False</homogeneous>
 	<row_spacing>2</row_spacing>
@@ -604,7 +588,7 @@ Low
 
 	<widget>
 	  <class>GnomeDateEdit</class>
-	  <name>dateedit3</name>
+	  <name>completed-date</name>
 	  <show_time>True</show_time>
 	  <use_24_format>True</use_24_format>
 	  <week_start_monday>False</week_start_monday>
@@ -654,32 +638,6 @@ Low
 
 	<widget>
 	  <class>GtkLabel</class>
-	  <name>label13</name>
-	  <label>Location:</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>GtkLabel</class>
 	  <name>label14</name>
 	  <label>URL:</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
@@ -691,84 +649,10 @@ Low
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</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>GtkEntry</class>
-	  <name>entry4</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <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>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry5</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</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>GtkLabel</class>
-	  <name>label15</name>
-	  <label>Resources:</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>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
@@ -780,7 +664,7 @@ Low
 
 	<widget>
 	  <class>GtkEntry</class>
-	  <name>entry6</name>
+	  <name>url</name>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -789,8 +673,8 @@ Low
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>