aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/addressbook-component.c8
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/calendar-component.c10
-rw-r--r--calendar/gui/component-factory.c10
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/component-factory.c12
-rw-r--r--ui/ChangeLog5
-rw-r--r--ui/evolution-mail-global.xml13
9 files changed, 42 insertions, 33 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 33e81e6159..70c228ab87 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
2002-07-31 Ettore Perazzoli <ettore@ximian.com>
+ * gui/component/addressbook-component.c (create_component): Change
+ the order so that "New Contact" is first and "New Contact List" is
+ next.
+
+2002-07-31 Ettore Perazzoli <ettore@ximian.com>
+
* gui/component/addressbook-component.c (add_creatable_item): Pass
"contacts" as the @folder_type to
evolution_shell_component_add_user_creatable_item().
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 7bf4bec508..a8d01563f4 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -577,14 +577,14 @@ create_component (void)
bonobo_object_add_interface (BONOBO_OBJECT (shell_component),
BONOBO_OBJECT (destination_interface));
- add_creatable_item (shell_component, "contact_list",
- _("New Contact List"), _("Contact _List"),
- _("Create a new contact list"), 'l',
- "all_contacts.xpm");
add_creatable_item (shell_component, "contact",
_("New Contact"), _("_Contact"),
_("Create a new contact"), 'c',
"evolution-contacts-mini.png");
+ add_creatable_item (shell_component, "contact_list",
+ _("New Contact List"), _("Contact _List"),
+ _("Create a new contact list"), 'l',
+ "all_contacts.xpm");
gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
GTK_SIGNAL_FUNC (owner_set_cb), NULL);
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ac94f62045..187c8ee528 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,11 @@
2002-07-31 Ettore Perazzoli <ettore@ximian.com>
+ * gui/component-factory.c (create_object): Change the order of the
+ user creatable items a bit so that "New Appointment" and "New
+ Meeting" are at the top when in a calendar folder.
+
+2002-07-31 Ettore Perazzoli <ettore@ximian.com>
+
* gui/component-factory.c (add_creatable_item): New arg
@folder_type, pass it to
evolution_shell_component_add_user_creatable_item().
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 3f7b280e1f..b6e36b3b49 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -704,6 +704,11 @@ create_object (void)
/* User creatable items */
+ add_creatable_item (shell_component, CREATE_EVENT_ID,
+ _("New appointment"), _("_Appointment"),
+ _("Create a new appointment"),
+ "calendar", 'a', "new_appointment.xpm");
+
add_creatable_item (shell_component, CREATE_MEETING_ID,
_("New meeting"), _("_Meeting"),
_("Create a new meeting request"),
@@ -719,11 +724,6 @@ create_object (void)
_("Create a new all-day appointment"),
"calendar", 'd', "new_all_day_event.png");
- add_creatable_item (shell_component, CREATE_EVENT_ID,
- _("New appointment"), _("_Appointment"),
- _("Create a new appointment"),
- "calendar", 'a', "new_appointment.xpm");
-
gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",
GTK_SIGNAL_FUNC (sc_user_create_new_item_cb), NULL);
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
index 3f7b280e1f..b6e36b3b49 100644
--- a/calendar/gui/component-factory.c
+++ b/calendar/gui/component-factory.c
@@ -704,6 +704,11 @@ create_object (void)
/* User creatable items */
+ add_creatable_item (shell_component, CREATE_EVENT_ID,
+ _("New appointment"), _("_Appointment"),
+ _("Create a new appointment"),
+ "calendar", 'a', "new_appointment.xpm");
+
add_creatable_item (shell_component, CREATE_MEETING_ID,
_("New meeting"), _("_Meeting"),
_("Create a new meeting request"),
@@ -719,11 +724,6 @@ create_object (void)
_("Create a new all-day appointment"),
"calendar", 'd', "new_all_day_event.png");
- add_creatable_item (shell_component, CREATE_EVENT_ID,
- _("New appointment"), _("_Appointment"),
- _("Create a new appointment"),
- "calendar", 'a', "new_appointment.xpm");
-
gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",
GTK_SIGNAL_FUNC (sc_user_create_new_item_cb), NULL);
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7f3bd5b935..160ed5bc1f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,10 @@
2002-07-31 Ettore Perazzoli <ettore@ximian.com>
+ * component-factory.c (create_component): Put "New Mail Message"
+ before "New Message Post" instead of vice versa.
+
+2002-07-31 Ettore Perazzoli <ettore@ximian.com>
+
* component-factory.c (create_component): Pass "mail" as
@folder_type to
evolution_shell_component_add_user_creatable_item().
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 64baf75714..635b378dd7 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -991,18 +991,18 @@ create_component (void)
new_mail_icon = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/new-message.xpm");
- evolution_shell_component_add_user_creatable_item (shell_component, "post",
- _("New Message Post"), _("_Post Message"),
- _("Post a new mail message"),
- "mail", 'p',
- new_mail_icon);
-
evolution_shell_component_add_user_creatable_item (shell_component, "message",
_("New Mail Message"), _("_Mail Message"),
_("Compose a new mail message"),
"mail", 'm',
new_mail_icon);
+ evolution_shell_component_add_user_creatable_item (shell_component, "post",
+ _("New Message Post"), _("_Post Message"),
+ _("Post a new mail message"),
+ "mail", 'p',
+ new_mail_icon);
+
if (new_mail_icon != NULL)
gdk_pixbuf_unref (new_mail_icon);
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 8812c81235..8dedfbbc1d 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-31 Ettore Perazzoli <ettore@ximian.com>
+
+ * evolution-mail-global.xml: Remove "New Mail Message" and "Post
+ Message" items.
+
2002-07-26 Ettore Perazzoli <ettore@ximian.com>
* evolution.xml: Move File/New/NewItems placeholder on the top and
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 244ab284fe..bc1e1ae7eb 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -45,19 +45,6 @@
<menu>
- <submenu name="File">
- <submenu name="New">
- <placeholder name="NewFirstItem">
- <menuitem name="MessageNew" verb="MailCompose"
- accel="*Control*n" _label="_Mail Message"/>
- <menuitem name="MessagePost" verb="MailPost"
- accel="" _label="Post a Message"/>
-
- <separator f="" name="emailglobal"/>
- </placeholder>
- </submenu>
- </submenu>
-
<submenu name="View">
<menuitem name="ViewPreview" verb="" _label="_Preview Pane"/>
<separator f="" name="emailglobal"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 15:47:40 +0800