diff --git a/cmake/headerimage.bmp b/cmake/headerimage.bmp index 73c88d6d..625680c3 100644 Binary files a/cmake/headerimage.bmp and b/cmake/headerimage.bmp differ diff --git a/cmake/leftimage.bmp b/cmake/leftimage.bmp index e89fdd95..aea76267 100644 Binary files a/cmake/leftimage.bmp and b/cmake/leftimage.bmp differ diff --git a/cockatrice/resources/appicon.icns b/cockatrice/resources/appicon.icns index 4bd00ffc..f521035e 100644 Binary files a/cockatrice/resources/appicon.icns and b/cockatrice/resources/appicon.icns differ diff --git a/cockatrice/resources/appicon.ico b/cockatrice/resources/appicon.ico index 9a4885f4..4cf839bc 100644 Binary files a/cockatrice/resources/appicon.ico and b/cockatrice/resources/appicon.ico differ diff --git a/cockatrice/resources/back.svg b/cockatrice/resources/back.svg index 0377ecb2..3dd1c69c 100644 --- a/cockatrice/resources/back.svg +++ b/cockatrice/resources/back.svg @@ -1,5 +1,6 @@ + + version="1.0" + inkscape:export-filename="C:\Users\Matt\Documents\GitHub\Cockatrice\cockatrice\resources\back_new.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + + + + + + + + + xlink:href="#linearGradient3009" + id="linearGradient3015" + x1="10.096291" + y1="329.42294" + x2="229.81081" + y2="12.591727" + gradientUnits="userSpaceOnUse" /> - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-width="1920" + inkscape:window-height="1028" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" /> @@ -149,40 +658,377 @@ image/svg+xml + + id="layer1" + style="display:inline" + sodipodi:insensitive="true"> + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-opacity:0" + id="rect3004" + width="240" + height="340" + x="0" + y="0.57232106" + rx="10" + ry="10" /> + style="fill:url(#linearGradient3015);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.00535154;stroke-opacity:0;display:inline" + id="rect3007" + width="220.67607" + height="318.77353" + x="10.096291" + y="11.610939" /> + + + + + + + style="fill:#ff5555;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-opacity:0;display:inline" + id="path5297-7" + sodipodi:cx="-96.635925" + sodipodi:cy="76.534889" + sodipodi:rx="2.8846545" + sodipodi:ry="2.8846545" + d="m -93.751271,76.534889 a 2.8846545,2.8846545 0 1 1 -5.769309,0 2.8846545,2.8846545 0 1 1 5.769309,0 z" + transform="translate(118.51147,240.79097)" /> + sodipodi:type="arc" + style="fill:url(#linearGradient5324-8);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-opacity:0;display:inline" + id="path5299-6-1" + sodipodi:cx="-24.925219" + sodipodi:cy="38.493507" + sodipodi:rx="1.4573514" + sodipodi:ry="1.1418424" + d="m -23.467867,38.493507 a 1.4573514,1.1418424 0 1 1 -2.914703,0 1.4573514,1.1418424 0 1 1 2.914703,0 z" + transform="matrix(-1.3207348,0.77962891,-1.166227,-1.9837166,33.337282,413.41782)" /> + + + + + + + + + + + + + + diff --git a/cockatrice/resources/cockatrice.png b/cockatrice/resources/cockatrice.png index ed79b88a..200d2480 100644 Binary files a/cockatrice/resources/cockatrice.png and b/cockatrice/resources/cockatrice.png differ diff --git a/cockatrice/resources/cockatrice.svg b/cockatrice/resources/cockatrice.svg index 991a53c6..1cd1f217 100644 --- a/cockatrice/resources/cockatrice.svg +++ b/cockatrice/resources/cockatrice.svg @@ -1,5 +1,6 @@ + + inkscape:version="0.48.5 r10040" + sodipodi:docname="cockatrice.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2621" /> + + + + + + + + id="linearGradient3779"> + style="stop-color:#99ff00;stop-opacity:1;" /> + style="stop-color:#0f620f;stop-opacity:1;" /> + id="stop3815" /> + style="stop-color:#007400;stop-opacity:0.40000001;" /> + id="stop4579" /> + id="stop3817" /> + id="linearGradient3841"> + style="stop-color:white;stop-opacity:1;" /> + style="stop-color:#fefce9;stop-opacity:0;" /> + + + + + - + id="linearGradient3999-4"> + + + + id="linearGradient4009-4"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2621-2" /> + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2571-9" /> + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2519-8" /> + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2467-1" /> + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2650-6" /> + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2578-7" /> + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2511-5" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -180,95 +635,142 @@ image/svg+xml + - - - - - - - + id="g3026"> + transform="matrix(0.99103064,0,0,0.98943856,1.2668213,1.9022887)" + id="layer4" + style="display:inline" + clip-path="none"> + + + - - - + id="g3342" + transform="matrix(1.0090505,0,0,1.0106742,411.46737,-30.548174)" + style="fill:#ffffff;fill-opacity:1"> + + + + + + + + + - + id="layer1" + style="display:none"> + d="m 300,149.64285 a 149.64285,149.64285 0 1 1 -299.28570557,0 149.64285,149.64285 0 1 1 299.28570557,0 z" + transform="matrix(1.0015936,0,0,1.0000039,-0.00173336,0.71369073)" + id="path3221" + style="fill:url(#linearGradient4005);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0;filter:url(#filter4089)" /> + + + diff --git a/cockatrice/resources/hand.svg b/cockatrice/resources/hand.svg index 8c28fd59..7c34d7cc 100644 --- a/cockatrice/resources/hand.svg +++ b/cockatrice/resources/hand.svg @@ -14,10 +14,13 @@ height="500" id="svg2" sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="back.svg" + inkscape:version="0.48.5 r10040" + sodipodi:docname="hand.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0"> + version="1.0" + inkscape:export-filename="C:\Users\Matt\Documents\GitHub\Cockatrice\cockatrice\resources\hand_new.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> - - - - - - - - - + id="linearGradient4766-8-0-3-31"> + + + + x1="-20.65873" + y1="37.909077" + x2="-25.41811" + y2="38.523342" /> + + + + + x1="-20.65873" + y1="37.909077" + x2="-25.41811" + y2="38.523342" /> + + + + + x1="-20.65873" + y1="37.909077" + x2="-25.41811" + y2="38.523342" /> + + + + + x1="-20.65873" + y1="37.909077" + x2="-25.41811" + y2="38.523342" /> + + + + + + + + + x1="-20.65873" + y1="37.909077" + x2="-25.41811" + y2="38.523342" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -377,7 +3435,7 @@ image/svg+xml - + @@ -387,99 +3445,992 @@ id="layer1" transform="translate(0,160)"> + id="g4178-7" + transform="matrix(0.89531447,-0.44543462,0.44543462,0.89531447,-0.7217683,-5.4209005)"> - - - - - + style="display:inline" + id="layer1-1-4" + inkscape:label="boarder"> + + - - - - - + style="display:inline" + inkscape:label="inlay" + id="layer3-0"> + + + inkscape:label="dots" + id="layer4-0"> + + + + + + + + + + + + + + + - - - + transform="translate(-380.13559,-22.492048)" + id="g3866-2-5"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +