From 01dfbc077907ca53ae7e2b6c5127fe5be18030a2 Mon Sep 17 00:00:00 2001 From: Wolfgang Steitz Date: Wed, 12 Feb 2014 14:49:09 -0800 Subject: [PATCH] Use sym. icons for read/unread starred/unstarred mail: Refs bgo#720771 --- icons/CMakeLists.txt | 4 -- icons/read-symbolic.svg | 66 ----------------- icons/star-symbolic.svg | 46 ------------ icons/unread-symbolic.svg | 71 ------------------- icons/unstarred-symbolic.svg | 46 ------------ .../formatted-conversation-data.vala | 4 +- .../conversation-web-view.vala | 4 +- .../folder-list/folder-list-folder-entry.vala | 2 +- 8 files changed, 5 insertions(+), 238 deletions(-) delete mode 100644 icons/read-symbolic.svg delete mode 100755 icons/star-symbolic.svg delete mode 100644 icons/unread-symbolic.svg delete mode 100755 icons/unstarred-symbolic.svg diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index ae25a143..2b5f3a77 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -11,7 +11,6 @@ set(ICON_FILES inbox-symbolic.svg marker-symbolic.svg outbox-symbolic.svg - read-symbolic.svg reply-all-symbolic.svg reply-all-rtl-symbolic.svg reply-symbolic.svg @@ -20,11 +19,8 @@ set(ICON_FILES sent-rtl-symbolic.svg spam-symbolic.svg spam-rtl-symbolic.svg - star-symbolic.svg tag-symbolic.svg tag-rtl-symbolic.svg - unread-symbolic.svg - unstarred-symbolic.svg ) install(FILES ${ICON_FILES} DESTINATION ${ICONS_DEST}) diff --git a/icons/read-symbolic.svg b/icons/read-symbolic.svg deleted file mode 100644 index 15111455..00000000 --- a/icons/read-symbolic.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/icons/star-symbolic.svg b/icons/star-symbolic.svg deleted file mode 100755 index 9a5c73d9..00000000 --- a/icons/star-symbolic.svg +++ /dev/null @@ -1,46 +0,0 @@ - -image/svg+xml \ No newline at end of file diff --git a/icons/unread-symbolic.svg b/icons/unread-symbolic.svg deleted file mode 100644 index 0604f51c..00000000 --- a/icons/unread-symbolic.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/icons/unstarred-symbolic.svg b/icons/unstarred-symbolic.svg deleted file mode 100755 index f95b18b3..00000000 --- a/icons/unstarred-symbolic.svg +++ /dev/null @@ -1,46 +0,0 @@ - -image/svg+xml \ No newline at end of file diff --git a/src/client/conversation-list/formatted-conversation-data.vala b/src/client/conversation-list/formatted-conversation-data.vala index a52c7ac8..586b97f8 100644 --- a/src/client/conversation-list/formatted-conversation-data.vala +++ b/src/client/conversation-list/formatted-conversation-data.vala @@ -316,7 +316,7 @@ public class FormattedConversationData : Geary.BaseObject { // Unread indicator. if (is_unread || hover) { Gdk.Pixbuf read_icon = IconFactory.instance.load_symbolic( - is_unread ? "unread-symbolic" : "read-symbolic", + is_unread ? "mail-unread-symbolic" : "mail-read-symbolic", IconFactory.UNREAD_ICON_SIZE, widget.get_style_context()); Gdk.cairo_set_source_pixbuf(ctx, read_icon, cell_area.x + LINE_SPACING, unread_y); ctx.paint(); @@ -326,7 +326,7 @@ public class FormattedConversationData : Geary.BaseObject { if (is_flagged || hover) { int star_y = cell_area.y + (cell_area.height / 2) + (display_preview ? LINE_SPACING : 0); Gdk.Pixbuf starred_icon = IconFactory.instance.load_symbolic( - is_flagged ? "starred-symbolic" : "unstarred-symbolic", + is_flagged ? "starred-symbolic" : "non-starred-symbolic", IconFactory.STAR_ICON_SIZE, widget.get_style_context()); Gdk.cairo_set_source_pixbuf(ctx, starred_icon, cell_area.x + LINE_SPACING, star_y); ctx.paint(); diff --git a/src/client/conversation-viewer/conversation-web-view.vala b/src/client/conversation-viewer/conversation-web-view.vala index fbd7de76..88e7accc 100644 --- a/src/client/conversation-viewer/conversation-web-view.vala +++ b/src/client/conversation-viewer/conversation-web-view.vala @@ -143,8 +143,8 @@ public class ConversationWebView : WebKit.WebView { // Load the icons. set_icon_src("#email_template .menu .icon", "go-down-symbolic"); - set_icon_src("#email_template .starred .icon", "star-symbolic"); - set_icon_src("#email_template .unstarred .icon", "unstarred-symbolic"); + set_icon_src("#email_template .starred .icon", "starred-symbolic"); + set_icon_src("#email_template .unstarred .icon", "non-starred-symbolic"); set_icon_src("#email_template .attachment.icon", "mail-attachment-symbolic"); set_icon_src("#email_template .close_show_images", "close-symbolic"); set_icon_src("#link_warning_template .close_link_warning", "close-symbolic"); diff --git a/src/client/folder-list/folder-list-folder-entry.vala b/src/client/folder-list/folder-list-folder-entry.vala index 99e93d02..64b4f613 100644 --- a/src/client/folder-list/folder-list-folder-entry.vala +++ b/src/client/folder-list/folder-list-folder-entry.vala @@ -60,7 +60,7 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In return new ThemedIcon(rtl ? "sent-rtl-symbolic" : "sent-symbolic"); case Geary.SpecialFolderType.FLAGGED: - return new ThemedIcon("star-symbolic"); + return new ThemedIcon("starred-symbolic"); case Geary.SpecialFolderType.IMPORTANT: return new ThemedIcon("task-due-symbolic");