aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/ChangeLog7
-rw-r--r--ui/evolution-contact-editor.xml14
2 files changed, 16 insertions, 5 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 55d8531b75..fb630190a1 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-06 Anna Marie Dirks <anna@ximian.com>
+
+ * evolution-contact-editor.xml: Changed "Save" to "Save and Close"
+
2001-09-05 Ettore Perazzoli <ettore@ximian.com>
[Fix #5503, Edit menu is empty and should be removed.]
@@ -24,6 +28,7 @@
Ctrl-Shift-Y so we are more like O* and don't get in the way of
the Ctrl-Shift-C for "New Contact".
+>>>>>>> 1.245
2001-09-04 Ettore Perazzoli <ettore@ximian.com>
* evolution-mail-global.xml: Add an F9 accelerator for the
@@ -38,6 +43,7 @@
* evolution-mail-message.xml: Add a pixtype to
/Commands/MessageUndelete so that people can see the icon.
+>>>>>>> 1.242
2001-08-23 Larry Ewing <lewing@ximian.com>
* evolution-mail-message.xml: added ... to Search Message to
@@ -65,6 +71,7 @@
* evolution-comp-editor.xml: remove print preview from toolbar
+>>>>>>> 1.239
2001-08-20 JP Rosevear <jpr@ximian.com>
* evolution-comp-editor.xml: remove print setup option for
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index 4ec5876629..845c9b3633 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -24,14 +24,15 @@
<cmd name="ContactEditorSaveClose"
_tip="Save the contact and close the dialog box"
- pixtype="stock" pixname="Save"/>
+ pixtype="pixbuf"/>
</commands>
<menu>
<submenu name="File" _label="_File">
- <menuitem name="ContactEditorSave" verb="" _label="_Save"/>
+ <menuitem name="ContactEditorSave" verb="" _label="_Save"/> <menuitem name="ContactEditorSaveClose" verb="" _label="Save and Close"/>
+
<menuitem name="ContactEditorSaveAs" verb="" _label="Save _As..."/>
<separator/>
@@ -71,11 +72,11 @@
<dockitem name="Toolbar" relief="none" behavior="exclusive"
hlook="text" vlook="icon">
- <toolitem name="ContactEditorSave" verb=""
- _label="Save" priority="1" pixtype="pixbuf"/>
- <separator/>
+ <toolitem name="ContactEditorSaveClose" verb=""
+ _label="Save and Close" priority="1" pixtype="pixbuf"/>
+ <separator/>
<toolitem name="ContactEditorPrint" verb=""
_label="Print" priority="1" pixtype="pixbuf"/>
@@ -90,3 +91,6 @@
</dockitem>
</Root>
+
+
+