forked from osmocom/wireshark
Qt: Multi-state capture start icon.
Add ".on" versions of the x-capture-start icon along with corresponding code in the StockIcon constructor to look for ".on" variants and add them with the QIcon::On state. Make the plain versions of x-capture-start blue to match the general application icon. The goal is to make the toolbar and app icon fins blue when Wireshark is "at rest" and green when it's capturing. Change-Id: I31f4f9d910fc99c41d7c63bd9a722db1611760c7 Reviewed-on: https://code.wireshark.org/review/4225 Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs
Gerald Combs
parent
e1a420aeb4
commit
5d1aafbb36
|
|
@ -928,6 +928,8 @@ EXTRA_DIST = \
|
|||
image/toolbar/16x16/x-capture-restart-turn1.svg \
|
||||
image/toolbar/16x16/x-capture-restart-turn2.svg \
|
||||
image/toolbar/16x16/x-capture-restart.png \
|
||||
image/toolbar/16x16/x-capture-start.on.png \
|
||||
image/toolbar/16x16/x-capture-start.on.svg \
|
||||
image/toolbar/16x16/x-capture-start.png \
|
||||
image/toolbar/16x16/x-capture-start.svg \
|
||||
image/toolbar/16x16/x-capture-stop-red.svg \
|
||||
|
|
@ -971,6 +973,8 @@ EXTRA_DIST = \
|
|||
image/toolbar/24x24/x-capture-restart-turn1.svg \
|
||||
image/toolbar/24x24/x-capture-restart-turn2.svg \
|
||||
image/toolbar/24x24/x-capture-restart.png \
|
||||
image/toolbar/24x24/x-capture-start.on.png \
|
||||
image/toolbar/24x24/x-capture-start.on.svg \
|
||||
image/toolbar/24x24/x-capture-start.png \
|
||||
image/toolbar/24x24/x-capture-start.svg \
|
||||
image/toolbar/24x24/x-capture-stop-red.svg \
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
<file>toolbar/16x16/x-capture-file-save.png</file>
|
||||
<file>toolbar/16x16/x-capture-options.png</file>
|
||||
<file>toolbar/16x16/x-capture-restart.png</file>
|
||||
<file>toolbar/16x16/x-capture-start.on.png</file>
|
||||
<file>toolbar/16x16/x-capture-start.png</file>
|
||||
<file>toolbar/16x16/x-capture-stop.png</file>
|
||||
<file>toolbar/24x24/edit-find.png</file>
|
||||
|
|
@ -57,6 +58,7 @@
|
|||
<file>toolbar/24x24/x-capture-file-save.png</file>
|
||||
<file>toolbar/24x24/x-capture-options.png</file>
|
||||
<file>toolbar/24x24/x-capture-restart.png</file>
|
||||
<file>toolbar/24x24/x-capture-start.on.png</file>
|
||||
<file>toolbar/24x24/x-capture-start.png</file>
|
||||
<file>toolbar/24x24/x-capture-stop.png</file>
|
||||
</qresource>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 675 B |
|
|
@ -0,0 +1,82 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<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="svg548"
|
||||
sodipodi:version="0.32"
|
||||
sodipodi:docname="x-capture-start.on.svg"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
inkscape:export-filename="x-capture-start.on.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90"
|
||||
x="0px"
|
||||
y="0px"
|
||||
width="16px"
|
||||
height="16px"
|
||||
viewBox="0 0 16 16"
|
||||
enable-background="new 0 0 16 16"
|
||||
xml:space="preserve"><metadata
|
||||
id="metadata16"><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><defs
|
||||
id="defs14" /><sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="896"
|
||||
inkscape:window-height="518"
|
||||
id="namedview12"
|
||||
showgrid="true"
|
||||
inkscape:zoom="19.5"
|
||||
inkscape:cx="8"
|
||||
inkscape:cy="8"
|
||||
inkscape:window-x="284"
|
||||
inkscape:window-y="60"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg548"><inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid3042"
|
||||
empspacing="4"
|
||||
visible="true"
|
||||
enabled="true"
|
||||
snapvisiblegridlinesonly="true"
|
||||
spacingx="0.5px"
|
||||
spacingy="0.5px" /></sodipodi:namedview>
|
||||
<path
|
||||
fill="#FFFFFF"
|
||||
d="M1.058,15.339l13.509,0.02c-0.736-1.84-3.162-8.883,0.156-14.697C3.471,1.236,1.353,13.14,1.058,15.339z"
|
||||
id="path3" />
|
||||
<g
|
||||
id="g5">
|
||||
<g
|
||||
id="g7">
|
||||
<path
|
||||
fill="#999999"
|
||||
d="M15.049,16C15.049,16,15.049,16,15.049,16L0.698,15.979c-0.089-0.001-0.175-0.038-0.235-0.104 c-0.061-0.065-0.09-0.154-0.083-0.244C0.392,15.478,1.848,0.214,15.297,0.002c0.11-0.016,0.228,0.061,0.284,0.164 c0.058,0.103,0.055,0.229-0.01,0.328c-3.947,6.179-0.629,14.148-0.264,14.979c0.047,0.056,0.074,0.127,0.074,0.205 c0,0.178-0.144,0.321-0.32,0.321C15.059,16,15.054,16,15.049,16z M1.058,15.339l13.509,0.02c-0.736-1.84-3.162-8.883,0.156-14.697 C3.471,1.236,1.353,13.14,1.058,15.339z"
|
||||
id="path9" />
|
||||
</g>
|
||||
|
||||
<path
|
||||
id="path2995_3_"
|
||||
inkscape:export-filename="/home/gerald/devel/wsweb/image/wslogo.png"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccc"
|
||||
fill="#21DE08"
|
||||
d=" M2.251,14.441c0,0,1.543-11.499,11.188-12.837c-2.991,6.231-0.145,12.852-0.145,12.852L2.251,14.441z" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 559 B After Width: | Height: | Size: 757 B |
|
|
@ -7,14 +7,15 @@
|
|||
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:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.1"
|
||||
id="svg548"
|
||||
sodipodi:version="0.32"
|
||||
sodipodi:docname="capture_start_16.svg"
|
||||
sodipodi:docname="x-capture-start.svg"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
inkscape:export-filename="/tmp/capture_start_16.png"
|
||||
inkscape:export-filename="x-capture-start.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90"
|
||||
x="0px"
|
||||
|
|
@ -26,8 +27,42 @@
|
|||
xml:space="preserve"><metadata
|
||||
id="metadata16"><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><defs
|
||||
id="defs14" /><sodipodi:namedview
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs14"><linearGradient
|
||||
id="linearGradient4514"><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><linearGradient
|
||||
id="linearGradient4506"><stop
|
||||
style="stop-color:#000000;stop-opacity:0.15753424;"
|
||||
offset="0"
|
||||
id="stop4508" /><stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop4510" /></linearGradient>
|
||||
|
||||
|
||||
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4506"
|
||||
id="linearGradient4512"
|
||||
x1="11.5"
|
||||
y1="14"
|
||||
x2="9"
|
||||
y2="8"
|
||||
gradientUnits="userSpaceOnUse" /><linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4514"
|
||||
id="linearGradient4520"
|
||||
x1="10"
|
||||
y1="1.5"
|
||||
x2="12"
|
||||
y2="8"
|
||||
gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
|
|
@ -36,39 +71,59 @@
|
|||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="640"
|
||||
inkscape:window-height="480"
|
||||
inkscape:window-width="1135"
|
||||
inkscape:window-height="649"
|
||||
id="namedview12"
|
||||
showgrid="false"
|
||||
inkscape:zoom="14.75"
|
||||
showgrid="true"
|
||||
inkscape:zoom="30.0625"
|
||||
inkscape:cx="8"
|
||||
inkscape:cy="7.3559322"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="865"
|
||||
inkscape:cy="8"
|
||||
inkscape:window-x="465"
|
||||
inkscape:window-y="129"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg548" />
|
||||
inkscape:current-layer="svg548"><inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid3989"
|
||||
empspacing="4"
|
||||
visible="true"
|
||||
enabled="true"
|
||||
snapvisiblegridlinesonly="true"
|
||||
spacingx="0.5px"
|
||||
spacingy="0.5px" /></sodipodi:namedview>
|
||||
<path
|
||||
fill="#FFFFFF"
|
||||
d="M1.058,15.339l13.509,0.02c-0.736-1.84-3.162-8.883,0.156-14.697C3.471,1.236,1.353,13.14,1.058,15.339z"
|
||||
id="path3" />
|
||||
<g
|
||||
id="g5">
|
||||
<g
|
||||
id="g7">
|
||||
<path
|
||||
fill="#999999"
|
||||
d="M15.049,16C15.049,16,15.049,16,15.049,16L0.698,15.979c-0.089-0.001-0.175-0.038-0.235-0.104 c-0.061-0.065-0.09-0.154-0.083-0.244C0.392,15.478,1.848,0.214,15.297,0.002c0.11-0.016,0.228,0.061,0.284,0.164 c0.058,0.103,0.055,0.229-0.01,0.328c-3.947,6.179-0.629,14.148-0.264,14.979c0.047,0.056,0.074,0.127,0.074,0.205 c0,0.178-0.144,0.321-0.32,0.321C15.059,16,15.054,16,15.049,16z M1.058,15.339l13.509,0.02c-0.736-1.84-3.162-8.883,0.156-14.697 C3.471,1.236,1.353,13.14,1.058,15.339z"
|
||||
id="path9" />
|
||||
</g>
|
||||
|
||||
<path
|
||||
id="path2995_3_"
|
||||
style="fill:#999999"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path9"
|
||||
d="m 15.049,16 c 0,0 0,0 0,0 L 0.698,15.979 C 0.609,15.978 0.523,15.941 0.463,15.875 0.402,15.81 0.373,15.721 0.38,15.631 0.392,15.478 1.848,0.214 15.297,0.002 c 0.11,-0.016 0.228,0.061 0.284,0.164 0.058,0.103 0.055,0.229 -0.01,0.328 -3.947,6.179 -0.629,14.148 -0.264,14.979 0.047,0.056 0.074,0.127 0.074,0.205 0,0.178 -0.144,0.321 -0.32,0.321 C 15.059,16 15.054,16 15.049,16 z M 1.058,15.339 14.567,15.359 C 13.831,13.519 11.405,6.476 14.723,0.662 3.471,1.236 1.353,13.14 1.058,15.339 z" />
|
||||
</g><path
|
||||
style="fill:#2c4bc4;fill-opacity:1"
|
||||
d="m 2.251,14.441 c 0,0 1.543,-11.499 11.188,-12.837 -2.991,6.231 -0.145,12.852 -0.145,12.852 L 2.251,14.441 z"
|
||||
sodipodi:nodetypes="cccc"
|
||||
inkscape:connector-curvature="0"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-filename="/home/gerald/devel/wsweb/image/wslogo.png"
|
||||
id="path2995_3_" />
|
||||
<path
|
||||
id="path4502"
|
||||
inkscape:export-filename="/home/gerald/devel/wsweb/image/wslogo.png"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccc"
|
||||
fill="#21DE08"
|
||||
d=" M2.251,14.441c0,0,1.543-11.499,11.188-12.837c-2.991,6.231-0.145,12.852-0.145,12.852L2.251,14.441z" />
|
||||
</g>
|
||||
</svg>
|
||||
d="m 2.251,14.441 c 0,0 1.543,-11.499 11.188,-12.837 -2.991,6.231 -0.145,12.852 -0.145,12.852 L 2.251,14.441 z"
|
||||
style="fill:url(#linearGradient4512);fill-opacity:1" /><path
|
||||
style="fill:url(#linearGradient4520);fill-opacity:1"
|
||||
d="m 2.251,14.441 c 0,0 1.543,-11.499 11.188,-12.837 -2.991,6.231 -0.145,12.852 -0.145,12.852 L 2.251,14.441 z"
|
||||
sodipodi:nodetypes="cccc"
|
||||
inkscape:connector-curvature="0"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-filename="/home/gerald/devel/wsweb/image/wslogo.png"
|
||||
id="path4504" /></svg>
|
||||
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
|
|
@ -0,0 +1,81 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<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="svg548"
|
||||
sodipodi:version="0.32"
|
||||
sodipodi:docname="x-capture-start.on.svg"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
inkscape:export-filename="x-capture-start.on.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90"
|
||||
x="0px"
|
||||
y="0px"
|
||||
width="24px"
|
||||
height="24px"
|
||||
viewBox="0 0 24 24"
|
||||
enable-background="new 0 0 24 24"
|
||||
xml:space="preserve"><metadata
|
||||
id="metadata3007"><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><defs
|
||||
id="defs3005" />
|
||||
<path
|
||||
fill="#FFFFFF"
|
||||
d="M1.604,22.989l20.23,0.03c-1.103-2.755-4.736-13.304,0.234-22.011C5.218,1.869,2.045,19.696,1.604,22.989z"
|
||||
id="path2994" />
|
||||
<sodipodi:namedview
|
||||
inkscape:current-layer="svg548"
|
||||
inkscape:window-width="1443"
|
||||
showguides="true"
|
||||
inkscape:guide-bbox="true"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:window-height="837"
|
||||
inkscape:cy="11.54297"
|
||||
inkscape:cx="16.300419"
|
||||
inkscape:window-x="152"
|
||||
id="base"
|
||||
inkscape:window-y="83"
|
||||
showgrid="true"
|
||||
inkscape:zoom="24.101265">
|
||||
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
enabled="true"
|
||||
visible="true"
|
||||
spacingx="0.5px"
|
||||
spacingy="0.5px"
|
||||
empspacing="5"
|
||||
snapvisiblegridlinesonly="true"
|
||||
id="grid3142">
|
||||
</inkscape:grid>
|
||||
</sodipodi:namedview>
|
||||
<g
|
||||
id="g2998">
|
||||
<g
|
||||
id="g3000">
|
||||
<path
|
||||
fill="#999999"
|
||||
d="M22.557,23.979C22.557,23.979,22.557,23.979,22.557,23.979L1.064,23.947 c-0.134-0.001-0.262-0.057-0.353-0.155c-0.091-0.1-0.136-0.231-0.125-0.365c0.02-0.23,2.2-23.088,22.341-23.406 c0.166-0.024,0.34,0.091,0.426,0.246c0.086,0.154,0.081,0.343-0.015,0.491c-5.911,9.253-0.941,21.189-0.396,22.435 c0.07,0.083,0.112,0.19,0.112,0.308c0,0.265-0.215,0.479-0.479,0.479C22.571,23.98,22.564,23.98,22.557,23.979z M1.604,22.989 l20.23,0.03c-1.103-2.755-4.736-13.304,0.234-22.011C5.218,1.869,2.045,19.696,1.604,22.989z"
|
||||
id="path3002" />
|
||||
</g>
|
||||
|
||||
<path
|
||||
id="path2995_3_"
|
||||
inkscape:export-filename="/home/gerald/devel/wsweb/image/wslogo.png"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccc"
|
||||
fill="#21DE08"
|
||||
d=" M3.39,21.646c0,0,2.312-17.222,16.754-19.225c-4.48,9.331-0.216,19.247-0.216,19.247L3.39,21.646z" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 934 B After Width: | Height: | Size: 1.1 KiB |
|
|
@ -7,14 +7,15 @@
|
|||
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:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
version="1.1"
|
||||
id="svg548"
|
||||
sodipodi:version="0.32"
|
||||
sodipodi:docname="capture_start_24.svg"
|
||||
sodipodi:docname="x-capture-start.svg"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
inkscape:export-filename="/tmp/capture_start_24.png"
|
||||
inkscape:export-filename="x-capture-start.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90"
|
||||
x="0px"
|
||||
|
|
@ -26,8 +27,42 @@
|
|||
xml:space="preserve"><metadata
|
||||
id="metadata3007"><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><defs
|
||||
id="defs3005" />
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs3005"><linearGradient
|
||||
id="linearGradient5075"><stop
|
||||
style="stop-color:#fffdff;stop-opacity:0.15753424;"
|
||||
offset="0"
|
||||
id="stop5077" /><stop
|
||||
style="stop-color:#ffffff;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop5079" /></linearGradient><linearGradient
|
||||
id="linearGradient5067"><stop
|
||||
style="stop-color:#000000;stop-opacity:0.15753424;"
|
||||
offset="0"
|
||||
id="stop5069" /><stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop5071" /></linearGradient>
|
||||
|
||||
|
||||
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient5067"
|
||||
id="linearGradient5073"
|
||||
x1="15"
|
||||
y1="21.5"
|
||||
x2="12.5"
|
||||
y2="11.5"
|
||||
gradientUnits="userSpaceOnUse" /><linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient5075"
|
||||
id="linearGradient5081"
|
||||
x1="15"
|
||||
y1="4"
|
||||
x2="18"
|
||||
y2="11.5"
|
||||
gradientUnits="userSpaceOnUse" /></defs>
|
||||
<path
|
||||
fill="#FFFFFF"
|
||||
d="M1.604,22.989l20.23,0.03c-1.103-2.755-4.736-13.304,0.234-22.011C5.218,1.869,2.045,19.696,1.604,22.989z"
|
||||
|
|
@ -40,10 +75,10 @@
|
|||
inkscape:window-maximized="0"
|
||||
inkscape:window-height="837"
|
||||
inkscape:cy="11.54297"
|
||||
inkscape:cx="16.300419"
|
||||
inkscape:window-x="0"
|
||||
inkscape:cx="15.291385"
|
||||
inkscape:window-x="206"
|
||||
id="base"
|
||||
inkscape:window-y="865"
|
||||
inkscape:window-y="0"
|
||||
showgrid="true"
|
||||
inkscape:zoom="24.101265">
|
||||
|
||||
|
|
@ -59,23 +94,35 @@
|
|||
</inkscape:grid>
|
||||
</sodipodi:namedview>
|
||||
<g
|
||||
id="g2998">
|
||||
<g
|
||||
id="g3000">
|
||||
<path
|
||||
fill="#999999"
|
||||
d="M22.557,23.979C22.557,23.979,22.557,23.979,22.557,23.979L1.064,23.947 c-0.134-0.001-0.262-0.057-0.353-0.155c-0.091-0.1-0.136-0.231-0.125-0.365c0.02-0.23,2.2-23.088,22.341-23.406 c0.166-0.024,0.34,0.091,0.426,0.246c0.086,0.154,0.081,0.343-0.015,0.491c-5.911,9.253-0.941,21.189-0.396,22.435 c0.07,0.083,0.112,0.19,0.112,0.308c0,0.265-0.215,0.479-0.479,0.479C22.571,23.98,22.564,23.98,22.557,23.979z M1.604,22.989 l20.23,0.03c-1.103-2.755-4.736-13.304,0.234-22.011C5.218,1.869,2.045,19.696,1.604,22.989z"
|
||||
id="path3002" />
|
||||
</g>
|
||||
|
||||
<path
|
||||
id="path2995_3_"
|
||||
style="fill:#999999"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3002"
|
||||
d="m 22.557,23.979 c 0,0 0,0 0,0 L 1.064,23.947 C 0.93,23.946 0.802,23.89 0.711,23.792 0.62,23.692 0.575,23.561 0.586,23.427 c 0.02,-0.23 2.2,-23.088 22.341,-23.406 0.166,-0.024 0.34,0.091 0.426,0.246 0.086,0.154 0.081,0.343 -0.015,0.491 -5.911,9.253 -0.941,21.189 -0.396,22.435 0.07,0.083 0.112,0.19 0.112,0.308 0,0.265 -0.215,0.479 -0.479,0.479 -0.004,0 -0.011,0 -0.018,-0.001 z m -20.953,-0.99 20.23,0.03 C 20.731,20.264 17.098,9.715 22.068,1.008 5.218,1.869 2.045,19.696 1.604,22.989 z" />
|
||||
</g><path
|
||||
style="fill:#2c4bc4;fill-opacity:1"
|
||||
d="m 3.39,21.646 c 0,0 2.312,-17.222 16.754,-19.225 -4.48,9.331 -0.216,19.247 -0.216,19.247 L 3.39,21.646 z"
|
||||
sodipodi:nodetypes="cccc"
|
||||
inkscape:connector-curvature="0"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-filename="/home/gerald/devel/wsweb/image/wslogo.png"
|
||||
id="path2995_3_" />
|
||||
<path
|
||||
id="path4555"
|
||||
inkscape:export-filename="/home/gerald/devel/wsweb/image/wslogo.png"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccc"
|
||||
fill="#21DE08"
|
||||
d=" M3.39,21.646c0,0,2.312-17.222,16.754-19.225c-4.48,9.331-0.216,19.247-0.216,19.247L3.39,21.646z" />
|
||||
</g>
|
||||
</svg>
|
||||
d="m 3.39,21.646 c 0,0 2.312,-17.222 16.754,-19.225 -4.48,9.331 -0.216,19.247 -0.216,19.247 L 3.39,21.646 z"
|
||||
style="fill:url(#linearGradient5073);fill-opacity:1" /><path
|
||||
style="fill:url(#linearGradient5081);fill-opacity:1"
|
||||
d="m 3.39,21.646 c 0,0 2.312,-17.222 16.754,-19.225 -4.48,9.331 -0.216,19.247 -0.216,19.247 L 3.39,21.646 z"
|
||||
sodipodi:nodetypes="cccc"
|
||||
inkscape:connector-curvature="0"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-filename="/home/gerald/devel/wsweb/image/wslogo.png"
|
||||
id="path4557" /></svg>
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 4.5 KiB |
|
|
@ -137,12 +137,12 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||
connect(df_edit, SIGNAL(addBookmark(QString)), this, SLOT(addDisplayFilterButton(QString)));
|
||||
connect(this, SIGNAL(displayFilterSuccess(bool)), df_edit, SLOT(displayFilterSuccess(bool)));
|
||||
|
||||
#if defined(Q_OS_MAC)
|
||||
// XXX Force icons to 24x24 for now, otherwise actionFileOpen looks wonky on OS X.
|
||||
main_ui_->mainToolBar->setIconSize(QSize(24, 24));
|
||||
#elif defined(Q_OS_WIN)
|
||||
#if defined(Q_OS_WIN)
|
||||
// Current GTK+ and other Windows app behavior.
|
||||
main_ui_->mainToolBar->setIconSize(QSize(16, 16));
|
||||
#else
|
||||
// Force icons to 24x24 for now, otherwise actionFileOpen looks wonky.
|
||||
main_ui_->mainToolBar->setIconSize(QSize(24, 24));
|
||||
#endif
|
||||
|
||||
main_ui_->actionCaptureStart->setIcon(StockIcon("x-capture-start"));
|
||||
|
|
|
|||
|
|
@ -73,10 +73,16 @@ StockIcon::StockIcon(const char *icon_name) :
|
|||
} else {
|
||||
QStringList types = QStringList() << "16x16" << "24x24";
|
||||
foreach (QString type, types) {
|
||||
// Along with each name check for "<name>.on" to use for the on (checked) state.
|
||||
// XXX Add checks for each combination of QIcon::Mode + QIcon::State
|
||||
QString icon_path = path_pfx_ + QString("%1/%2.png").arg(type).arg(icon_name);
|
||||
QString icon_path_on = path_pfx_ + QString("%1/%2.on.png").arg(type).arg(icon_name);
|
||||
if (QFile::exists(icon_path)) {
|
||||
addFile(icon_path);
|
||||
}
|
||||
if (QFile::exists(icon_path_on)) {
|
||||
addFile(icon_path_on, QSize(), QIcon::Normal, QIcon::On);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue