From 82101429ace39073911832aea85ef1d435d2357d Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sat, 17 Nov 2007 23:20:07 +0000 Subject: ** Fix for bug #495875 right click menu reordering svn path=/trunk/; revision=34549 --- addressbook/ChangeLog | 7 ++++++ addressbook/gui/component/addressbook-view.c | 12 ++++++----- calendar/ChangeLog | 9 ++++++++ calendar/gui/calendar-component.c | 6 +++++- calendar/gui/memos-component.c | 6 +++++- calendar/gui/tasks-component.c | 6 +++++- mail/ChangeLog | 7 ++++++ mail/em-folder-tree.c | 25 ++++++++++++---------- plugins/folder-unsubscribe/ChangeLog | 7 ++++++ .../org-gnome-mail-folder-unsubscribe.eplug.xml | 2 +- plugins/mail-account-disable/ChangeLog | 7 ++++++ .../mail-account-disable/mail-account-disable.c | 4 ++-- plugins/mark-all-read/ChangeLog | 7 ++++++ .../org-gnome-mark-all-read.eplug.xml | 2 +- 14 files changed, 84 insertions(+), 23 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c2431f1143..b1716b477c 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2007-11-18 Gilles Dartiguelongue + + ** Fix bug #495875 + + * gui/component/addressbook-view.c: + right click menu reordering + 2007-11-03 Matthew Barnes ** Remove dead files from source control. The dates below diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 75c3f2f221..ec5600f80a 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -952,11 +952,13 @@ primary_source_selection_changed_callback (ESourceSelector *selector, static EPopupItem abv_source_popups[] = { { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "contact-new", 0, 0 }, - { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "40.bar"}, - { E_POPUP_ITEM, "40.saveasvcard", N_("Save As Vcard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "30.bar"}, - { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, "20.saveasvcard", N_("Save As Vcard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, + + { E_POPUP_BAR, "30.bar" }, + { E_POPUP_ITEM, "30.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, + + { E_POPUP_BAR, "99.bar" }, + { E_POPUP_ITEM, "99.properties", N_("_Properties..."), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY }, }; static void diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 79be754b62..028ca2c5ff 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2007-11-18 Gilles Dartiguelongue + + ** Fix bug #495875 + + * gui/calendar-component.c: + * gui/memos-component.c: + * gui/tasks-component.c: + right click menu reordering + 2007-11-16 Milan Crha ** Fix for bug #492793 diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 607e199f81..067fadd21d 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -604,8 +604,12 @@ edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data) static EPopupItem ecc_source_popups[] = { { E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 }, { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + + { E_POPUP_BAR, "20.bar" }, { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, - { E_POPUP_ITEM, "30.properties", N_("_Properties"), edit_calendar_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + + { E_POPUP_BAR, "99.bar" }, + { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_calendar_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, }; static void diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 8766649959..534d31ec71 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -463,8 +463,12 @@ edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data) static EPopupItem emc_source_popups[] = { { E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 }, { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_memo_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + + { E_POPUP_BAR, "20.bar" }, { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "30.properties", N_("_Properties"), edit_memo_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + + { E_POPUP_BAR, "99.bar" }, + { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_memo_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, }; static void diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index da1c0e61eb..3ff57e4411 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -454,8 +454,12 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data) static EPopupItem etc_source_popups[] = { { E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 }, { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + + { E_POPUP_BAR, "20.bar" }, { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, "30.properties", N_("_Properties"), edit_task_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, + + { E_POPUP_BAR, "99.bar" }, + { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_task_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, }; static void diff --git a/mail/ChangeLog b/mail/ChangeLog index 91c336d06c..1f6419714d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2007-11-18 Gilles Dartiguelongue + + ** Fix bug #495875 + + * em-folder-tree.c: + right click menu reordering + 2007-11-14 Matthew Barnes * em-folder-tree.c (em_folder_tree_get_selected_folder_info): diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index ee33c575cb..6efb4f45e2 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -2112,23 +2112,26 @@ static EPopupItem emft_popup_items[] = { { E_POPUP_BAR, "10.emc" }, #endif - { E_POPUP_ITEM, "10.emc.00", N_("_Copy..."), emft_popup_copy, NULL, "stock_folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, - { E_POPUP_ITEM, "10.emc.01", N_("_Move..."), emft_popup_move, NULL, "stock_folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - - { E_POPUP_BAR, "20.emc" }, /* FIXME: need to disable for nochildren folders */ - { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, + { E_POPUP_ITEM, "10.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, + + { E_POPUP_ITEM, "10.emc.05", N_("_Copy..."), emft_popup_copy, NULL, "stock_folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, + { E_POPUP_ITEM, "10.emc.06", N_("_Move..."), emft_popup_move, NULL, "stock_folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + /* FIXME: need to disable for undeletable folders */ + { E_POPUP_BAR, "20.emc" }, { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, - { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, + + { E_POPUP_BAR, "30.emc" }, + { E_POPUP_ITEM, "30.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_ITEM, "30.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, + { E_POPUP_ITEM, "30.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, - { E_POPUP_BAR, "80.emc" }, - { E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } + { E_POPUP_BAR, "99.emc" }, + { E_POPUP_ITEM, "99.emc.00", N_("_Properties"), emft_popup_properties, NULL, "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } }; -static EPopupItem trash_popup_item = {E_POPUP_ITEM, "20.emc.03", N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}; +static EPopupItem trash_popup_item = {E_POPUP_ITEM, "30.emc.05", N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}; static void emft_popup_free(EPopup *ep, GSList *items, void *data) diff --git a/plugins/folder-unsubscribe/ChangeLog b/plugins/folder-unsubscribe/ChangeLog index 0323493df0..909ad22d46 100644 --- a/plugins/folder-unsubscribe/ChangeLog +++ b/plugins/folder-unsubscribe/ChangeLog @@ -1,3 +1,10 @@ +2007-11-18 Gilles Dartiguelongue + + ** Fix bug #495875 + + * org-gnome-mail-folder-unsubscribe.eplug.xml: + right click menu reordering + 2007-04-02 Sankar P * Committed on behalf of Gilles Dartiguelongue diff --git a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml index c564f15460..6452504f95 100644 --- a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml +++ b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml @@ -11,7 +11,7 @@ - diff --git a/plugins/mail-account-disable/ChangeLog b/plugins/mail-account-disable/ChangeLog index 13d2d14224..d40282a91b 100644 --- a/plugins/mail-account-disable/ChangeLog +++ b/plugins/mail-account-disable/ChangeLog @@ -1,3 +1,10 @@ +2007-11-18 Gilles Dartiguelongue + + ** Fix bug #495875 + + * mail-account-disable.c: + right click menu reordering + 2007-04-02 Sankar P * Committed on behalf of Gilles Dartiguelongue diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c index bd6df815b0..d83f5aae77 100644 --- a/plugins/mail-account-disable/mail-account-disable.c +++ b/plugins/mail-account-disable/mail-account-disable.c @@ -43,8 +43,8 @@ void mail_account_disable (EPopup *ep, EPopupItem *p, void *data); void org_gnome_create_mail_account_disable (EPlugin *ep, EMPopupTargetFolder *t); static EPopupItem popup_items[] = { - { E_POPUP_ITEM, "20.emc.04", N_("_Disable"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }, - { E_POPUP_ITEM, "20.emc.04", N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } + { E_POPUP_ITEM, "40.emc.04", N_("_Disable"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }, + { E_POPUP_ITEM, "40.emc.04", N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE } }; static void diff --git a/plugins/mark-all-read/ChangeLog b/plugins/mark-all-read/ChangeLog index 71d81e28ae..ce35ebf76e 100644 --- a/plugins/mark-all-read/ChangeLog +++ b/plugins/mark-all-read/ChangeLog @@ -1,3 +1,10 @@ +2007-11-18 Gilles Dartiguelongue + + ** Fix bug #495875 + + * org-gnome-mark-all-read.eplug.xml: + right click menu reordering + 2007-11-05 Michael Monreal ** Fix for bug #492102 diff --git a/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml b/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml index 1bba85e254..a4542572a5 100644 --- a/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml +++ b/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml @@ -11,7 +11,7 @@ - + -- cgit v1.2.3