set the height of the scrolled window for the description field, since the

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

	* gui/dialogs/task-editor-dialog.glade: set the height of the scrolled
	window for the description field, since the default window height
	doesn't seem to be working.

	* cal-util/cal-component.h: added functions to get the actual
	icalproperty lists for RRULE and EXRULE properties.

	* cal-util/cal-recur.[hc]: added support for COUNT, though I need to
	test it a bit. Also fixed the call to generate_instances_for_year() so
	it uses the chunk dates.

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

	* gui/event-editor.c: got rid of 1 '_' in '__Formatting'.

svn path=/trunk/; revision=5562

4 files changed, 18 insertions, 17 deletions

diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade
index 7f5bff8e6f..bdde9ed091 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade
+++ b/calendar/gui/dialogs/task-editor-dialog.glade
@@ -22,7 +22,6 @@
   <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>
@@ -450,6 +449,7 @@ Confidential
 	<widget>
 	  <class>GtkScrolledWindow</class>
 	  <name>scrolledwindow1</name>
+	  <height>150</height>
 	  <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
 	  <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
 	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -484,6 +484,7 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>button3</name>
 	    <can_focus>True</can_focus>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -524,6 +525,7 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>button4</name>
 	    <can_focus>True</can_focus>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h
index 20f7db3014..8ba4eea0a1 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade.h
+++ b/calendar/gui/dialogs/task-editor-dialog.glade.h
@@ -10,22 +10,19 @@ gchar *s = N_("Sta_rt Date:");
 gchar *s = N_("_Due Date:");
 gchar *s = N_("% Comp_lete:");
 gchar *s = N_("_Status:");
-gchar *s = N_("Not Started\n"
-              "In Progress\n"
-              "Completed\n"
-              "Cancelled\n"
-              "");
+gchar *s = N_("Not Started");
+gchar *s = N_("In Progress");
+gchar *s = N_("Completed");
+gchar *s = N_("Cancelled");
 gchar *s = N_("_Priority:");
-gchar *s = N_("High\n"
-              "Normal\n"
-              "Low\n"
-              "");
+gchar *s = N_("High");
+gchar *s = N_("Normal");
+gchar *s = N_("Low");
 gchar *s = N_("C_lassification:");
-gchar *s = N_("None\n"
-              "Public\n"
-              "Private\n"
-              "Confidential\n"
-              "");
+gchar *s = N_("None");
+gchar *s = N_("Public");
+gchar *s = N_("Private");
+gchar *s = N_("Confidential");
 gchar *s = N_("_Contacts...");
 gchar *s = N_("Ca_tegories...");
 gchar *s = N_("Task");
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
index 7f5bff8e6f..bdde9ed091 100644
--- a/calendar/gui/dialogs/task-page.glade
+++ b/calendar/gui/dialogs/task-page.glade
@@ -22,7 +22,6 @@
   <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>
@@ -450,6 +449,7 @@ Confidential
 	<widget>
 	  <class>GtkScrolledWindow</class>
 	  <name>scrolledwindow1</name>
+	  <height>150</height>
 	  <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
 	  <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
 	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -484,6 +484,7 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>button3</name>
 	    <can_focus>True</can_focus>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -524,6 +525,7 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>button4</name>
 	    <can_focus>True</can_focus>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index d2ac13941f..92d843ce89 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -1239,7 +1239,7 @@ static GnomeUIInfo view_next_menu[] = {
 static GnomeUIInfo view_toolbars_menu[] = {
 	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: _Standard"), NULL, NULL, NULL, NULL,
 	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },
-	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: __Formatting"), NULL, NULL, NULL, NULL,
+	{ GNOME_APP_UI_TOGGLEITEM, N_("FIXME: _Formatting"), NULL, NULL, NULL, NULL,
 	  GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },
 	GNOMEUIINFO_SEPARATOR,
 	GNOMEUIINFO_ITEM_NONE (N_("FIXME: _Customize..."), NULL, NULL),