aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog13
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.glade67
-rw-r--r--calendar/gui/dialogs/event-page.c8
-rw-r--r--calendar/gui/dialogs/task-page.c6
4 files changed, 92 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 2687d1c4ae..47f82094a7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,18 @@
2001-08-18 Damon Chaplin <damon@ximian.com>
+ * gui/dialogs/cal-prefs-dialog.glade: added option to hide completed
+ tasks after a given number of minutes/hours/days. Unfinished.
+
+ * gui/dialogs/event-page.c (event_page_fill_component): initialize
+ zone to NULL to avoid a warning.
+ (contacts_clicked_cb): work around a bug in SelectNames by notifying
+ that the page has changed when you click the 'Contacts' button.
+ Otherwise it is easy to lose changes.
+
+ * gui/dialogs/task-page.c (contacts_clicked_cb): ditto.
+
+2001-08-18 Damon Chaplin <damon@ximian.com>
+
* gui/dialogs/comp-editor.c (pixmaps): used new Save/Save As icons.
* gui/tasks-control.c:
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 6290db63dd..42ad66c1d7 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -646,7 +646,7 @@ Sunday
<name>vbox3</name>
<border_width>4</border_width>
<homogeneous>False</homogeneous>
- <spacing>4</spacing>
+ <spacing>8</spacing>
<widget>
<class>GtkTable</class>
@@ -762,6 +762,71 @@ Sunday
</child>
</widget>
</widget>
+
+ <widget>
+ <class>GtkHBox</class>
+ <name>hbox14</name>
+ <homogeneous>False</homogeneous>
+ <spacing>4</spacing>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+
+ <widget>
+ <class>GtkCheckButton</class>
+ <name>tasks-hide-completed-checkbutton</name>
+ <can_focus>True</can_focus>
+ <label>Hide completed tasks after</label>
+ <active>False</active>
+ <draw_indicator>True</draw_indicator>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkSpinButton</class>
+ <name>tasks-hide-completed-spinbutton</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>9999</upper>
+ <step>1</step>
+ <page>10</page>
+ <page_size>10</page_size>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>True</fill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkOptionMenu</class>
+ <name>tasks-hide-completed-optionmenu</name>
+ <can_focus>True</can_focus>
+ <items>Minutes
+Hours
+Days
+</items>
+ <initial_choice>0</initial_choice>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+ </widget>
</widget>
<widget>
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index e20822e088..a8ab66af6a 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -561,7 +561,7 @@ event_page_fill_component (CompEditorPage *page, CalComponent *comp)
char *cat, *str;
CalComponentClassification classif;
CalComponentTransparency transparency;
- icaltimezone *zone;
+ icaltimezone *zone = NULL;
epage = EVENT_PAGE (page);
priv = epage->priv;
@@ -1091,6 +1091,12 @@ contacts_clicked_cb (GtkWidget *button, gpointer data)
g_print ("In contacts_clicked_cb\n");
comp_editor_show_contacts_dialog (priv->corba_select_names);
+
+ /* FIXME: Currently we aren't getting the changed event from the
+ SelectNames component correctly, so we aren't saving the event
+ if just the contacts are changed. To work around that, we assume
+ that if the contacts button is clicked it is changed. */
+ comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));
}
/* Callback used when the categories button is clicked; we must bring up the
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 11e6eb44e3..729ec8c641 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -737,6 +737,12 @@ contacts_clicked_cb (GtkWidget *button, gpointer data)
g_print ("In contacts_clicked_cb\n");
comp_editor_show_contacts_dialog (priv->corba_select_names);
+
+ /* FIXME: Currently we aren't getting the changed event from the
+ SelectNames component correctly, so we aren't saving the event
+ if just the contacts are changed. To work around that, we assume
+ that if the contacts button is clicked it is changed. */
+ comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));
}
/* Callback used when the categories button is clicked; we must bring up the