From 095049f8490c54eece90b0ca8ceb6aa0b24a64ce Mon Sep 17 00:00:00 2001 From: Michael James Gratton Date: Wed, 13 Jul 2016 22:45:37 +1000 Subject: [PATCH] Don't rely on a the GEdit app icon for the draft folder. Bug 753672. Themes may change the app icon, which would also change the draft folder icon in Geary. Import Adawaita's to match current use, install, use, and update copyright. --- COPYING.icons | 4 + icons/CMakeLists.txt | 4 +- icons/mail-drafts-rtl-symbolic.svg | 174 ++++++++++++++++++ icons/mail-drafts-symbolic.svg | 39 ++++ .../folder-list/folder-list-folder-entry.vala | 4 +- 5 files changed, 222 insertions(+), 3 deletions(-) create mode 100644 icons/mail-drafts-rtl-symbolic.svg create mode 100644 icons/mail-drafts-symbolic.svg diff --git a/COPYING.icons b/COPYING.icons index 6490fda5..e8172ca0 100644 --- a/COPYING.icons +++ b/COPYING.icons @@ -47,6 +47,10 @@ detach-symbolic.svg Modified from view-restore-symbolic by the GNOME Project https://git.gnome.org/browse/adwaita-icon-theme/plain/Adwaita/scalable/actions/view-restore-symbolic.svg +mail-draft-symbolic.svg + Modified from accessories-text-editor-symbolic.svg by the GNOME Project + https://git.gnome.org/browse/adwaita-icon-theme/plain/Adwaita/scalable/apps/accessories-text-editor-symbolic.svg + The following work is public domain. diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index b14903d4..c21504aa 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -7,10 +7,11 @@ set(ICON_FILES text-x-generic-symbolic.svg edit-symbolic.svg format-text-remove-symbolic.svg + mail-drafts-symbolic.svg + mail-drafts-rtl-symbolic.svg mail-forward-symbolic.svg mail-forward-rtl-symbolic.svg mail-inbox-symbolic.svg - marker-symbolic.svg mail-outbox-symbolic.svg mail-reply-all-symbolic.svg mail-reply-all-rtl-symbolic.svg @@ -20,6 +21,7 @@ set(ICON_FILES mail-sent-rtl-symbolic.svg mail-spam-symbolic.svg mail-spam-rtl-symbolic.svg + marker-symbolic.svg tag-symbolic.svg tag-rtl-symbolic.svg ) diff --git a/icons/mail-drafts-rtl-symbolic.svg b/icons/mail-drafts-rtl-symbolic.svg new file mode 100644 index 00000000..484ecc15 --- /dev/null +++ b/icons/mail-drafts-rtl-symbolic.svg @@ -0,0 +1,174 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/mail-drafts-symbolic.svg b/icons/mail-drafts-symbolic.svg new file mode 100644 index 00000000..b75c9509 --- /dev/null +++ b/icons/mail-drafts-symbolic.svg @@ -0,0 +1,39 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/folder-list/folder-list-folder-entry.vala b/src/client/folder-list/folder-list-folder-entry.vala index bef1ab94..31199530 100644 --- a/src/client/folder-list/folder-list-folder-entry.vala +++ b/src/client/folder-list/folder-list-folder-entry.vala @@ -56,8 +56,8 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In return "mail-inbox-symbolic"; case Geary.SpecialFolderType.DRAFTS: - return "accessories-text-editor-symbolic"; - + return rtl ? "mail-drafts-rtl-symbolic" : "mail-drafts-symbolic"; + case Geary.SpecialFolderType.SENT: return rtl ? "mail-sent-rtl-symbolic" : "mail-sent-symbolic";