Skip to content
GitLab
Commit 433412de authored by poixen's avatar poixen
Browse files

Merge pull request #1061 from poixen/filter_svgs 

Updated filter svgs
parents 9a81b151 c34718fe
Expand all Hide whitespace changes
Inline Side-by-side
cockatrice/cockatrice.qrc
View file @ 433412de
......@@ -24,7 +24,6 @@
<file>resources/icon_settings.svg</file>
<file>resources/hand.svg</file>
<file>resources/pencil.svg</file>
<file>resources/icon_search.svg</file>
<file>resources/icon_search_black.svg</file>
<file>resources/icon_clearsearch.svg</file>
<file>resources/icon_update.png</file>
......
cockatrice/resources/icon_clearsearch.svg
View file @ 433412de
......@@ -14,8 +14,8 @@
height="64"
id="svg2"
version="1.1"
inkscape:version="0.47 r22583"
sodipodi:docname="loup2_icon.svg">
inkscape:version="0.48.5 r10040"
sodipodi:docname="icon_clearsearch.svg">
<defs
id="defs4">
<linearGradient
......@@ -192,15 +192,15 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.84375"
inkscape:cx="31.09415"
inkscape:cx="11.205704"
inkscape:cy="35.993597"
inkscape:document-units="px"
inkscape:current-layer="layer2"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="752"
inkscape:window-x="-4"
inkscape:window-y="-3"
inkscape:window-width="1920"
inkscape:window-height="1028"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
......@@ -210,7 +210,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
......@@ -218,88 +218,11 @@
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-988.36218)">
<g
id="g3919"
transform="translate(-1.3230272e-7,1.7392704e-6)">
<path
transform="matrix(0.79182793,0.79182793,-0.79182793,0.79182793,41.129475,954.34728)"
d="M 49.338646,35.505978 C 49.338646,42.934317 43.316787,48.956177 35.888447,48.956177 C 28.460107,48.956177 22.438248,42.934317 22.438248,35.505978 C 22.438248,28.077638 28.460107,22.055779 35.888447,22.055779 C 43.316787,22.055779 49.338646,28.077638 49.338646,35.505978 z"
sodipodi:ry="13.450199"
sodipodi:rx="13.450199"
sodipodi:cy="35.505978"
sodipodi:cx="35.888447"
id="path2816"
style="fill:url(#linearGradient3928);fill-opacity:1;stroke:black;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
transform="matrix(0.86772778,0.86772778,-0.86772778,0.86772778,59.796352,957.0042)"
d="M 31.617529,41.6255 C 31.617529,47.786445 26.623096,52.780878 20.462151,52.780878 C 14.301205,52.780878 9.3067722,47.786445 9.3067722,41.6255 C 9.3067722,35.464554 14.301205,30.470121 20.462151,30.470121 C 26.623096,30.470121 31.617529,35.464554 31.617529,41.6255 z"
sodipodi:ry="11.155378"
sodipodi:rx="11.155378"
sodipodi:cy="41.6255"
sodipodi:cx="20.462151"
id="path2818"
style="fill:#e6e6e6;stroke:black;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
transform="matrix(0.79182793,0.79182793,-0.79182793,0.79182793,46.076038,980.89717)"
d="M 18.613546,52.207172 C 18.613546,59.001815 17.471962,64.509961 16.063745,64.509961 C 14.655529,64.509961 13.513945,59.001815 13.513945,52.207172 C 13.513945,45.41253 14.655529,39.904384 16.063745,39.904384 C 17.471962,39.904384 18.613546,45.41253 18.613546,52.207172 z"
sodipodi:ry="12.302789"
sodipodi:rx="2.5498009"
sodipodi:cy="52.207172"
sodipodi:cx="16.063745"
id="path2826"
style="fill:#803300;stroke:black;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
transform="matrix(1.0025564,1.0025564,-0.8958053,0.8958053,27.483125,963.47693)"
d="M 38.501993,15.23506 C 38.501993,18.720395 34.96308,21.545817 30.59761,21.545817 C 26.23214,21.545817 22.693228,18.720395 22.693228,15.23506 C 22.693228,11.749725 26.23214,8.9243026 30.59761,8.9243026 C 34.96308,8.9243026 38.501993,11.749725 38.501993,15.23506 z"
sodipodi:ry="6.3107572"
sodipodi:rx="7.9043827"
sodipodi:cy="15.23506"
sodipodi:cx="30.59761"
id="path3612"
style="fill:url(#linearGradient3930);fill-opacity:1;stroke:none"
sodipodi:type="arc" />
<path
transform="matrix(1.6496415,1.6496415,-0.80613807,0.80613807,7.5831169,947.5977)"
d="M 29.960159,47.808765 C 29.960159,53.652862 29.617684,58.390439 29.195219,58.390439 C 28.772754,58.390439 28.430279,53.652862 28.430279,47.808765 C 28.430279,41.964668 28.772754,37.227092 29.195219,37.227092 C 29.617684,37.227092 29.960159,41.964668 29.960159,47.808765 z"
sodipodi:ry="10.581674"
sodipodi:rx="0.76494026"
sodipodi:cy="47.808765"
sodipodi:cx="29.195219"
id="path3630"
style="fill:url(#linearGradient3932);fill-opacity:1;stroke:none"
sodipodi:type="arc" />
<rect
transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
ry="1.427651"
y="700.70703"
x="742.24078"
height="6.2816648"
width="3.7118928"
id="rect2820"
style="fill:gray;stroke:black;stroke-width:0.33594415;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
ry="1.2411796"
y="701.03101"
x="742.42395"
height="5.4611907"
width="2.6364384"
id="rect2820-3"
style="fill:url(#linearGradient3934);fill-opacity:1;stroke:none" />
</g>
</g>
transform="translate(0,-988.36218)" />
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Verbot">
<path
style="fill:red;fill-opacity:1;stroke:black;stroke-width:0.29999053;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 49.348787,14.651214 C 39.764908,5.0673334 24.235093,5.0673334 14.651214,14.651214 C 5.0673334,24.235093 5.0673334,39.764908 14.651214,49.348787 C 24.235093,58.932667 39.764908,58.932667 49.348787,49.348787 C 58.932667,39.764908 58.932667,24.235093 49.348787,14.651214 z M 47.11689,16.883112 C 55.035518,24.80174 55.427019,37.407158 48.317239,45.804009 L 18.195993,15.682763 C 26.592843,8.5729818 39.198262,8.9644827 47.11689,16.883112 z M 15.682763,18.195993 L 45.804009,48.317239 C 37.407158,55.427019 24.80174,55.035518 16.883112,47.11689 C 8.9644827,39.198262 8.5729818,26.592843 15.682763,18.195993 z"
id="path3787" />
<g
sodipodi:type="inkscape:box3d"
style="fill:red;fill-opacity:1;stroke:black;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
......@@ -344,5 +267,10 @@
inkscape:box3dsidetype="14"
d="M -1.0199203,33.784832 L -1.0199203,-421.92491 L -1.5309297,-421.89731 L -1.5309297,34.124972 z" />
</g>
<path
style="fill:#ff0000;fill-opacity:1;stroke:#cd3535;stroke-width:5.84793520000000020;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 52.385908,50.646333 C 62.721799,39.279033 61.886144,21.695001 50.518842,11.359112 39.151542,1.0232223 21.567509,1.8588773 11.231623,13.22618 0.89573232,24.593479 1.7313874,42.177512 13.098689,52.5134 c 11.3673,10.335889 28.951332,9.500234 39.287219,-1.867067 z M 49.738687,48.239307 C 41.198715,57.631478 26.946973,58.753059 17.056847,51.15466 L 49.541588,15.428288 c 8.502064,9.124975 8.737071,23.418851 0.197099,32.811019 z M 46.560682,12.717855 14.075941,48.444228 C 5.5738777,39.31925 5.3388704,25.025377 13.878842,15.633206 22.418813,6.2410344 36.670557,5.1194531 46.560682,12.717855 z"
id="path3787"
inkscape:connector-curvature="0" />
</g>
</svg>
cockatrice/resources/icon_search.svg deleted 100644 → 0
View file @ 9a81b151
<?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: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"
width="64"
height="64"
id="svg2"
version="1.1"
inkscape:version="0.47 r22583"
sodipodi:docname="loup.svg">
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient3709">
<stop
style="stop-color:#4d4d4d;stop-opacity:1;"
offset="0"
id="stop3711" />
<stop
style="stop-color:#4d4d4d;stop-opacity:0;"
offset="1"
id="stop3713" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3699">
<stop
style="stop-color:#ececec;stop-opacity:1;"
offset="0"
id="stop3701" />
<stop
style="stop-color:#ececec;stop-opacity:0;"
offset="1"
id="stop3703" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3632">
<stop
style="stop-color:#c87137;stop-opacity:1;"
offset="0"
id="stop3634" />
<stop
style="stop-color:#c87137;stop-opacity:0;"
offset="1"
id="stop3636" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3622">
<stop
style="stop-color:#f9f9f9;stop-opacity:1;"
offset="0"
id="stop3624" />
<stop
style="stop-color:#f9f9f9;stop-opacity:0;"
offset="1"
id="stop3626" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
id="perspective10" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3622"
id="linearGradient3628"
x1="30.59761"
y1="8.9243031"
x2="30.59761"
y2="21.545816"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3632"
id="linearGradient3638"
x1="28.430279"
y1="47.808765"
x2="29.960159"
y2="47.808765"
gradientUnits="userSpaceOnUse" />
<inkscape:perspective
id="perspective3685"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3699"
id="linearGradient3705"
x1="29.215645"
y1="1021.9559"
x2="31.852083"
y2="1021.9559"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3709"
id="linearGradient3715"
x1="22.288248"
y1="35.505978"
x2="49.488647"
y2="49.106178"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3709"
id="linearGradient3726"
gradientUnits="userSpaceOnUse"
x1="22.288248"
y1="35.505978"
x2="49.488647"
y2="49.106178" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3622"
id="linearGradient3728"
gradientUnits="userSpaceOnUse"
x1="30.59761"
y1="8.9243031"
x2="30.59761"
y2="21.545816" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3632"
id="linearGradient3730"
gradientUnits="userSpaceOnUse"
x1="28.430279"
y1="47.808765"
x2="29.960159"
y2="47.808765" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3699"
id="linearGradient3732"
gradientUnits="userSpaceOnUse"
x1="29.215645"
y1="1021.9559"
x2="31.852083"
y2="1021.9559" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.84375"
inkscape:cx="25.960998"
inkscape:cy="32"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="752"
inkscape:window-x="-4"
inkscape:window-y="-3"
inkscape:window-maximized="1" />
<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="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-988.36218)">
<g
id="g3717"
transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,729.31175,279.31708)">
<path
transform="matrix(1.1198138,0,0,1.1198138,-9.2999214,963.93679)"
d="M 49.338646,35.505978 C 49.338646,42.934317 43.316787,48.956177 35.888447,48.956177 C 28.460107,48.956177 22.438248,42.934317 22.438248,35.505978 C 22.438248,28.077638 28.460107,22.055779 35.888447,22.055779 C 43.316787,22.055779 49.338646,28.077638 49.338646,35.505978 z"
sodipodi:ry="13.450199"
sodipodi:rx="13.450199"
sodipodi:cy="35.505978"
sodipodi:cx="35.888447"
id="path2816"
style="fill:url(#linearGradient3726);fill-opacity:1;stroke:black;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
transform="matrix(1.2271524,0,0,1.2271524,5.7782787,952.61604)"
d="M 31.617529,41.6255 C 31.617529,47.786445 26.623096,52.780878 20.462151,52.780878 C 14.301205,52.780878 9.3067722,47.786445 9.3067722,41.6255 C 9.3067722,35.464554 14.301205,30.470121 20.462151,30.470121 C 26.623096,30.470121 31.617529,35.464554 31.617529,41.6255 z"
sodipodi:ry="11.155378"
sodipodi:rx="11.155378"
sodipodi:cy="41.6255"
sodipodi:cx="20.462151"
id="path2818"
style="fill:#e6e6e6;stroke:black;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
transform="matrix(1.1198138,0,0,1.1198138,12.971435,979.21265)"
d="M 18.613546,52.207172 C 18.613546,59.001815 17.471962,64.509961 16.063745,64.509961 C 14.655529,64.509961 13.513945,59.001815 13.513945,52.207172 C 13.513945,45.41253 14.655529,39.904384 16.063745,39.904384 C 17.471962,39.904384 18.613546,45.41253 18.613546,52.207172 z"
sodipodi:ry="12.302789"
sodipodi:rx="2.5498009"
sodipodi:cy="52.207172"
sodipodi:cx="16.063745"
id="path2826"
style="fill:#803300;stroke:black;stroke-width:0.30000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
transform="matrix(1.4178288,0,0,1.26686,-12.493715,980.04185)"
d="M 38.501993,15.23506 C 38.501993,18.720395 34.96308,21.545817 30.59761,21.545817 C 26.23214,21.545817 22.693228,18.720395 22.693228,15.23506 C 22.693228,11.749725 26.23214,8.9243026 30.59761,8.9243026 C 34.96308,8.9243026 38.501993,11.749725 38.501993,15.23506 z"
sodipodi:ry="6.3107572"
sodipodi:rx="7.9043827"
sodipodi:cy="15.23506"
sodipodi:cx="30.59761"
id="path3612"
style="fill:url(#linearGradient3728);fill-opacity:1;stroke:none"
sodipodi:type="arc" />
<path
transform="matrix(2.3329454,0,0,1.1400514,-37.793456,982.88497)"
d="M 29.960159,47.808765 C 29.960159,53.652862 29.617684,58.390439 29.195219,58.390439 C 28.772754,58.390439 28.430279,53.652862 28.430279,47.808765 C 28.430279,41.964668 28.772754,37.227092 29.195219,37.227092 C 29.617684,37.227092 29.960159,41.964668 29.960159,47.808765 z"
sodipodi:ry="10.581674"
sodipodi:rx="0.76494026"
sodipodi:cy="47.808765"
sodipodi:cx="29.195219"
id="path3630"
style="fill:url(#linearGradient3730);fill-opacity:1;stroke:none"
sodipodi:type="arc" />
<rect
ry="1.427651"
y="1018.9013"
x="29.032509"
height="6.2816648"
width="3.7118928"
id="rect2820"
style="fill:gray;stroke:black;stroke-width:0.33594415;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
ry="1.2411796"
y="1019.2253"
x="29.215645"
height="5.4611907"
width="2.6364384"
id="rect2820-3"
style="fill:url(#linearGradient3732);fill-opacity:1;stroke:none" />
</g>
</g>
</svg>
cockatrice/src/gameselector.cpp
View file @ 433412de
......@@ -60,7 +60,7 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
gameListView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
#endif
filterButton = new QPushButton;
filterButton->setIcon(QIcon(":/resources/icon_search.svg"));
filterButton->setIcon(QIcon(":/resources/icon_search_black.svg"));
connect(filterButton, SIGNAL(clicked()), this, SLOT(actSetFilter()));
clearFilterButton = new QPushButton;
clearFilterButton->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
......
cockatrice/translations/cockatrice_en.ts
View file @ 433412de
This diff is collapsed.
Supports Markdown
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