From 86316e18bda5a47197cb65a638a485e5120a17bf Mon Sep 17 00:00:00 2001 From: Robert Roth Date: Tue, 28 Oct 2014 13:20:00 -0700 Subject: [PATCH] Use common icon names and "mail-" prefix: Bug #713454 --- COPYING.icons | 18 ++++++------ THANKS | 1 + icons/CMakeLists.txt | 28 +++++++++---------- ...symbolic.svg => mail-archive-symbolic.svg} | 0 ...olic.svg => mail-forward-rtl-symbolic.svg} | 0 ...symbolic.svg => mail-forward-symbolic.svg} | 0 ...x-symbolic.svg => mail-inbox-symbolic.svg} | 0 ...-symbolic.svg => mail-outbox-symbolic.svg} | 0 ...ic.svg => mail-reply-all-rtl-symbolic.svg} | 0 ...mbolic.svg => mail-reply-all-symbolic.svg} | 0 ...svg => mail-reply-sender-rtl-symbolic.svg} | 0 ...lic.svg => mail-reply-sender-symbolic.svg} | 0 ...ymbolic.svg => mail-sent-rtl-symbolic.svg} | 0 ...nt-symbolic.svg => mail-sent-symbolic.svg} | 0 ...ymbolic.svg => mail-spam-rtl-symbolic.svg} | 0 ...am-symbolic.svg => mail-spam-symbolic.svg} | 0 ...mbolic.svg => text-x-generic-symbolic.svg} | 0 src/client/application/geary-controller.vala | 2 +- src/client/components/icon-factory.vala | 2 +- src/client/components/main-toolbar.vala | 6 ++-- .../folder-list/folder-list-folder-entry.vala | 10 +++---- 21 files changed, 34 insertions(+), 33 deletions(-) rename icons/{archive-symbolic.svg => mail-archive-symbolic.svg} (100%) rename icons/{forward-rtl-symbolic.svg => mail-forward-rtl-symbolic.svg} (100%) rename icons/{forward-symbolic.svg => mail-forward-symbolic.svg} (100%) rename icons/{inbox-symbolic.svg => mail-inbox-symbolic.svg} (100%) rename icons/{outbox-symbolic.svg => mail-outbox-symbolic.svg} (100%) rename icons/{reply-all-rtl-symbolic.svg => mail-reply-all-rtl-symbolic.svg} (100%) rename icons/{reply-all-symbolic.svg => mail-reply-all-symbolic.svg} (100%) rename icons/{reply-rtl-symbolic.svg => mail-reply-sender-rtl-symbolic.svg} (100%) rename icons/{reply-symbolic.svg => mail-reply-sender-symbolic.svg} (100%) rename icons/{sent-rtl-symbolic.svg => mail-sent-rtl-symbolic.svg} (100%) rename icons/{sent-symbolic.svg => mail-sent-symbolic.svg} (100%) rename icons/{spam-rtl-symbolic.svg => mail-spam-rtl-symbolic.svg} (100%) rename icons/{spam-symbolic.svg => mail-spam-symbolic.svg} (100%) rename icons/{document-symbolic.svg => text-x-generic-symbolic.svg} (100%) diff --git a/COPYING.icons b/COPYING.icons index ed57852c..6490fda5 100644 --- a/COPYING.icons +++ b/COPYING.icons @@ -7,9 +7,9 @@ unstarred-symbolic.svg http://thenounproject.com/noun/star/#icon-No15362 http://thenounproject.com/noun/star/#icon-No15361 -reply-symbolic.svg -reply-all-symbolic.svg (derivative) -forward-symbolic.svg (derivative) +mail-reply-sender-symbolic.svg +mail-reply-all-symbolic.svg (derivative) +mail-forward-symbolic.svg (derivative) Back designed by Anisha Varghese from The Noun Project http://thenounproject.com/noun/back/#icon-No14792 @@ -17,16 +17,16 @@ marker-symbolic.svg Marker designed by factor[e] design initiative from The Noun Project http://thenounproject.com/noun/marker/#icon-No18908 -inbox-symbolic.svg -outbox-symbolic.svg (derivative) +mail-inbox-symbolic.svg +mail-outbox-symbolic.svg (derivative) Inbox designed by Edward Boatman from The Noun Project http://thenounproject.com/noun/inbox/#icon-No406 -document-symbolic.svg +text-x-generic-symbolic.svg Document designed by Edward Boatman from The Noun Project http://thenounproject.com/noun/document/#icon-No453 -spam-symbolic.svg +mail-spam-symbolic.svg Pig designed by aLf from The Noun Project http://thenounproject.com/noun/pig/#icon-No5271 @@ -34,9 +34,9 @@ close-symbolic.svg Close designed by Icomatic from The Noun Project http://thenounproject.com/noun/close/#icon-No18932 -archive-symbolic.svg +mail-archive-symbolic.svg format-text-remove-symbolic.svg -sent-symbolic.svg +mail-sent-symbolic.svg Designed for Geary by Sam Hewitt, 2013 diff --git a/THANKS b/THANKS index 0535b45b..4f5279a0 100644 --- a/THANKS +++ b/THANKS @@ -38,6 +38,7 @@ Tiago Quelhas Viko Adi Rahmawan Didier Roche Janosch Rolles +Robert Roth Gustavo Rubio Michel Alexandre Salim Anirudh Sanjeev diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 55030eab..fe509f24 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -1,25 +1,25 @@ set(ICONS_DEST share/geary/icons) set(ICON_FILES - archive-symbolic.svg + mail-archive-symbolic.svg close-symbolic.svg detach-symbolic.svg - document-symbolic.svg + text-x-generic-symbolic.svg edit-symbolic.svg format-text-remove-symbolic.svg - forward-symbolic.svg - forward-rtl-symbolic.svg - inbox-symbolic.svg + mail-forward-symbolic.svg + mail-forward-rtl-symbolic.svg + mail-inbox-symbolic.svg marker-symbolic.svg - outbox-symbolic.svg - reply-all-symbolic.svg - reply-all-rtl-symbolic.svg - reply-symbolic.svg - reply-rtl-symbolic.svg - sent-symbolic.svg - sent-rtl-symbolic.svg - spam-symbolic.svg - spam-rtl-symbolic.svg + mail-outbox-symbolic.svg + mail-reply-all-symbolic.svg + mail-reply-all-rtl-symbolic.svg + mail-reply-sender-symbolic.svg + mail-reply-sender-rtl-symbolic.svg + mail-sent-symbolic.svg + mail-sent-rtl-symbolic.svg + mail-spam-symbolic.svg + mail-spam-rtl-symbolic.svg tag-symbolic.svg tag-rtl-symbolic.svg ) diff --git a/icons/archive-symbolic.svg b/icons/mail-archive-symbolic.svg similarity index 100% rename from icons/archive-symbolic.svg rename to icons/mail-archive-symbolic.svg diff --git a/icons/forward-rtl-symbolic.svg b/icons/mail-forward-rtl-symbolic.svg similarity index 100% rename from icons/forward-rtl-symbolic.svg rename to icons/mail-forward-rtl-symbolic.svg diff --git a/icons/forward-symbolic.svg b/icons/mail-forward-symbolic.svg similarity index 100% rename from icons/forward-symbolic.svg rename to icons/mail-forward-symbolic.svg diff --git a/icons/inbox-symbolic.svg b/icons/mail-inbox-symbolic.svg similarity index 100% rename from icons/inbox-symbolic.svg rename to icons/mail-inbox-symbolic.svg diff --git a/icons/outbox-symbolic.svg b/icons/mail-outbox-symbolic.svg similarity index 100% rename from icons/outbox-symbolic.svg rename to icons/mail-outbox-symbolic.svg diff --git a/icons/reply-all-rtl-symbolic.svg b/icons/mail-reply-all-rtl-symbolic.svg similarity index 100% rename from icons/reply-all-rtl-symbolic.svg rename to icons/mail-reply-all-rtl-symbolic.svg diff --git a/icons/reply-all-symbolic.svg b/icons/mail-reply-all-symbolic.svg similarity index 100% rename from icons/reply-all-symbolic.svg rename to icons/mail-reply-all-symbolic.svg diff --git a/icons/reply-rtl-symbolic.svg b/icons/mail-reply-sender-rtl-symbolic.svg similarity index 100% rename from icons/reply-rtl-symbolic.svg rename to icons/mail-reply-sender-rtl-symbolic.svg diff --git a/icons/reply-symbolic.svg b/icons/mail-reply-sender-symbolic.svg similarity index 100% rename from icons/reply-symbolic.svg rename to icons/mail-reply-sender-symbolic.svg diff --git a/icons/sent-rtl-symbolic.svg b/icons/mail-sent-rtl-symbolic.svg similarity index 100% rename from icons/sent-rtl-symbolic.svg rename to icons/mail-sent-rtl-symbolic.svg diff --git a/icons/sent-symbolic.svg b/icons/mail-sent-symbolic.svg similarity index 100% rename from icons/sent-symbolic.svg rename to icons/mail-sent-symbolic.svg diff --git a/icons/spam-rtl-symbolic.svg b/icons/mail-spam-rtl-symbolic.svg similarity index 100% rename from icons/spam-rtl-symbolic.svg rename to icons/mail-spam-rtl-symbolic.svg diff --git a/icons/spam-symbolic.svg b/icons/mail-spam-symbolic.svg similarity index 100% rename from icons/spam-symbolic.svg rename to icons/mail-spam-symbolic.svg diff --git a/icons/document-symbolic.svg b/icons/text-x-generic-symbolic.svg similarity index 100% rename from icons/document-symbolic.svg rename to icons/text-x-generic-symbolic.svg diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala index 8d8910c5..808f3f4c 100644 --- a/src/client/application/geary-controller.vala +++ b/src/client/application/geary-controller.vala @@ -68,7 +68,7 @@ public class GearyController : Geary.BaseObject { private const string ARCHIVE_MESSAGE_LABEL = _("_Archive"); private const string ARCHIVE_MESSAGE_TOOLTIP_SINGLE = _("Archive conversation (A)"); private const string ARCHIVE_MESSAGE_TOOLTIP_MULTIPLE = _("Archive conversations (A)"); - private const string ARCHIVE_MESSAGE_ICON_NAME = "archive-symbolic"; + private const string ARCHIVE_MESSAGE_ICON_NAME = "mail-archive-symbolic"; private const string MARK_AS_SPAM_LABEL = _("Mark as S_pam"); private const string MARK_AS_NOT_SPAM_LABEL = _("Mark as not S_pam"); diff --git a/src/client/components/icon-factory.vala b/src/client/components/icon-factory.vala index 6277d8ac..08c99a95 100644 --- a/src/client/components/icon-factory.vala +++ b/src/client/components/icon-factory.vala @@ -120,7 +120,7 @@ public class IconFactory { public Gtk.IconInfo? lookup_icon(string icon_name, int size, Gtk.IconLookupFlags flags = 0) { Gtk.IconInfo? icon_info = icon_theme.lookup_icon(icon_name, size, flags); return icon_info != null ? icon_info.copy() : - icon_theme.lookup_icon("document-symbolic", size, flags); + icon_theme.lookup_icon("text-x-generic-symbolic", size, flags); } // GTK+ 3.14 no longer scales icons via the IconInfo, so perform manually until we diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala index 75ab2b06..4f0a960a 100644 --- a/src/client/components/main-toolbar.vala +++ b/src/client/components/main-toolbar.vala @@ -49,9 +49,9 @@ public class MainToolbar : PillHeaderbar { // Reply buttons insert.clear(); - insert.add(create_toolbar_button(rtl ? "reply-rtl-symbolic" : "reply-symbolic", GearyController.ACTION_REPLY_TO_MESSAGE)); - insert.add(create_toolbar_button(rtl ? "reply-all-rtl-symbolic" : "reply-all-symbolic", GearyController.ACTION_REPLY_ALL_MESSAGE)); - insert.add(create_toolbar_button(rtl ? "forward-rtl-symbolic" : "forward-symbolic", GearyController.ACTION_FORWARD_MESSAGE)); + insert.add(create_toolbar_button(rtl ? "mail-reply-sender-rtl-symbolic" : "mail-reply-sender-symbolic", GearyController.ACTION_REPLY_TO_MESSAGE)); + insert.add(create_toolbar_button(rtl ? "mail-reply-all-rtl-symbolic" : "mail-reply-all-symbolic", GearyController.ACTION_REPLY_ALL_MESSAGE)); + insert.add(create_toolbar_button(rtl ? "mail-forward-rtl-symbolic" : "mail-forward-symbolic", GearyController.ACTION_FORWARD_MESSAGE)); add_start(create_pill_buttons(insert)); // Mark, copy, move. diff --git a/src/client/folder-list/folder-list-folder-entry.vala b/src/client/folder-list/folder-list-folder-entry.vala index a2170461..88f560d2 100644 --- a/src/client/folder-list/folder-list-folder-entry.vala +++ b/src/client/folder-list/folder-list-folder-entry.vala @@ -53,13 +53,13 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In return rtl ? "tag-rtl-symbolic" : "tag-symbolic"; case Geary.SpecialFolderType.INBOX: - return "inbox-symbolic"; + return "mail-inbox-symbolic"; case Geary.SpecialFolderType.DRAFTS: return "accessories-text-editor-symbolic"; case Geary.SpecialFolderType.SENT: - return rtl ? "sent-rtl-symbolic" : "sent-symbolic"; + return rtl ? "mail-sent-rtl-symbolic" : "mail-sent-symbolic"; case Geary.SpecialFolderType.FLAGGED: return "starred-symbolic"; @@ -68,16 +68,16 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In return "task-due-symbolic"; case Geary.SpecialFolderType.ALL_MAIL: - return "archive-symbolic"; + return "mail-archive-symbolic"; case Geary.SpecialFolderType.SPAM: - return rtl ? "spam-rtl-symbolic" : "spam-symbolic"; + return rtl ? "mail-spam-rtl-symbolic" : "mail-spam-symbolic"; case Geary.SpecialFolderType.TRASH: return "user-trash-symbolic"; case Geary.SpecialFolderType.OUTBOX: - return "outbox-symbolic"; + return "mail-outbox-symbolic"; default: assert_not_reached();