From 104e2e2fdc22cd51aa0bb08e2dea5c663add20a7 Mon Sep 17 00:00:00 2001
From: Gavin Bises <gbisesi@localytics.com>
Date: Wed, 28 Jan 2015 11:11:04 -0500
Subject: [PATCH] Add neutral gender to pixmap gen

---
 .../genders/{female.svg => feminine.svg}      |  0
 .../genders/{male.svg => masculine.svg}       |  0
 cockatrice/resources/genders/null.svg         | 70 +++++++++++++++++++
 cockatrice/src/pixmapgenerator.cpp            |  7 +-
 4 files changed, 74 insertions(+), 3 deletions(-)
 rename cockatrice/resources/genders/{female.svg => feminine.svg} (100%)
 rename cockatrice/resources/genders/{male.svg => masculine.svg} (100%)
 create mode 100644 cockatrice/resources/genders/null.svg

diff --git a/cockatrice/resources/genders/female.svg b/cockatrice/resources/genders/feminine.svg
similarity index 100%
rename from cockatrice/resources/genders/female.svg
rename to cockatrice/resources/genders/feminine.svg
diff --git a/cockatrice/resources/genders/male.svg b/cockatrice/resources/genders/masculine.svg
similarity index 100%
rename from cockatrice/resources/genders/male.svg
rename to cockatrice/resources/genders/masculine.svg
diff --git a/cockatrice/resources/genders/null.svg b/cockatrice/resources/genders/null.svg
new file mode 100644
index 000000000..105fd08e8
--- /dev/null
+++ b/cockatrice/resources/genders/null.svg
@@ -0,0 +1,70 @@
+<?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"
+   version="1.0"
+   width="75"
+   height="75"
+   id="svg34864"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="male - Copy.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="8.9001173"
+     inkscape:cx="42.389132"
+     inkscape:cy="39.781744"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs34866" />
+  <g
+     transform="translate(-348.755, -478.091)"
+     id="layer1">
+    <g
+       transform="matrix(1.94812,0,0,1.93731,-342.76707,-460.12236)"
+       id="g1872">
+      <path
+         d="m 387.08496,488.84952 c -12.84014,14.06563 -8.44438,9.25621 -26.53281,28.65893"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:3;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"
+         id="path26867"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         d="m 382.87439,511.71776 a 12.436672,12.446365 45 0 1 -17.58811,-17.58811 12.436672,12.446365 45 0 1 17.58811,17.58811 z"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:3.4600544;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"
+         id="path26871"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/cockatrice/src/pixmapgenerator.cpp b/cockatrice/src/pixmapgenerator.cpp
index 8bae48539..cd5af445b 100644
--- a/cockatrice/src/pixmapgenerator.cpp
+++ b/cockatrice/src/pixmapgenerator.cpp
@@ -93,9 +93,10 @@ QPixmap GenderPixmapGenerator::generatePixmap(int height, int _gender)
     
     QString genderStr;
     switch (gender) {
-        case ServerInfo_User::Male: genderStr = "male"; break;
-        case ServerInfo_User::Female: genderStr = "female"; break;
-        default: genderStr = "unknown";
+        case ServerInfo_User::Male: genderStr = "masculine"; break;
+        case ServerInfo_User::Female: genderStr = "feminine"; break;
+        case ServerInfo_User::Neutral: genderStr = "neutral"; break;
+        default: genderStr = "null";
     };
     
     QSvgRenderer svg(QString(":/resources/genders/" + genderStr + ".svg"));