aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/dialogs/comp-editor.c2
-rw-r--r--calendar/gui/print.c8
3 files changed, 13 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index bae9dfe0c6..07bc15705d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-25 Damon Chaplin <damon@ximian.com>
+
+ * gui/dialogs/comp-editor.c (pixmaps): used the new print preview icon.
+
+ * gui/print.c (range_selector_new): changed the 'Current day/week...'
+ strings to 'Selected day/week...' to make a little less confusing.
+ Fixes bug #5451.
+
2001-07-25 JP Rosevear <jpr@ximian.com>
* gui/dialogs/meeting-page.c (is_duplicate): see if the address is
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 5f2e315890..6023e80295 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -105,7 +105,7 @@ static EPixmap pixmaps [] =
E_PIXMAP ("/menu/File/FilePrintPreview", "print-preview.xpm"),
E_PIXMAP ("/Toolbar/FilePrint", "buttons/print.png"),
- E_PIXMAP ("/Toolbar/FilePrintPreview", "print-preview.xpm"),
+ E_PIXMAP ("/Toolbar/FilePrintPreview", "buttons/print-preview-24.png"),
E_PIXMAP_END
};
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index fcf3bcecfe..aa8fb92432 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -1812,7 +1812,7 @@ range_selector_new (GtkWidget *dialog, time_t at, int *view)
/* Day */
- strftime (text, sizeof (text), _("Current day (%a %b %d %Y)"), &tm);
+ strftime (text, sizeof (text), _("Selected day (%a %b %d %Y)"), &tm);
radio = gtk_radio_button_new_with_label (NULL, text);
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
@@ -1843,7 +1843,7 @@ range_selector_new (GtkWidget *dialog, time_t at, int *view)
}
}
- g_snprintf (text, sizeof (text), _("Current week (%s - %s)"), str1, str2);
+ g_snprintf (text, sizeof (text), _("Selected week (%s - %s)"), str1, str2);
radio = gtk_radio_button_new_with_label (group, text);
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
@@ -1851,14 +1851,14 @@ range_selector_new (GtkWidget *dialog, time_t at, int *view)
/* Month */
- strftime (text, sizeof (text), _("Current month (%b %Y)"), &tm);
+ strftime (text, sizeof (text), _("Selected month (%b %Y)"), &tm);
radio = gtk_radio_button_new_with_label (group, text);
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
/* Year */
- strftime (text, sizeof (text), _("Current year (%Y)"), &tm);
+ strftime (text, sizeof (text), _("Selected year (%Y)"), &tm);
radio = gtk_radio_button_new_with_label (group, text);
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);