aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c17
-rw-r--r--ui/ChangeLog6
-rw-r--r--ui/evolution-contact-editor.xml35
4 files changed, 39 insertions, 24 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index deb7c46fc0..e20567a4a6 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-02 Jason Leach <jleach@ximian.com>
+
+ * gui/contact-editor/e-contact-editor.c: Use the updated Save,
+ Save As, and Print icons for the menus and toolbar.
+
2001-08-02 Christopher James Lahey <clahey@ximian.com>
* gui/component/addressbook.c: Added ContactsSaveAsVCard,
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 322a7ce79b..ae1ef0ff95 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -45,6 +45,7 @@
#include "addressbook/printing/e-contact-print-envelope.h"
#include "e-util/e-gui-utils.h"
#include "widgets/misc/e-dateedit.h"
+#include "shell/evolution-shell-component-utils.h"
#include "e-card-merging.h"
@@ -1021,15 +1022,27 @@ BonoboUIVerb verbs [] = {
BONOBO_UI_VERB_END
};
+EPixmap pixmaps[] = {
+ E_PIXMAP ("/commands/ContactEditorSave", "save-16.png"),
+ E_PIXMAP ("/commands/ContactEditorSaveAs", "save-as-16.png"),
+ E_PIXMAP ("/commands/ContactEditorPrint", "print.xpm"),
+ E_PIXMAP ("/commands/ContactEditorPrintEnvelope", "print.xpm"),
+
+ E_PIXMAP ("/Toolbar/ContactEditorPrint", "buttons/print.png"),
+
+ E_PIXMAP_END
+};
+
static void
create_ui (EContactEditor *ce)
{
- bonobo_ui_component_add_verb_list_with_data (
- ce->uic, verbs, ce);
+ bonobo_ui_component_add_verb_list_with_data (ce->uic, verbs, ce);
bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
"evolution-contact-editor.xml",
"evolution-contact-editor");
+
+ e_pixmaps_update (ce->uic, pixmaps);
}
/* Callback used when the dialog box is destroyed */
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 04e84aab6a..fafbeb42b4 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-02 Jason Leach <jleach@ximian.com>
+
+ * evolution-contact-editor.xml: Update the updated Save, Save As,
+ and Print icons for menus and the toolbar. Also added a Close
+ button to the toolbar and some other fixes suggested in #5518.
+
2001-08-02 Christopher James Lahey <clahey@ximian.com>
* evolution-addressbook.xml: Added ContactsSaveAsVCard,
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index 3acae0b328..7916ef9986 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -157,11 +157,6 @@ static GnomeUIInfo actions_menu[] = {
GNOMEUIINFO_ITEM_NONE (N_("FIXME: For_ward"), NULL, NULL)
};
-static GnomeUIInfo help_menu[] = {
- GNOMEUIINFO_ITEM_NONE ("FIXME: fix Bonobo so it supports help items!", NULL, NULL),
- GNOMEUIINFO_END
-};
-
static GnomeUIInfo main_menu[] = {
GNOMEUIINFO_MENU_FILE_TREE (file_menu),
GNOMEUIINFO_MENU_EDIT_TREE (edit_menu),
@@ -170,16 +165,12 @@ static GnomeUIInfo main_menu[] = {
GNOMEUIINFO_SUBTREE (N_("F_ormat"), format_menu),
GNOMEUIINFO_SUBTREE (N_("_Tools"), tools_menu),
GNOMEUIINFO_SUBTREE (N_("Actio_ns"), actions_menu),
- GNOMEUIINFO_MENU_HELP_TREE (help_menu),
GNOMEUIINFO_END
};
-->
<commands>
- <cmd name="ContactEditorSave"
- pixtype="stock" pixname="Save"/>
-
- <cmd name="ContactEditorSaveAs"
- pixtype="stock" pixname="SaveAs"/>
+ <cmd name="ContactEditorSave" pixtype="pixbuf"/>
+ <cmd name="ContactEditorSaveAs" pixtype="pixbuf"/>
<cmd name="ContactEditorSendAs"/>
@@ -191,10 +182,10 @@ static GnomeUIInfo main_menu[] = {
<cmd name="ContactEditorPrint"
_tip="Print this item"
- pixtype="stock" pixname="Print"/>
+ pixtype="pixbuf"/>
<cmd name="ContactEditorPrintEnvelope"
- pixtype="stock" pixname="Print"/>
+ pixtype="pixbuf"/>
<cmd name="ContactEditorClose"
pixtype="stock" pixname="Close"/>
@@ -208,15 +199,12 @@ static GnomeUIInfo main_menu[] = {
<submenu name="File" _label="_File">
- <menuitem name="ContactEditorSave" verb=""
- _label="_Save"/>
-
- <menuitem name="ContactEditorSaveAs" verb=""
- _label="Save _As..."/>
+ <menuitem name="ContactEditorSave" verb="" _label="_Save"/>
+ <menuitem name="ContactEditorSaveAs" verb="" _label="Save _As..."/>
<separator/>
- <menuitem name="ContactEditorSendAs" verb=""
+ <menuitem name="ContactEditorSendAs" verb=""
_label="Se_nd contact to other..."/>
<menuitem name="ContactEditorSendTo" verb=""
@@ -225,7 +213,7 @@ static GnomeUIInfo main_menu[] = {
<separator/>
<menuitem name="ContactEditorDelete" verb=""
- _label="Delete..."/>
+ _label="Delete"/>
<separator/>
@@ -255,10 +243,13 @@ static GnomeUIInfo main_menu[] = {
<separator/>
<toolitem name="ContactEditorPrint" verb=""
- _label="Print..." priority="1"/>
+ _label="Print" priority="1" pixtype="pixbuf"/>
<toolitem name="ContactEditorDelete" verb=""
- _label="Delete..." priority="1"/>
+ _label="Delete" priority="1"/>
+
+ <toolitem name="ContactEditorClose" verb=""
+ _label="Close" priority="1"/>
<!--
<toolitem name="Help" _label="Help"