aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/addressbook.c1
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c1
-rw-r--r--ui/ChangeLog7
-rw-r--r--ui/evolution-addressbook.xml3
-rw-r--r--ui/evolution-contact-editor.xml18
-rw-r--r--ui/evolution-contact-list-editor.xml2
7 files changed, 19 insertions, 19 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index a5c8303cbd..f839b3f903 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-18 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/component/addressbook.c: Hook up `delete-message.png' as the
+ icon for "ContactDelete".
+ * gui/contact-editor/e-contact-editor.c: Likewise.
+
2001-08-17 Chris Toshok <toshok@ximian.com>
* gui/component/addressbook-storage.h: add prototype for
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 8aeeb0d032..a6f0dfc2a5 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -273,6 +273,7 @@ static EPixmap pixmaps [] = {
E_PIXMAP ("/Toolbar/ContactNew", "new_contact.xpm"),
E_PIXMAP ("/Toolbar/ContactNewList", "all_contacts.xpm"),
E_PIXMAP ("/Toolbar/ContactsPrint", "buttons/print.png"),
+ E_PIXMAP ("/Toolbar/ContactDelete", "buttons/delete-message.png"),
E_PIXMAP_END
};
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 3631ea6310..1907e6de30 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -1056,6 +1056,7 @@ EPixmap pixmaps[] = {
E_PIXMAP ("/commands/ContactEditorPrint", "print.xpm"),
E_PIXMAP ("/commands/ContactEditorPrintEnvelope", "print.xpm"),
+ E_PIXMAP ("/Toolbar/ContactEditorDelete", "buttons/delete-message.png"),
E_PIXMAP ("/Toolbar/ContactEditorPrint", "buttons/print.png"),
E_PIXMAP_END
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 416e631556..b90e922178 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,12 @@
2001-08-18 Ettore Perazzoli <ettore@ximian.com>
+ * evolution-addressbook.xml: Set the pixtype for
+ "ContactEditorDelete" to "pixbuf".
+ * evolution-contact-editor.xml: Likewise.
+ * evolution-contact-list-editor.xml: Likewise.
+
+2001-08-18 Ettore Perazzoli <ettore@ximian.com>
+
* evolution.xml: Remove "Control-W" accelerator for closing the
window.
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index fbb22c69ba..40b7b6ab4d 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -2,7 +2,6 @@
<commands>
<cmd name="ContactDelete"
_tip="Delete selected contacts"
- pixtype="stock" pixname="Trash"
accel="*Control*d"/>
<cmd name="ContactNew"
@@ -138,7 +137,7 @@
_label="Print" pixtype="pixbuf"/>
<toolitem name="ContactDelete" verb=""
- _label="Delete"/>
+ _label="Delete" pixtype="pixbuf"/>
<toolitem name="ContactStop" verb=""
_label="Stop"/>
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index cc1aa4be14..01d71062ea 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -8,8 +8,7 @@
<cmd name="ContactEditorSendTo"/>
<cmd name="ContactEditorDelete"
- _tip="Delete this item"
- pixtype="stock" pixname="Trash" accel="*Control*d"/>
+ _tip="Delete this item" accel="*Control*d"/>
<cmd name="ContactEditorPrint"
_tip="Print this item"
@@ -83,24 +82,11 @@
<separator/>
<toolitem name="ContactEditorDelete" verb=""
- _label="Delete" priority="1"/>
+ _label="Delete" pixtype="pixbuf" priority="1"/>
<toolitem name="ContactEditorClose" verb=""
_label="Close" priority="1"/>
-<!--
- <toolitem name="Help" _label="Help"
- _tip="See online help" verb="ContactEditorHelp"
- pixtype="stock" pixname="Help"/>
-
- GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Previous"),
- N_("Go to the previous item"), NULL,
- GNOME_STOCK_PIXMAP_BACK),
- GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Next"),
- N_("Go to the next item"), NULL,
- GNOME_STOCK_PIXMAP_FORWARD),
--->
-
</dockitem>
</Root>
diff --git a/ui/evolution-contact-list-editor.xml b/ui/evolution-contact-list-editor.xml
index e9d2aa8fe3..49cc8b6abe 100644
--- a/ui/evolution-contact-list-editor.xml
+++ b/ui/evolution-contact-list-editor.xml
@@ -8,7 +8,7 @@
<cmd name="ContactListEditorDelete"
_tip="Delete this list"
- pixtype="stock" pixname="Trash" accel="*Control*d"/>
+ pixtype="pixbuf" accel="*Control*d"/>
<cmd name="ContactListEditorClose"
pixtype="stock" pixname="Close" accel="*Control*w"/>