aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.c3
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.glade8
3 files changed, 17 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 052aee156d..40729af584 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-30 Damon Chaplin <damon@ximian.com>
+
+ * gui/dialogs/cal-prefs-dialog.glade: added Help button. Though of
+ course it doesn't do anything yet.
+
2001-07-30 JP Rosevear <jpr@ximian.com>
* gui/dialogs/meeting-page.c: Mark strings for translation
@@ -178,6 +183,7 @@
value from cal_component_get_as_string and don't call
GNOME_Evolution_Calendar_Cal_updateObjects if NULL
+>>>>>>> 1.1002
2001-07-25 Damon Chaplin <damon@ximian.com>
* gui/dialogs/comp-editor.c (pixmaps): used the new print preview icon.
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 7176354a73..c05628797f 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -331,6 +331,9 @@ cal_prefs_dialog_button_clicked (GtkWidget *dialog,
/* OK & Close buttons close the dialog. */
if (button == 0 || button == 2)
gtk_widget_hide (priv->dialog);
+
+ /* FIXME: Handle button 3 (Help). */
+
}
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 038d091a72..b93e15f442 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -77,6 +77,14 @@
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
</widget>
+
+ <widget>
+ <class>GtkButton</class>
+ <name>button4</name>
+ <can_default>True</can_default>
+ <can_focus>True</can_focus>
+ <stock_button>GNOME_STOCK_BUTTON_HELP</stock_button>
+ </widget>
</widget>
<widget>