More work on classic and minimal themes; now both include a fancy Xonotic logo!

diff --git a/xonstat/batch/badges/gen_badges.py b/xonstat/batch/badges/gen_badges.py
index 4465ead7035ffbf800685ca97191fce0b9eb3a21..0cd17a34701caf5383dc22d021e096d161641c41 100644 (file)
--- a/xonstat/batch/badges/gen_badges.py
+++ b/xonstat/batch/badges/gen_badges.py
@@ -38,38 +38,43 @@ skin_minimal = Skin( "minimal",
         overlay         = "overlay_minimal",
         width           = 560,
         height          = 40,
+        nick_fontsize   = 16,
+        nick_pos        = (36,16),
         num_gametypes   = 3,
-        gametype_pos    = (8,30),
-        gametype_color  = (0.8, 0.8, 0.8),
+        nick_maxwidth   = 300,
+        gametype_pos    = (78,30),
+        gametype_color  = (0.0, 0.0, 0.0),
         gametype_text   = "%s:",
-        gametype_width  = 112,
+        gametype_width  = 96,
         gametype_fontsize = 10,
         gametype_center = False,
-        elo_pos         = (75,30),
+        elo_pos         = (82,30),
         elo_text        = "Elo %.0f",
-        elo_color       = (0.9, 0.9, 0.7),
-        elo_center      = True,
+        elo_color       = (0.7, 0.7, 0.7),
+        elo_center      = False,
         rank_pos        = None,
-        nostats_pos     = (75,30),
+        nostats_pos     = (82,30),
         nostats_fontsize = 10,
         nostats_angle   = 0,
         nostats_text    = "no stats!",
-        nostats_color   = (0.8, 0.3, 0.3),
-        nostats_center  = True,
+        nostats_color   = (0.7, 0.4, 0.4),
+        nostats_center  = False,
         kdr_pos         = (392,15),
+        kdr_fontsize    = 10,
         kdr_colortop    = (0.1, 0.8, 0.1),
         kdr_colormid    = (0.6, 0.6, 0.1),
         kdr_colorbot    = (0.8, 0.1, 0.1),
         kills_pos       = None,
         deaths_pos      = None,
         winp_pos        = (508,15),
-        wins_pos        = None,
+        winp_fontsize   = 10,
         winp_colortop   = (0.1, 0.6, 0.6),
         winp_colormid   = (0.2, 0.6, 0.2),
         winp_colorbot   = (0.6, 0.6, 0.1),
+        wins_pos        = None,
         loss_pos        = None,
         ptime_pos       = (451,30),
-        ptime_color     = (0.7, 0.7, 0.9),
+        ptime_color     = (0.7, 0.7, 0.7),
     )
 
 

diff --git a/xonstat/batch/badges/img/overlay.png b/xonstat/batch/badges/img/overlay.png
deleted file mode 100644 (file)
index b00bf5a..0000000
Binary files a/xonstat/batch/badges/img/overlay.png and /dev/null differ

diff --git a/xonstat/batch/badges/img/overlay_classic.png b/xonstat/batch/badges/img/overlay_classic.png
index fdc58d895b61ca79a2ff86859de71261193ef481..9578e905fa1d193ed8ab7a10e1d9b66598bd33f5 100644 (file)
Binary files a/xonstat/batch/badges/img/overlay_classic.png and b/xonstat/batch/badges/img/overlay_classic.png differ

diff --git a/xonstat/batch/badges/img/overlay_classic.xcf b/xonstat/batch/badges/img/overlay_classic.xcf
index 360fc8dc282daca3b5f64a1f63e7b29303b7c382..ab0194455d97b5bac16e6bec88fe16da1b376fb8 100644 (file)
Binary files a/xonstat/batch/badges/img/overlay_classic.xcf and b/xonstat/batch/badges/img/overlay_classic.xcf differ

diff --git a/xonstat/batch/badges/img/overlay_minimal.png b/xonstat/batch/badges/img/overlay_minimal.png
index 1f39a7128078f0d1c3e100abd2de0c7ca005ec8b..fa8eb8b532a5993c2236df3b89b2547260ae4e73 100644 (file)
Binary files a/xonstat/batch/badges/img/overlay_minimal.png and b/xonstat/batch/badges/img/overlay_minimal.png differ

diff --git a/xonstat/batch/badges/img/overlay_minimal.xcf b/xonstat/batch/badges/img/overlay_minimal.xcf
index fefa526d855e10ee2c67dc021aaa68fe3353e7fd..fe74fd6581652699a0b80694be5bb35fb3e046a4 100644 (file)
Binary files a/xonstat/batch/badges/img/overlay_minimal.xcf and b/xonstat/batch/badges/img/overlay_minimal.xcf differ

diff --git a/xonstat/batch/badges/img/xonotic_logo.svg b/xonstat/batch/badges/img/xonotic_logo.svg
new file mode 100644 (file)
index 0000000..b8bc1b2
--- /dev/null
+++ b/xonstat/batch/badges/img/xonotic_logo.svg
@@ -0,0 +1,346 @@
+<?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="289.6001"
+   height="277.31879"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   version="1.0"
+   sodipodi:docname="xonotic_logo.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3700">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop3705" />
+      <stop
+         id="stop3707"
+         offset="0.31"
+         style="stop-color:#000000;stop-opacity:0;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.18431373;"
+         offset="0.44"
+         id="stop3709" />
+      <stop
+         id="stop3711"
+         offset="0.85000002"
+         style="stop-color:#000000;stop-opacity:0;" />
+      <stop
+         id="stop3713"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3681">
+      <stop
+         id="stop3691"
+         offset="0"
+         style="stop-color:#1f7fff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#1f7fff;stop-opacity:0;"
+         offset="0.31"
+         id="stop3695" />
+      <stop
+         id="stop3689"
+         offset="0.44"
+         style="stop-color:#1f7fff;stop-opacity:0.18431373;" />
+      <stop
+         style="stop-color:#1f7fff;stop-opacity:0;"
+         offset="0.85000002"
+         id="stop3704" />
+      <stop
+         style="stop-color:#1f7fff;stop-opacity:0;"
+         offset="1"
+         id="stop3685" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3699">
+      <stop
+         id="stop3701"
+         offset="0"
+         style="stop-color:#3f0f00;stop-opacity:0.56078434;" />
+      <stop
+         style="stop-color:#ff7f2f;stop-opacity:0.56078434;"
+         offset="0.75"
+         id="stop3673" />
+      <stop
+         id="stop3703"
+         offset="1"
+         style="stop-color:#ff9f5f;stop-opacity:0.56078434;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3698">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3700" />
+      <stop
+         id="stop3706"
+         offset="0.5"
+         style="stop-color:#0f3f6f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3702" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3674">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3676" />
+      <stop
+         style="stop-color:#3f0b00;stop-opacity:1;"
+         offset="1"
+         id="stop3678" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3666">
+      <stop
+         style="stop-color:#3f0f00;stop-opacity:1;"
+         offset="0"
+         id="stop3668" />
+      <stop
+         id="stop3671"
+         offset="0.75"
+         style="stop-color:#ff7f2f;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ff9f5f;stop-opacity:1;"
+         offset="1"
+         id="stop3670" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3606">
+      <stop
+         style="stop-color:#bfdfff;stop-opacity:1;"
+         offset="0"
+         id="stop3608" />
+      <stop
+         id="stop3616"
+         offset="0.2"
+         style="stop-color:#5fafff;stop-opacity:1;" />
+      <stop
+         id="stop3614"
+         offset="0.80000001"
+         style="stop-color:#5fafff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#bfdfff;stop-opacity:1;"
+         offset="1"
+         id="stop3610" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3674"
+       id="linearGradient4196"
+       x1="1024"
+       y1="640"
+       x2="1024"
+       y2="440"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3666"
+       id="linearGradient4204"
+       x1="1024"
+       y1="640"
+       x2="1024"
+       y2="440"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3699"
+       id="linearGradient4214"
+       x1="1024"
+       y1="640"
+       x2="1024"
+       y2="440"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3698"
+       id="linearGradient3686"
+       gradientUnits="userSpaceOnUse"
+       x1="1024"
+       y1="640"
+       x2="1024"
+       y2="384" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3606"
+       id="linearGradient3689"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1024)"
+       x1="1024"
+       y1="1664"
+       x2="1024"
+       y2="1480" />
+    <filter
+       inkscape:collect="always"
+       id="filter3806"
+       x="-0.075428568"
+       width="1.1508571"
+       y="-0.132"
+       height="1.2640001"
+       inkscape:label="BlurShadow"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="6"
+         id="feGaussianBlur3808" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3852"
+       inkscape:label="BlurGlow"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="7"
+         id="feGaussianBlur3854" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="72.936179"
+     inkscape:cy="118.80348"
+     inkscape:document-units="px"
+     inkscape:current-layer="XonoticLogo"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     gridtolerance="10"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-global="true"
+     borderlayer="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="pt"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       visible="true"
+       enabled="true"
+       empspacing="4"
+       snapvisiblegridlinesonly="true" />
+  </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>
+        <dc:date>2010</dc:date>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Xonotic Community</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Xonotic Community</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="Dual-licensed under the &quot;GNU LGPL v2.1, or any later version&quot; (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) and &quot;CC-BY v3.0&quot; (http://creativecommons.org/licenses/by/3.0/)" />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Xonotic</rdf:li>
+            <rdf:li>Phoenix</rdf:li>
+            <rdf:li>Logo</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:language />
+        <dc:description>The logo of the Xonotic project.</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="XonoticLogo"
+     transform="translate(-879.2,-379.4812)">
+    <g
+       id="PhoenixHead">
+      <path
+         sodipodi:nodetypes="cccccccsccccccccccc"
+         id="PhoenixHeadShadow"
+         d="m 1057.0938,439.71875 c -34.0014,5.48439 -77.51225,47.9452 -119.9063,82.0625 l 52.125,-24.0625 -30.125,32.03125 26.03125,-12.1875 c -8.54487,16.84277 -7.62992,45.97673 -35.75,51.71875 14.64181,14.49069 33.4581,24.78052 54.50005,28.8125 C 1014,600 1021,628 1024,628 c 3,0 10,-28 20.0312,-29.90625 21.8482,-4.18648 41.2906,-15.12031 56.1563,-30.5 -74.3924,0.92961 -69.6917,-74.54814 -3.9687,-91.0625 -5.069,-4.72305 -21.9395,-3.83806 -35.75,-1.65625 2.4067,-16.09443 25.2286,-23.80249 42.0937,-21.71875 -9.6384,-9.77813 -21.3735,-16.84255 -40.8437,-8.71875 l -4.625,-4.71875 z m -9.3438,13.5625 5.0625,5 c -6.6098,5.59761 -12.4827,5.96968 -18.0625,0.96875 l 13,-5.96875 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3806)"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#linearGradient4214);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3852)"
+         d="m 1057.0938,439.71875 c -34.0014,5.48439 -77.51225,47.9452 -119.9063,82.0625 l 52.125,-24.0625 -30.125,32.03125 26.03125,-12.1875 c -8.54487,16.84277 -7.62992,45.97673 -35.75,51.71875 14.64181,14.49069 33.4581,24.78052 54.50005,28.8125 C 1014,600 1021,628 1024,628 c 3,0 10,-28 20.0312,-29.90625 21.8482,-4.18648 41.2906,-15.12031 56.1563,-30.5 -74.3924,0.92961 -69.6917,-74.54814 -3.9687,-91.0625 -5.069,-4.72305 -21.9395,-3.83806 -35.75,-1.65625 2.4067,-16.09443 25.2286,-23.80249 42.0937,-21.71875 -9.6384,-9.77813 -21.3735,-16.84255 -40.8437,-8.71875 l -4.625,-4.71875 z m -9.3438,13.5625 5.0625,5 c -6.6098,5.59761 -12.4827,5.96968 -18.0625,0.96875 l 13,-5.96875 z"
+         id="PhoenixHeadGlow"
+         sodipodi:nodetypes="cccccccsccccccccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccccccsccccccccccc"
+         id="PhoenixHeadFill"
+         d="m 1057.0938,439.71875 c -34.0014,5.48439 -77.51225,47.9452 -119.9063,82.0625 l 52.125,-24.0625 -30.125,32.03125 26.03125,-12.1875 c -8.54487,16.84277 -7.62992,45.97673 -35.75,51.71875 14.64181,14.49069 33.4581,24.78052 54.50005,28.8125 C 1014,600 1021,628 1024,628 c 3,0 10,-28 20.0312,-29.90625 21.8482,-4.18648 41.2906,-15.12031 56.1563,-30.5 -74.3924,0.92961 -69.6917,-74.54814 -3.9687,-91.0625 -5.069,-4.72305 -21.9395,-3.83806 -35.75,-1.65625 2.4067,-16.09443 25.2286,-23.80249 42.0937,-21.71875 -9.6384,-9.77813 -21.3735,-16.84255 -40.8437,-8.71875 l -4.625,-4.71875 z m -9.3438,13.5625 5.0625,5 c -6.6098,5.59761 -12.4827,5.96968 -18.0625,0.96875 l 13,-5.96875 z"
+         style="fill:url(#linearGradient4196);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4204);stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="Ring"
+       inkscape:export-xdpi="45"
+       inkscape:export-ydpi="45">
+      <path
+         style="fill:#1f7fff;fill-opacity:1;stroke:none;filter:url(#filter3852)"
+         d="M 969.28125,396.2812 C 925.981,416.8108 896,460.9225 896,512 c 0,70.656 57.344,128 128.0001,128 70.656,0 128,-57.344 128,-128 0,-51.0775 -29.9809,-95.1892 -73.2812,-115.7188 34.1753,19.1854 57.2812,55.7626 57.2812,97.7188 0,54.5462 -39.0631,100.0173 -90.7188,109.9688 -6.8922,1.3277 -15.2812,32.0312 -21.2812,32.0312 -6,0 -14.3892,-30.7034 -21.2814,-32.0312 C 951.06315,594.0172 912,548.5462 912,494 c 0,-41.9562 23.1059,-78.5334 57.28125,-97.7188 z"
+         id="RingGlow"
+         inkscape:connector-curvature="0" />
+      <path
+         id="RingBorder"
+         d="M 969.28125,396.2812 C 925.981,416.8108 896,460.9225 896,512 c 0,70.656 57.344,128 128.0001,128 70.656,0 128,-57.344 128,-128 0,-51.0775 -29.9809,-95.1892 -73.2812,-115.7188 34.1753,19.1854 57.2812,55.7626 57.2812,97.7188 0,54.5462 -39.0631,100.0173 -90.7188,109.9688 -6.8922,1.3277 -15.2812,32.0312 -21.2812,32.0312 -6,0 -14.3892,-30.7034 -21.2814,-32.0312 C 951.06315,594.0172 912,548.5462 912,494 c 0,-41.9562 23.1059,-78.5334 57.28125,-97.7188 z"
+         style="fill:url(#linearGradient3689);fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="csccsccsccsc"
+         id="RingFill"
+         d="M 924.4375,436.40625 C 908.47534,457.39804 899,483.594 899,512 c 0,67.6951 53.81855,122.8847 121,125 -8,-7 -14,-29 -18,-30 -53.03387,-10.23 -93,-56.9795 -93,-113 0,-20.98082 5.62297,-40.66002 15.4375,-57.59375 z m 199.125,0 C 1133.377,453.33998 1139,473.01918 1139,494 c 0,56.0205 -39.9661,102.77 -93,113 -4,1 -10,23 -18,30 67.1815,-2.1153 121,-57.3049 121,-125 0,-28.406 -9.4753,-54.60196 -25.4375,-75.59375 z"
+         style="fill:url(#linearGradient3686);fill-opacity:1;stroke:#00001f;stroke-width:1.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

diff --git a/xonstat/batch/badges/img/xonotic_logo_black-white.svg b/xonstat/batch/badges/img/xonotic_logo_black-white.svg
new file mode 100644 (file)
index 0000000..e0c8dbb
--- /dev/null
+++ b/xonstat/batch/badges/img/xonotic_logo_black-white.svg
@@ -0,0 +1,120 @@
+<?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="256"
+   height="243.72501"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   version="1.0"
+   sodipodi:docname="xonotic_logo_black-white.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-xdpi="14.765625"
+   inkscape:export-ydpi="14.765625"
+   inkscape:export-filename="/home/zykure/XonStat/xonstat/batch/badges/img/xonotic_logo_black-white.png">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="219.9015"
+     inkscape:cy="151.47868"
+     inkscape:document-units="px"
+     inkscape:current-layer="XonoticLogo"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     gridtolerance="10"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-global="true"
+     borderlayer="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="744"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="pt">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       visible="true"
+       enabled="true"
+       empspacing="4"
+       snapvisiblegridlinesonly="true" />
+  </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>
+        <dc:date>2010</dc:date>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Xonotic Community</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Xonotic Community</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="Dual-licensed under the &quot;GNU LGPL v2.1, or any later version&quot; (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) and &quot;CC-BY v3.0&quot; (http://creativecommons.org/licenses/by/3.0/)" />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Xonotic</rdf:li>
+            <rdf:li>Phoenix</rdf:li>
+            <rdf:li>Logo</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>A print version of the Xonotic logo. Completely black.</dc:description>
+        <dc:relation>Xonotic Logo</dc:relation>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="XonoticLogo"
+     transform="translate(-896,-396.275)">
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 1057.0938,439.71875 c -34.0014,5.48439 -77.51225,47.9452 -119.9063,82.0625 l 52.125,-24.0625 -30.125,32.03125 26.03125,-12.1875 c -8.54487,16.84277 -7.62992,45.97673 -35.75,51.71875 14.64181,14.49069 33.4581,24.78052 54.50005,28.8125 C 1014,600 1021,628 1024,628 c 3,0 10,-28 20.0312,-29.90625 21.8482,-4.18648 41.2906,-15.12031 56.1563,-30.5 -74.3924,0.92961 -69.6917,-74.54814 -3.9687,-91.0625 -5.069,-4.72305 -21.9395,-3.83806 -35.75,-1.65625 2.4067,-16.09443 25.2286,-23.80249 42.0937,-21.71875 -9.6384,-9.77813 -21.3735,-16.84255 -40.8437,-8.71875 l -4.625,-4.71875 z m -9.3438,13.5625 5.0625,5 c -6.6098,5.59761 -12.4827,5.96968 -18.0625,0.96875 l 13,-5.96875 z"
+       id="PhoenixHead"
+       sodipodi:nodetypes="cccccccsccccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="M 969.28125,396.2812 C 925.981,416.8108 896,460.9225 896,512 c 0,70.656 57.344,128 128.0001,128 70.656,0 128,-57.344 128,-128 0,-51.0775 -29.9809,-95.1892 -73.2812,-115.7188 34.1753,19.1854 57.2812,55.7626 57.2812,97.7188 0,54.5462 -39.0631,100.0173 -90.7188,109.9688 -6.8922,1.3277 -15.2812,32.0312 -21.2812,32.0312 -6,0 -14.3892,-30.7034 -21.2814,-32.0312 C 951.06315,594.0172 912,548.5462 912,494 c 0,-41.9562 23.1059,-78.5334 57.28125,-97.7188 z"
+       id="RingBorder"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="14.765619"
+       inkscape:export-ydpi="14.765619" />
+  </g>
+</svg>

diff --git a/xonstat/batch/badges/skin.py b/xonstat/batch/badges/skin.py
index 0af57d81a02562011c764cb4a1767c94656b40b5..a2bb0ed83336a12ea50deecc4534301e86d8881f 100644 (file)
--- a/xonstat/batch/badges/skin.py
+++ b/xonstat/batch/badges/skin.py
@@ -64,31 +64,31 @@ class Skin:
             'width':            560,
             'height':           70,
             'nick_fontsize':    20,
-            'nick_pos':         (5,18),
-            'nick_maxwidth':    330,
-            'gametype_fontsize':12,
-            'gametype_pos':     (60,31),
-            'gametype_width':   110,
+            'nick_pos':         (56,18),
+            'nick_maxwidth':    280,
+            'gametype_fontsize':10,
+            'gametype_pos':     (101,33),
+            'gametype_width':   94,
             'gametype_color':   (0.9, 0.9, 0.9),
             'gametype_text':    "[ %s ]",
             'gametype_center':  True,
             'num_gametypes':    3,
             'nostats_fontsize': 12,
-            'nostats_pos':      (60,59),
+            'nostats_pos':      (101,59),
             'nostats_color':    (0.8, 0.2, 0.1),
             'nostats_angle':    -10,
             'nostats_text':     "no stats yet!",
-            'nostats_center':   False,
-            'elo_pos':          (60,47),
+            'nostats_center':   True,
+            'elo_pos':          (101,47),
             'elo_fontsize':     10,
             'elo_color':        (1.0, 1.0, 0.5),
             'elo_text':         "Elo %.0f",
-            'elo_center':       False,
+            'elo_center':       True,
             'rank_fontsize':    8,
-            'rank_pos':         (60,57),
+            'rank_pos':         (101,57),
             'rank_color':       (0.8, 0.8, 1.0),
             'rank_text':        "Rank %d of %d",
-            'rank_center':      False,
+            'rank_center':      True,
             'wintext_fontsize': 10,
             'wintext_pos':      (508,3),
             'wintext_color':    (0.8, 0.8, 0.8),
@@ -281,6 +281,9 @@ class Skin:
         # show up to three gametypes the player has participated in
         xoffset = 0
         for gt in data.total_stats['gametypes'][:self.num_gametypes]:
+            if not elos.has_key(gt) or not ranks.has_key(gt):
+                continue
+
             if self.gametype_pos:
                 ctx.select_font_face(font, C.FONT_SLANT_NORMAL, C.FONT_WEIGHT_BOLD)
                 ctx.set_font_size(self.gametype_fontsize)
@@ -290,10 +293,11 @@ class Skin:
                 if self.gametype_center:
                     ctx.move_to(self.gametype_pos[0]+xoffset-xoff-tw/2, self.gametype_pos[1]-yoff)
                 else:
-                    ctx.move_to(self.gametype_pos[0]+xoffset-xoff, self.gametype_pos[1]-yoff)
+                    ctx.move_to(self.gametype_pos[0]+xoffset-xoff-tw, self.gametype_pos[1]-yoff)
                 ctx.show_text(txt)
 
             if not elos.has_key(gt) or not ranks.has_key(gt):
+                pass
                 if self.nostats_pos:
                     ctx.select_font_face(font, C.FONT_SLANT_NORMAL, C.FONT_WEIGHT_BOLD)
                     ctx.set_font_size(self.nostats_fontsize)