aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-10-04 22:43:21 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-10-04 22:43:21 +0800
commitc44d7bdc7305613757ea5b2a2b3187face5500cb (patch)
tree18eee36ec5e42dfaf6a6f5581dac35281d1a3c46
parent72cc581e8c60c00544473b4b923e2340575997ad (diff)
downloadgsoc2013-evolution-c44d7bdc7305613757ea5b2a2b3187face5500cb.tar.gz
gsoc2013-evolution-c44d7bdc7305613757ea5b2a2b3187face5500cb.tar.zst
gsoc2013-evolution-c44d7bdc7305613757ea5b2a2b3187face5500cb.zip
** Fixes bug #477045
2007-10-04 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #477045 * addressbook/gui/component/addressbook-view.c: * calendar/gui/calendar-component.c: * calendar/gui/memos-component.c: * calendar/gui/tasks-component.c: * mail/em-folder-tree.c: Use "edit-copy" and "document-properties" icons in the pop-up menu. svn path=/trunk/; revision=34354
Diffstat
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook-view.c2
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/gui/calendar-component.c4
-rw-r--r--calendar/gui/memos-component.c4
-rw-r--r--calendar/gui/tasks-component.c4
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-browser.c2
-rw-r--r--mail/em-folder-tree.c2
9 files changed, 32 insertions, 9 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 0ad2bf1163..ecb0822768 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-04 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #477045
+
+ * gui/component/addressbook-view.c:
+ Use "edit-copy" icon for the FolderCopy verb.
+
2007-10-04 Milan Crha <mcrha@redhat.com>
** Fix for bug #331421
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index cbd8efb822..2f380c1aa2 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -624,7 +624,7 @@ static EPixmap pixmaps [] = {
E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-send", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/FolderCopy", "edit-copy", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/FolderDelete", "edit-delete", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/FolderSave", "document-save-as", E_ICON_SIZE_MENU),
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 42747afd70..3128badaba 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-04 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #477045
+
+ * gui/calendar-component.c:
+ * gui/memos-component.c:
+ * gui/tasks-component.c:
+ Use "edit-copy" and "document-properties" icons in the pop-up menu.
+
2007-10-04 Milan Crha <mcrha@redhat.com>
** Fix for bug #325685
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index ae0dc63e6a..6168988aad 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -603,9 +603,9 @@ 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, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
{ 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, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, "30.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 4138c83f03..2023306e84 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -462,9 +462,9 @@ 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, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_memo_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
{ 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, "stock_folder-properties", 0, 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 },
};
static void
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 30571774cc..3f5a13d9ec 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -453,9 +453,9 @@ 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, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+ { E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
{ 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, "stock_folder-properties", 0, 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 },
};
static void
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 380c3749ff..98b078f75c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-04 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #477045
+
+ * em-folder-tree.c:
+ Use "document-properties" icon in pop-up menu.
+
2007-10-03 Milan Crha <mcrha@redhat.com>
** Fix for bug #473903
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index bdbd6bfe76..95638fd74c 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -1607,7 +1607,7 @@ static BonoboUIVerb emfb_verbs[] = {
};
static EPixmap emfb_pixmaps[] = {
- E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index b04fecf272..3aff4a0358 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2113,7 +2113,7 @@ static EPopupItem emft_popup_items[] = {
{ E_POPUP_BAR, "80.emc" },
- { E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "stock_folder-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }
+ { E_POPUP_ITEM, "80.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};
generated by cgit (git 2.34.1) at 2024-11-16 08:01:02 +0800