# HG changeset patch
# User Wuzzy <almikes@aol.com>
# Date 1492144596 -7200
# Node ID caff1a3a7456863b72ccba4526f3aaec31ef7eef
# Parent  05f1935175dacde26a03ef2c00357112230ad4b8
Use palette icon for user color settings group box

diff -r 05f1935175da -r caff1a3a7456 CREDITS
--- a/CREDITS	Thu Apr 13 23:50:00 2017 +0200
+++ b/CREDITS	Fri Apr 14 06:36:36 2017 +0200
@@ -11,7 +11,8 @@
 (File name suffixes are omitted)
 
 - Tango Project and Wuzzy -> audio, home (CC0)
-- abustany and Wuzzy -> Videos, (CC0)
+- abustany and Wuzzy -> Videos (CC0)
+- Juliane Krug and Wuzzy -> Palette (CC0)
 
 ==========
 = FORTS
diff -r 05f1935175da -r caff1a3a7456 QTfrontend/hedgewars.qrc
--- a/QTfrontend/hedgewars.qrc	Thu Apr 13 23:50:00 2017 +0200
+++ b/QTfrontend/hedgewars.qrc	Fri Apr 14 06:36:36 2017 +0200
@@ -93,6 +93,7 @@
         <file>res/Save.png</file>
         <file>res/Record.png</file>
         <file>res/Videos.png</file>
+        <file>res/Palette.png</file>
         <file>res/weaponsicon.png</file>
         <file>res/teamicon.png</file>
         <file>res/panelbg.png</file>
diff -r 05f1935175da -r caff1a3a7456 QTfrontend/res/Palette.png
Binary file QTfrontend/res/Palette.png has changed
diff -r 05f1935175da -r caff1a3a7456 QTfrontend/res/Palette.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/res/Palette.svg	Fri Apr 14 06:36:36 2017 +0200
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="48"
+   width="48"
+   version="1.1"
+   viewBox="0 0 45 45"
+   id="svg20305">
+  <defs
+     id="defs20307" />
+  <g
+     transform="matrix(0.59479444,0.10227643,-0.10227643,0.59479444,1.7060659,-7.8021394)"
+     id="g21200">
+    <path
+       d="M 56.964,9.6436 C 52.703,6.7734 45.988,6.4849 43.088,10.98 39.455,16.782 39.651,24.598 34.789,29.67 28.82,36.548 19.661,39.993 14.663,47.835 11.227,52.538 8.856,59.176 11.79,65.011 c 3.235,6.347 10.016,9.623 16.219,12.145 9.557,3.543 20.641,2.117 28.235,-4.201 C 66.569,65.055 73.162,52.531 74.223,39.264 74.44,32.316 72.524,25.071 68.406,19.231 65.15,15.43 61.352,12.023 56.964,9.6436 Z"
+       style="fill:#d19153;fill-opacity:1;fill-rule:evenodd;stroke:#482e18;stroke-width:2.63609332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path20328" />
+    <path
+       d="M 60.902589,13.329601 C 59.467882,12.218236 57.953793,11.215297 56.360321,10.352053 52.235298,7.573447 45.734587,7.2941543 42.927132,11.646096 c -3.516095,5.616846 -3.324414,13.183421 -8.032226,18.094531 -5.778517,6.657541 -14.646201,9.992605 -19.484705,17.585318 -3.32635,4.551949 -5.6242038,10.978117 -2.783253,16.625942 3.130797,6.145422 9.697337,9.316878 15.702386,11.757428 9.252016,3.429936 19.983272,2.05041 27.334931,-4.065969 9.995508,-7.647895 16.378112,-19.772228 17.405253,-32.614882 0.210075,-6.726276 -1.646717,-13.742009 -5.632336,-19.395643 -1.971027,-2.299209 -4.143416,-4.4503 -6.534593,-6.30322 z m -1.314663,0.85579 c 1.879058,1.446323 3.656468,3.027211 5.252844,4.793003 4.09598,4.831727 6.092178,11.179479 6.199635,17.324901 C 70.84582,47.946489 65.493261,58.975915 57.218046,66.589927 51.850967,72.150623 43.857465,74.993898 35.973357,74.09648 31.296524,73.490457 26.762968,71.669484 22.638914,69.255072 18.98535,67.122375 15.365669,63.916067 14.488582,59.595492 13.78575,55.124861 15.735478,50.84204 18.26122,47.441147 23.365947,40.622904 31.318789,36.865755 37.027605,30.660311 c 3.675829,-3.908171 4.755247,-9.423367 6.617849,-14.352872 0.819002,-2.368911 1.811292,-5.134738 4.381565,-5.99924 3.290531,-1.1281127 6.845351,0.547937 9.648933,2.473465 0.645714,0.454032 1.286589,0.921619 1.911974,1.403727 z"
+       style="fill:#ae7172;fill-opacity:0.29375;fill-rule:evenodd;stroke-width:0.96808791"
+       id="path21001" />
+    <path
+       d="m 59.890436,13.51037 c -2.769,-2.281 -6.034,-4.2953004 -9.634,-4.3409004 -2.539,-0.1368 -5.058,1.0949004 -6.226,3.3489004 -2.324,3.56 -3.122,7.903 -5.03,11.692 -1.975,4.42 -5.23,8.091 -8.992,11.018 -5.134,4.507 -10.717,8.659 -14.747,14.271 -2.26,3.452 -3.404,7.855 -2.527,12.089 0.8,3.333 3.241,6.044 5.923,8.083 2.203,-1.463 3.734,-3.698 5.635,-5.494 6.587,-6.966 10.155872,-14.523982 18.364872,-19.509982 7.886,-4.97 20.231128,-7.533018 28.993128,-10.807018 -0.806,-7.945 -5.148,-15.63 -11.76,-20.35 z"
+       style="fill:#ffffff;fill-opacity:0.1360634;fill-rule:evenodd"
+       id="path20961" />
+    <g
+       transform="matrix(1.1189191,0,0,1.1189191,23.244443,-19.439177)"
+       id="g4540">
+      <path
+         id="path21032"
+         style="fill:#4980c1;fill-opacity:0.90620871;fill-rule:evenodd"
+         d="M 25.813,60.121 C 36.546,59.159 37.102,68.399 30.81,71.094 18.041,72.25 18.411,63.202 25.813,60.121 Z" />
+      <path
+         id="path21033"
+         style="fill:#000000;fill-opacity:0.44253636;fill-rule:evenodd"
+         d="m 25.872,60.229 c -7.403,3.081 -7.765,12.138 5.004,10.983 6.292,-2.695 5.729,-11.945 -5.004,-10.983 z m 2.253,0.566 c 2.504,-0.233 6.524,2.046 5.221,5.575 -1.895,4.928 -7.369,3.498 -10.772,2.047 -2.983,-2.758 0.482,-7.077 3.183,-7.546 0.788,10e-4 1.582,-0.159 2.368,-0.076 z" />
+      <path
+         id="path21034"
+         style="fill:#ffffff;fill-opacity:0.13342142;fill-rule:evenodd"
+         d="m 23.897,62.344 c -2.172,1.282 -3.454,5.485 -0.508,6.68 4.33,1.123 5.495,-2.816 4.711,-7.9 -1.585,-0.334 -2.845,0.287 -4.203,1.22 z" />
+    </g>
+    <g
+       transform="matrix(1.0747502,0,0,1.0747502,10.652197,-28.766215)"
+       id="g4535">
+      <path
+         id="path21030"
+         style="fill:#20bf00;fill-opacity:0.8982827;fill-rule:evenodd"
+         d="M 43.927,57.271 C 55.041,56.326 55.615,65.395 49.101,68.04 35.879,69.174 36.263,60.294 43.927,57.271 Z" />
+      <path
+         id="path21031"
+         style="fill:#000000;fill-opacity:0.44253636;fill-rule:evenodd"
+         d="m 43.988,57.377 c -7.665,3.023 -8.04,11.912 5.181,10.779 6.515,-2.646 5.932,-11.724 -5.181,-10.779 z m 2.333,0.555 c 2.593,-0.229 6.755,2.008 5.406,5.471 -1.963,4.837 -7.63,3.434 -11.154,2.009 -3.088,-2.706 0.5,-6.945 3.296,-7.405 0.816,0.001 1.639,-0.156 2.452,-0.075 z" />
+      <path
+         id="path21040"
+         style="fill:#ffffff;fill-opacity:0.13333333;fill-rule:evenodd"
+         d="m 42.226,59.205 c -2.249,1.258 -3.577,5.383 -0.526,6.556 4.483,1.103 5.689,-2.764 4.877,-7.754 -1.641,-0.327 -2.945,0.282 -4.351,1.198 z" />
+    </g>
+    <g
+       transform="matrix(1.1403571,0,0,1.1403571,-25.702664,8.2163177)"
+       id="g4530">
+      <path
+         id="path21028"
+         style="fill:#ff0204;fill-opacity:0.90356673;fill-rule:evenodd"
+         d="m 55.349,46.446 c 11.722,-0.846 12.328,7.279 5.457,9.649 -13.945,1.016 -13.541,-6.94 -5.457,-9.649 z" />
+      <path
+         id="path21029"
+         style="fill:#000000;fill-opacity:0.44253636;fill-rule:evenodd"
+         d="m 55.413,46.541 c -8.084,2.709 -8.48,10.673 5.465,9.657 6.871,-2.37 6.257,-10.503 -5.465,-9.657 z m 2.461,0.497 c 2.735,-0.205 7.125,1.799 5.702,4.903 -2.07,4.333 -8.048,3.076 -11.765,1.799 -3.256,-2.425 0.528,-6.222 3.477,-6.635 0.861,0.001 1.728,-0.139 2.586,-0.067 z" />
+      <path
+         id="path21041"
+         style="fill:#ffffff;fill-opacity:0.13474241;fill-rule:evenodd"
+         d="m 53.417,48.109 c -2.372,1.127 -3.773,4.823 -0.555,5.874 4.728,0.988 6,-2.476 5.144,-6.947 -1.731,-0.293 -3.107,0.253 -4.589,1.073 z" />
+    </g>
+    <g
+       transform="matrix(1.0747502,0,0,1.0747502,6.4639824,-44.660848)"
+       id="g4535-3">
+      <path
+         id="path21030-6"
+         style="fill:#ffff04;fill-opacity:0.8982827;fill-rule:evenodd"
+         d="M 43.927,57.271 C 55.041,56.326 55.615,65.395 49.101,68.04 35.879,69.174 36.263,60.294 43.927,57.271 Z" />
+      <path
+         id="path21031-7"
+         style="fill:#000000;fill-opacity:0.44253636;fill-rule:evenodd"
+         d="m 43.988,57.377 c -7.665,3.023 -8.04,11.912 5.181,10.779 6.515,-2.646 5.932,-11.724 -5.181,-10.779 z m 2.333,0.555 c 2.593,-0.229 6.755,2.008 5.406,5.471 -1.963,4.837 -7.63,3.434 -11.154,2.009 -3.088,-2.706 0.5,-6.945 3.296,-7.405 0.816,0.001 1.639,-0.156 2.452,-0.075 z" />
+      <path
+         id="path21040-5"
+         style="fill:#ffffff;fill-opacity:0.13333333;fill-rule:evenodd"
+         d="m 42.226,59.205 c -2.249,1.258 -3.577,5.383 -0.526,6.556 4.483,1.103 5.689,-2.764 4.877,-7.754 -1.641,-0.327 -2.945,0.282 -4.351,1.198 z" />
+    </g>
+  </g>
+  <metadata
+     id="metadata34">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff -r 05f1935175da -r caff1a3a7456 QTfrontend/ui/page/pageoptions.cpp
--- a/QTfrontend/ui/page/pageoptions.cpp	Thu Apr 13 23:50:00 2017 +0200
+++ b/QTfrontend/ui/page/pageoptions.cpp	Fri Apr 14 06:36:36 2017 +0200
@@ -426,7 +426,7 @@
         }
 
         { // group: colors
-            OptionGroupBox * groupColors = new OptionGroupBox(":/res/lightbulb_on.png", tr("Custom colors"), this);
+            OptionGroupBox * groupColors = new OptionGroupBox(":/res/Palette.png", tr("Custom colors"), this);
             rightColumn->addWidget(groupColors);
 
             groupColors->layout()->setColumnStretch(0, 1);