Commit 01dfbc07 authored by Wolfgang Steitz's avatar Wolfgang Steitz Committed by Jim Nelson

Use sym. icons for read/unread starred/unstarred mail: Refs bgo#720771

parent 0e08a819
......@@ -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})
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="18"
height="18"
id="svg3751"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="read-symbolic.svg">
<defs
id="defs3753" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.197802"
inkscape:cx="3.2744129"
inkscape:cy="7.9549503"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1319"
inkscape:window-height="894"
inkscape:window-x="507"
inkscape:window-y="128"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata3756">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(-0.09009933,2.0450497)">
<path
style="fill:#bebebe;fill-opacity:1;stroke:none"
d="M 9 2.21875 C 5.2555368 2.21875 2.21875 5.2555368 2.21875 9 C 2.21875 12.744463 5.2555368 15.78125 9 15.78125 C 12.744463 15.78125 15.78125 12.744463 15.78125 9 C 15.78125 5.2555368 12.744463 2.21875 9 2.21875 z M 9 3.9375 C 11.799017 3.9375 14.0625 6.2009826 14.0625 9 C 14.0625 11.799017 11.799017 14.0625 9 14.0625 C 6.2009826 14.0625 3.9375 11.799017 3.9375 9 C 3.9375 6.2009826 6.2009826 3.9375 9 3.9375 z "
transform="translate(0.09009933,-2.0450497)"
id="path3759" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Your_Icon"
x="0px"
y="0px"
width="100px"
height="95.844px"
viewBox="0 0 100 95.844"
enable-background="new 0 0 100 95.844"
xml:space="preserve"
inkscape:version="0.48.4 r9939"
sodipodi:docname="star-symbolic.svg"><metadata
id="metadata9"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs7" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="776"
inkscape:window-height="620"
id="namedview5"
showgrid="false"
inkscape:zoom="2.4623346"
inkscape:cx="-24.725832"
inkscape:cy="47.922001"
inkscape:window-x="924"
inkscape:window-y="278"
inkscape:window-maximized="0"
inkscape:current-layer="Your_Icon" /><path
d="M92.44,38.392L92.44,38.392L92.44,38.392 M49.996,0c-3.272,0-6.18,2.109-7.187,5.225l-8.324,25.606H7.559 c-3.272,0-6.18,2.109-7.187,5.226c-1.016,3.111,0.096,6.522,2.743,8.449l21.787,15.833l-8.324,25.61 c-1.016,3.111,0.096,6.522,2.743,8.449c1.328,0.964,2.89,1.445,4.444,1.445c1.562,0,3.125-0.481,4.444-1.445l21.787-15.832 l21.787,15.832c1.319,0.964,2.882,1.445,4.444,1.445c1.554,0,3.116-0.481,4.444-1.445c2.647-1.927,3.758-5.338,2.743-8.454 L75.09,60.339l21.795-15.828c2.647-1.923,3.759-5.334,2.743-8.45s-3.915-5.226-7.188-5.226H65.507l-8.324-25.61 C56.167,2.109,53.268,0.004,49.996,0L49.996,0z"
id="path3"
style="fill:#bebebe;fill-opacity:1" /></svg>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="18"
height="18"
id="svg3751"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="unread-symbolic.svg">
<defs
id="defs3753" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.197802"
inkscape:cx="6.7178215"
inkscape:cy="7.9549503"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1319"
inkscape:window-height="894"
inkscape:window-x="356"
inkscape:window-y="71"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata3756">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(-0.09009933,2.0450497)">
<path
sodipodi:type="arc"
style="fill:#bebebe;fill-opacity:1;stroke:none"
id="path3759"
sodipodi:cx="8.0188122"
sodipodi:cy="8.0262375"
sodipodi:rx="7.9287128"
sodipodi:ry="7.9287128"
d="m 15.947525,8.0262375 a 7.9287128,7.9287128 0 1 1 -15.85742567,0 7.9287128,7.9287128 0 1 1 15.85742567,0 z"
transform="matrix(0.85511363,0,0,0.85511363,2.2331037,0.09160523)" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Your_Icon"
x="0px"
y="0px"
width="100px"
height="95.844px"
viewBox="0 0 100 95.844"
enable-background="new 0 0 100 95.844"
xml:space="preserve"
inkscape:version="0.48.4 r9939"
sodipodi:docname="unstarred-symbolic.svg"><metadata
id="metadata9"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs7" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="769"
inkscape:window-height="480"
id="namedview5"
showgrid="false"
inkscape:zoom="2.4623346"
inkscape:cx="50"
inkscape:cy="47.922001"
inkscape:window-x="678"
inkscape:window-y="284"
inkscape:window-maximized="0"
inkscape:current-layer="Your_Icon" /><path
d="M49.996,7.56l10.016,30.836H92.44L66.201,57.452l10.025,30.832L49.996,69.223L23.765,88.284l10.017-30.832L7.559,38.392 H39.97L49.996,7.56 M49.996,0c-3.272,0-6.18,2.109-7.187,5.225l-8.324,25.606H7.559c-3.272,0-6.18,2.109-7.187,5.226 c-1.016,3.111,0.096,6.522,2.743,8.449l21.787,15.833l-8.324,25.61c-1.016,3.111,0.096,6.527,2.743,8.449 c1.328,0.964,2.89,1.445,4.444,1.445c1.562,0,3.125-0.481,4.444-1.445l21.787-15.832l21.787,15.832 c1.319,0.964,2.882,1.445,4.444,1.445c1.554,0,3.116-0.481,4.444-1.445c2.647-1.927,3.758-5.338,2.743-8.449l-8.324-25.61 l21.795-15.828c2.647-1.923,3.759-5.338,2.743-8.45c-1.016-3.116-3.915-5.226-7.188-5.226H65.507l-8.324-25.61 C56.167,2.109,53.268,0,49.996,0L49.996,0z"
id="path3"
style="stroke:none;stroke-opacity:1;fill:#bebebe;fill-opacity:1" /></svg>
\ No newline at end of file
......@@ -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();
......
......@@ -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");
......
......@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment