Skip to content
GitLab
Commit 45542243 authored by Matt Lowe's avatar Matt Lowe
Browse files

Reworked replay buttons 

+ Removed unused buttons
+ remade button art
+ fixed crash with font colors/replays
+ removed unused timestamp label in replay
parent 7ea755ab
Hide whitespace changes
Inline Side-by-side
cockatrice/cockatrice.qrc
View file @ 45542243
......@@ -46,11 +46,7 @@
<file>resources/icon_spectator.svg</file>
<file>resources/replay_start.svg</file>
<file>resources/replay_stop.svg</file>
<file>resources/replay_fastforward.svg</file>
<file>resources/replay_rewind.svg</file>
<file>resources/replay_toend.svg</file>
<file>resources/replay_tostart.svg</file>
<file>resources/replay_pause.svg</file>
<file>resources/genders/male.svg</file>
......
cockatrice/resources/replay_fastforward.svg
View file @ 45542243
......@@ -14,8 +14,8 @@
height="32px"
id="svg3415"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="New document 11">
inkscape:version="0.48.5 r10040"
sodipodi:docname="replay_fastforward.svg">
<defs
id="defs3417">
<linearGradient
......@@ -121,17 +121,21 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.197802"
inkscape:cx="1.7561332"
inkscape:cy="16"
inkscape:cx="14.738044"
inkscape:cy="15.565723"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="800"
inkscape:window-height="628"
inkscape:window-x="946"
inkscape:window-y="0"
inkscape:window-maximized="0" />
inkscape:window-x="307"
inkscape:window-y="118"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid3001" />
</sodipodi:namedview>
<metadata
id="metadata3420">
<rdf:RDF>
......@@ -140,7 +144,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>
......@@ -148,33 +152,39 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g7099"
transform="matrix(0.77034956,0,0,0.77034956,-682.67795,-169.99219)">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
id="path6972"
d="m 888.47136,230.84445 -0.1313,21.48508 c -0.0519,2.75946 0.7649,3.42552 3.1952,2.65928 l 12.9804,-10.37119 c 1.9695,-1.71776 1.7878,-3.98642 0.1996,-5.31856 l -13.5794,-11.4349 c -2.2809,-0.95305 -2.6175,0.73817 -2.6645,2.98029 z"
style="fill:url(#linearGradient7105);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:0.8665719px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
id="path6974"
d="m 889.06306,231.14531 -0.1312,13.62502 c 6.5402,-8.90875 2.6913,1.16873 11.1093,-8.53132 l -8.7455,-7.28544 c -2.2809,-0.70088 -2.1856,0.54285 -2.2326,2.19174 z"
style="fill:url(#linearGradient7107);fill-opacity:1;fill-rule:evenodd;stroke:none" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
id="path7005"
d="m 908.10846,230.84445 -0.1313,21.48508 c -0.0519,2.75946 0.7649,3.42552 3.1952,2.65928 l 12.9804,-10.37119 c 1.9695,-1.71776 1.7878,-3.98642 0.1996,-5.31856 l -13.5794,-11.4349 c -2.2809,-0.95305 -2.6175,0.73817 -2.6645,2.98029 z"
style="fill:url(#linearGradient7109);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:0.8665719px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
id="path7007"
d="m 908.70016,231.15923 -0.1312,13.6111 c 6.5402,-8.89965 2.5318,0.85011 10.9498,-8.84003 l -8.586,-6.96057 c -2.2809,-0.70017 -2.1856,0.54229 -2.2326,2.1895 z"
style="fill:url(#linearGradient3413);fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
<path
sodipodi:type="star"
style="fill:#237d12;fill-opacity:1;fill-rule:nonzero;stroke:#233312;stroke-width:0.89551872;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path3004"
sodipodi:sides="3"
sodipodi:cx="2.1432779"
sodipodi:cy="10.835132"
sodipodi:r1="13.13031"
sodipodi:r2="6.565155"
sodipodi:arg1="0"
sodipodi:arg2="1.0471976"
inkscape:flatsided="true"
inkscape:rounded="1.6306401e-016"
inkscape:randomized="0"
d="m 15.273588,10.835132 -19.6954651,11.371182 0,-22.74236443 z"
inkscape:transform-center-x="-2.2213292"
transform="matrix(0.67670276,0,0,0.67670276,5.6643209,8.6678365)" />
<path
sodipodi:type="star"
style="fill:#237d12;fill-opacity:1;fill-rule:nonzero;stroke:#233312;stroke-width:0.89551872;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path3004-1"
sodipodi:sides="3"
sodipodi:cx="2.1432779"
sodipodi:cy="10.835132"
sodipodi:r1="13.13031"
sodipodi:r2="6.565155"
sodipodi:arg1="0"
sodipodi:arg2="1.0471976"
inkscape:flatsided="true"
inkscape:rounded="1.6306401e-016"
inkscape:randomized="0"
d="m 15.273588,10.835132 -19.6954651,11.371182 0,-22.74236443 z"
inkscape:transform-center-x="-2.2213293"
transform="matrix(0.67670276,0,0,0.67670276,20.336345,8.6678365)" />
</g>
</svg>
cockatrice/resources/replay_pause.svg
View file @ 45542243
......@@ -7,27 +7,16 @@
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="32px"
height="32px"
id="svg3648"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="New document 17">
inkscape:version="0.48.5 r10040"
sodipodi:docname="replay_pause.svg">
<defs
id="defs3650">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2237"
id="linearGradient5207"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.2215923,0,0,0.8996584,781.52213,-119.35192)"
x1="292.30838"
y1="419.81253"
x2="333.20709"
y2="475.94916" />
<linearGradient
id="linearGradient2237">
<stop
......@@ -39,16 +28,6 @@
offset="1"
id="stop2241" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3207"
id="linearGradient5209"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.1914392,0,0,0.8996584,791.32934,-118.70141)"
x1="297.8941"
y1="424.00873"
x2="333.20709"
y2="475.94916" />
<linearGradient
id="linearGradient3207">
<stop
......@@ -60,16 +39,6 @@
offset="1"
style="stop-color:#48ff00;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2237"
id="linearGradient5211"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.2215923,0,0,0.8996584,781.52213,-119.35192)"
x1="292.30838"
y1="419.81253"
x2="333.20709"
y2="475.94916" />
<linearGradient
id="linearGradient3627">
<stop
......@@ -81,16 +50,6 @@
offset="1"
id="stop3631" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3207"
id="linearGradient5213"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.1914392,0,0,0.8996584,791.32934,-118.70141)"
x1="297.8941"
y1="424.00873"
x2="333.20709"
y2="475.94916" />
<linearGradient
id="linearGradient3634">
<stop
......@@ -110,18 +69,22 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.197802"
inkscape:cx="16"
inkscape:cy="16"
inkscape:current-layer="layer1"
inkscape:zoom="15.836083"
inkscape:cx="12.936067"
inkscape:cy="16.951221"
inkscape:current-layer="g5246"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="849"
inkscape:window-height="609"
inkscape:window-x="842"
inkscape:window-y="83"
inkscape:window-maximized="0" />
inkscape:window-width="988"
inkscape:window-height="852"
inkscape:window-x="109"
inkscape:window-y="38"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid2997" />
</sodipodi:namedview>
<metadata
id="metadata3653">
<rdf:RDF>
......@@ -130,7 +93,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>
......@@ -141,47 +104,20 @@
<g
id="g5246"
transform="matrix(0.76403568,0,0,0.76403568,-640.5195,-200.07815)">
<g
transform="translate(0.4951,0.288308)"
id="g5189">
<g
id="g5175">
<rect
ry="1.8429986"
y="268.62585"
x="847.34686"
height="27.794876"
width="6.8460755"
id="rect4006"
style="fill:url(#linearGradient5207);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
rx="1.5517035" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
id="rect4406"
d="m 849.53757,269.27635 3.23338,0 c 0.74268,0 0.69637,0.86122 0.69637,1.88224 l -0.10173,10.84392 c 0.20417,2.44168 -3.19894,3.13232 -5.23638,5.33738 l 0.0678,-16.22055 c 0,-1.02102 0.59787,-1.84299 1.34055,-1.84299 z"
style="fill:url(#linearGradient5209);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44649449px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</g>
<g
transform="translate(16.522255,0.288308)"
id="g5179">
<rect
rx="1.5517035"
style="fill:url(#linearGradient5211);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect5181"
width="6.8460755"
height="27.794876"
x="847.34686"
y="268.62585"
ry="1.8429986" />
<path
inkscape:connector-curvature="0"
style="fill:url(#linearGradient5213);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44649449px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 849.53757,269.27635 3.23338,0 c 0.74268,0 0.69637,0.86122 0.69637,1.88224 l -0.10173,10.84392 c 0.20417,2.44168 -3.19894,3.13232 -5.23638,5.33738 l 0.0678,-16.22055 c 0,-1.02102 0.59787,-1.84299 1.34055,-1.84299 z"
id="path5183"
sodipodi:nodetypes="ccccccc" />
</g>
<rect
style="fill:#1ea4e2;fill-opacity:1;fill-rule:nonzero;stroke:#0a3447;stroke-width:0.9470951;stroke-opacity:1"
id="rect3006"
width="7.8596921"
height="28.228474"
x="848.80786"
y="268.82208" />
<rect
style="fill:#1ea5e2;fill-opacity:1;fill-rule:nonzero;stroke:#0a3447;stroke-width:0.9470951;stroke-opacity:1"
id="rect3006-7"
width="7.8596921"
height="28.228474"
x="862.22552"
y="268.79242" />
</g>
</g>
</svg>
cockatrice/resources/replay_rewind.svg deleted 100644 → 0
View file @ 7ea755ab
<?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="32px"
height="32px"
id="svg3530"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="New document 14">
<defs
id="defs3532">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2237"
id="linearGradient7125"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.7508448,0,0,1.0047463,1224.9887,-260.93318)"
x1="561.24646"
y1="416.94766"
x2="581.19086"
y2="451.85028" />
<linearGradient
id="linearGradient2237">
<stop
style="stop-color:#006000;stop-opacity:1;"
offset="0"
id="stop2239" />
<stop
style="stop-color:#48ff00;stop-opacity:1;"
offset="1"
id="stop2241" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3207"
id="linearGradient7127"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7508448,0,0,1.0047463,356.20533,-226.06053)"
x1="574.19977"
y1="386.51755"
x2="602.19623"
y2="414.91589" />
<linearGradient
id="linearGradient3207">
<stop
id="stop3209"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop3211"
offset="1"
style="stop-color:#48ff00;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2237"
id="linearGradient7129"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-0.7508448,0,0,1.0047463,1224.9887,-260.93318)"
x1="561.24646"
y1="416.94766"
x2="581.19086"
y2="451.85028" />
<linearGradient
id="linearGradient3510">
<stop
style="stop-color:#006000;stop-opacity:1;"
offset="0"
id="stop3512" />
<stop
style="stop-color:#48ff00;stop-opacity:1;"
offset="1"
id="stop3514" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3207"
id="linearGradient7131"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.7508448,0,0,1.0047463,356.20533,-226.06053)"
x1="574.19977"
y1="386.51755"
x2="602.19623"
y2="414.91589" />
<linearGradient
id="linearGradient3517">
<stop
id="stop3519"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop3521"
offset="1"
style="stop-color:#48ff00;stop-opacity:0;" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.197802"
inkscape:cx="1.7561332"
inkscape:cy="16"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="721"
inkscape:window-height="582"
inkscape:window-x="1025"
inkscape:window-y="0"
inkscape:window-maximized="0" />
<metadata
id="metadata3535">
<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
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g7117"
transform="matrix(0.76676112,0,0,0.76676112,-600.90663,-119.37546)">
<g
transform="translate(0.3991365,0)"
id="g7085">
<path
inkscape:connector-curvature="0"
style="fill:url(#linearGradient7125);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:0.86856693px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 802.95336,165.91041 0.13124,21.58705 c 0.0519,2.77256 -0.76484,3.44178 -3.19474,2.6719 l -12.97858,-10.42041 c -1.96927,-1.72591 -1.78765,-4.00534 -0.19967,-5.34381 l 13.5776,-11.48917 c 2.28061,-0.95757 2.61716,0.74168 2.66415,2.99444 z"
id="path7045"
sodipodi:nodetypes="ccccccc" />
<path
inkscape:connector-curvature="0"
style="fill:url(#linearGradient7127);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 802.33383,166.70719 0.0368,6.3298 c -6.54702,5.58043 -7.17964,0.0807 -10.96661,9.35453 l -3.24611,-2.72331 c -1.83699,-1.68228 -2.19329,-3.37644 -0.71199,-4.68107 l 12.66555,-11.19867 c 2.12742,-0.93337 2.17849,0.72292 2.22234,2.91872 z"
id="path7051"
sodipodi:nodetypes="ccccccc" />
</g>
<g
transform="translate(20.159898,-1.4678949e-6)"
id="g7089">
<path
inkscape:connector-curvature="0"
style="fill:url(#linearGradient7129);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:0.86856693px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 802.95336,165.91041 0.13124,21.58705 c 0.0519,2.77256 -0.76484,3.44178 -3.19474,2.6719 l -12.97858,-10.42041 c -1.96927,-1.72591 -1.78765,-4.00534 -0.19967,-5.34381 l 13.5776,-11.48917 c 2.28061,-0.95757 2.61716,0.74168 2.66415,2.99444 z"
id="path7091"
sodipodi:nodetypes="ccccccc" />
<path
inkscape:connector-curvature="0"
style="fill:url(#linearGradient7131);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 802.33383,166.70719 0.0368,6.3298 c -6.54702,5.58043 -7.17964,0.0807 -10.96661,9.35453 l -3.24611,-2.72331 c -1.83699,-1.68228 -2.19329,-3.37644 -0.71199,-4.68107 l 12.66555,-11.19867 c 2.12742,-0.93337 2.17849,0.72292 2.22234,2.91872 z"
id="path7093"
sodipodi:nodetypes="ccccccc" />
</g>
</g>
</g>
</svg>
cockatrice/resources/replay_start.svg
View file @ 45542243
......@@ -14,20 +14,17 @@
height="32px"
id="svg3239"
version="1.1"
inkscape:version="0.48.2 r9819"
inkscape:version="0.48.5 r10040"
sodipodi:docname="replay_start.svg">
<defs
id="defs3241">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient12715"
id="linearGradient12804"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(636.02621,139.8406)"
x1="561.24646"
y1="416.94766"
x2="581.19086"
y2="451.85028" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 16 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="32 : 16 : 1"
inkscape:persp3d-origin="16 : 10.666667 : 1"
id="perspective2997" />
<linearGradient
id="linearGradient12715">
<stop
......@@ -64,16 +61,6 @@
offset="1"
id="stop13572" />
</linearGradient>
<linearGradient
y2="451.85028"
x2="581.19086"
y1="416.94766"
x1="561.24646"
gradientTransform="translate(636.73201,141.31112)"
gradientUnits="userSpaceOnUse"
id="linearGradient3237"
xlink:href="#linearGradient13568"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
......@@ -82,18 +69,22 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.197802"
inkscape:cx="1.7561332"
inkscape:cy="16"
inkscape:current-layer="layer1"
inkscape:zoom="15.836083"
inkscape:cx="16.176897"
inkscape:cy="16.73396"
inkscape:current-layer="g13955"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="907"
inkscape:window-height="665"
inkscape:window-x="839"
inkscape:window-y="0"
inkscape:window-maximized="0" />
inkscape:window-width="1221"
inkscape:window-height="886"
inkscape:window-x="210"
inkscape:window-y="33"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid2993" />
</sodipodi:namedview>
<metadata
id="metadata3244">
<rdf:RDF>
......@@ -102,7 +93,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>
......@@ -112,19 +103,24 @@
inkscape:groupmode="layer">
<g
id="g13955"
transform="matrix(0.6981983,0,0,0.76802309,-828.57925,-425.81456)">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
id="path12784"
d="m 1198.1068,564.66784 -0.1748,21.48508 c -0.069,2.75946 1.0186,3.42552 4.2549,2.65928 l 17.2853,-10.37119 c 2.6227,-1.71776 2.3808,-3.98642 0.2659,-5.31856 l -18.0831,-11.4349 c -3.0374,-0.95305 -3.4856,0.73817 -3.5482,2.98029 z"
style="fill:url(#linearGradient12804);fill-opacity:1;fill-rule:evenodd;stroke:#000061;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
transform="matrix(0.6981983,0,0,0.76802309,-828.26352,-426.88805)">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
id="path12786"
d="m 1198.8948,565.80969 -0.1748,18.52705 c 8.7093,-12.11394 4.4337,-0.58002 15.6435,-13.76997 l -12.4957,-7.73737 c -3.0374,-0.95305 -2.9104,0.73817 -2.973,2.98029 z"
style="fill:url(#linearGradient3237);fill-opacity:1;fill-rule:evenodd;stroke:none" />
sodipodi:type="star"
style="fill:#237d12;fill-opacity:1;fill-rule:nonzero;stroke:#233312;stroke-width:0.52436191;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path3013"
sodipodi:sides="3"
sodipodi:cx="11.177006"
sodipodi:cy="8.825078"
sodipodi:r1="8.8405695"
sodipodi:r2="4.4202847"
sodipodi:arg1="0"
sodipodi:arg2="1.0471976"
inkscape:flatsided="true"
inkscape:rounded="1.6306401e-016"
inkscape:randomized="0"
d="m 20.017575,8.825078 -13.260854,7.656158 0,-15.3123158 z"
transform="matrix(2.0475365,0,0,1.8613848,1182.5389,560.23295)"
inkscape:transform-center-x="-3.1595648" />
</g>
</g>
</svg>
cockatrice/resources/replay_stop.svg
View file @ 45542243
......@@ -14,20 +14,10 @@
height="32px"
id="svg3320"
version="1.1"
inkscape:version="0.48.2 r9819"
inkscape:version="0.48.5 r10040"
sodipodi:docname="replay_stop.svg">
<defs
id="defs3322">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2237"
id="linearGradient3610"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.8996584,0,0,0.8996584,542.1675,-118.95505)"
x1="297.8941"
y1="424.00873"
x2="333.20709"
y2="475.94916" />
<linearGradient
id="linearGradient2237">
<stop
......@@ -60,16 +50,6 @@
offset="1"
style="stop-color:#48ff00;stop-opacity:0;" />
</linearGradient>
<linearGradient
y2="472.74878"
x2="330.00668"
y1="423.03891"
x1="293.33597"
gradientTransform="matrix(0.8996584,0,0,0.8996584,543.08369,-117.97095)"
gradientUnits="userSpaceOnUse"
id="linearGradient3318"
xlink:href="#linearGradient3207"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
......@@ -78,18 +58,22 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.197802"
inkscape:cx="1.7561332"
inkscape:cy="16"
inkscape:zoom="22.395604"
inkscape:cx="12.669812"
inkscape:cy="27.464311"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1075"
inkscape:window-height="703"
inkscape:window-x="841"
inkscape:window-y="315"
inkscape:window-maximized="0" />
inkscape:window-width="1099"
inkscape:window-height="800"
inkscape:window-x="128"
inkscape:window-y="20"
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid2990" />
</sodipodi:namedview>
<metadata
id="metadata3325">
<rdf:RDF>
......@@ -105,23 +89,12 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g4000"
transform="matrix(0.76669653,0,0,0.76669653,-615.23012,-200.91391)">
<rect
ry="3.588665"
y="269.02274"
x="809.41412"
height="27.794876"
width="27.794876"
id="rect3598"
style="fill:url(#linearGradient3610);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:0.89965838px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
id="rect3612"
d="m 813.91895,270.00686 20.0068,0 c 10.54509,7.32439 -17.45185,10.45989 -23.59547,24.20621 l 0,-20.61755 c 0,-1.98812 1.60055,-3.58866 3.58867,-3.58866 z"
style="fill:url(#linearGradient3318);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
<rect
style="fill:#b60000;fill-opacity:1;fill-rule:nonzero;stroke:#3f0000;stroke-opacity:1;stroke-width:0.8;stroke-miterlimit:4;stroke-dasharray:none"
id="rect2994"
width="20.271835"
height="20.271835"
x="5.8940139"
y="5.2983313" />
</g>
</svg>
cockatrice/resources/replay_toend.svg deleted 100644 → 0
View file @ 7ea755ab
<?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="32px"
height="32px"
id="svg3766"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="New document 20">
<defs
id="defs3768">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2237"
id="linearGradient9289"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(325.22401,-152.70392)"
x1="561.24646"
y1="416.94766"
x2="581.19086"
y2="451.85028" />
<linearGradient
id="linearGradient2237">
<stop
style="stop-color:#006000;stop-opacity:1;"
offset="0"
id="stop2239" />
<stop
style="stop-color:#48ff00;stop-opacity:1;"
offset="1"
id="stop2241" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3207"
id="linearGradient9291"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(325.92981,-151.2334)"
x1="561.24646"
y1="416.94766"
x2="581.19086"
y2="451.85028" />
<linearGradient
id="linearGradient3207">
<stop
id="stop3209"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop3211"
offset="1"
style="stop-color:#48ff00;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2237"
id="linearGradient9293"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.2215923,0,0,0.8996584,781.52213,-119.35192)"
x1="292.30838"
y1="419.81253"
x2="333.20709"
y2="475.94916" />
<linearGradient
id="linearGradient3747">
<stop
style="stop-color:#006000;stop-opacity:1;"
offset="0"
id="stop3749" />
<stop
style="stop-color:#48ff00;stop-opacity:1;"
offset="1"
id="stop3751" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3207"
id="linearGradient9295"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.1914392,0,0,0.8996584,791.32934,-118.70141)"
x1="297.8941"
y1="424.00873"
x2="333.20709"
y2="475.94916" />
<linearGradient
id="linearGradient3754">
<stop
id="stop3756"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop3758"
offset="1"
style="stop-color:#48ff00;stop-opacity:0;" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.197802"
inkscape:cx="16"
inkscape:cy="16"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="804"
inkscape:window-height="488"
inkscape:window-x="1089"
inkscape:window-y="0"
inkscape:window-maximized="0" />
<metadata
id="metadata3771">
<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
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g9274"
transform="matrix(0.76402345,0,0,0.76402345,-674.86163,-200.00285)">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
id="path5221"
d="m 887.3046,272.12332 -0.17478,21.48508 c -0.0691,2.75946 1.01863,3.42552 4.25485,2.65928 l 17.28531,-10.37119 c 2.62273,-1.71776 2.38085,-3.98642 0.26593,-5.31856 l -18.0831,-11.4349 c -3.0374,-0.95305 -3.48562,0.73817 -3.54821,2.98029 z"
style="fill:url(#linearGradient9289);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
id="path5223"
d="m 888.09257,273.26517 -0.17479,18.52705 c 8.70928,-12.11394 4.43369,-0.58002 15.64354,-13.76997 l -12.49571,-7.73737 c -3.0374,-0.95305 -2.91045,0.73817 -2.97304,2.98029 z"
style="fill:url(#linearGradient9291);fill-opacity:1;fill-rule:evenodd;stroke:none" />
<g
transform="translate(67.163097,0.1942719)"
id="g5236">
<rect
rx="1.5517035"
style="fill:url(#linearGradient9293);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect5238"
width="6.8460755"
height="27.794876"
x="847.34686"
y="268.62585"
ry="1.8429986" />
<path
inkscape:connector-curvature="0"
style="fill:url(#linearGradient9295);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44649449px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 849.53757,269.27635 3.23338,0 c 0.74268,0 0.69637,0.86122 0.69637,1.88224 l -0.10173,10.84392 c 0.20417,2.44168 -3.19894,3.13232 -5.23638,5.33738 l 0.0678,-16.22055 c 0,-1.02102 0.59787,-1.84299 1.34055,-1.84299 z"
id="path5240"
sodipodi:nodetypes="ccccccc" />
</g>
</g>
</g>
</svg>
cockatrice/resources/replay_tostart.svg deleted 100644 → 0
View file @ 7ea755ab
<?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="32px"
height="32px"
id="svg3881"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="New document 23">
<defs
id="defs3883">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2237"
id="linearGradient5301"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,1457.2153,-101.44165)"
x1="561.24646"
y1="416.94766"
x2="581.19086"
y2="451.85028" />
<linearGradient
id="linearGradient2237">
<stop
style="stop-color:#006000;stop-opacity:1;"
offset="0"
id="stop2239" />
<stop
style="stop-color:#48ff00;stop-opacity:1;"
offset="1"
id="stop2241" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2237"
id="linearGradient5295"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.2215923,0,0,0.8996584,-933.75407,-67.895376)"
x1="292.30838"
y1="419.81253"
x2="333.20709"
y2="475.94916" />
<linearGradient
id="linearGradient3857">
<stop
style="stop-color:#006000;stop-opacity:1;"
offset="0"
id="stop3859" />
<stop
style="stop-color:#48ff00;stop-opacity:1;"
offset="1"
id="stop3861" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3207"
id="linearGradient5292"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.1914392,0,0,0.8996584,805.00844,-67.244866)"
x1="297.8941"
y1="424.00873"
x2="333.20709"
y2="475.94916" />
<linearGradient
id="linearGradient3207">
<stop
id="stop3209"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop3211"
offset="1"
style="stop-color:#48ff00;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3207"
id="linearGradient6073"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(300.14087,-66.733744)"
x1="574.19977"
y1="386.51755"
x2="602.19623"
y2="414.91589" />
<linearGradient
id="linearGradient3868">
<stop
id="stop3870"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop3872"
offset="1"
style="stop-color:#48ff00;stop-opacity:0;" />
</linearGradient>
<linearGradient
y2="414.91589"
x2="602.19623"
y1="386.51755"
x1="574.19977"
gradientTransform="translate(300.14087,-66.733744)"
gradientUnits="userSpaceOnUse"
id="linearGradient3879"
xlink:href="#linearGradient3207"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.197802"
inkscape:cx="16"
inkscape:cy="16"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="783"
inkscape:window-height="494"
inkscape:window-x="1110"
inkscape:window-y="0"
inkscape:window-maximized="0" />
<metadata
id="metadata3886">
<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
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g6466"
transform="matrix(0.76402304,0,0,0.76402304,-654.96343,-239.16829)">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
id="path5273"
d="m 895.1347,323.38559 0.17478,21.48508 c 0.0691,2.75946 -1.01863,3.42552 -4.25485,2.65928 l -17.28531,-10.37119 c -2.62273,-1.71776 -2.38085,-3.98642 -0.26593,-5.31856 l 18.0831,-11.4349 c 3.0374,-0.95305 3.48562,0.73817 3.54821,2.98029 z"
style="fill:url(#linearGradient5301);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<rect
transform="scale(-1,1)"
ry="1.8429986"
y="320.0824"
x="-867.92932"
height="27.794876"
width="6.8460755"
id="rect5279"
style="fill:url(#linearGradient5295);fill-opacity:1;fill-rule:evenodd;stroke:#006100;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
rx="1.5517035" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
id="path5281"
d="m 863.21667,320.73289 3.23338,0 c 0.74268,0 0.69637,0.86122 0.69637,1.88224 l -0.10173,10.84392 c 0.20417,2.44168 -3.19894,3.13232 -5.23638,5.33738 l 0.0678,-16.22055 c 0,-1.02102 0.59787,-1.84299 1.34055,-1.84299 z"
style="fill:url(#linearGradient5292);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44649449px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
id="path5303"
d="m 894.30958,324.17861 0.049,6.2999 c -8.71954,5.55407 -9.56209,0.0803 -14.6057,9.31034 l -4.32328,-2.71045 c -2.44656,-1.67433 -2.9211,-3.36049 -0.94825,-4.65895 l 16.8684,-11.14577 c 2.83337,-0.92896 2.90139,0.7195 2.95978,2.90493 z"
style="fill:url(#linearGradient3879);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</g>
</svg>
cockatrice/src/messagelogwidget.cpp
View file @ 45542243
......@@ -799,8 +799,7 @@ void MessageLogWidget::logSetActivePlayer(Player *player)
str = tr("It is now %1's turn.", "female");
else
str = tr("It is now %1's turn.", "male");
QString fontColor = (player->getName().compare(QString(tabSupervisor->getUserInfo()->name().c_str())) == 0) ? "#" + settingsCache->getChatMentionColor(): "#0041FF";
appendHtml("<br><font color=\"green\"><b>" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") + str.arg("<font color=" + fontColor + ">" + player->getName() + "</font>") + "</b></font><br>");
appendHtml("<br><font color=\"green\"><b>" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") + str.arg(player->getName()) + "</b></font><br>");
}
void MessageLogWidget::logSetActivePhase(int phase)
......
cockatrice/src/tab_game.cpp
View file @ 45542243
......@@ -283,8 +283,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
playerListWidget = new PlayerListWidget(0, 0, this);
playerListWidget->setFocusPolicy(Qt::NoFocus);
timeElapsedLabel = new QLabel;
timeElapsedLabel->setAlignment(Qt::AlignCenter);
messageLog = new MessageLogWidget(tabSupervisor, this);
connect(messageLog, SIGNAL(cardNameHovered(QString)), cardInfo, SLOT(setCard(QString)));
connect(messageLog, SIGNAL(showCardInfoPopup(QPoint, QString)), this, SLOT(showCardInfoPopup(QPoint, QString)));
......@@ -294,7 +292,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
deckViewContainerLayout = new QVBoxLayout;
QVBoxLayout *messageLogLayout = new QVBoxLayout;
messageLogLayout->addWidget(timeElapsedLabel);
messageLogLayout->addWidget(messageLog);
QWidget *messageLogLayoutWidget = new QWidget;
......@@ -305,10 +302,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
connect(timelineWidget, SIGNAL(processNextEvent()), this, SLOT(replayNextEvent()));
connect(timelineWidget, SIGNAL(replayFinished()), this, SLOT(replayFinished()));
replayToStartButton = new QToolButton;
replayToStartButton->setIconSize(QSize(32, 32));
replayToStartButton->setIcon(QIcon(":/resources/replay_tostart.svg"));
connect(replayToStartButton, SIGNAL(clicked()), this, SLOT(replayToStartButtonClicked()));
replayStartButton = new QToolButton;
replayStartButton->setIconSize(QSize(32, 32));
replayStartButton->setIcon(QIcon(":/resources/replay_start.svg"));
......@@ -318,21 +311,12 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
replayPauseButton->setEnabled(false);
replayPauseButton->setIcon(QIcon(":/resources/replay_pause.svg"));
connect(replayPauseButton, SIGNAL(clicked()), this, SLOT(replayPauseButtonClicked()));
replayStopButton = new QToolButton;
replayStopButton->setIconSize(QSize(32, 32));
replayStopButton->setEnabled(false);
replayStopButton->setIcon(QIcon(":/resources/replay_stop.svg"));
connect(replayStopButton, SIGNAL(clicked()), this, SLOT(replayStopButtonClicked()));
replayFastForwardButton = new QToolButton;
replayFastForwardButton->setIconSize(QSize(32, 32));
replayFastForwardButton->setEnabled(false);
replayFastForwardButton->setIcon(QIcon(":/resources/replay_fastforward.svg"));
replayFastForwardButton->setCheckable(true);
connect(replayFastForwardButton, SIGNAL(toggled(bool)), this, SLOT(replayFastForwardButtonToggled(bool)));
replayToEndButton = new QToolButton;
replayToEndButton->setIconSize(QSize(32, 32));
replayToEndButton->setIcon(QIcon(":/resources/replay_toend.svg"));
connect(replayStopButton, SIGNAL(clicked()), this, SLOT(replayToEndButtonClicked()));
splitter = new QSplitter(Qt::Vertical);
splitter->addWidget(cardInfo);
......@@ -346,12 +330,9 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
QHBoxLayout *replayControlLayout = new QHBoxLayout;
replayControlLayout->addWidget(timelineWidget, 10);
replayControlLayout->addWidget(replayToStartButton);
replayControlLayout->addWidget(replayStartButton);
replayControlLayout->addWidget(replayPauseButton);
replayControlLayout->addWidget(replayStopButton);
replayControlLayout->addWidget(replayFastForwardButton);
replayControlLayout->addWidget(replayToEndButton);
QVBoxLayout *superMainLayout = new QVBoxLayout;
superMainLayout->addLayout(mainLayout);
......@@ -599,20 +580,14 @@ void TabGame::replayFinished()
{
replayStartButton->setEnabled(true);
replayPauseButton->setEnabled(false);
replayStopButton->setEnabled(false);
replayFastForwardButton->setEnabled(false);
}
void TabGame::replayToStartButtonClicked()
{
// XXX
}
void TabGame::replayStartButtonClicked()
{
replayStartButton->setEnabled(false);
replayPauseButton->setEnabled(true);
replayStopButton->setEnabled(true);
replayFastForwardButton->setEnabled(true);
timelineWidget->startReplay();
......@@ -627,27 +602,11 @@ void TabGame::replayPauseButtonClicked()
timelineWidget->stopReplay();
}
void TabGame::replayStopButtonClicked()
{
replayStartButton->setEnabled(true);
replayPauseButton->setEnabled(false);
replayStopButton->setEnabled(false);
replayFastForwardButton->setEnabled(false);
timelineWidget->stopReplay();
// XXX to start
}
void TabGame::replayFastForwardButtonToggled(bool checked)
{
timelineWidget->setTimeScaleFactor(checked ? 10.0 : 1.0);
}
void TabGame::replayToEndButtonClicked()
{
// XXX
}
void TabGame::incrementGameTime()
{
int seconds = ++secondsElapsed;
......
cockatrice/src/tab_game.h
View file @ 45542243
......@@ -121,7 +121,7 @@ private:
int currentReplayStep;
QList<int> replayTimeline;
ReplayTimelineWidget *timelineWidget;
QToolButton *replayToStartButton, *replayStartButton, *replayPauseButton, *replayStopButton, *replayFastForwardButton, *replayToEndButton;
QToolButton *replayStartButton, *replayPauseButton, *replayFastForwardButton;
QSplitter *splitter;
CardInfoWidget *cardInfo;
......@@ -176,12 +176,9 @@ signals:
private slots:
void replayNextEvent();
void replayFinished();
void replayToStartButtonClicked();
void replayStartButtonClicked();
void replayPauseButtonClicked();
void replayStopButtonClicked();
void replayFastForwardButtonToggled(bool checked);
void replayToEndButtonClicked();
void incrementGameTime();
void adminLockChanged(bool lock);
......
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