GNOME.org
 

[shotwell/wip/phako/dark: 14/18] wip: Replace more icons in search bar

commit 98d089dad3b428ee49a6231d3fb904374c20cd2f
Author: Jens Georg <mail jensge org>
Date:   Fri Apr 13 19:30:08 2018 +0200

    wip: Replace more icons in search bar

 icons/all-rejected.png                     |  Bin 1993 -> 0 bytes
 icons/filter-flagged-disabled-symbolic.svg |   31 ++++++++++++++++++++++
 icons/filter-flagged-disabled.png          |  Bin 3135 -> 0 bytes
 icons/filter-flagged-symbolic.svg          |   31 ++++++++++++++++++++++
 icons/filter-flagged.png                   |  Bin 3179 -> 0 bytes
 icons/filter-photos-disabled-symbolic.svg  |   33 ++++++++++++++++++++++++
 icons/filter-photos-disabled.png           |  Bin 3106 -> 0 bytes
 icons/filter-photos-symbolic.svg           |   33 ++++++++++++++++++++++++
 icons/filter-photos.png                    |  Bin 3176 -> 0 bytes
 icons/filter-raw-disabled-symbolic.svg     |   17 ++++++++++++
 icons/filter-raw-disabled.png              |  Bin 4166 -> 0 bytes
 icons/filter-raw-symbolic.svg              |   17 ++++++++++++
 icons/filter-raw.png                       |  Bin 4265 -> 0 bytes
 icons/filter-videos-disabled-symbolic.svg  |   33 ++++++++++++++++++++++++
 icons/filter-videos-disabled.png           |  Bin 3610 -> 0 bytes
 icons/filter-videos-symbolic.svg           |   33 ++++++++++++++++++++++++
 icons/filter-videos.png                    |  Bin 3627 -> 0 bytes
 org.gnome.Shotwell.gresource.xml           |   17 ++++++------
 src/Resources.vala                         |    8 ------
 src/SearchFilter.vala                      |   38 +++++++++++++++------------
 src/library/FlaggedSidebarEntry.vala       |    2 +-
 21 files changed, 258 insertions(+), 35 deletions(-)
---
diff --git a/icons/filter-flagged-disabled-symbolic.svg b/icons/filter-flagged-disabled-symbolic.svg
new file mode 100644
index 0000000..986cc53
--- /dev/null
+++ b/icons/filter-flagged-disabled-symbolic.svg
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:svg='http://www.w3.org/2000/svg' id='svg7384' 
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' 
sodipodi:docname='emblem-important-symbolic.svg' version='1.1' inkscape:version='0.48pre1 r9509' height='16' 
xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' 
xmlns='http://www.w3.org/2000/svg' width='16'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:cy='-146.05202' pagecolor='#555753' borderopacity='1' showborder='false' 
inkscape:bbox-paths='false' guidetolerance='10' inkscape:window-width='1310' showguides='true' 
inkscape:object-nodes='true' inkscape:snap-bbox='true' inkscape:pageshadow='2' inkscape:guide-bbox='true' 
inkscape:snap-nodes='true' bordercolor='#666666' objecttolerance='10' id='namedview88' showgrid='false' 
inkscape:window-maximized='0' inkscape:window-x='54' inkscape:snap-global='true' inkscape:window-y='24' 
gridtolerance='10' inkscape:window-height='690' inkscape:snap-to-guides='true' 
inkscape:current-layer='layer15' inkscape:zoom='1' inkscape:cx='-349.84279' inkscape:snap-grids='true' 
inkscape:pageopacity='1'>
+    <inkscape:grid spacingx='1px' spacingy='1px' id='grid4866' empspacing='2' enabled='true' type='xygrid' 
snapvisiblegridlinesonly='true' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:label='status' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' id='layer9' 
style='display:inline'/>
+  <g inkscape:label='devices' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' 
id='layer10'/>
+  <g inkscape:label='apps' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' id='layer11'/>
+  <g inkscape:label='actions' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' 
id='layer12'/>
+  <g inkscape:label='places' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' id='layer13'/>
+  <g inkscape:label='mimetypes' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' 
id='layer14'/>
+  <g inkscape:label='emblems' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' id='layer15' 
style='display:inline'>
+    <g inkscape:label='emblem-important' transform='translate(115.8093,-581.17812)' id='g35541'>
+      <path transform='translate(284.1907,141.17812)' inkscape:connector-curvature='0' d='m 70,823 c 
-3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 
-0.09375,1.96875 A 1.0001,1.0001 0 0 1 71,826 l 0,5 a 1.0001,1.0001 0 1 1 -2,0 l 0,-5 a 1.0001,1.0001 0 0 1 
0.78125,-1 1.0001,1.0001 0 0 1 0.125,-0.0313 z M 70,833 c 0.552285,0 1,0.44772 1,1 0,0.55228 -0.447715,1 -1,1 
-0.552285,0 -1,-0.44772 -1,-1 0,-0.55228 0.447715,-1 1,-1 z' id='path35543' 
style='opacity:.35;fill:#bebebe;fill-opacity:1;stroke:none'/>
+
+    </g>
+  </g>
+</svg>
diff --git a/icons/filter-flagged-symbolic.svg b/icons/filter-flagged-symbolic.svg
new file mode 100644
index 0000000..0ecb44c
--- /dev/null
+++ b/icons/filter-flagged-symbolic.svg
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:svg='http://www.w3.org/2000/svg' id='svg7384' 
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' 
sodipodi:docname='emblem-important-symbolic.svg' version='1.1' inkscape:version='0.48pre1 r9509' height='16' 
xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' 
xmlns='http://www.w3.org/2000/svg' width='16'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:cy='-146.05202' pagecolor='#555753' borderopacity='1' showborder='false' 
inkscape:bbox-paths='false' guidetolerance='10' inkscape:window-width='1310' showguides='true' 
inkscape:object-nodes='true' inkscape:snap-bbox='true' inkscape:pageshadow='2' inkscape:guide-bbox='true' 
inkscape:snap-nodes='true' bordercolor='#666666' objecttolerance='10' id='namedview88' showgrid='false' 
inkscape:window-maximized='0' inkscape:window-x='54' inkscape:snap-global='true' inkscape:window-y='24' 
gridtolerance='10' inkscape:window-height='690' inkscape:snap-to-guides='true' 
inkscape:current-layer='layer15' inkscape:zoom='1' inkscape:cx='-349.84279' inkscape:snap-grids='true' 
inkscape:pageopacity='1'>
+    <inkscape:grid spacingx='1px' spacingy='1px' id='grid4866' empspacing='2' enabled='true' type='xygrid' 
snapvisiblegridlinesonly='true' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:label='status' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' id='layer9' 
style='display:inline'/>
+  <g inkscape:label='devices' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' 
id='layer10'/>
+  <g inkscape:label='apps' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' id='layer11'/>
+  <g inkscape:label='actions' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' 
id='layer12'/>
+  <g inkscape:label='places' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' id='layer13'/>
+  <g inkscape:label='mimetypes' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' 
id='layer14'/>
+  <g inkscape:label='emblems' transform='translate(-462,-381.99998)' inkscape:groupmode='layer' id='layer15' 
style='display:inline'>
+    <g inkscape:label='emblem-important' transform='translate(115.8093,-581.17812)' id='g35541'>
+      <path transform='translate(284.1907,141.17812)' inkscape:connector-curvature='0' d='m 70,823 c 
-3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 
-0.09375,1.96875 A 1.0001,1.0001 0 0 1 71,826 l 0,5 a 1.0001,1.0001 0 1 1 -2,0 l 0,-5 a 1.0001,1.0001 0 0 1 
0.78125,-1 1.0001,1.0001 0 0 1 0.125,-0.0313 z M 70,833 c 0.552285,0 1,0.44772 1,1 0,0.55228 -0.447715,1 -1,1 
-0.552285,0 -1,-0.44772 -1,-1 0,-0.55228 0.447715,-1 1,-1 z' id='path35543' 
style='fill:#bebebe;fill-opacity:1;stroke:none'/>
+
+    </g>
+  </g>
+</svg>
diff --git a/icons/filter-photos-disabled-symbolic.svg b/icons/filter-photos-disabled-symbolic.svg
new file mode 100644
index 0000000..f392cdb
--- /dev/null
+++ b/icons/filter-photos-disabled-symbolic.svg
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:svg='http://www.w3.org/2000/svg' id='svg7384' 
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' 
sodipodi:docname='emblem-photos-symbolic.svg' version='1.1' inkscape:version='0.48.1 r9760' height='16' 
xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' 
xmlns='http://www.w3.org/2000/svg' width='16.0002'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:cy='8.0141006' pagecolor='#555753' borderopacity='1' showborder='false' 
inkscape:bbox-paths='false' guidetolerance='10' inkscape:object-paths='true' inkscape:window-width='1239' 
showguides='true' inkscape:object-nodes='true' inkscape:snap-bbox='true' inkscape:pageshadow='2' 
inkscape:guide-bbox='true' inkscape:snap-nodes='true' bordercolor='#666666' objecttolerance='10' 
id='namedview88' showgrid='false' inkscape:window-maximized='0' inkscape:window-x='125' 
inkscape:snap-global='true' inkscape:window-y='26' gridtolerance='10' inkscape:window-height='708' 
inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:current-layer='layer15' 
inkscape:snap-bbox-midpoints='false' inkscape:zoom='1' inkscape:cx='-26.97353' inkscape:snap-grids='true' 
inkscape:pageopacity='1'>
+    <inkscape:grid spacingx='1px' spacingy='1px' id='grid4866' empspacing='2' enabled='true' type='xygrid' 
snapvisiblegridlinesonly='true' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:label='status' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer9' 
style='display:inline'/>
+  <g inkscape:label='devices' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' 
id='layer10'/>
+  <g inkscape:label='apps' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer11'/>
+  <g inkscape:label='places' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer13'/>
+  <g inkscape:label='mimetypes' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' 
id='layer14'/>
+  <g inkscape:label='emblems' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer15' 
style='display:inline'>
+
+    <path inkscape:connector-curvature='0' d='m 615.0002,387 0,2 1,0 0,5 -10,0 0,2 12,0 0,-9 z' 
id='rect6307-1' sodipodi:nodetypes='ccccccccc' 
style='opacity:.35;font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 602,384 0,9 12,0 0,-9 z m 2,2 8,0 0,5 -8,0 z' id='rect6307' 
sodipodi:nodetypes='cccccccccc' 
style='opacity:.35;font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 605.0002,389 c 2.32075,1 3.04463,-1.65963 6,0 l 0,1 -6,0 z' 
id='rect6402' sodipodi:nodetypes='ccccc' 
style='opacity:0.35;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
+  </g>
+  <g inkscape:label='emotes' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='g71291' 
style='display:inline'/>
+  <g inkscape:label='categories' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' 
id='g4953' style='display:inline'/>
+  <g inkscape:label='actions' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer12' 
style='display:inline'/>
+</svg>
diff --git a/icons/filter-photos-symbolic.svg b/icons/filter-photos-symbolic.svg
new file mode 100644
index 0000000..11a2e77
--- /dev/null
+++ b/icons/filter-photos-symbolic.svg
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:svg='http://www.w3.org/2000/svg' id='svg7384' 
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' 
sodipodi:docname='emblem-photos-symbolic.svg' version='1.1' inkscape:version='0.48.1 r9760' height='16' 
xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' 
xmlns='http://www.w3.org/2000/svg' width='16.0002'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:cy='8.0141006' pagecolor='#555753' borderopacity='1' showborder='false' 
inkscape:bbox-paths='false' guidetolerance='10' inkscape:object-paths='true' inkscape:window-width='1239' 
showguides='true' inkscape:object-nodes='true' inkscape:snap-bbox='true' inkscape:pageshadow='2' 
inkscape:guide-bbox='true' inkscape:snap-nodes='true' bordercolor='#666666' objecttolerance='10' 
id='namedview88' showgrid='false' inkscape:window-maximized='0' inkscape:window-x='125' 
inkscape:snap-global='true' inkscape:window-y='26' gridtolerance='10' inkscape:window-height='708' 
inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:current-layer='layer15' 
inkscape:snap-bbox-midpoints='false' inkscape:zoom='1' inkscape:cx='-26.97353' inkscape:snap-grids='true' 
inkscape:pageopacity='1'>
+    <inkscape:grid spacingx='1px' spacingy='1px' id='grid4866' empspacing='2' enabled='true' type='xygrid' 
snapvisiblegridlinesonly='true' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:label='status' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer9' 
style='display:inline'/>
+  <g inkscape:label='devices' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' 
id='layer10'/>
+  <g inkscape:label='apps' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer11'/>
+  <g inkscape:label='places' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer13'/>
+  <g inkscape:label='mimetypes' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' 
id='layer14'/>
+  <g inkscape:label='emblems' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer15' 
style='display:inline'>
+
+    <path inkscape:connector-curvature='0' d='m 615.0002,387 0,2 1,0 0,5 -10,0 0,2 12,0 0,-9 z' 
id='rect6307-1' sodipodi:nodetypes='ccccccccc' 
style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 602,384 0,9 12,0 0,-9 z m 2,2 8,0 0,5 -8,0 z' id='rect6307' 
sodipodi:nodetypes='cccccccccc' 
style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 605.0002,389 c 2.32075,1 3.04463,-1.65963 6,0 l 0,1 -6,0 z' 
id='rect6402' sodipodi:nodetypes='ccccc' 
style='opacity:0.35;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
+  </g>
+  <g inkscape:label='emotes' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='g71291' 
style='display:inline'/>
+  <g inkscape:label='categories' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' 
id='g4953' style='display:inline'/>
+  <g inkscape:label='actions' transform='translate(-602,-381.99998)' inkscape:groupmode='layer' id='layer12' 
style='display:inline'/>
+</svg>
diff --git a/icons/filter-raw-disabled-symbolic.svg b/icons/filter-raw-disabled-symbolic.svg
new file mode 100644
index 0000000..68c3957
--- /dev/null
+++ b/icons/filter-raw-disabled-symbolic.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns="http://www.w3.org/2000/svg"; 
height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#"; 
xmlns:dc="http://purl.org/dc/elements/1.1/";>
+ <metadata id="metadata90">
+  <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>Gnome Symbolic Icon Theme</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <title id="title9167">Gnome Symbolic Icon Theme</title>
+ <g id="layer13" transform="translate(-521,-195)">
+  <path id="path4975" style="opacity:.35;color:#bebebe;fill:#bebebe" d="m527 197c-0.54996 0-1 0.45004-1 
1v1h-3c-0.55201 0-1 0.45004-1 1v8c0 0.54996 0.44799 1 1 1h12c0.55201 0 1-0.45004 
1-1v-8c0-0.54996-0.44799-1-1-1h-3v-1c0-0.54996-0.45004-1-1-1h-4zm2 3c2.2091 0 4 1.7909 4 4s-1.7909 4-4 
4-4-1.7909-4-4 1.7909-4 4-4zm0 2c-1.1046 0-2 0.89543-2 2s0.89543 2 2 2 2-0.89543 2-2-0.89543-2-2-2z"/>
+ </g>
+</svg>
diff --git a/icons/filter-raw-symbolic.svg b/icons/filter-raw-symbolic.svg
new file mode 100644
index 0000000..e8201f5
--- /dev/null
+++ b/icons/filter-raw-symbolic.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns="http://www.w3.org/2000/svg"; 
height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#"; 
xmlns:dc="http://purl.org/dc/elements/1.1/";>
+ <metadata id="metadata90">
+  <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>Gnome Symbolic Icon Theme</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <title id="title9167">Gnome Symbolic Icon Theme</title>
+ <g id="layer13" transform="translate(-521,-195)">
+  <path id="path4975" style="color:#bebebe;fill:#bebebe" d="m527 197c-0.54996 0-1 0.45004-1 1v1h-3c-0.55201 
0-1 0.45004-1 1v8c0 0.54996 0.44799 1 1 1h12c0.55201 0 1-0.45004 
1-1v-8c0-0.54996-0.44799-1-1-1h-3v-1c0-0.54996-0.45004-1-1-1h-4zm2 3c2.2091 0 4 1.7909 4 4s-1.7909 4-4 
4-4-1.7909-4-4 1.7909-4 4-4zm0 2c-1.1046 0-2 0.89543-2 2s0.89543 2 2 2 2-0.89543 2-2-0.89543-2-2-2z"/>
+ </g>
+</svg>
diff --git a/icons/filter-videos-disabled-symbolic.svg b/icons/filter-videos-disabled-symbolic.svg
new file mode 100644
index 0000000..25b81e3
--- /dev/null
+++ b/icons/filter-videos-disabled-symbolic.svg
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' 
sodipodi:docname='emblem-videos-symbolic.svg' 
inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' 
inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' 
xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' 
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' 
version='1.1' inkscape:version='0.48.4 r9939' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' 
borderopacity='1' inkscape:current-layer='layer15' inkscape:cx='-91.6517' inkscape:cy='-92.47383' 
gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' 
inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' 
inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' 
inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' 
inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' 
inkscape:snap-to-guides='true' inkscape:window-height='1373' inkscape:window-maximized='0' 
inkscape:window-width='1279' inkscape:window-x='1279' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-319.9998px' originy='164px' 
snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+    <inkscape:grid color='#000000' empcolor='#000000' empopacity='0' empspacing='4' enabled='true' 
id='grid5968' opacity='0.1254902' originx='-319.9998px' originy='164px' snapvisiblegridlinesonly='true' 
spacingx='0.5px' spacingy='0.5px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' 
transform='translate(-561,-381)'>
+
+    <rect height='9' id='rect5538' rx='0.99980003' ry='1' 
style='opacity:.35;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'
 width='9.96875' x='562.03125' y='385'/>
+    <path inkscape:connector-curvature='0' d='m 572,389.4693 3.46929,-3.4693 0.53091,0 0,7 -0.5,0 z' 
id='path5540' sodipodi:nodetypes='cccccc' 
style='opacity:.35;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
+  </g>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' 
transform='translate(-561,-381)'/>
+</svg>
diff --git a/icons/filter-videos-symbolic.svg b/icons/filter-videos-symbolic.svg
new file mode 100644
index 0000000..fb1a406
--- /dev/null
+++ b/icons/filter-videos-symbolic.svg
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' 
sodipodi:docname='emblem-videos-symbolic.svg' 
inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' 
inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' 
xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' 
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' 
version='1.1' inkscape:version='0.48.4 r9939' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' 
borderopacity='1' inkscape:current-layer='layer15' inkscape:cx='-91.6517' inkscape:cy='-92.47383' 
gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' 
inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' 
inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' 
inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' 
inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' 
inkscape:snap-to-guides='true' inkscape:window-height='1373' inkscape:window-maximized='0' 
inkscape:window-width='1279' inkscape:window-x='1279' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-319.9998px' originy='164px' 
snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+    <inkscape:grid color='#000000' empcolor='#000000' empopacity='0' empspacing='4' enabled='true' 
id='grid5968' opacity='0.1254902' originx='-319.9998px' originy='164px' snapvisiblegridlinesonly='true' 
spacingx='0.5px' spacingy='0.5px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' 
transform='translate(-561,-381)'>
+
+    <rect height='9' id='rect5538' rx='0.99980003' ry='1' 
style='color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'
 width='9.96875' x='562.03125' y='385'/>
+    <path inkscape:connector-curvature='0' d='m 572,389.4693 3.46929,-3.4693 0.53091,0 0,7 -0.5,0 z' 
id='path5540' sodipodi:nodetypes='cccccc' 
style='color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible'/>
+  </g>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' 
transform='translate(-561,-381)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' 
transform='translate(-561,-381)'/>
+</svg>
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index c030792..4c3807a 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -33,18 +33,17 @@
       <file preprocess="xml-stripblanks">ui/trash.ui</file>
       <!-- Icons -->
       <file>icons/about-braunschweig.jpg</file>
-      <file>icons/all-rejected.png</file>
       <file>icons/crop-pivot-reticle.png</file>
       <file>icons/events-merge-symbolic.svg</file>
       <file>icons/faces-tool.png</file>
-      <file>icons/filter-flagged-disabled.png</file>
-      <file>icons/filter-flagged.png</file>
-      <file>icons/filter-photos-disabled.png</file>
-      <file>icons/filter-photos.png</file>
-      <file>icons/filter-raw-disabled.png</file>
-      <file>icons/filter-raw.png</file>
-      <file>icons/filter-videos-disabled.png</file>
-      <file>icons/filter-videos.png</file>
+      <file>icons/filter-flagged-symbolic.svg</file>
+      <file>icons/filter-flagged-disabled-symbolic.svg</file>
+      <file>icons/filter-photos-symbolic.svg</file>
+      <file>icons/filter-photos-disabled-symbolic.svg</file>
+      <file>icons/filter-raw-symbolic.svg</file>
+      <file>icons/filter-raw-disabled-symbolic.svg</file>
+      <file>icons/filter-videos-disabled-symbolic.svg</file>
+      <file>icons/filter-videos-symbolic.svg</file>
       <file>icons/five-stars.svg</file>
       <file>icons/flag-page.png</file>
       <file>icons/flag-trinket.png</file>
diff --git a/src/Resources.vala b/src/Resources.vala
index ee519d1..f856f41 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -112,14 +112,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string ICON_MISSING_FILES = "process-stop-symbolic";
     public const string ICON_PHOTOS = "shotwell-symbolic";
     public const string ICON_SINGLE_PHOTO = "image-x-generic-symbolic";
-    public const string ICON_FILTER_PHOTOS = "filter-photos";
-    public const string ICON_FILTER_PHOTOS_DISABLED = "filter-photos-disabled";
-    public const string ICON_FILTER_VIDEOS = "filter-videos";
-    public const string ICON_FILTER_VIDEOS_DISABLED = "filter-videos-disabled";
-    public const string ICON_FILTER_RAW = "filter-raw";
-    public const string ICON_FILTER_RAW_DISABLED = "filter-raw-disabled";
-    public const string ICON_FILTER_FLAGGED = "filter-flagged";
-    public const string ICON_FILTER_FLAGGED_DISABLED = "filter-flagged-disabled";
     public const string ICON_TRASH_EMPTY = "user-trash-symbolic";
     public const string ICON_TRASH_FULL = "user-trash-full-symbolic";
     public const string ICON_VIDEOS_PAGE = "videos-page";
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index 6f6c3ef..e9f34ef 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -754,28 +754,32 @@ public class SearchFilterToolbar : Gtk.Revealer {
         }
 
         private Gtk.Widget get_filter_icon(RatingFilter filter) {
-            string filename = null;
+            Gtk.Widget? icon = null;
 
             switch (filter) {
                 case RatingFilter.REJECTED_OR_HIGHER:
-                    filename = Resources.ICON_FILTER_REJECTED_OR_BETTER;
+                    icon = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
+                    var image = new Gtk.Image.from_icon_name ("emblem-photos-symbolic", 
Gtk.IconSize.SMALL_TOOLBAR);
+                    image.margin_end = 2;
+                    (icon as Gtk.Box).pack_start(image);
+                    image = new Gtk.Image.from_icon_name ("window-close-symbolic", 
Gtk.IconSize.SMALL_TOOLBAR);
+                    (icon as Gtk.Box).pack_start(image);
+                    icon.show_all();
                 break;
                 
                 case RatingFilter.REJECTED_ONLY:
-                    filename = Resources.ICON_RATING_REJECTED;
+                    icon = new Gtk.Image.from_icon_name ("window-close-symbolic", 
Gtk.IconSize.SMALL_TOOLBAR);
                 break;
                 
                 case RatingFilter.UNRATED_OR_HIGHER:
                 default:
-                    filename = Resources.ICON_FILTER_UNRATED_OR_BETTER;
+                    icon = new Gtk.Image.from_icon_name ("emblem-photos-symbolic", 
Gtk.IconSize.SMALL_TOOLBAR);
                 break;
             }
-            
-            Gtk.Image image = new Gtk.Image.from_pixbuf(Resources.load_icon(filename,
-                get_filter_icon_size(filter)));
-            image.set_margin_end(6);
 
-            return image;
+            icon.margin_end = 6;
+
+            return icon;
         }
 
         private int get_filter_icon_size(RatingFilter filter) {
@@ -1171,24 +1175,24 @@ public class SearchFilterToolbar : Gtk.Revealer {
         if (has_photos || has_raw)
             // As a user, I would expect, that a raw photo is still a photo.
             // Let's enable the photo button even if there ar only raw photos.
-            toolbtn_photos.set_icon_name(Resources.ICON_FILTER_PHOTOS);
+            toolbtn_photos.set_icon_name("filter-photos-symbolic");
         else
-            toolbtn_photos.set_icon_name(Resources.ICON_FILTER_PHOTOS_DISABLED);
+            toolbtn_photos.set_icon_name("filter-photos-disabled-symbolic");
 
         if (has_videos)
-            toolbtn_videos.set_icon_name(Resources.ICON_FILTER_VIDEOS);
+            toolbtn_videos.set_icon_name("filter-videos-symbolic");
         else
-            toolbtn_videos.set_icon_name(Resources.ICON_FILTER_VIDEOS_DISABLED);
+            toolbtn_videos.set_icon_name("filter-videos-disabled-symbolic");
 
         if (has_raw)
-            toolbtn_raw.set_icon_name(Resources.ICON_FILTER_RAW);
+            toolbtn_raw.set_icon_name("filter-raw-symbolic");
         else
-            toolbtn_raw.set_icon_name(Resources.ICON_FILTER_RAW_DISABLED);
+            toolbtn_raw.set_icon_name("filter-raw-disabled-symbolic");
 
         if (has_flagged)
-            toolbtn_flag.set_icon_name(Resources.ICON_FILTER_FLAGGED);
+            toolbtn_flag.set_icon_name("filter-flagged-symbolic");
         else
-            toolbtn_flag.set_icon_name(Resources.ICON_FILTER_FLAGGED_DISABLED);
+            toolbtn_flag.set_icon_name("filter-flagged-disabled-symbolic");
     }
     
     // Ticket #3260 part IV - display the context menu on secondary click
diff --git a/src/library/FlaggedSidebarEntry.vala b/src/library/FlaggedSidebarEntry.vala
index e94e695..11b4f3e 100644
--- a/src/library/FlaggedSidebarEntry.vala
+++ b/src/library/FlaggedSidebarEntry.vala
@@ -22,7 +22,7 @@ public class Library.FlaggedSidebarEntry : Library.HideablePageEntry, Sidebar.In
     }
     
     public override string? get_sidebar_icon() {
-        return Resources.ICON_FLAGGED_PAGE;
+        return "filter-flagged-symbolic";
     }
     
     protected override Page create_page() {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]