aboutsummaryrefslogtreecommitdiffstats
path: root/image
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-06-21 15:06:33 -0700
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2019-06-23 06:13:32 +0000
commita9ed94356d1b0cb149351e063014d3bdb94c0cd7 (patch)
treedb5b2504d3bb451c7759badbce994a3d71854f3f /image
parent70d61952dfbf2b1e96bbac824e3fb2538061f12d (diff)
Qt: Split the filter dropdown arrow icon into dark and light versions.
The capture and display filter widgets set their dropdown arrow icons using CSS, which means we can't use a template icon without a significant amount of hackery. This is the only instance where we set an icon using CSS, so split it into dark and light versions and use them as appropriate. Ping-Bug: 15511 Change-Id: I699ddc327d8eb109129e60bcb5036b14e6e34414 Reviewed-on: https://code.wireshark.org/review/33696 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'image')
-rw-r--r--image/stock_icons.qrc6
-rw-r--r--image/stock_icons/14x14/x-filter-dropdown.dark.pngbin0 -> 224 bytes
-rw-r--r--image/stock_icons/14x14/x-filter-dropdown.dark.svg108
-rw-r--r--image/stock_icons/14x14/x-filter-dropdown.dark@2x.pngbin0 -> 268 bytes
-rw-r--r--image/stock_icons/14x14/x-filter-dropdown.light.png (renamed from image/stock_icons/14x14/x-filter-dropdown.png)bin120 -> 120 bytes
-rw-r--r--image/stock_icons/14x14/x-filter-dropdown.light.svg (renamed from image/stock_icons/14x14/x-filter-dropdown.svg)0
-rw-r--r--image/stock_icons/14x14/x-filter-dropdown.light@2x.png (renamed from image/stock_icons/14x14/x-filter-dropdown@2x.png)bin146 -> 146 bytes
-rwxr-xr-ximage/stock_icons/svg-to-png.sh3
8 files changed, 114 insertions, 3 deletions
diff --git a/image/stock_icons.qrc b/image/stock_icons.qrc
index fa412c8841..0dd8748cac 100644
--- a/image/stock_icons.qrc
+++ b/image/stock_icons.qrc
@@ -45,8 +45,10 @@
<file>stock_icons/14x14/x-filter-clear.selected@2x.png</file>
<file>stock_icons/14x14/x-filter-deprecated.png</file>
<file>stock_icons/14x14/x-filter-deprecated@2x.png</file>
- <file>stock_icons/14x14/x-filter-dropdown.png</file>
- <file>stock_icons/14x14/x-filter-dropdown@2x.png</file>
+ <file>stock_icons/14x14/x-filter-dropdown.dark.png</file>
+ <file>stock_icons/14x14/x-filter-dropdown.dark@2x.png</file>
+ <file>stock_icons/14x14/x-filter-dropdown.light.png</file>
+ <file>stock_icons/14x14/x-filter-dropdown.light@2x.png</file>
<file>stock_icons/14x14/x-filter-invalid.png</file>
<file>stock_icons/14x14/x-filter-invalid@2x.png</file>
<file>stock_icons/14x14/x-filter-matching-bookmark.png</file>
diff --git a/image/stock_icons/14x14/x-filter-dropdown.dark.png b/image/stock_icons/14x14/x-filter-dropdown.dark.png
new file mode 100644
index 0000000000..1ce176eaa4
--- /dev/null
+++ b/image/stock_icons/14x14/x-filter-dropdown.dark.png
Binary files differ
diff --git a/image/stock_icons/14x14/x-filter-dropdown.dark.svg b/image/stock_icons/14x14/x-filter-dropdown.dark.svg
new file mode 100644
index 0000000000..060a8b2af1
--- /dev/null
+++ b/image/stock_icons/14x14/x-filter-dropdown.dark.svg
@@ -0,0 +1,108 @@
+<?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="14"
+ height="14"
+ viewBox="0 0 14 14"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+ sodipodi:docname="x-filter-dropdown.dark.svg"
+ inkscape:export-filename="/Users/gerald/Development/wireshark/image/x-filter-apply.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="Wireshark_highlight">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.15753424;"
+ offset="0"
+ id="stop4516" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4518" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="46.857143"
+ inkscape:cx="7"
+ inkscape:cy="7"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1401"
+ inkscape:window-height="817"
+ inkscape:window-x="266"
+ inkscape:window-y="877"
+ inkscape:window-maximized="0"
+ inkscape:object-nodes="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4136"
+ spacingx="0.5"
+ spacingy="0.5" />
+ <sodipodi:guide
+ position="7,8"
+ orientation="0,1"
+ id="guide4140"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1038.3622)">
+ <path
+ sodipodi:type="star"
+ style="fill:#d3d7cf;stroke:none;fill-opacity:1"
+ id="path3912"
+ sodipodi:sides="3"
+ sodipodi:cx="116"
+ sodipodi:cy="6.0121169"
+ sodipodi:r1="0.22362253"
+ sodipodi:r2="0.97227186"
+ sodipodi:arg1="1.5707963"
+ sodipodi:arg2="2.6179939"
+ inkscape:flatsided="true"
+ inkscape:rounded="-3.469447e-18"
+ inkscape:randomized="0"
+ d="m 116,6.2357394 -0.19366,-0.3354338 0.38732,0 z"
+ transform="matrix(18.072651,0,0,10.43425,-2089.4275,982.04694)"
+ inkscape:transform-center-y="2.5363326"
+ inkscape:transform-center-x="0.018274753"
+ inkscape:export-filename="/Users/gcombs/Development/qtshark/qt/dfilter_dropdown.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ </g>
+</svg>
diff --git a/image/stock_icons/14x14/x-filter-dropdown.dark@2x.png b/image/stock_icons/14x14/x-filter-dropdown.dark@2x.png
new file mode 100644
index 0000000000..14a48faf69
--- /dev/null
+++ b/image/stock_icons/14x14/x-filter-dropdown.dark@2x.png
Binary files differ
diff --git a/image/stock_icons/14x14/x-filter-dropdown.png b/image/stock_icons/14x14/x-filter-dropdown.light.png
index a994dccf52..a994dccf52 100644
--- a/image/stock_icons/14x14/x-filter-dropdown.png
+++ b/image/stock_icons/14x14/x-filter-dropdown.light.png
Binary files differ
diff --git a/image/stock_icons/14x14/x-filter-dropdown.svg b/image/stock_icons/14x14/x-filter-dropdown.light.svg
index 6346f18c3f..6346f18c3f 100644
--- a/image/stock_icons/14x14/x-filter-dropdown.svg
+++ b/image/stock_icons/14x14/x-filter-dropdown.light.svg
diff --git a/image/stock_icons/14x14/x-filter-dropdown@2x.png b/image/stock_icons/14x14/x-filter-dropdown.light@2x.png
index 162e4c817e..162e4c817e 100644
--- a/image/stock_icons/14x14/x-filter-dropdown@2x.png
+++ b/image/stock_icons/14x14/x-filter-dropdown.light@2x.png
Binary files differ
diff --git a/image/stock_icons/svg-to-png.sh b/image/stock_icons/svg-to-png.sh
index a9d68bbdfa..60389bf60b 100755
--- a/image/stock_icons/svg-to-png.sh
+++ b/image/stock_icons/svg-to-png.sh
@@ -64,7 +64,8 @@ ICONS="
x-filter-clear.active
x-filter-clear.selected
x-filter-deprecated
- x-filter-dropdown
+ x-filter-dropdown.dark
+ x-filter-dropdown.light
x-filter-invalid
x-filter-matching-bookmark
x-filter-matching-bookmark.active