[evolution-patches] Customization of Toolbar
- From: Ranjan Somani <sranjan novell com>
- To: evolution-patches gnome org
- Subject: [evolution-patches] Customization of Toolbar
- Date: Wed, 05 Jul 2006 19:54:50 +0530
Hi
The following patch enables the user to customize the Toolbar.
Regards,
Ranjan
? evolution-zip
? iconv-detect.h
? toolbar-latest.diff
? a11y/.deps
? a11y/.libs
? a11y/ea-cell-table.lo
? a11y/gal-a11y-util.lo
? a11y/libevolution-a11y.la
? a11y/addressbook/.deps
? a11y/addressbook/.libs
? a11y/addressbook/ea-addressbook-view.lo
? a11y/addressbook/ea-addressbook.lo
? a11y/addressbook/ea-minicard-view.lo
? a11y/addressbook/ea-minicard.lo
? a11y/addressbook/libevolution-addressbook-a11y.la
? a11y/calendar/.deps
? a11y/calendar/.libs
? a11y/calendar/ea-cal-view-event.lo
? a11y/calendar/ea-cal-view.lo
? a11y/calendar/ea-calendar-helpers.lo
? a11y/calendar/ea-calendar.lo
? a11y/calendar/ea-day-view-cell.lo
? a11y/calendar/ea-day-view-main-item.lo
? a11y/calendar/ea-day-view.lo
? a11y/calendar/ea-gnome-calendar.lo
? a11y/calendar/ea-jump-button.lo
? a11y/calendar/ea-week-view-cell.lo
? a11y/calendar/ea-week-view-main-item.lo
? a11y/calendar/ea-week-view.lo
? a11y/calendar/libevolution-calendar-a11y.la
? a11y/e-table/.deps
? a11y/e-table/gal-a11y-e-cell-popup.lo
? a11y/e-table/gal-a11y-e-cell-registry.lo
? a11y/e-table/gal-a11y-e-cell-text.lo
? a11y/e-table/gal-a11y-e-cell-toggle.lo
? a11y/e-table/gal-a11y-e-cell-tree.lo
? a11y/e-table/gal-a11y-e-cell-vbox.lo
? a11y/e-table/gal-a11y-e-cell.lo
? a11y/e-table/gal-a11y-e-table-click-to-add-factory.lo
? a11y/e-table/gal-a11y-e-table-click-to-add.lo
? a11y/e-table/gal-a11y-e-table-column-header.lo
? a11y/e-table/gal-a11y-e-table-factory.lo
? a11y/e-table/gal-a11y-e-table-item-factory.lo
? a11y/e-table/gal-a11y-e-table-item.lo
? a11y/e-table/gal-a11y-e-table.lo
? a11y/e-table/gal-a11y-e-tree-factory.lo
? a11y/e-table/gal-a11y-e-tree.lo
? a11y/e-text/.deps
? a11y/e-text/gal-a11y-e-text-factory.lo
? a11y/e-text/gal-a11y-e-text.lo
? a11y/widgets/.deps
? a11y/widgets/.libs
? a11y/widgets/ea-calendar-cell.lo
? a11y/widgets/ea-calendar-item.lo
? a11y/widgets/ea-combo-button.lo
? a11y/widgets/ea-expander.lo
? a11y/widgets/ea-widgets.lo
? a11y/widgets/libevolution-widgets-a11y.la
? addressbook/addressbook.error
? addressbook/gui/component/addressbook-view.tm
? addressbook/gui/component/addressbook-view.tool
? addressbook/gui/component/temp.diff
? addressbook/gui/component/temporary.diff
? addressbook/gui/contact-list-editor/.libs
? addressbook/gui/contact-list-editor/e-contact-list-editor-marshal.lo
? addressbook/gui/contact-list-editor/e-contact-list-editor.lo
? addressbook/gui/contact-list-editor/e-contact-list-model.lo
? addressbook/gui/contact-list-editor/libecontactlisteditor.la
? addressbook/tools/.deps
? addressbook/tools/.libs
? addressbook/util/.deps
? addressbook/util/.libs
? addressbook/util/eab-book-util.lo
? addressbook/util/eab-marshal.lo
? addressbook/util/libeabutil.la
? calendar/calendar.error
? calendar/common/.deps
? calendar/common/.libs
? calendar/common/authentication.lo
? calendar/common/libevolution-calendarprivate.la
? calendar/conduits/memo/.deps
? calendar/conduits/memo/Makefile
? calendar/conduits/memo/Makefile.in
? calendar/gui/apps_evolution_calendar-2.8.schemas
? calendar/gui/libevolution-calendar.la
? calendar/gui/dialogs/.libs
? calendar/gui/dialogs/alarm-dialog.lo
? calendar/gui/dialogs/alarm-list-dialog.lo
? calendar/gui/dialogs/cal-attachment-select-file.lo
? calendar/gui/dialogs/cal-prefs-dialog.lo
? calendar/gui/dialogs/calendar-setup.lo
? calendar/gui/dialogs/cancel-comp.lo
? calendar/gui/dialogs/changed-comp.lo
? calendar/gui/dialogs/comp-editor-page.lo
? calendar/gui/dialogs/comp-editor-util.lo
? calendar/gui/dialogs/comp-editor.lo
? calendar/gui/dialogs/copy-source-dialog.lo
? calendar/gui/dialogs/delete-comp.lo
? calendar/gui/dialogs/delete-error.lo
? calendar/gui/dialogs/e-delegate-dialog.lo
? calendar/gui/dialogs/e-send-options-utils.lo
? calendar/gui/dialogs/event-editor.lo
? calendar/gui/dialogs/event-page.lo
? calendar/gui/dialogs/libcal-dialogs.la
? calendar/gui/dialogs/memo-editor.lo
? calendar/gui/dialogs/memo-page.lo
? calendar/gui/dialogs/recur-comp.lo
? calendar/gui/dialogs/recurrence-page.lo
? calendar/gui/dialogs/save-comp.lo
? calendar/gui/dialogs/schedule-page.lo
? calendar/gui/dialogs/select-source-dialog.lo
? calendar/gui/dialogs/send-comp.lo
? calendar/gui/dialogs/task-details-page.lo
? calendar/gui/dialogs/task-editor.lo
? calendar/gui/dialogs/task-page.lo
? calendar/importers/icalendar-importer.lo
? calendar/importers/libevolution-calendar-importers.la
? composer/mail-composer.error
? e-util/.e-xml-utils.c.swp
? e-util/e-system.error
? filter/filter.error
? help/C/evolution-2.8-C.omf
? help/C/evolution-2.8.xml
? help/C/home
? mail/Evolution-Mail-common.lo
? mail/Evolution-Mail-skels.lo
? mail/Evolution-Mail-stubs.lo
? mail/Spell-common.lo
? mail/Spell-skels.lo
? mail/Spell-stubs.lo
? mail/e-searching-tokenizer.lo
? mail/em-account-editor.lo
? mail/em-account-prefs.lo
? mail/em-composer-prefs.lo
? mail/em-composer-utils.lo
? mail/em-config.lo
? mail/em-event.lo
? mail/em-filter-context.lo
? mail/em-filter-editor.lo
? mail/em-filter-folder-element.lo
? mail/em-filter-rule.lo
? mail/em-filter-source-element.lo
? mail/em-folder-browser.lo
? mail/em-folder-properties.lo
? mail/em-folder-selection-button.lo
? mail/em-folder-selection.lo
? mail/em-folder-selector.lo
? mail/em-folder-tree-model.lo
? mail/em-folder-tree.lo
? mail/em-folder-utils.lo
? mail/em-folder-view.lo
? mail/em-format-hook.lo
? mail/em-format-html-display.lo
? mail/em-format-html-print.lo
? mail/em-format-html.lo
? mail/em-format-quote.lo
? mail/em-format.lo
? mail/em-html-stream.lo
? mail/em-icon-stream.lo
? mail/em-inline-filter.lo
? mail/em-junk-hook.lo
? mail/em-mailer-prefs.lo
? mail/em-marshal.lo
? mail/em-menu.lo
? mail/em-message-browser.lo
? mail/em-migrate.lo
? mail/em-popup.lo
? mail/em-search-context.lo
? mail/em-stripsig-filter.lo
? mail/em-subscribe-editor.lo
? mail/em-sync-stream.lo
? mail/em-utils.lo
? mail/em-vfolder-context.lo
? mail/em-vfolder-editor.lo
? mail/em-vfolder-rule.lo
? mail/em-vfs-stream.lo
? mail/evolution-mail-2.8.schemas
? mail/libevolution-mail.la
? mail/mail-autofilter.lo
? mail/mail-component-factory.lo
? mail/mail-component.lo
? mail/mail-config-factory.lo
? mail/mail-config.lo
? mail/mail-crypto.lo
? mail/mail-folder-cache.lo
? mail/mail-mt.lo
? mail/mail-ops.lo
? mail/mail-send-recv.lo
? mail/mail-session.lo
? mail/mail-signature-editor.lo
? mail/mail-tools.lo
? mail/mail-vfolder.lo
? mail/mail.error
? mail/message-list.lo
? mail/message-tag-editor.lo
? mail/message-tag-followup.lo
? mail/default/fr/Makefile
? mail/default/fr/Makefile.in
? mail/default/lt/Makefile
? mail/default/lt/Makefile.in
? plugins/addressbook-file/.deps
? plugins/addressbook-file/.libs
? plugins/addressbook-file/addressbook-file.lo
? plugins/addressbook-file/liborg-gnome-addressbook-file.la
? plugins/addressbook-file/org-gnome-addressbook-file.eplug
? plugins/audio-inline/audio-inline.lo
? plugins/audio-inline/liborg-gnome-audio-inline.la
? plugins/bbdb/.deps
? plugins/bbdb/.libs
? plugins/bbdb/bbdb.lo
? plugins/bbdb/gaimbuddies.lo
? plugins/bbdb/liborg-gnome-evolution-bbdb.la
? plugins/caldav/.deps
? plugins/caldav/.libs
? plugins/caldav/caldav-source.lo
? plugins/caldav/liborg-gnome-evolution-caldav.la
? plugins/calendar-file/calendar-file.lo
? plugins/calendar-file/liborg-gnome-calendar-file.la
? plugins/calendar-http/calendar-http.lo
? plugins/calendar-http/liborg-gnome-calendar-http.la
? plugins/calendar-weather/calendar-weather.lo
? plugins/calendar-weather/liborg-gnome-calendar-weather.la
? plugins/copy-tool/copy-tool.lo
? plugins/copy-tool/liborg-gnome-copy-tool.la
? plugins/default-mailer/.deps
? plugins/default-mailer/.libs
? plugins/default-mailer/default-mailer.lo
? plugins/default-mailer/liborg-gnome-default-mailer.la
? plugins/default-mailer/org-gnome-default-mailer.eplug
? plugins/default-mailer/org-gnome-default-mailer.error
? plugins/default-source/.deps
? plugins/default-source/.libs
? plugins/default-source/default-source.lo
? plugins/default-source/liborg-gnome-default-source.la
? plugins/default-source/org-gnome-default-source.eplug
? plugins/exchange-operations/.deps
? plugins/exchange-operations/.libs
? plugins/exchange-operations/exchange-account-setup.lo
? plugins/exchange-operations/exchange-calendar.lo
? plugins/exchange-operations/exchange-change-password.lo
? plugins/exchange-operations/exchange-config-listener.lo
? plugins/exchange-operations/exchange-contacts.lo
? plugins/exchange-operations/exchange-delegates-user.lo
? plugins/exchange-operations/exchange-delegates.lo
? plugins/exchange-operations/exchange-folder-permission.lo
? plugins/exchange-operations/exchange-folder-size-display.lo
? plugins/exchange-operations/exchange-folder-subscription.lo
? plugins/exchange-operations/exchange-folder.lo
? plugins/exchange-operations/exchange-operations.lo
? plugins/exchange-operations/exchange-permissions-dialog.lo
? plugins/exchange-operations/exchange-user-dialog.lo
? plugins/exchange-operations/liborg-gnome-exchange-operations.la
? plugins/exchange-operations/org-gnome-exchange-operations.eplug
? plugins/exchange-operations/org-gnome-exchange-operations.error
? plugins/folder-unsubscribe/.deps
? plugins/groupwise-account-setup/.deps
? plugins/groupwise-account-setup/.libs
? plugins/groupwise-account-setup/camel-gw-listener.lo
? plugins/groupwise-account-setup/groupwise-account-setup.lo
? plugins/groupwise-account-setup/liborg-gnome-gw-account-setup.la
? plugins/groupwise-features/.deps
? plugins/groupwise-features/.libs
? plugins/groupwise-features/addressbook-groupwise.lo
? plugins/groupwise-features/install-shared.lo
? plugins/groupwise-features/junk-mail-settings.lo
? plugins/groupwise-features/junk-settings.lo
? plugins/groupwise-features/liborg-gnome-groupwise-features.la
? plugins/groupwise-features/mail-send-options.lo
? plugins/groupwise-features/process-meeting.lo
? plugins/groupwise-features/proxy-login.lo
? plugins/groupwise-features/proxy.lo
? plugins/groupwise-features/send-options.lo
? plugins/groupwise-features/share-folder-common.lo
? plugins/groupwise-features/share-folder.lo
? plugins/groupwise-features/status-track.lo
? plugins/hula-account-setup/.deps
? plugins/hula-account-setup/.libs
? plugins/hula-account-setup/camel-hula-listener.lo
? plugins/hula-account-setup/hula-account-setup.lo
? plugins/hula-account-setup/liborg-gnome-evolution-hula-account-setup.la
? plugins/import-ics-attachments/.deps
? plugins/import-ics-attachments/.libs
? plugins/import-ics-attachments/icsimporter.lo
? plugins/import-ics-attachments/liborg-gnome-evolution-mail-attachments-import-ics.la
? plugins/ipod-sync/.deps
? plugins/itip-formatter/itip-formatter.lo
? plugins/itip-formatter/itip-view.lo
? plugins/itip-formatter/liborg-gnome-itip-formatter.la
? plugins/itip-formatter/org-gnome-itip-formatter.error
? plugins/mail-account-disable/.deps
? plugins/mail-account-disable/.libs
? plugins/mail-account-disable/libmail-account-disable.la
? plugins/mail-account-disable/mail-account-disable.lo
? plugins/mail-remote/.deps
? plugins/mail-to-task/liborg-gnome-mail-to-task.la
? plugins/mail-to-task/mail-to-task.lo
? plugins/mailing-list-actions/liborg-gnome-mailing-list-actions.la
? plugins/mailing-list-actions/mailing-list-actions.lo
? plugins/mailing-list-actions/org-gnome-mailing-list-actions.error
? plugins/mark-all-read/.deps
? plugins/mark-all-read/.libs
? plugins/mark-all-read/liborg-gnome-mark-all-read.la
? plugins/mark-all-read/mark-all-read.lo
? plugins/mark-calendar-offline/.deps
? plugins/mark-calendar-offline/.libs
? plugins/mark-calendar-offline/liborg-gnome-mark-calendar-offline.la
? plugins/mark-calendar-offline/mark-calendar-offline.lo
? plugins/mono/.deps
? plugins/new-mail-notify/.deps
? plugins/new-mail-notify/.libs
? plugins/new-mail-notify/liborg-gnome-new-mail-notify.la
? plugins/new-mail-notify/new-mail-notify.lo
? plugins/plugin-manager/liborg-gnome-plugin-manager.la
? plugins/plugin-manager/plugin-manager.lo
? plugins/print-message/.deps
? plugins/print-message/.libs
? plugins/print-message/liborg-gnome-print-message.la
? plugins/print-message/print-message.lo
? plugins/profiler/.deps
? plugins/publish-calendar/.deps
? plugins/publish-calendar/.libs
? plugins/publish-calendar/liborg-gnome-publish-calendar.la
? plugins/publish-calendar/publish-calendar.lo
? plugins/publish-calendar/publish-format-fb.lo
? plugins/publish-calendar/publish-format-ical.lo
? plugins/publish-calendar/publish-location.lo
? plugins/publish-calendar/url-editor-dialog.lo
? plugins/sa-junk-plugin/.deps
? plugins/sa-junk-plugin/.libs
? plugins/sa-junk-plugin/em-junk-filter.lo
? plugins/sa-junk-plugin/liborg-gnome-sa-junk-plugin.la
? plugins/save-calendar/csv-format.lo
? plugins/save-calendar/ical-format.lo
? plugins/save-calendar/liborg-gnome-save-calendar.la
? plugins/save-calendar/rdf-format.lo
? plugins/save-calendar/save-calendar.lo
? plugins/select-one-source/liborg-gnome-select-one-source.la
? plugins/select-one-source/select-one-source.lo
? plugins/startup-wizard/.deps
? plugins/startup-wizard/.libs
? plugins/startup-wizard/liborg-gnome-evolution-startup-wizard.la
? plugins/startup-wizard/startup-wizard.lo
? plugins/subject-thread/liborg-gnome-subject-thread.la
? plugins/subject-thread/subject-thread.lo
? po/.intltool-merge-cache
? po/stamp-it
? shell/.e-shell-window-commands.c.swp
? shell/shell.error
? smime/gui/.deps
? smime/gui/.libs
? smime/gui/ca-trust-dialog.lo
? smime/gui/cert-trust-dialog.lo
? smime/gui/certificate-manager.lo
? smime/gui/certificate-viewer.lo
? smime/gui/component.lo
? smime/gui/e-cert-selector.lo
? smime/gui/libevolution-smime.la
? smime/lib/.deps
? smime/lib/.libs
? smime/lib/e-asn1-object.lo
? smime/lib/e-cert-db.lo
? smime/lib/e-cert-trust.lo
? smime/lib/e-cert.lo
? smime/lib/e-pkcs12.lo
? smime/lib/smime-marshal.lo
? views/memos/Makefile
? views/memos/Makefile.in
? win32/Makefile
? win32/Makefile.in
Index: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in,v
retrieving revision 1.25
diff -u -p -r1.25 GNOME_Evolution_Addressbook.server.in.in
--- addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in 5 Feb 2006 23:46:25 -0000 1.25
+++ addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in 5 Jul 2006 14:15:23 -0000
@@ -44,6 +44,8 @@
_value="Evolution Address Book component"/>
<oaf_attribute name="evolution:component_alias" type="string" value="contacts"/>
+ <oaf_attribute name="evolution:component_file" type="string" value="evolution-addressbook.xml"/>
+
<oaf_attribute name="evolution:menu_label" type="string" _value="C_ontacts"/>
<oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*2"/>
Index: addressbook/gui/component/addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-view.c,v
retrieving revision 1.48
diff -u -p -r1.48 addressbook-view.c
--- addressbook/gui/component/addressbook-view.c 15 Jun 2006 09:59:54 -0000 1.48
+++ addressbook/gui/component/addressbook-view.c 5 Jul 2006 14:15:24 -0000
@@ -47,6 +47,10 @@
#include "misc/e-task-bar.h"
#include "misc/e-info-label.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <libgnome/libgnome.h>
#include "e-util/e-icon-factory.h"
#include "e-util/e-util-private.h"
@@ -622,18 +626,27 @@ static EPixmap pixmaps [] = {
E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "stock_copy", E_ICON_SIZE_MENU),
E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "stock_paste", E_ICON_SIZE_MENU),
E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "stock_delete", E_ICON_SIZE_MENU),
-
- E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendContactToOther", "stock_mail-forward", E_ICON_SIZE_MENU),
+
+ E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendContactToOther", "stock_mail-forward", E_ICON_SIZE_MENU),
E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendMessageToContact", "stock_mail-send", E_ICON_SIZE_MENU),
- E_PIXMAP ("/Toolbar/ContactsPrint", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/ContactDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR),
-
E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU),
E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
E_PIXMAP ("/menu/FolderPlaceholder/Folder/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU),
E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderSave", "stock_save-as", E_ICON_SIZE_MENU),
-
+
+ E_PIXMAP ("/commands/ContactsSendContactToOther", "stock_mail-forward", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ContactsSendMessageToContact", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ContactsCopyToFolder", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ContactsMoveToFolder", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderCreate", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderSave", "stock_save-as", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderDelete", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderRename", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_LARGE_TOOLBAR),
+
E_PIXMAP_END
};
@@ -656,9 +669,8 @@ control_activate (BonoboControl *con
bonobo_ui_component_freeze (uic, NULL);
- xmlfile = g_build_filename (EVOLUTION_UIDIR,
- "evolution-addressbook.xml",
- NULL);
+ xmlfile = e_toolbar_copy_file ("evolution-addressbook.xml");
+
bonobo_ui_util_set_ui (uic, PREFIX,
xmlfile,
"evolution-addressbook", NULL);
Index: calendar/gui/GNOME_Evolution_Calendar.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/GNOME_Evolution_Calendar.server.in.in,v
retrieving revision 1.20
diff -u -p -r1.20 GNOME_Evolution_Calendar.server.in.in
--- calendar/gui/GNOME_Evolution_Calendar.server.in.in 12 Jan 2006 15:08:40 -0000 1.20
+++ calendar/gui/GNOME_Evolution_Calendar.server.in.in 5 Jul 2006 14:15:24 -0000
@@ -40,6 +40,7 @@
</oaf_attribute>
<oaf_attribute name="evolution:component_alias" type="string" value="calendar"/>
+ <oaf_attribute name="evolution:component_file" type="string" value="evolution-calendar.xml"/>
<oaf_attribute name="name" type="string" _value="Evolution's Calendar component"/>
@@ -60,6 +61,7 @@
</oaf_attribute>
<oaf_attribute name="evolution:component_alias" type="string" value="tasks"/>
+ <oaf_attribute name="evolution:component_file" type="string" value="evolution-tasks.xml"/>
<oaf_attribute name="name" type="string" _value="Evolution's Tasks component"/>
@@ -80,6 +82,7 @@
</oaf_attribute>
<oaf_attribute name="evolution:component_alias" type="string" value="memos"/>
+ <oaf_attribute name="evolution:component_file" type="string" value="evolution-memos.xml"/>
<oaf_attribute name="name" type="string" _value="Evolution's Memos component"/>
Index: calendar/gui/calendar-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-commands.c,v
retrieving revision 1.163
diff -u -p -r1.163 calendar-commands.c
--- calendar/gui/calendar-commands.c 30 Jan 2006 04:27:10 -0000 1.163
+++ calendar/gui/calendar-commands.c 5 Jul 2006 14:15:24 -0000
@@ -66,6 +66,7 @@
#include "e-util/e-icon-factory.h"
#include "e-util/e-util-private.h"
#include "e-cal-menu.h"
+#include "e-util/e-util.h"
/* Focusing information for the calendar view. We have to keep track of this
* ourselves because with Bonobo controls, we may get unpaired focus_out events.
@@ -616,13 +617,16 @@ static BonoboUIVerb verbs [] = {
static EPixmap pixmaps [] =
{
- E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/Prev", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/Next", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ShowDayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ShowWorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ShowWeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ShowMonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ShowListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR),
+
+ E_PIXMAP ("/commands/CalendarPrev", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/CalendarNext", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR),
+
+ E_PIXMAP ("/commands/CalendarPurge", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP_END
};
@@ -649,9 +653,8 @@ calendar_control_activate (BonoboControl
bonobo_ui_component_freeze (uic, NULL);
- xmlfile = g_build_filename (EVOLUTION_UIDIR,
- "evolution-calendar.xml",
- NULL);
+ xmlfile = e_toolbar_copy_file ("evolution-calendar.xml");
+
bonobo_ui_util_set_ui (uic, PREFIX,
xmlfile,
"evolution-calendar",
Index: calendar/gui/memos-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/memos-control.c,v
retrieving revision 1.2
diff -u -p -r1.2 memos-control.c
--- calendar/gui/memos-control.c 26 Nov 2005 02:31:50 -0000 1.2
+++ calendar/gui/memos-control.c 5 Jul 2006 14:15:24 -0000
@@ -213,9 +213,8 @@ memos_control_activate (BonoboControl *c
bonobo_ui_component_freeze (uic, NULL);
- xmlfile = g_build_filename (EVOLUTION_UIDIR,
- "evolution-memos.xml",
- NULL);
+ xmlfile = e_toolbar_copy_file ("evolution-memos.xml");
+
bonobo_ui_util_set_ui (uic, PREFIX,
xmlfile,
"evolution-memos",
Index: calendar/gui/tasks-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-control.c,v
retrieving revision 1.87
diff -u -p -r1.87 tasks-control.c
--- calendar/gui/tasks-control.c 26 Apr 2006 09:05:21 -0000 1.87
+++ calendar/gui/tasks-control.c 5 Jul 2006 14:15:24 -0000
@@ -59,6 +59,7 @@
#include "e-cal-menu.h"
#include "e-util/e-menu.h"
#include "itip-utils.h"
+#include "e-util/e-util.h"
#define FIXED_MARGIN .05
@@ -258,6 +259,11 @@ static BonoboUIVerb verbs [] = {
static EPixmap pixmaps [] = {
E_PIXMAP ("/menu/ActionsPlaceholder/Actions/TasksForward", "stock_mail-forward", E_ICON_SIZE_MENU),
+
+ E_PIXMAP ("/commands/TasksMarkComplete", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/TasksForward", "stock_mail-forward", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/TasksPurge", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/TasksAssign", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP_END
};
@@ -285,9 +291,8 @@ tasks_control_activate (BonoboControl *c
bonobo_ui_component_freeze (uic, NULL);
- xmlfile = g_build_filename (EVOLUTION_UIDIR,
- "evolution-tasks.xml",
- NULL);
+ xmlfile = e_toolbar_copy_file ("evolution-tasks.xml");
+
bonobo_ui_util_set_ui (uic, PREFIX,
xmlfile,
"evolution-tasks",
Index: e-util/e-util.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-util.c,v
retrieving revision 1.73
diff -u -p -r1.73 e-util.c
--- e-util/e-util.c 2 Jun 2006 12:46:09 -0000 1.73
+++ e-util/e-util.c 5 Jul 2006 14:15:24 -0000
@@ -605,6 +605,41 @@ e_create_directory (gchar *directory)
}
+const char *
+e_toolbar_copy_file (const char * file)
+{
+ char *home = g_get_home_dir();
+ char *path = g_build_filename (home, ".evolution", "ui", NULL);
+ char *xmlfile, *contents = NULL, *tmp = NULL;
+ int length;
+ GError *err=NULL;
+ xmlfile = g_build_filename (path, file, NULL);
+
+ if (!g_file_test (path, G_FILE_TEST_IS_DIR)) {
+ if (g_mkdir (path, 0777))
+ g_warning ("Directory UI Was not created");
+ }
+
+ tmp = g_build_filename (EVOLUTION_UIDIR, file, NULL);
+
+ if (!g_file_test (xmlfile, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+ if (g_file_get_contents (tmp, &contents, &length, &err)) {
+ if (!g_file_set_contents (xmlfile, contents, length, &err))
+ g_warning ("Cannot set the contents of file %s", file);
+ }
+ else {
+ g_warning ("Cannot copy the file %s", file);
+ }
+
+ }
+
+ g_free(path);
+ g_free(tmp);
+ return(xmlfile);
+}
+
+
+
/* Perform a binary search for key in base which has nmemb elements
of size bytes each. The comparisons are done by (*compare)(). */
void e_bsearch (const void *key,
Index: e-util/e-util.h
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-util.h,v
retrieving revision 1.60
diff -u -p -r1.60 e-util.h
--- e-util/e-util.h 25 May 2006 06:04:46 -0000 1.60
+++ e-util/e-util.h 5 Jul 2006 14:15:24 -0000
@@ -195,6 +195,7 @@ size_t e_utf8_strftime_fix_am_pm (cha
const char *fmt,
const struct tm *tm);
+const char * e_toolbar_copy_file (const char *file);
/* String to/from double conversion functions */
gdouble e_flexible_strtod (const gchar *nptr,
Index: e-util/e-xml-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-xml-utils.c,v
retrieving revision 1.40
diff -u -p -r1.40 e-xml-utils.c
--- e-util/e-xml-utils.c 17 Dec 2005 16:50:36 -0000 1.40
+++ e-util/e-xml-utils.c 5 Jul 2006 14:15:25 -0000
@@ -39,6 +39,7 @@
#include <glib/gstdio.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
+#include <libgnome/libgnome.h>
#include "e-i18n.h"
#include "e-util.h"
@@ -430,5 +431,284 @@ e_xml_get_translated_string_prop_by_name
g_free(combined_name);
return ret_val;
+}
+
+void
+toolbar_xml_parse_file ( const char *path, GList **name, GList **verb)
+{
+ xmlDocPtr doc = NULL;
+ xmlNodePtr root, scan, cur, iter;
+ char *tmp = NULL, *tmp1 = NULL, *status = NULL;
+
+ doc = e_xml_parse_file (path);
+ if (doc == NULL) {
+ g_warning("Error: file '%s' not found", path);
+ return;
+ }
+
+ root = xmlDocGetRootElement (doc);
+ if (root == NULL
+ || strcmp (root->name, "Root") != 0 ) {
+ g_warning ("Error: file '%s' Invalid format", path);
+ xmlFreeDoc (doc);
+ return;
+ }
+
+ cur = root->children;
+
+ for (scan = cur->next->children; scan; scan = scan->next) {
+ if (!strcmp (scan->name, "cmd")) {
+ status = xmlGetProp (scan, "ignore");
+ if ((status != NULL) && (!strcmp (status, "yes"))) {
+ continue;
+ }
+
+ tmp = xmlGetProp (scan, "_label");
+ if (tmp == NULL)
+ continue;
+ else {
+ *name = g_list_append ( *name, tmp);
+
+ tmp1 = xmlGetProp (scan, "name");
+ *verb = g_list_append ( *verb, tmp1);
+ }
+ }
+ if (!strcmp (scan->name, "placeholder")) {
+ for (iter = scan->children; iter; iter = iter->next) {
+ if (!strcmp (iter->name, "cmd")) {
+ tmp = xmlGetProp (iter, "_label");
+ if(tmp == NULL)
+ continue;
+ else {
+ *name = g_list_append ( *name, tmp);
+
+ tmp1 = xmlGetProp (iter, "name");
+ *verb = g_list_append ( *verb, tmp1);
+ }
+ }
+ }
+ }
+ }
+
+ xmlFreeDoc (doc);
+}
+
+
+
+
+void
+get_placeholders (const char *path, GList **verb, GList **place)
+{
+ xmlDocPtr doc = NULL;
+ xmlNodePtr root, scan, cur, iter;
+ char *tmp = NULL, *tmp1 = NULL, *status = NULL;
+
+ doc = e_xml_parse_file (path);
+ if (doc == NULL) {
+ g_warning("Error: file '%s' not found", path);
+ return;
+ }
+
+ root = xmlDocGetRootElement (doc);
+ if (root == NULL
+ || strcmp (root->name, "Root") != 0 ) {
+ g_warning ("Error: file '%s' Invalid format", path);
+ xmlFreeDoc (doc);
+ return;
+ }
+
+ cur = root->children;
+
+ for (scan = cur->next->children; scan; scan = scan->next) {
+ if (!strcmp (scan->name, "cmd")) {
+ status = xmlGetProp (scan, "ignore");
+ if ((status != NULL) && (!strcmp (status, "yes"))) {
+ continue;
+ }
+ tmp = xmlGetProp (scan, "name");
+ if (tmp == NULL)
+ continue;
+ else {
+ *verb = g_list_append ( *verb, tmp);
+
+ tmp1 = xmlGetProp (scan, "placeholder");
+ *place = g_list_append ( *place, tmp1);
+ }
+ }
+ }
+
+ xmlFreeDoc (doc);
+}
+
+void
+toolbar_get_active_items ( const char *path, GList **active)
+{
+ xmlDocPtr doc = NULL;
+ xmlNodePtr root, scan, cur, iter;
+ char *tmp = NULL;
+
+ doc = e_xml_parse_file (path);
+ if (doc == NULL) {
+ g_warning ("Error: file '%s' not found", path);
+ return;
+ }
+
+ root = xmlDocGetRootElement (doc);
+ if (root == NULL
+ || strcmp (root->name, "Root") != 0 ) {
+ g_warning ("Error: file '%s' Invalid format", path);
+ xmlFreeDoc (doc);
+ return;
+ }
+ cur = root->children;
+
+ for (; cur; cur=cur->next) {
+ if (!strcmp (cur->name, "dockitem"))
+ break;
+ }
+ if (cur!=NULL) {
+ for (scan = cur->children; scan; scan = scan->next) {
+ if (!strcmp (scan->name, "toolitem")) {
+ tmp = xmlGetProp (scan, "verb");
+ if (tmp == NULL)
+ continue;
+ else {
+ *active = g_list_append ( *active, tmp);
+ }
+ }
+ if (!strcmp (scan->name, "placeholder")) {
+ for (iter = scan->children; iter; iter = iter->next) {
+ if (!strcmp (iter->name, "toolitem")) {
+ tmp = xmlGetProp(iter, "verb");
+ if (tmp == NULL)
+ continue;
+ else {
+ *active = g_list_append ( *active, tmp);
+ }
+
+ }
+ }
+ }
+ }
+ }
+ xmlFreeDoc (doc);
+}
+
+
+void
+toolbar_xml_save_file (GList * modify, const char * file)
+{
+ xmlDoc *doc;
+ xmlNode *root, *child, *gchild, *ggchild;
+ xmlDocPtr source = NULL;
+ xmlNodePtr scan = NULL, cur = NULL, temp = NULL, trav = NULL;
+
+ int i, len, j, index, next_index;
+
+ char *filename = NULL, *str = NULL, *tmp = NULL, *next_place = NULL, *cur_place = NULL;
+ char *home = g_get_home_dir();
+ char *user_path = g_build_filename (home, ".evolution", "ui", NULL);
+
+ char **xml_files;
+
+ xml_files = g_strsplit (file, ",", 0);
+ for (i = 0; xml_files[i] != NULL; i++) {
+ GList *verb = NULL, *place = NULL, *ind = NULL, *next_ind = NULL;
+ char * source_filename = NULL;
+
+ source_filename = g_build_filename (user_path, xml_files[i], NULL);
+ get_placeholders (source_filename, &verb, &place);
+
+ source = e_xml_parse_file (source_filename);
+ if (source == NULL) {
+ g_warning ("Error: file '%s' not found",source_filename);
+ return;
+ }
+
+ temp = xmlDocGetRootElement (source);
+
+ doc = xmlNewDoc ("1.0");
+ root = xmlNewNode (NULL, "Root");
+ xmlDocSetRootElement (doc, root);
+
+ for ( cur = temp->children; cur != NULL; cur = cur->next)
+ {
+
+ if (!strcmp (cur->name, "text"))
+ continue;
+ else if (!strcmp (cur->name, "dockitem")) {
+ child = xmlNewChild (root, NULL, "dockitem", NULL);
+ e_xml_set_string_prop_by_name (child, "name", "Toolbar");
+
+ for (trav = cur->children; trav; trav = trav->next) {
+ if (g_str_equal (trav->name, "placeholder") && xmlGetLastChild (trav) == NULL) {
+ scan = xmlCopyNode (trav , 1);
+ if ( scan != NULL)
+ scan = xmlAddChild (child,scan);
+ }
+ }
+
+ len = g_list_length (modify);
+ for (j=0 ; j<len ; j++) {
+ str = g_list_nth_data (modify, j);
+ ind = NULL;
+ if ((ind = g_list_find_custom (verb, str, (GCompareFunc *)strcmp))!= NULL) {
+ index = g_list_position ( verb, ind);
+ cur_place = g_list_nth_data (place, index);
+ if ( cur_place != NULL) {
+
+ gchild = xmlNewChild (child, NULL, "placeholder", NULL);
+ e_xml_set_string_prop_by_name (gchild, "name", cur_place);
+ do {
+ ggchild = xmlNewChild (gchild, NULL, "toolitem", NULL);
+ e_xml_set_string_prop_by_name (ggchild, "verb", str);
+ j++;
+ if( j == len )
+ break;
+ str=g_list_nth_data (modify, j);
+ if ((next_ind = g_list_find_custom (verb, str, (GCompareFunc *)strcmp))!= NULL) {
+ next_index = g_list_position (verb, next_ind);
+ next_place = g_list_nth_data (place, next_index);
+ }
+ } while (next_place != NULL && !strcmp (next_place, cur_place));
+ j--;
+
+ } else {
+
+ gchild = xmlNewChild (child, NULL, "toolitem", NULL);
+ e_xml_set_string_prop_by_name (gchild, "verb", str);
+ }
+ }
+ }
+ }
+ else {
+ scan = xmlCopyNode (cur , 1);
+ if ( scan != NULL)
+ scan = xmlAddChild (root,scan);
+ }
+ }
+
+ filename = g_concat_dir_and_file (user_path,"save.xml");
+ if (e_xml_save_file (filename, doc) == -1)
+ g_warning ("Unable to save view to %s", filename);
+
+ xmlFreeDoc(doc);
+ xmlFreeDoc(source);
+
+ if (g_remove (source_filename))
+ g_print ("\nError In Removing File");
+ else if (g_rename (filename, source_filename))
+ g_print ("\nERROR In renaming The file");
+
+ g_free (source_filename);
+ g_free (filename);
+ if (verb != NULL)
+ g_list_foreach (verb, (GFunc *)g_free, NULL);
+ if (place != NULL)
+ g_list_foreach (place, (GFunc *)g_free, NULL);
+ }
+
+ g_free (user_path);
+
}
Index: mail/GNOME_Evolution_Mail.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/mail/GNOME_Evolution_Mail.server.in.in,v
retrieving revision 1.28
diff -u -p -r1.28 GNOME_Evolution_Mail.server.in.in
--- mail/GNOME_Evolution_Mail.server.in.in 12 Jan 2006 15:03:03 -0000 1.28
+++ mail/GNOME_Evolution_Mail.server.in.in 5 Jul 2006 14:15:25 -0000
@@ -28,6 +28,8 @@
<oaf_attribute name="name" type="string" _value="Evolution Mail component"/>
<oaf_attribute name="evolution:component_alias" type="string" value="mail"/>
+ <oaf_attribute name="evolution:component_file" type="string" value="evolution-mail-global.xml,evolution-mail-list.xml,evolution-mail-messagedisplay.xml,evolution-mail-message.xml"/>
+
<oaf_attribute name="evolution:menu_label" type="string" _value="_Mail"/>
<oaf_attribute name="evolution:menu_accelerator" type="string" value="*Control*1"/>
Index: mail/em-filter-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-filter-editor.c,v
retrieving revision 1.3
diff -u -p -r1.3 em-filter-editor.c
--- mail/em-filter-editor.c 18 Dec 2005 04:45:01 -0000 1.3
+++ mail/em-filter-editor.c 5 Jul 2006 14:15:25 -0000
@@ -108,7 +108,7 @@ em_filter_editor_new (EMFilterContext *f
EMFilterEditor *fe = (EMFilterEditor *) g_object_new (em_filter_editor_get_type(), NULL);
GladeXML *gui;
char *gladefile;
-
+
gladefile = g_build_filename (EVOLUTION_GLADEDIR,
"filter.glade",
NULL);
Index: mail/em-folder-browser.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-browser.c,v
retrieving revision 1.78
diff -u -p -r1.78 em-folder-browser.c
--- mail/em-folder-browser.c 21 Jun 2006 04:47:42 -0000 1.78
+++ mail/em-folder-browser.c 5 Jul 2006 14:15:25 -0000
@@ -78,6 +78,7 @@
#include "e-util/e-dialog-utils.h"
#include "e-util/e-error.h"
#include "e-util/e-util-private.h"
+#include "e-util/e-util.h"
#include "em-utils.h"
#include "em-composer-utils.h"
#include "em-format-html-display.h"
@@ -205,17 +206,11 @@ emfb_init(GObject *o)
g_slist_free(emfb->view.ui_files);
emfb->view.ui_files = g_slist_append(NULL,
- g_build_filename (EVOLUTION_UIDIR,
- "evolution-mail-global.xml",
- NULL));
+ e_toolbar_copy_file ("evolution-mail-global.xml"));
emfb->view.ui_files = g_slist_append(emfb->view.ui_files,
- g_build_filename (EVOLUTION_UIDIR,
- "evolution-mail-list.xml",
- NULL));
+ e_toolbar_copy_file ("evolution-mail-list.xml"));
emfb->view.ui_files = g_slist_append(emfb->view.ui_files,
- g_build_filename (EVOLUTION_UIDIR,
- "evolution-mail-message.xml",
- NULL));
+ e_toolbar_copy_file ("evolution-mail-message.xml"));
emfb->view.enable_map = g_slist_prepend(emfb->view.enable_map, (void *)emfb_enable_map);
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.152
diff -u -p -r1.152 em-folder-view.c
--- mail/em-folder-view.c 2 Jun 2006 19:30:10 -0000 1.152
+++ mail/em-folder-view.c 5 Jul 2006 14:15:25 -0000
@@ -1796,18 +1796,47 @@ static EPixmap emfv_message_pixmaps[] =
E_PIXMAP ("/commands/ViewLoadImages", "stock_insert_image", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/MailCompose", "stock_mail-compose", E_ICON_SIZE_MENU),
- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "stock_mail-forward", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "stock_mail-move", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "stock_mail-copy", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "stock_spam", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "stock_not-spam", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageForward", "stock_mail-forward", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/PrintMessage", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/command/MessageCopy", "stock_mail-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageMarkAsJunk", "stock_spam", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageMarkAsNotJunk", "stock_not-spam", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MailNext", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MailPrevious", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR),
+
+ E_PIXMAP ("/commands/AddSenderToAddressbook", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MailNextFlagged", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MailNextUnread", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MailNextThread", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MailPreviousFlagged", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MailPreviousUnread", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageMarkAsImportant", "stock_mail-priority-high", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageMarkAsUnimportant", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+
+ E_PIXMAP ("/commands/MailPost", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessagePostReply", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageRedirect", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/MessageReplyList", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/PrintSetup", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+
+ E_PIXMAP ("/commands/EmptyTrash", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderCreate", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ToolsFilters", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ToolsSubscriptions", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ViewPreview", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+
+ E_PIXMAP ("/commands/EditSelectThread", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/FolderExpunge", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/HideDeleted", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/commands/ViewThreaded", "stock_unknown", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP_END
};
Index: mail/em-message-browser.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-message-browser.c,v
retrieving revision 1.24
diff -u -p -r1.24 em-message-browser.c
--- mail/em-message-browser.c 23 Jan 2006 08:18:09 -0000 1.24
+++ mail/em-message-browser.c 5 Jul 2006 14:15:25 -0000
@@ -51,6 +51,7 @@
#include <bonobo/bonobo-ui-util.h>
#include "e-util/e-util-private.h"
+#include "e-util/e-util.h"
#include "em-format-html-display.h"
#include "em-message-browser.h"
@@ -92,13 +93,9 @@ emmb_init(GObject *o)
g_slist_free(emmb->view.ui_files);
emmb->view.ui_files = g_slist_append(NULL,
- g_build_filename (EVOLUTION_UIDIR,
- "evolution-mail-messagedisplay.xml",
- NULL));
+ e_toolbar_copy_file ("evolution-mail-messagedisplay.xml"));
emmb->view.ui_files = g_slist_append(emmb->view.ui_files,
- g_build_filename (EVOLUTION_UIDIR,
- "evolution-mail-message.xml",
- NULL));
+ e_toolbar_copy_file ("evolution-mail-message.xml"));
/* currently: just use a scrolledwindow for preview widget */
p->preview = gtk_scrolled_window_new(NULL, NULL);
Index: shell/e-component-registry.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-component-registry.c,v
retrieving revision 1.58
diff -u -p -r1.58 e-component-registry.c
--- shell/e-component-registry.c 2 Jun 2006 17:32:19 -0000 1.58
+++ shell/e-component-registry.c 5 Jul 2006 14:15:26 -0000
@@ -50,6 +50,7 @@ static EComponentInfo *
component_info_new (const char *id,
GNOME_Evolution_Component iface,
const char *alias,
+ const char *file,
const char *button_label,
const char *button_tooltips,
const char *menu_label,
@@ -63,6 +64,7 @@ component_info_new (const char *id,
info->id = g_strdup (id);
info->iface = bonobo_object_dup_ref(iface, NULL);
info->alias = g_strdup (alias);
+ info->file = g_strdup (file);
info->button_label = g_strdup (button_label);
info->button_tooltips = g_strdup (button_tooltips);
info->menu_label = g_strdup (menu_label);
@@ -180,6 +182,7 @@ query_components (EComponentRegistry *re
const char *menu_label;
const char *menu_accelerator;
const char *alias;
+ const char *file;
const char *icon_name;
const char *sort_order_string;
const char *tooltips;
@@ -210,6 +213,8 @@ query_components (EComponentRegistry *re
alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL);
+ file = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_file", NULL);
+
icon_name = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_icon", NULL);
if (icon_name) {
icon = e_icon_factory_get_icon (icon_name, E_ICON_SIZE_LARGE_TOOLBAR);
@@ -223,7 +228,7 @@ query_components (EComponentRegistry *re
else
sort_order = atoi (sort_order_string);
- info = component_info_new (id, iface, alias, label, tooltips, menu_label,
+ info = component_info_new (id, iface, alias, file, label, tooltips, menu_label,
menu_accelerator, sort_order, icon, menuicon);
set_schemas (info, & info_list->_buffer [i]);
Index: shell/e-component-registry.h
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-component-registry.h,v
retrieving revision 1.17
diff -u -p -r1.17 e-component-registry.h
--- shell/e-component-registry.h 16 May 2005 04:46:40 -0000 1.17
+++ shell/e-component-registry.h 5 Jul 2006 14:15:26 -0000
@@ -67,6 +67,7 @@ struct _EComponentInfo {
char *id;
char *alias;
+ char *file;
/* NULL if not activated. */
GNOME_Evolution_Component iface;
@@ -77,7 +78,7 @@ struct _EComponentInfo {
char *menu_label;
char *menu_accelerator;
GdkPixbuf *menu_icon;
-
+
int sort_order;
/* List of URI schemas that this component supports. */
Index: shell/e-shell-window-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window-commands.c,v
retrieving revision 1.50
diff -u -p -r1.50 e-shell-window-commands.c
--- shell/e-shell-window-commands.c 24 Apr 2006 11:00:52 -0000 1.50
+++ shell/e-shell-window-commands.c 5 Jul 2006 14:15:26 -0000
@@ -30,11 +30,15 @@
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-url.h>
+#include <libgnome/libgnome.h>
+
#include <libgnomeui/gnome-about.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
#include <libgnomevfs/gnome-vfs-utils.h>
+#include <libxml/parser.h>
+
#include <bonobo/bonobo-ui-component.h>
@@ -42,6 +46,9 @@
#include <gconf/gconf-client.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
#include "e-util/e-icon-factory.h"
#include "e-util/e-dialog-utils.h"
#include "e-util/e-error.h"
@@ -53,6 +60,18 @@
#include "e-shell-importer.h"
+
+enum {
+
+TB_NAME = 0,
+TB_VERB,
+TB_ENABLED_COLUMN,
+TB_N_COLUMN
+
+};
+
+
+
/* Utility functions. */
static void
@@ -605,6 +624,225 @@ command_about_box (BonoboUIComponent *ui
gtk_widget_show (about_box_window);
}
+
+static void
+list_enable_toggled (GtkCellRendererToggle *renderer,
+ const char *path_string,
+ GtkWidget *view)
+{
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ gboolean bool;
+
+ path = gtk_tree_path_new_from_string (path_string);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+
+ if (gtk_tree_model_get_iter (model, &iter, path)) {
+ gtk_tree_model_get (model, &iter, TB_ENABLED_COLUMN, &bool , -1);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, TB_ENABLED_COLUMN,!bool , -1);
+ }
+
+ gtk_tree_path_free (path);
+}
+
+static int
+custom_toolbar_dialog_key_pressed (GtkWidget *dialog, GdkEventKey *event, void *user_data)
+{
+ if (event->keyval == GDK_Escape) {
+ gtk_widget_destroy (dialog);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static void
+custom_toolbar (BonoboUIComponent *uih,
+ EShellWindow *window,
+ const char *path)
+{
+ GtkCellRenderer *renderer;
+ GtkTreeModel *model;
+ GtkWidget *view, *scrolled;
+ GtkListStore *store;
+ GtkTreeIter iter;
+ GtkDialog *dialog;
+ GtkTreeSelection *selection;
+ GList *cols, *l, *name = NULL, *active = NULL, *selected = NULL, *verb = NULL;
+ char *str = NULL, *str1 = NULL, *component = NULL, *file = NULL;
+ int response, i, len;
+ char **xml_files;
+
+ char *home = g_get_home_dir();
+ char *user_path = g_build_filename (home, ".evolution", "ui", NULL);
+
+ component = e_shell_window_peek_current_component_alias(window);
+ EComponentRegistry *registry = e_shell_peek_component_registry (e_shell_window_peek_shell (window));
+ EComponentInfo *info = e_component_registry_peek_info (registry,
+ ECR_FIELD_ALIAS,
+ component);
+
+ file = g_strdup (info->file);
+ xml_files = g_strsplit (file, ",", 0);
+
+ dialog = (GtkDialog *)gtk_dialog_new();
+ gtk_dialog_set_has_separator(dialog, TRUE);
+ g_signal_connect ((GtkWidget *)dialog, "key-press-event" , G_CALLBACK (custom_toolbar_dialog_key_pressed), NULL);
+
+ gtk_widget_ensure_style ((GtkWidget *)dialog);
+ gtk_container_set_border_width ((GtkContainer *)(dialog->vbox), 0);
+ gtk_container_set_border_width ((GtkContainer *)(dialog->action_area), 12);
+
+ gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (dialog, GTK_STOCK_OK, GTK_RESPONSE_OK);
+ gtk_window_set_title ((GtkWindow *)dialog, "Customize Toolbar..." );
+ gtk_window_set_default_size ((GtkWindow *) dialog, 300, 500);
+
+ scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN);
+
+ view = gtk_tree_view_new ();
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
+ -1,
+ _("Name"),
+ renderer,
+ "text", TB_NAME,
+ NULL);
+ g_object_set_data ((GObject *) scrolled, "renderer", renderer);
+
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
+ -1,
+ "Verb",
+ renderer,
+ "text", TB_VERB,
+ NULL);
+ g_object_set_data ((GObject *) scrolled, "renderer", renderer);
+
+ renderer = gtk_cell_renderer_toggle_new ();
+ g_object_set (G_OBJECT (renderer), "activatable", TRUE, NULL);
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
+ -1,
+ _("Enabled"),
+ renderer,
+ "active", TB_ENABLED_COLUMN ,
+ NULL);
+ g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (list_enable_toggled), view);
+
+ for (i = 0; xml_files[i] != NULL; i++) {
+ char *parse_filename = NULL;
+
+ e_toolbar_copy_file (xml_files[i]);
+ parse_filename = g_build_filename (user_path, xml_files[i], NULL);
+ toolbar_xml_parse_file (parse_filename, &name, &verb);
+ toolbar_get_active_items (parse_filename, &active);
+
+ g_free(parse_filename);
+ }
+
+ store = gtk_list_store_new (TB_N_COLUMN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+
+ len=g_list_length(name);
+ for (i=0 ; i<len ; i++){
+ str = g_list_nth_data (name , i);
+ str1 = g_list_nth_data (verb, i);
+ gtk_list_store_append (store, &iter);
+ if (g_list_find_custom (active, str1, (GCompareFunc *)strcmp)!= NULL) {
+ gtk_list_store_set (store, &iter,
+ TB_NAME, str,
+ TB_VERB, str1,
+ TB_ENABLED_COLUMN, TRUE,
+ -1);
+ }
+ else {
+ gtk_list_store_set (store, &iter,
+ TB_NAME, str,
+ TB_VERB,str1,
+ TB_ENABLED_COLUMN, FALSE,
+ -1);
+ }
+ }
+
+ cols = gtk_tree_view_get_columns (GTK_TREE_VIEW (view));
+ for (l = cols; l; l = l->next) {
+ GtkTreeViewColumn *col = (GtkTreeViewColumn *) l->data;
+ if(strcmp (gtk_tree_view_column_get_title (col), "Name") == 0) {
+ gtk_tree_view_column_set_fixed_width (col, 200);
+ }
+ if (strcmp (gtk_tree_view_column_get_title (col), "Verb") == 0) {
+ gtk_tree_view_column_set_visible (col, FALSE);
+ break;
+ }
+ }
+
+ model= GTK_TREE_MODEL(store);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (view),model);
+ g_object_unref (model);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
+ gtk_container_add (GTK_CONTAINER (scrolled), view);
+ g_object_set_data ((GObject *) scrolled, "view", view);
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), scrolled);
+
+ gtk_widget_show_all ((GtkWidget *)dialog);
+ response = gtk_dialog_run(dialog);
+
+ if (response == GTK_RESPONSE_OK)
+ {
+ int valid;
+ valid = gtk_tree_model_get_iter_first (store, &iter);
+
+ while (valid)
+ {
+ gchar *str_data;
+ gboolean bool_data;
+
+ gtk_tree_model_get (store, &iter,
+ TB_VERB, &str_data,
+ TB_ENABLED_COLUMN, &bool_data,
+ -1);
+ if (bool_data)
+ selected = g_list_append ( selected, str_data);
+
+ valid = gtk_tree_model_iter_next (store, &iter);
+ }
+
+ toolbar_xml_save_file (selected, file);
+ gtk_widget_destroy ((GtkWidget *)dialog);
+ }
+ else if (response == GTK_RESPONSE_CANCEL) {
+ gtk_widget_destroy ((GtkWidget *)dialog);
+ }
+
+
+ g_free(file);
+ g_strfreev(xml_files);
+ g_free(user_path);
+ g_list_foreach (name, (GFunc *)g_free, NULL);
+ g_list_foreach (active, (GFunc *)g_free, NULL);
+ g_list_foreach (selected, (GFunc *)g_free, NULL);
+ g_list_foreach (verb, (GFunc *)g_free, NULL);
+}
+
+static void
+custom_shortcuts (BonoboUIComponent *uih, void *user_data, const char *path)
+{
+ printf("Custom Shortcuts is Selected");
+}
+
+
+
+
+
+
#if 0
/* Unused */
static void
@@ -748,6 +986,9 @@ static BonoboUIVerb new_verbs [] = {
static BonoboUIVerb actions_verbs[] = {
BONOBO_UI_VERB ("SendReceive", (BonoboUIVerbFn) command_send_receive),
BONOBO_UI_VERB ("ForgetPasswords", command_forget_passwords),
+ BONOBO_UI_VERB ("CustomToolbar", custom_toolbar),
+ BONOBO_UI_VERB ("CustomShortcuts", custom_shortcuts),
+
BONOBO_UI_VERB_END
};
Index: shell/e-shell-window.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window.c,v
retrieving revision 1.49
diff -u -p -r1.49 e-shell-window.c
--- shell/e-shell-window.c 28 Apr 2006 11:19:51 -0000 1.49
+++ shell/e-shell-window.c 5 Jul 2006 14:15:26 -0000
@@ -54,6 +54,8 @@
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-gconf.h>
+#include <e-util/e-util.h>
+
#include <gconf/gconf-client.h>
#include <string.h>
@@ -1009,7 +1011,7 @@ e_shell_window_new (EShell *shell,
bonobo_object_corba_objref (BONOBO_OBJECT (ui_container)),
NULL);
- xmlfile = g_build_filename (EVOLUTION_UIDIR, "evolution.xml", NULL);
+ xmlfile = e_toolbar_copy_file ("evolution.xml");
bonobo_ui_util_set_ui (priv->ui_component,
PREFIX,
xmlfile,
@@ -1098,6 +1100,16 @@ e_shell_window_peek_current_component_id
return window->priv->current_view->component_id;
}
+const char *
+e_shell_window_peek_current_component_alias (EShellWindow *window)
+{
+ g_return_val_if_fail (E_IS_SHELL_WINDOW (window), NULL);
+
+ if (window->priv->current_view == NULL)
+ return NULL;
+
+ return window->priv->current_view->component_alias;
+}
EShell *
e_shell_window_peek_shell (EShellWindow *window)
Index: shell/e-shell-window.h
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window.h,v
retrieving revision 1.11
diff -u -p -r1.11 e-shell-window.h
--- shell/e-shell-window.h 21 Dec 2005 07:18:49 -0000 1.11
+++ shell/e-shell-window.h 5 Jul 2006 14:15:26 -0000
@@ -63,6 +63,9 @@ void e_shell_window_switch_to_com
const char *component_id);
const char *e_shell_window_peek_current_component_id (EShellWindow *shell);
+const char *e_shell_window_peek_current_component_alias (EShellWindow *shell);
+
+
EShell *e_shell_window_peek_shell (EShellWindow *window);
BonoboUIComponent *e_shell_window_peek_bonobo_ui_component (EShellWindow *window);
ESidebar *e_shell_window_peek_sidebar (EShellWindow *window);
Index: ui/evolution-addressbook.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-addressbook.xml,v
retrieving revision 1.74
diff -u -p -r1.74 evolution-addressbook.xml
--- ui/evolution-addressbook.xml 26 Apr 2006 08:57:47 -0000 1.74
+++ ui/evolution-addressbook.xml 5 Jul 2006 14:15:26 -0000
@@ -2,24 +2,29 @@
<commands>
<cmd name="ContactDelete"
_tip="Delete selected contacts"
+ _label="Delete"
pixtype="stock" pixname="gtk-delete"
accel="*Control*d"/>
<cmd name="ContactsPrint"
_tip="Print selected contacts"
+ _label="Print"
pixtype="stock" pixname="gtk-print"
accel="*Control*p"/>
<cmd name="ContactsPrintPreview"
_tip="Previews the contacts to be printed"
+ _label="Print Preview"
pixtype="stock" pixname="gtk-print-preview"/>
<cmd name="ContactsView"
_tip="View the current contact"
- accel="*Control*o"/>
+ _label="Contacts View"
+ accel="*Control*o" ignore="yes"/>
<cmd name="ContactStop"
_tip="Stop Loading"
+ _label="Stop"
pixtype="stock" pixname="gtk-stop"/>
<cmd name="ContactsCut" _label="Cut" _tip="Cut the selection"
@@ -38,55 +43,60 @@
<cmd name="ContactsSelectAll" _label="Select All"
_tip="Select all contacts"
- accel="*Control*a"/>
+ accel="*Control*a" ignore="yes"/>
- <cmd name="ContactsSaveAsVCard" _label="Save as VCard..."
+ <cmd name="ContactsSaveAsVCard" _label="Save Contact as VCard"
_tip="Save selected contacts as a VCard."
pixtype="stock" pixname="gtk-save-as"
accel="*Control*s"/>
<cmd name="ContactsSendContactToOther" _label="Forward Contact"
- _tip="Send selected contacts to another person."/>
+ _tip="Send selected contacts to another person."
+ pixtype="pixbuf"/>
+
<cmd name="ContactsSendMessageToContact" _label="Send message to contact"
- _tip="Send a message to the selected contacts."/>
+ _tip="Send a message to the selected contacts."
+ pixtype="pixbuf"/>
+
- <cmd name="ContactsCopyToFolder" _label="Copy to Folder..."
+ <cmd name="ContactsCopyToFolder" _label="Copy Contact to"
_tip="Copy Selected Contacts to Another Folder..."
- accel="*Control**Shift*y"/>
+ accel="*Control**Shift*y" pixtype="pixbuf"/>
- <cmd name="ContactsMoveToFolder" _label="Move to Folder..."
+ <cmd name="ContactsMoveToFolder" _label="Move Contact to"
_tip="Move Selected Contacts to Another Folder..."
- accel="*Control**Shift*v"/>
+ accel="*Control**Shift*v" pixtype="pixbuf"/>
- <cmd name="ContactsViewPreview" _label="Contact _Preview"
+ <cmd name="ContactsViewPreview" _label="Contact Preview"
_tip="Show contact preview window"
accel="*Control*m"
- type="toggle"/>
+ type="toggle" ignore="yes"/>
- <cmd name="FolderCreate" _label="_New"
+ <cmd name="FolderCreate" _label="New Addressbook"
_tip="Create a new addressbook folder"
pixtype="pixbuf"/>
- <cmd name="FolderCopy" _label="_Copy Folder Contacts To"
+ <cmd name="FolderCopy" _label="Copy All Contacts To"
_tip="Copy the contacts of the selected folder into another folder"
pixtype="pixbuf"/>
- <cmd name="FolderMove" _label="_Move Folder Contacts To"
+ <cmd name="FolderMove" _label="Move All Contacts To"
_tip="Move the contacts of the selected folder into another folder"
pixtype="pixbuf"/>
- <cmd name="FolderSave" _label="_Save Folder Contacts As VCard"
+ <cmd name="FolderSave" _label="Save Address Book As VCard"
_tip="Save the contacts of the selected folder as VCard"
pixtype="pixbuf"/>
- <cmd name="FolderDelete" _label="_Delete"
+ <cmd name="FolderDelete" _label="Delete AddressBook"
_tip="Delete the selected folder"
pixtype="pixbuf"/>
- <cmd name="FolderRename" _label="_Rename"
+ <cmd name="FolderRename" _label="Rename"
_tip="Rename the selected folder"
pixtype="pixbuf"/>
- <cmd name="ChangeFolderProperties" _label="_Properties"
+ <cmd name="ChangeFolderProperties" _label="Properties"
_tip="Change the properties of the selected folder"
pixtype="pixbuf"/>
+
</commands>
<menu>
@@ -103,7 +113,7 @@
<placeholder name="Print">
<menuitem name="ContactsPrintPreview" verb=""
_label="Print Pre_view"/>
- <menuitem name="ContactsPrint" verb=""
+ <menuitem name="ContactsPrint" verb="ContactsPrint"
_label="_Print..."/>
</placeholder>
@@ -130,7 +140,8 @@
<menuitem name="ContactDelete" verb="" _label="_Delete Contact"/>
<menuitem name="FolderDelete" verb="" _label="Del_ete Address Book" pixtype="stock" pixname="gtk-delete"/>
- </placeholder>
+
+ </placeholder>
</submenu>
<placeholder name="FolderPlaceholder">
@@ -166,13 +177,13 @@
</menu>
<dockitem name="Toolbar">
- <toolitem name="ContactsPrint" verb=""
+ <toolitem name="ContactsPrint" verb="ContactsPrint"
_label="Print"/>
- <toolitem name="ContactDelete" verb=""
+ <toolitem name="ContactDelete" verb="ContactDelete"
_label="Delete"/>
- <toolitem name="ContactStop" verb=""
+ <toolitem name="ContactStop" verb="ContactStop"
_label="Stop"/>
</dockitem>
Index: ui/evolution-calendar.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-calendar.xml,v
retrieving revision 1.75
diff -u -p -r1.75 evolution-calendar.xml
--- ui/evolution-calendar.xml 13 Feb 2006 00:09:49 -0000 1.75
+++ ui/evolution-calendar.xml 5 Jul 2006 14:15:27 -0000
@@ -1,30 +1,30 @@
<Root>
- <commands>
- <cmd name="EventOpen" _tip="View the current appointment" accel="*Control*o"/>
- <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="stock" pixname="gtk-print"
- accel="*Control*p"/>
- <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="stock" pixname="gtk-print-preview"/>
-
- <cmd name="CalendarPrev" _tip="Go back" pixtype="pixbuf"/>
- <cmd name="CalendarToday" _tip="Select today" pixtype="stock" pixname="Home"/>
- <cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/>
- <cmd name="CalendarGoto" _tip="Select a specific date" pixtype="stock" pixname="gtk-jump-to"/>
-
- <cmd name="ShowDayView" _tip="Show one day" pixtype="pixbuf"/>
- <cmd name="ShowWorkWeekView" _tip="Show the working week" pixtype="pixbuf"/>
- <cmd name="ShowWeekView" _tip="Show one week" pixtype="pixbuf"/>
- <cmd name="ShowMonthView" _tip="Show one month" pixtype="pixbuf"/>
- <cmd name="ShowListView" _tip="Show as list" pixtype="pixbuf"/>
-
- <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
- <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
- <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
-
- <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="stock" pixname="gtk-delete"/>
- <cmd name="DeleteOccurrence" _tip="Delete this occurrence" pixtype="stock" pixname="gtk-delete"/>
- <cmd name="DeleteAllOccurrences" _tip="Delete all occurrences" pixtype="stock" pixname="gtk-delete"/>
-
- <cmd name="CalendarPurge" _label="Purg_e" _tip="Purge old appointments and meetings" accel="*Control*e"/>
+ <commands>
+ <cmd name="EventOpen" _tip="View the current appointment" accel="*Control*o" _label="Open" ignore="yes"/>
+ <cmd name="CalendarPrint" _tip="Print this calendar" _label="Print" pixtype="stock" pixname="gtk-print" accel="*Control*p"/>
+ <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="stock" pixname="gtk-delete" _label="Delete"/>
+ <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" _label="Print Preview" pixtype="stock" pixname="gtk-print-preview"/>
+
+ <cmd name="CalendarPrev" _tip="Go back" _label="Previous" pixtype="pixbuf"/>
+ <cmd name="CalendarToday" _tip="Select today" _label="Today" pixtype="stock" pixname="Home"/>
+ <cmd name="CalendarNext" _tip="Go forward" _label="Next" pixtype="pixbuf"/>
+ <cmd name="CalendarGoto" _tip="Select a specific date" _label="Go To" priority="1" pixtype="stock" pixname="gtk-jump-to"/>
+
+ <cmd name="ShowDayView" _tip="Show one day" _label="Day" priority="1" pixtype="pixbuf"/>
+ <cmd name="ShowWorkWeekView" _tip="Show the working week" _label="Work Week" priority="1" pixtype="pixbuf"/>
+ <cmd name="ShowWeekView" _tip="Show one week" _label="Week" priority="1" pixtype="pixbuf"/>
+ <cmd name="ShowMonthView" _tip="Show one month" _label="Month" priority="1" pixtype="pixbuf"/>
+ <cmd name="ShowListView" _tip="Show as list" _label="List" priority="1" pixtype="pixbuf"/>
+
+ <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" _label="Cut" pixtype="stock" pixname="gtk-cut"/>
+ <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" _label="Copy" pixtype="stock" pixname="gtk-copy"/>
+ <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" _label="Paste" pixtype="stock" pixname="gtk-paste"/>
+
+
+ <cmd name="DeleteOccurrence" _tip="Delete this occurrence" _label="Occurrence" pixtype="stock" pixname="gtk-delete" ignore="yes"/>
+ <cmd name="DeleteAllOccurrences" _tip="Delete all occurrences" _label="All Occurrences" pixtype="stock" pixname="gtk-delete" ignore="yes"/>
+
+ <cmd name="CalendarPurge" _label="Purge" _tip="Purge old appointments and meetings" accel="*Control*e" pixtype="pixbuf"/>
</commands>
<menu>
@@ -76,13 +76,13 @@
<dockitem name="Toolbar">
<toolitem name="Print" verb="CalendarPrint" _label="Print"/>
- <toolitem name="Delete" verb="" _label="Delete"/>
+ <toolitem name="Delete" verb="Delete" _label="Delete"/>
<separator f="" name="ecal2"/>
- <toolitem name="Prev" verb="CalendarPrev" _label="Previous" pixtype="pixbuf"/>
+ <toolitem name="Prev" verb="CalendarPrev" _label="Previous" />
<toolitem name="Today" verb="CalendarToday" _label="Today"/>
- <toolitem name="Next" verb="CalendarNext" _label="Next" pixtype="pixbuf"/>
+ <toolitem name="Next" verb="CalendarNext" _label="Next" />
<separator f="" name="ecal3"/>
@@ -90,11 +90,11 @@
<separator f="" name="ecal4"/>
- <toolitem name="DayView" verb="ShowDayView" _label="Day" priority="1" pixtype="pixbuf"/>
- <toolitem name="WorkWeekView" verb="ShowWorkWeekView" _label="Work Week" priority="1" pixtype="pixbuf"/>
- <toolitem name="WeekView" verb="ShowWeekView" _label="Week" priority="1" pixtype="pixbuf"/>
- <toolitem name="MonthView" verb="ShowMonthView" _label="Month" priority="1" pixtype="pixbuf"/>
- <toolitem name="ListView" verb="ShowListView" _label="List" priority="1" pixtype="pixbuf"/>
+ <toolitem name="DayView" verb="ShowDayView" _label="Day" priority="1"/>
+ <toolitem name="WorkWeekView" verb="ShowWorkWeekView" _label="Work Week" priority="1"/>
+ <toolitem name="WeekView" verb="ShowWeekView" _label="Week" priority="1"/>
+ <toolitem name="MonthView" verb="ShowMonthView" _label="Month" priority="1"/>
+ <toolitem name="ListView" verb="ShowListView" _label="List" priority="1"/>
</dockitem>
Index: ui/evolution-mail-global.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-global.xml,v
retrieving revision 1.42
diff -u -p -r1.42 evolution-mail-global.xml
--- ui/evolution-mail-global.xml 2 Jun 2006 18:12:05 -0000 1.42
+++ ui/evolution-mail-global.xml 5 Jul 2006 14:15:27 -0000
@@ -3,43 +3,43 @@
<commands> <!-- Alphabetical by name, yo -->
<cmd name="EmptyTrash"
- _tip="Permanently remove all deleted messages from all folders"/>
+ _tip="Permanently remove all deleted messages from all folders" _label="Empty Trash" pixtype="pixbuf"/>
<cmd name="MailStop"
- _tip="Cancel the current mail operation"
+ _tip="Cancel the current mail operation" _label="Cancel"
pixtype="stock" pixname="gtk-stop"/>
<cmd name="FolderCreate"
- _tip="Create a new folder for storing mail"
+ _tip="Create a new folder for storing mail" _label="Create Folder"
pixtype="pixbuf"/>
<cmd name="FolderCopy"
- _tip="Copy the selected folder into another folder"
+ _tip="Copy the selected folder into another folder" _label="Copy Folder To"
pixtype="pixbuf"/>
<cmd name="FolderMove"
- _tip="Move the selected folder into another folder"
+ _tip="Move the selected folder into another folder" _label="Move Folder To"
pixtype="pixbuf"/>
<cmd name="ToolsFilters"
- _tip="Create or edit rules for filtering new mail"/>
+ _tip="Create or edit rules for filtering new mail" _label="Message Filters" pixtype="pixbuf"/>
<cmd name="ToolsSubscriptions"
- _tip="Subscribe or unsubscribe to folders on remote servers"/>
+ _tip="Subscribe or unsubscribe to folders on remote servers" _label="Subscriptions" pixtype="pixbuf"/>
<cmd name="ToolsVFolders"
- _tip="Create or edit Search Folder definitions"/>
+ _tip="Create or edit Search Folder definitions" _label="Tools VFolders" ignore="yes"/>
<cmd name="ViewPreview"
- _tip="Show message preview window"
+ _tip="Show message preview window" _label="View Preview"
accel="*Control*m"
- type="toggle"/>
+ type="toggle" pixtype="pixbuf"/>
- <cmd name="ViewBelow" _label="_Classic View"
- type="radio" group="preview_display" _tip="Show message preview below the message list"/>
+ <cmd name="ViewBelow" _label="Classic View"
+ type="radio" group="preview_display" _tip="Show message preview below the message list" ignore="yes"/>
- <cmd name="ViewAfter" _label="_Vertical View"
- type="radio" group="preview_display" _tip="Show message preview side-by-side with the message list"/>
+ <cmd name="ViewAfter" _label="Vertical View"
+ type="radio" group="preview_display" _tip="Show message preview side-by-side with the message list" ignore="yes"/>
</commands>
@@ -129,7 +129,7 @@
<placeholder name="MailMessageToolbar"/>
- <toolitem name="MailStop" verb=""
+ <toolitem name="MailStop" verb="MailStop"
_label="Cancel"/>
<separator f="" name="emailglobal1"/>
Index: ui/evolution-mail-list.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-list.xml,v
retrieving revision 1.32
diff -u -p -r1.32 evolution-mail-list.xml
--- ui/evolution-mail-list.xml 2 Jun 2006 18:12:05 -0000 1.32
+++ ui/evolution-mail-list.xml 5 Jul 2006 14:15:27 -0000
@@ -2,66 +2,54 @@
<commands> <!-- Alphabetical by name, yo -->
- <cmd name="EditCut"
- _tip="Cut selected message(s) to the clipboard"
- accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
-
- <cmd name="EditCopy"
- _tip="Copy selected message(s) to the clipboard"
- accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
-
- <cmd name="EditPaste"
- _tip="Paste message(s) from the clipboard"
- accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
-
<cmd name="EditInvertSelection"
- _tip="Select all and only the messages that are not currently selected"
- accel="*Control**Shift*i"/>
+ _tip="Select all and only the messages that are not currently selected" _label="Edit Invert Selection"
+ accel="*Control**Shift*i" ignore="yes"/>
<cmd name="EditSelectAll"
- _tip="Select all visible messages"
- accel="*Control*a"/>
+ _tip="Select all visible messages" _label="Edit Select All"
+ accel="*Control*a" ignore="yes"/>
<cmd name="EditSelectThread"
- _tip="Select all messages in the same thread as the selected message"
- accel="*Control*h"/>
+ _tip="Select all messages in the same thread as the selected message" _label="Select Message Thread"
+ accel="*Control*h" pixtype="pixbuf"/>
<cmd name="ChangeFolderProperties"
- _tip="Change the properties of this folder"
+ _tip="Change the properties of this folder" _label="Properties"
pixtype="pixbuf"/>
<cmd name="FolderExpunge"
- _tip="Permanently remove all deleted messages from this folder"
- accel="*Control*e"/>
+ _tip="Permanently remove all deleted messages from this folder" _label="Expunge"
+ accel="*Control*e" pixtype="pixbuf"/>
<cmd name="FolderDelete"
- _tip="Permanently remove this folder"/>
+ _tip="Permanently remove this folder" _label="Folder Delete" ignore="yes"/>
<cmd name="FolderRename"
- _tip="Change the name of this folder"/>
+ _tip="Change the name of this folder" _label="Folder Rename" ignore="yes"/>
- <cmd name="HideDeleted" _tip="Hide deleted messages rather than displaying them with a line through them"
- type="toggle" />
+ <cmd name="HideDeleted" _tip="Hide deleted messages rather than displaying them with a line through them" _label="Hide Deleted Messages"
+ type="toggle" pixtype="pixbuf"/>
- <cmd name="ViewHideRead" _tip="Temporarily hide all messages that have already been read"
- pixtype="pixbuf" />
+ <cmd name="ViewHideRead" _tip="Temporarily hide all messages that have already been read" _label="View Hide Read"
+ pixtype="pixbuf" ignore="yes"/>
- <cmd name="ViewHideSelected" _tip="Temporarily hide the selected messages"
- pixtype="pixbuf" />
+ <cmd name="ViewHideSelected" _tip="Temporarily hide the selected messages" _label="View Hide Selected"
+ pixtype="pixbuf" ignore="yes"/>
- <cmd name="ViewShowAll" _tip="Show messages that have been temporarily hidden"
- pixtype="pixbuf" />
+ <cmd name="ViewShowAll" _tip="Show messages that have been temporarily hidden" _label="View Show ALL"
+ pixtype="pixbuf" ignore="yes"/>
<cmd name="ViewThreaded"
- _tip="Threaded Message list"
+ _tip="Threaded Message list" _label="Group by Threads"
accel="*Control*t"
- type="toggle" />
+ type="toggle" pixtype="pixbuf"/>
<cmd name="ViewThreadsCollapseAll"
- _tip="Collapse all message threads"/>
+ _tip="Collapse all message threads" _label="View Threads Collapse All" ignore="yes"/>
<cmd name="ViewThreadsExpandAll"
- _tip="Expand all message threads"/>
+ _tip="Expand all message threads" _label="View Threads Expand All" ignore="yes"/>
</commands>
@@ -134,5 +122,7 @@
-->
</menu>
+
+ <dockitem name="Toolbar"/>
</Root>
Index: ui/evolution-mail-message.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-message.xml,v
retrieving revision 1.93
diff -u -p -r1.93 evolution-mail-message.xml
--- ui/evolution-mail-message.xml 2 Jun 2006 18:12:05 -0000 1.93
+++ ui/evolution-mail-message.xml 5 Jul 2006 14:15:27 -0000
@@ -3,239 +3,242 @@
<commands> <!-- Alphabetical by name, yo -->
<cmd name="AddSenderToAddressbook"
- _tip="Add Sender to Address Book"/>
+ _tip="Add Sender to Address Book" _label="Add Sender To Addressbook" pixtype="pixbuf"/>
<cmd name="CaretMode"
_tip="Show a blinking cursor in the body of displayed messages"
- type="toggle" state="0" accel="F7"/>
+ _label="CaretMode" type="toggle" state="0" accel="F7" ignore="yes"/>
+
+ <cmd name="MessageReplySender"
+ _tip="Compose a reply to the sender of the selected message"
+ _label="Reply" priority="1" accel="*Control*r"
+ pixtype="pixbuf" placeholder="MailMessageToolbar"/>
+
+ <cmd name="MessageReplyAll"
+ _tip="Compose a reply to all of the recipients of the selected message"
+ _label="Reply to All" priority="1" accel="*Control**Shift*r"
+ pixtype="pixbuf" placeholder="MailMessageToolbar"/>
+
+ <cmd name="MessageForward"
+ _tip="Forward the selected message to someone"
+ _label="Forward" priority="1" accel="*Control*f"
+ pixtype="pixbuf" placeholder="MailMessageToolbar"/>
+
+ <cmd name="PrintMessage"
+ _tip="Print this message"
+ _label="Print" accel="*Control*p"
+ pixtype="stock" pixname="gtk-print" placeholder="MailMessageToolbar"/>
+
+ <cmd name="MessageDelete"
+ _tip="Mark the selected messages for deletion"
+ _label="Delete" accel="*Control*d"
+ pixtype="stock" pixname="gtk-delete" placeholder="MailMessageToolbar"/>
+
+ <cmd name="MessageMarkAsJunk"
+ _tip="Mark the selected messages as junk"
+ _label="Junk" accel="*Control*j"
+ pixtype="pixbuf" placeholder="MailMessageToolbar"/>
+
+ <cmd name="MessageMarkAsNotJunk"
+ _tip="Mark the selected messages as not being junk"
+ _label="Not Junk" accel="*Control**Shift*j"
+ pixtype="pixbuf" placeholder="MailMessageToolbar"/>
<cmd name="EditCut"
- _tip="Cut selected messages to the clipboard"
+ _tip="Cut selected messages to the clipboard" _label="Cut"
accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
<cmd name="EditCopy"
- _tip="Copy selected messages to the clipboard"
+ _tip="Copy selected messages to the clipboard" _label="Copy"
accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
<cmd name="EditPaste"
- _tip="Paste messages from the clipboard"
+ _tip="Paste messages from the clipboard" _label="Paste"
accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+ <cmd name="MailPrevious"
+ _tip="Display the previous message" _label="Previous"
+ accel="*Control*Page_Up"
+ pixtype="pixbuf" placeholder="MailNextButtons"/>
+
<cmd name="MailNext"
- _tip="Display the next message"
- accel="*Control*Page_Down"/>
+ _tip="Display the next message" _label="Next"
+ accel="*Control*Page_Down"
+ pixtype="pixbuf" placeholder="MailNextButtons"/>
<cmd name="MailNextFlagged"
- _tip="Display the next important message"/>
+ _tip="Display the next important message" _label="Next Flagged Message" pixtype="pixbuf"/>
<cmd name="MailNextUnread"
- _tip="Display the next unread message"
- accel="*Control*bracketright"/>
+ _tip="Display the next unread message" _label="Next Unread Message"
+ accel="*Control*bracketright" pixtype="pixbuf"/>
<cmd name="MailNextThread"
- _tip="Display the next thread"/>
-
- <cmd name="MailPrevious"
- _tip="Display the previous message"
- accel="*Control*Page_Up"/>
+ _tip="Display the next thread" _label="Next Thread" pixtype="pixbuf"/>
<cmd name="MailPreviousFlagged"
- _tip="Display the previous important message"/>
+ _tip="Display the previous important message" _label="Previous Flagged Message" pixtype="pixbuf"/>
<cmd name="MailPreviousUnread"
- _tip="Display the previous unread message"
- accel="*Control*bracketleft"/>
+ _tip="Display the previous unread message" _label="Previous Unread Message"
+ accel="*Control*bracketleft" pixtype="pixbuf"/>
<cmd name="MessageApplyFilters"
- _tip="Apply filter rules to the selected messages"
+ _tip="Apply filter rules to the selected messages" _label="Apply Filters"
accel="*Control*y"
pixtype="pixbuf"/>
<cmd name="MessageCopy"
- _tip="Copy selected messages to another folder"
+ _tip="Copy selected messages to another folder" _label="Copy to Folder"
accel="*Control**Shift*y"
pixtype="pixbuf"/>
- <cmd name="MessageDelete"
- _tip="Mark the selected messages for deletion"
- accel="*Control*d"
- pixtype="pixbuf"/>
-
<cmd name="MessageFollowUpFlag"
- _tip="Flag selected messages for follow-up"
+ _tip="Flag selected messages for follow-up" _label="MessageFollowUpFlag"
accel="*Control**Shift*G"
- pixtype="pixbuf"/>
-
- <cmd name="MessageForward"
- _tip="Forward the selected message to someone"
- accel="*Control*f"
- pixtype="pixbuf"/>
+ pixtype="pixbuf" ignore="yes"/>
<cmd name="MessageForwardAttached"
- _tip="Forward the selected message to someone as an attachment"/>
+ _tip="Forward the selected message to someone as an attachment" _label="MessageForwardAttached" ignore="yes"/>
<cmd name="MessageForwardInline"
- _tip="Forward the selected message in the body of a new message"/>
+ _tip="Forward the selected message in the body of a new message" _label="MessageForwardInline" ignore="yes"/>
<cmd name="MessageForwardQuoted"
- _tip="Forward the selected message quoted like a reply"/>
+ _tip="Forward the selected message quoted like a reply" _label="MessageForwardQuoted" ignore="yes"/>
<cmd name="MessageMarkAsRead"
- _tip="Mark the selected messages as having been read"
+ _tip="Mark the selected messages as having been read" _label="Mark As Read"
accel="*Control*k"
pixtype="pixbuf"/>
<cmd name="MessageMarkAsUnRead"
- _tip="Mark the selected messages as not having been read"
+ _tip="Mark the selected messages as not having been read" _label="Mark As UnRead"
accel="*Control**Shift*k"
pixtype="pixbuf"/>
<cmd name="MessageMarkAsImportant"
- _tip="Mark the selected messages as important"
+ _tip="Mark the selected messages as important" _label="Mark As Important"
pixtype="pixbuf"/>
<cmd name="MessageMarkAsUnimportant"
- _tip="Mark the selected messages as unimportant"/>
-
- <cmd name="MessageMarkAsJunk"
- _tip="Mark the selected messages as junk"
- accel="*Control*j"
- pixtype="pixbuf"/>
-
- <cmd name="MessageMarkAsNotJunk"
- _tip="Mark the selected messages as not being junk"
- accel="*Control**Shift*j"
- pixtype="pixbuf"/>
+ _tip="Mark the selected messages as unimportant" _label="Mark As Unimportant" pixtype="pixbuf"/>
<cmd name="MessageFilterJunk"
- _tip="Filter the selected messages for junk status"
+ _tip="Filter the selected messages for junk status" _label="Check for Junk"
pixtype="pixbuf"/>
<cmd name="MailCompose"
- _tip="Open a window for composing a mail message"
+ _tip="Open a window for composing a mail message" _label="MailCompose"
pixtype="pixbuf"
- accel="*Control**Shift*m"/>
+ accel="*Control**Shift*m" ignore="yes"/>
<cmd name="MessageMove"
- _tip="Move selected messages to another folder"
+ _tip="Move selected messages to another folder" _label="Move to Folder"
accel="*Control**Shift*v"
pixtype="pixbuf"/>
<cmd name="MessageEdit"
- _tip="Open the selected messages in the composer for editing"/>
+ _tip="Open the selected messages in the composer for editing" _label="MessageEdit" ignore="yes"/>
<cmd name="MessageOpen"
- _tip="Open the selected messages in a new window"
+ _tip="Open the selected messages in a new window" _label="MessageOpen"
accel="*Control*o"
- pixtype="pixbuf"/>
+ pixtype="pixbuf" ignore="yes"/>
<cmd name="MailPost"
- _tip="Post a message to a Public folder"/>
+ _tip="Post a message to a Public folder" _label="Post New Message to Folder" pixtype="pixbuf"/>
<cmd name="MessagePostReply"
- _tip="Post a reply to a message in a Public folder"
- accel=""/>
+ _tip="Post a reply to a message in a Public folder" _label="Post a Reply"
+ accel="" pixtype="pixbuf"/>
<cmd name="MessageRedirect"
- _tip="Redirect (bounce) the selected message to someone"
- accel=""/>
-
- <cmd name="MessageReplyAll"
- _tip="Compose a reply to all of the recipients of the selected message"
- accel="*Control**Shift*r"
- pixtype="pixbuf"/>
+ _tip="Redirect (bounce) the selected message to someone" _label="Forward As Redirect"
+ accel="" pixtype="pixbuf"/>
<cmd name="MessageReplyList"
- _tip="Compose a reply to the mailing list of the selected message"
- accel="*Control*l"/>
-
- <cmd name="MessageReplySender"
- _tip="Compose a reply to the sender of the selected message"
- accel="*Control*r"
- pixtype="pixbuf"/>
-
+ _tip="Compose a reply to the mailing list of the selected message" _label="Reply to List"
+ accel="*Control*l" pixtype="pixbuf"/>
+
<cmd name="MessageSaveAs"
- _tip="Save the selected messages as a text file"
+ _tip="Save the selected messages as a text file" _label="Save"
accel="*Control*s"
pixtype="stock" pixname="gtk-save-as"/>
<cmd name="MessageSearch"
- _tip="Search for text in the body of the displayed message"
+ _tip="Search for text in the body of the displayed message" _label="Search"
accel="*Control**Shift*f"
- pixtype="stock" pixname="gtk-find"/>
+ pixtype="stock" pixname="gtk-find" ignore="yes"/>
<cmd name="MessageUndelete"
- _tip="Undelete the selected messages"
- accel="*Control**Shift*d"/>
-
- <cmd name="PrintMessage"
- _tip="Print this message"
- accel="*Control*p"
- pixtype="stock" pixname="gtk-print"/>
+ _tip="Undelete the selected messages" _label="Undelete"
+ accel="*Control**Shift*d"
+ pixtype="stock" pixname="gtk-undelete"/>
<cmd name="PrintPreviewMessage"
- _tip="Preview the message to be printed"
+ _tip="Preview the message to be printed" _label="Print Preview"
pixtype="stock" pixname="gtk-print-preview"/>
<cmd name="PrintSetup"
- _tip="Set up the page settings for your current printer"
+ _tip="Set up the page settings for your current printer" _label="Print Setup"
pixtype="pixbuf"/>
<cmd name="SelectAllText"
- _tip="Select all the text in a message"
- accel="*Control**Shift*x"/>
+ _tip="Select all the text in a message" _label="SelectAll"
+ accel="*Control**Shift*x" ignore="yes"/>
<cmd name="ToolsFilterMailingList"
- _tip="Create a rule to filter messages to this mailing list"/>
+ _tip="Create a rule to filter messages to this mailing list" _label="ToolsFilterMailingList" ignore="yes"/>
<cmd name="ToolsFilterRecipient"
- _tip="Create a rule to filter messages to these recipients"/>
+ _tip="Create a rule to filter messages to these recipients" _label="ToolsFilterRecipient" ignore="yes"/>
<cmd name="ToolsFilterSender"
- _tip="Create a rule to filter messages from this sender"/>
+ _tip="Create a rule to filter messages from this sender" _label="ToolsFilterSender" ignore="yes"/>
<cmd name="ToolsFilterSubject"
- _tip="Create a rule to filter messages with this subject"/>
+ _tip="Create a rule to filter messages with this subject" _label="ToolsFilterSubject" ignore="yes"/>
<cmd name="ToolsVFolderMailingList"
- _tip="Create a Search Folder for this mailing list"/>
+ _tip="Create a Search Folder for this mailing list" _label="ToolsVFolderMailingList" ignore="yes"/>
<cmd name="ToolsVFolderRecipient"
- _tip="Create a Search Folder for these recipients"/>
+ _tip="Create a Search Folder for these recipients" _label="ToolsVFolderRecipient" ignore="yes"/>
<cmd name="ToolsVFolderSender"
- _tip="Create a Search Folder for this sender"/>
+ _tip="Create a Search Folder for this sender" _label="ToolsVFolderSender" ignore="yes"/>
<cmd name="ToolsVFolderSubject"
- _tip="Create a Search Folder for this subject"/>
+ _tip="Create a Search Folder for this subject" _label="ToolsVFolderSubject" ignore="yes"/>
<cmd name="ViewFullHeaders"
- _tip="Show messages with all email headers"
- type="toggle" state="0"/>
+ _tip="Show messages with all email headers" _label="ViewFullHeaders"
+ type="toggle" state="0" ignore="yes"/>
<cmd name="ViewLoadImages"
- _tip="Force images in HTML mail to be loaded"
+ _tip="Force images in HTML mail to be loaded" _label="Load Images"
accel="*Control*i" pixtype="pixbuf"/>
<cmd name="ViewNormal"
- _tip="Show messages in the normal style"
- type="radio" group="message_display"/>
+ _tip="Show messages in the normal style" _label="ViewNormal"
+ type="radio" group="message_display" ignore="yes"/>
<cmd name="ViewSource"
- _tip="Show the raw email source of the message"
- accel="*Control*u"/>
+ _tip="Show the raw email source of the message" _label="ViewSource"
+ accel="*Control*u" ignore="yes"/>
<cmd name="TextZoomIn"
- _tip="Increase the text size"
- accel="*Control*plus"/>
+ _tip="Increase the text size" _label="Zoom In"
+ accel="*Control*plus" pixtype="stock" pixname="gtk-zoom-in"/>
<cmd name="TextZoomOut"
- _tip="Decrease the text size"
- accel="*Control*minus"/>
+ _tip="Decrease the text size" _label="Zoom Out"
+ accel="*Control*minus" pixtype="stock" pixname="gtk-zoom-out"/>
<cmd name="TextZoomReset"
- _tip="Reset the text to its original size"
- accel="*Control*0"/>
+ _tip="Reset the text to its original size" _label="Normal Size"
+ accel="*Control*0" pixtype="stock" pixname="gtk-zoom-100"/>
</commands>
@@ -286,7 +289,7 @@
<submenu name="View">
<placeholder name="MailMessageZoom">
- <submenu name="zoom" _label="_Zoom">
+ <separator f="" name="emaillist"/>
<menuitem name="TextZoomIn" verb="" _label="_Zoom In"
pixtype="stock" pixname="gtk-zoom-in"/>
<menuitem name="TextZoomOut" verb="" _label="Zoom _Out"
@@ -294,7 +297,7 @@
<menuitem name="TextZoomReset" verb="" _label="_Normal Size"
pixtype="stock" pixname="gtk-zoom-100"/>
- </submenu>
+
</placeholder>
<placeholder name="MailViewType">
@@ -318,7 +321,7 @@
</placeholder>
<placeholder name="MessageNavigation">
- <submenu name="GoTo" _label="_Go To" pixtype="stock" pixname="gtk-jump-to">
+ <submenu name="GoTo" _label="_Go To">
<menuitem name="MailNext" verb="" _label="_Next Message"/>
<menuitem name="MailNextUnread" verb="" _label="Next _Unread Message"/>
<menuitem name="MailNextFlagged" verb="" _label="Next _Important Message"/>
@@ -400,44 +403,44 @@
<dockitem name="Toolbar">
<placeholder name="MailMessageToolbar">
- <toolitem name="MessageReplySender" verb=""
+ <toolitem name="MessageReplySender" verb="MessageReplySender"
_label="Reply" priority="1"
- pixtype="pixbuf"/>
+ />
- <toolitem name="MessageReplyAll" verb=""
+ <toolitem name="MessageReplyAll" verb="MessageReplyAll"
_label="Reply to All" priority="1"
- pixtype="pixbuf"/>
+ />
- <toolitem name="MessageForward" verb=""
+ <toolitem name="MessageForward" verb="MessageForward"
_label="Forward" priority="1"
- pixtype="pixbuf"/>
+ />
<separator f="" name="emaillist2"/>
- <toolitem name="PrintMessage" verb=""
+ <toolitem name="PrintMessage" verb="PrintMessage"
_label="Print"
- pixtype="stock" pixname="gtk-print"/>
+ />
- <toolitem name="MessageDelete" verb=""
+ <toolitem name="MessageDelete" verb="MessageDelete"
_label="Delete"
- pixtype="pixbuf"/>
+ />
- <toolitem name="MessageMarkAsJunk" verb=""
+ <toolitem name="MessageMarkAsJunk" verb="MessageMarkAsJunk"
_label="Junk"
- pixtype="pixbuf"/>
- <toolitem name="MessageMarkAsNotJunk" verb=""
+ />
+ <toolitem name="MessageMarkAsNotJunk" verb="MessageMarkAsNotJunk"
_label="Not Junk"
- pixtype="pixbuf"/>
+ />
</placeholder>
<placeholder name="MailNextButtons">
- <toolitem name="MailPrevious" verb=""
+ <toolitem name="MailPrevious" verb="MailPrevious"
_label="Previous"
- pixtype="pixbuf"/>
+ />
- <toolitem name="MailNext" verb=""
+ <toolitem name="MailNext" verb="MailNext"
_label="Next"
- pixtype="pixbuf"/>
+ />
</placeholder>
</dockitem>
Index: ui/evolution-mail-messagedisplay.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-messagedisplay.xml,v
retrieving revision 1.15
diff -u -p -r1.15 evolution-mail-messagedisplay.xml
--- ui/evolution-mail-messagedisplay.xml 13 May 2005 21:29:27 -0000 1.15
+++ ui/evolution-mail-messagedisplay.xml 5 Jul 2006 14:15:27 -0000
@@ -1,7 +1,7 @@
<Root>
<commands>
<cmd name="MessageBrowserClose" _label="Close" _tip="Close this window"
- pixtype="stock" pixname="Close" accel="*Control*w"/>
+ pixtype="stock" pixname="Close" accel="*Control*w" ignore="yes"/>
</commands>
<menu>
Index: ui/evolution-memos.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-memos.xml,v
retrieving revision 1.1
diff -u -p -r1.1 evolution-memos.xml
--- ui/evolution-memos.xml 19 Oct 2005 11:39:34 -0000 1.1
+++ ui/evolution-memos.xml 5 Jul 2006 14:15:27 -0000
@@ -1,14 +1,16 @@
<Root>
<commands>
- <cmd name="MemosOpenMemo" _tip="View the selected memo" accel="*Control*o"/>
- <cmd name="MemosPrint" _tip="Print the list of memos" pixtype="stock" pixname="gtk-print"
- accel="*Control*p"/>
- <cmd name="MemosPrintPreview" _tip="Previews the list of memos to be printed" pixtype="stock" pixname="gtk-print-preview"/>
+ <cmd name="MemosOpenMemo" _tip="View the selected memo" _label="Open Memo" accel="*Control*o" ignore="yes"/>
+
+ <cmd name="MemosCut" _tip="Cut selected memo" accel="*Control*x" _label="Cut" pixtype="stock" pixname="gtk-cut"/>
+ <cmd name="MemosCopy" _tip="Copy selected memo" accel="*Control*c" _label="Copy" pixtype="stock" pixname="gtk-copy"/>
+ <cmd name="MemosPaste" _tip="Paste memo from the clipboard" accel="*Control*v" _label="Paste" pixtype="stock" pixname="gtk-paste"/>
- <cmd name="MemosCut" _tip="Cut selected memo" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
- <cmd name="MemosCopy" _tip="Copy selected memo" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
- <cmd name="MemosPaste" _tip="Paste memo from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
- <cmd name="MemosDelete" _tip="Delete selected memos" accel="*Control*d" sensitive="0"
+ <cmd name="MemosPrint" _tip="Print the list of memos" _label="Print" pixtype="stock" pixname="gtk-print"
+ accel="*Control*p"/>
+ <cmd name="MemosPrintPreview" _tip="Previews the list of memos to be printed" _label="Print Preview" pixtype="stock" pixname="gtk-print-preview"/>
+
+ <cmd name="MemosDelete" _tip="Delete selected memos" accel="*Control*d" sensitive="0" _label="Delete"
pixtype="stock" pixname="gtk-delete"/>
</commands>
Index: ui/evolution-tasks.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-tasks.xml,v
retrieving revision 1.43
diff -u -p -r1.43 evolution-tasks.xml
--- ui/evolution-tasks.xml 26 Apr 2006 08:57:47 -0000 1.43
+++ ui/evolution-tasks.xml 5 Jul 2006 14:15:27 -0000
@@ -1,22 +1,22 @@
<Root>
<commands>
- <cmd name="TasksOpenTask" _tip="View the selected task" accel="*Control*o"/>
- <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="stock" pixname="gtk-print"
+ <cmd name="TasksOpenTask" _tip="View the selected task" _label="Open Task" accel="*Control*o" ignore="yes"/>
+ <cmd name="TasksPrint" _tip="Print the list of tasks" _label="Print" pixtype="stock" pixname="gtk-print"
accel="*Control*p"/>
- <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="stock" pixname="gtk-print-preview"/>
+ <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" _label="Print Preview" pixtype="stock" pixname="gtk-print-preview"/>
- <cmd name="TasksCut" _tip="Cut selected tasks" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
- <cmd name="TasksCopy" _tip="Copy selected tasks" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
- <cmd name="TasksPaste" _tip="Paste tasks from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
- <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0"
+ <cmd name="TasksCut" _tip="Cut selected tasks" accel="*Control*x" _label="Cut" pixtype="stock" pixname="gtk-cut"/>
+ <cmd name="TasksCopy" _tip="Copy selected tasks" accel="*Control*c" _label="Copy" pixtype="stock" pixname="gtk-copy"/>
+ <cmd name="TasksPaste" _tip="Paste tasks from the clipboard" accel="*Control*v" _label="Paste" pixtype="stock" pixname="gtk-paste"/>
+ <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0" _label="Delete"
pixtype="stock" pixname="gtk-delete"/>
- <cmd name="TasksMarkComplete" _tip="Mark selected tasks as complete" accel="*Control*k" sensitive="0"/>
+ <cmd name="TasksMarkComplete" _tip="Mark selected tasks as complete" _label="Mark as Complete" accel="*Control*k" sensitive="0" pixtype="pixbuf"/>
- <cmd name="TasksPurge" _label="Purg_e" _tip="Delete completed tasks" accel="*Control*e"/>
- <cmd name="TasksAssign" _label="_Assign Task"/>
- <cmd name="TasksForward" _label="_Forward as iCalendar" accel="*Control*f"/>
+ <cmd name="TasksPurge" _tip="Delete completed tasks" _label="Purge" accel="*Control*e" pixtype="pixbuf"/>
+ <cmd name="TasksAssign" _label="Assign Task" pixtype="pixbuf"/>
+ <cmd name="TasksForward" _label="Forward as iCalendar" accel="*Control*f" pixtype="pixbuf"/>
- <cmd name="ViewPreview" _tip="Show task preview window" accel="*Control*m" type="toggle"/>
+ <cmd name="ViewPreview" _tip="Show task preview window" _label="View Preview" accel="*Control*m" type="toggle" ignore="yes"/>
</commands>
@@ -57,9 +57,9 @@
<placeholder name="ActionsPlaceholder">
<submenu name="Actions" _label="_Actions">
- <menuitem name="TasksPurge" verb=""/>
- <menuitem name="TasksAssign" verb=""/>
- <menuitem name="TasksForward" verb="" pixtype="pixbuf"/>
+ <menuitem name="TasksPurge" verb="" _label="Purg_e"/>
+ <menuitem name="TasksAssign" verb="" _label="_Assign Task"/>
+ <menuitem name="TasksForward" verb="" _label="_Forward as iCalendar"/>
</submenu>
</placeholder>
Index: ui/evolution.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution.xml,v
retrieving revision 1.111
diff -u -p -r1.111 evolution.xml
--- ui/evolution.xml 2 Jun 2006 18:12:06 -0000 1.111
+++ ui/evolution.xml 5 Jul 2006 14:15:27 -0000
@@ -53,6 +53,13 @@
<cmd name="HelpAbout" _label="About Evolution..."
_tip="Show information about Evolution"
pixtype="stock" pixname="About"/>
+
+ <cmd name="CustomToolbar"
+ _tip="Customizes the toolbar" />
+
+ <cmd name="CustomShortcuts"
+ _tip="Customizes the shortcuts" />
+
</commands>
<menu>
@@ -109,6 +116,14 @@
<placeholder name="PluginManagerPlaceholder"/>
<menuitem name="Settings" verb="" _label="Prefere_nces" _tip="Change Evolution's settings" accel="*Control**Shift*s"/>
+
+ <separator/>
+
+ <menuitem name="CustomToolbar" verb="" _label="Customize Toolbar"/>
+
+ <menuitem name="CustomShortcuts" verb="" _label="Customize Shortcuts"/>
+
+
</submenu>
<submenu name="View" _label="_View">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
