# HG changeset patch
# User sheepluva <sheepluva@users.noreply.github.com>
# Date 1415445575 -3600
# Node ID dae4bb274822682cbb6dfcc3974e271ab2e89b1b
# Parent  1648912925f9520c1cc5c15163cc7e5589fe6091# Parent  d08611b520004b235c9feb41fd69d507c47ba194
Merge pull request #13 from LocutusOfBorg/fix-license

Fixed many license problems, spotted by licensecheck program

diff -r d08611b52000 -r dae4bb274822 QTfrontend/res/css/qt.css
--- a/QTfrontend/res/css/qt.css	Fri Feb 07 11:39:31 2014 +0100
+++ b/QTfrontend/res/css/qt.css	Sat Nov 08 12:19:35 2014 +0100
@@ -275,6 +275,21 @@
 height: 6px;
 border-radius: 3px;
 }
+#mapFeatureSize {
+margin-left: 3px;
+}
+
+#mapFeatureSize::groove::horizontal {
+/* background-color: #141250; 
+background-color: rgba(20, 18, 80, 50%);
+*/
+background-color: rgba(0, 0, 0, 60%);
+}
+#mapFeatureSize::handle {
+/* background-color: #141250; */
+background-color: rgba(0, 0, 0, 60%);
+border-radius: 5px;
+}
 
 HatButton, ThemeButton {
 text-align: left;
diff -r d08611b52000 -r dae4bb274822 QTfrontend/ui/widget/mapContainer.cpp
--- a/QTfrontend/ui/widget/mapContainer.cpp	Fri Feb 07 11:39:31 2014 +0100
+++ b/QTfrontend/ui/widget/mapContainer.cpp	Sat Nov 08 12:19:35 2014 +0100
@@ -16,27 +16,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <QPushButton>
+#include <QBitmap>
 #include <QBuffer>
-#include <QUuid>
-#include <QBitmap>
-#include <QPainter>
-#include <QLinearGradient>
 #include <QColor>
-#include <QTextStream>
-#include <QLabel>
-#include <QListView>
-#include <QVBoxLayout>
-#include <QIcon>
-#include <QLineEdit>
-#include <QStringListModel>
-#include <QListWidget>
-#include <QListWidgetItem>
 #include <QDebug>
 #include <QFile>
 #include <QFileDialog>
+#include <QIcon>
 #include <QInputDialog>
+#include <QLabel>
+#include <QLinearGradient>
+#include <QLineEdit>
+#include <QListView>
+#include <QListWidget>
+#include <QListWidgetItem>
 #include <QMessageBox>
+#include <QPainter>
+#include <QPushButton>
+#include <QSlider>
+#include <QStringListModel>
+#include <QTextStream>
+#include <QUuid>
+#include <QVBoxLayout>
 
 #include "hwconsts.h"
 #include "mapContainer.h"
@@ -152,6 +153,15 @@
     leftLayout->addWidget(mapPreview, 0);
     connect(mapPreview, SIGNAL(clicked()), this, SLOT(previewClicked()));
 
+    mapFeatureSize = new QSlider(Qt::Horizontal, this);
+    mapFeatureSize->setObjectName("mapFeatureSize");
+    //mapFeatureSize->setTickPosition(QSlider::TicksBelow);
+    mapFeatureSize->setMaximum(100);
+    mapFeatureSize->setMinimum(1);
+    mapFeatureSize->setFixedWidth(259);
+    mapFeatureSize->setValue(50);
+    leftLayout->addWidget(mapFeatureSize, 0);
+
     /* Bottom-Left layout */
 
     QVBoxLayout * bottomLeftLayout = new QVBoxLayout();
@@ -544,19 +554,24 @@
     {
         mapgen = m;
 
+        bool f = false;
         switch (m)
         {
             case MAPGEN_REGULAR:
                 m_mapInfo.type = MapModel::GeneratedMap;
+                f = true;
                 break;
             case MAPGEN_MAZE:
                 m_mapInfo.type = MapModel::GeneratedMaze;
+                f = true;
                 break;
             case MAPGEN_PERLIN:
                 m_mapInfo.type = MapModel::GeneratedPerlin;
+                f = true;
                 break;
             case MAPGEN_DRAWN:
                 m_mapInfo.type = MapModel::HandDrawnMap;
+                f = true;
                 break;
             case MAPGEN_MAP:
                 switch (m_mapInfo.type)
@@ -572,7 +587,8 @@
                 break;
         }
 
-        emit mapgenChanged(m);
+        if(f)
+            changeMapType(m_mapInfo.type, QModelIndex());
     }
 }
 
@@ -873,11 +889,8 @@
         mapList->scrollTo(map);
     }
 
-    if (map.data(Qt::UserRole + 1).canConvert<MapModel::MapInfo>())
-        setMapInfo(map.data(Qt::UserRole + 1).value<MapModel::MapInfo>());
-    else
-        Q_ASSERT(false); // Houston, we have a problem.
-
+    Q_ASSERT(map.data(Qt::UserRole + 1).canConvert<MapModel::MapInfo>()); // Houston, we have a problem.
+    setMapInfo(map.data(Qt::UserRole + 1).value<MapModel::MapInfo>());
 }
 
 void HWMapContainer::setMapInfo(MapModel::MapInfo mapInfo)
diff -r d08611b52000 -r dae4bb274822 QTfrontend/ui/widget/mapContainer.h
--- a/QTfrontend/ui/widget/mapContainer.h	Fri Feb 07 11:39:31 2014 +0100
+++ b/QTfrontend/ui/widget/mapContainer.h	Sat Nov 08 12:19:35 2014 +0100
@@ -20,13 +20,14 @@
 #ifndef _HWMAP_CONTAINER_INCLUDED
 #define _HWMAP_CONTAINER_INCLUDED
 
-#include <QWidget>
-#include <QGridLayout>
-#include <QVBoxLayout>
+#include <QByteArray>
 #include <QComboBox>
+#include <QGridLayout>
 #include <QLabel>
-#include <QByteArray>
 #include <QLineEdit>
+#include <QSlider>
+#include <QVBoxLayout>
+#include <QWidget>
 
 #include "DataManager.h"
 
@@ -117,6 +118,7 @@
     private:
         QVBoxLayout mainLayout;
         QPushButton* mapPreview;
+        QSlider* mapFeatureSize;
         QComboBox* chooseMap;
         MapModel * m_staticMapModel;
         MapModel * m_missionMapModel;
diff -r d08611b52000 -r dae4bb274822 hedgewars/uTypes.pas
--- a/hedgewars/uTypes.pas	Fri Feb 07 11:39:31 2014 +0100
+++ b/hedgewars/uTypes.pas	Sat Nov 08 12:19:35 2014 +0100
@@ -449,7 +449,7 @@
             sidConfirm, sidSuddenDeath, sidRemaining, sidFuel, sidSync,
             sidNoEndTurn, sidNotYetAvailable, sidRoundSD, sidRoundsSD, sidReady,
             sidBounce1, sidBounce2, sidBounce3, sidBounce4, sidBounce5, sidBounce,
-            sidMute, sidAFK, sidAutoCameraOn, sidAutoCameraOff);
+            sidMute, sidAFK, sidAutoCameraOff, sidAutoCameraOn);
 
     // Events that are important for the course of the game or at least interesting for other reasons
     TEventId = (eidDied, eidDrowned, eidRoundStart, eidRoundWin, eidRoundDraw,
diff -r d08611b52000 -r dae4bb274822 project_files/hedgewars.pro
--- a/project_files/hedgewars.pro	Fri Feb 07 11:39:31 2014 +0100
+++ b/project_files/hedgewars.pro	Sat Nov 08 12:19:35 2014 +0100
@@ -251,7 +251,7 @@
 
 RESOURCES += ../QTfrontend/hedgewars.qrc
 
-LIBS += -L../bin -lhwphysfs -lphyslayer
+LIBS += -L../bin -lphysfs -lphyslayer
 
 macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
diff -r d08611b52000 -r dae4bb274822 share/hedgewars/Data/Locale/hedgewars_it.ts
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts	Fri Feb 07 11:39:31 2014 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts	Sat Nov 08 12:19:35 2014 +0100
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>copy of %1</source>
-        <translation type="unfinished"></translation>
+        <translation>copia di %1</translation>
     </message>
 </context>
 <context>
@@ -62,7 +62,7 @@
     </message>
     <message>
         <source>you know why</source>
-        <translation></translation>
+        <translation>tu sai perché</translation>
     </message>
     <message>
         <source>Warning</source>
@@ -176,7 +176,7 @@
     <name>GameUIConfig</name>
     <message>
         <source>Guest</source>
-        <translation type="unfinished"></translation>
+        <translation>Ospite</translation>
     </message>
 </context>
 <context>
@@ -237,52 +237,52 @@
     <message>
         <source>Usage</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>Utilizzo</translation>
     </message>
     <message>
         <source>OPTION</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>OPZIONI</translation>
     </message>
     <message>
         <source>CONNECTSTRING</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>STRINGACONNESSIONE</translation>
     </message>
     <message>
         <source>Options</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>Opzioni</translation>
     </message>
     <message>
         <source>Display this help</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>Visualizza questo messaggio di help</translation>
     </message>
     <message>
         <source>Custom path for configuration data and user data</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>Percorso personalizzato per la configurazione e i dati utente</translation>
     </message>
     <message>
         <source>Custom path to the game data folder</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>Percorso personalizzato per i dati del gioco</translation>
     </message>
     <message>
         <source>Hedgewars can use a %1 (e.g. &quot;%2&quot;) to connect on start.</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hedgewars può usare un %1 (per esempio  &quot;%2&quot;) per connettersi all'avvio.</translation>
     </message>
     <message>
         <source>Malformed option argument: %1</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>Argomento %1 errato</translation>
     </message>
     <message>
         <source>Unknown option argument: %1</source>
         <comment>command-line</comment>
-        <translation type="unfinished"></translation>
+        <translation>Opzione %1 sconosciuta</translation>
     </message>
 </context>
 <context>
@@ -461,16 +461,17 @@
     </message>
     <message>
         <source>Guest</source>
-        <translation type="unfinished"></translation>
+        <translation>Ospite</translation>
     </message>
     <message>
         <source>Room password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password stanza</translation>
     </message>
     <message>
         <source>The room is protected with password.
 Please, enter the password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Questa stanza è protetta da password.
+Per piacere, inserisci la password:</translation>
     </message>
 </context>
 <context>
@@ -492,7 +493,14 @@
 
 Last two engine messages:
 %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ERRORE non recuperabile! Il motore di gioco si è dovuto arrestare.
+
+Ci dispiace molto per l'inconveniente :(
+
+Se continua a succedere, per piacere clicca il bottone &apos;%1&apos; nel menu principale!
+
+Ultimi due messaggi del motore:
+%2</translation>
     </message>
 </context>
 <context>
@@ -631,7 +639,7 @@
     </message>
     <message>
         <source>Style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Stile:</translation>
     </message>
 </context>
 <context>
@@ -701,7 +709,7 @@
     </message>
     <message>
         <source>Server authentication error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore di autenticazione server</translation>
     </message>
 </context>
 <context>
@@ -801,15 +809,15 @@
     </message>
     <message>
         <source>Duration: %1m %2s</source>
-        <translation type="unfinished"></translation>
+        <translation>Durata: %1m %2s</translation>
     </message>
     <message>
         <source>Video: %1x%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Video: %1x%2</translation>
     </message>
     <message>
         <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 fps</translation>
     </message>
 </context>
 <context>
@@ -901,7 +909,7 @@
     </message>
     <message>
         <source>Open packages directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri la cartella dei pacchetti</translation>
     </message>
 </context>
 <context>
@@ -944,19 +952,19 @@
     </message>
     <message>
         <source>Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation>Polilinea</translation>
     </message>
     <message>
         <source>Rectangle</source>
-        <translation type="unfinished"></translation>
+        <translation>Rettangolo</translation>
     </message>
     <message>
         <source>Ellipse</source>
-        <translation type="unfinished"></translation>
+        <translation>Ellisse</translation>
     </message>
     <message>
         <source>Optimize</source>
-        <translation type="unfinished"></translation>
+        <translation>Ottimizza</translation>
     </message>
 </context>
 <context>
@@ -1018,7 +1026,7 @@
     </message>
     <message numerus="yes">
         <source>The best shot award was won by &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; pts.</source>
-        <translation type="unfinished">
+        <translation>
             <numerusform>Il premio per il miglior colpo è stato vinto da &lt;b&gt;%1&lt;/b&gt; con &lt;b&gt;%2&lt;/b&gt; punti.</numerusform>
             <numerusform></numerusform>
         </translation>
@@ -1838,27 +1846,27 @@
     </message>
     <message>
         <source>Team</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Squadra</translation>
     </message>
     <message>
         <source>Enable team tags by default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abilita i tag della squadra in automatico</translation>
     </message>
     <message>
         <source>Hog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Riccio</translation>
     </message>
     <message>
         <source>Enable hedgehog tags by default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abilita i tag dei ricci in automatico</translation>
     </message>
     <message>
         <source>Health</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vita</translation>
     </message>
     <message>
         <source>Enable health tags by default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abilita i tag della vita in automatico</translation>
     </message>
     <message>
         <source>Translucent</source>
@@ -2255,7 +2263,7 @@
     </message>
     <message>
         <source>Tip: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Consiglio: %1</translation>
     </message>
     <message>
         <source>Displayed tags above hogs and translucent tags</source>
@@ -2267,7 +2275,7 @@
     </message>
     <message>
         <source>Script parameter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Parametro dello script</translation>
     </message>
 </context>
 <context>
@@ -2554,7 +2562,7 @@
     <name>QObject</name>
     <message>
         <source>No description available</source>
-        <translation type="unfinished">Nessuna descrizione disponibile</translation>
+        <translation>Nessuna descrizione disponibile</translation>
     </message>
 </context>
 <context>
@@ -2696,7 +2704,7 @@
     </message>
     <message>
         <source>set password</source>
-        <translation type="unfinished"></translation>
+        <translation>imposta la password</translation>
     </message>
 </context>
 <context>
@@ -2747,7 +2755,7 @@
     </message>
     <message>
         <source>Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Script</translation>
     </message>
     <message>
         <source>Random Perlin</source>
@@ -2801,7 +2809,7 @@
     </message>
     <message>
         <source>copy of %1</source>
-        <translation type="unfinished"></translation>
+        <translation>copia di %1</translation>
     </message>
 </context>
 <context>
@@ -3031,7 +3039,7 @@
     </message>
     <message>
         <source>speed up replay</source>
-        <translation type="unfinished"></translation>
+        <translation>aumenta velocità replay</translation>
     </message>
 </context>
 <context>
@@ -3455,115 +3463,115 @@
     <name>server</name>
     <message>
         <source>Not room master</source>
-        <translation type="unfinished">Non proprietario della stanza</translation>
+        <translation>Non proprietario della stanza</translation>
     </message>
     <message>
         <source>Corrupted hedgehogs info</source>
-        <translation type="unfinished">Informazioni ricci corrotte</translation>
+        <translation>Informazioni ricci corrotte</translation>
     </message>
     <message>
         <source>too many teams</source>
-        <translation type="unfinished">troppe squadre</translation>
+        <translation>troppe squadre</translation>
     </message>
     <message>
         <source>too many hedgehogs</source>
-        <translation type="unfinished">troppi ricci</translation>
+        <translation>troppi ricci</translation>
     </message>
     <message>
         <source>There&apos;s already a team with same name in the list</source>
-        <translation type="unfinished">C&apos;è già una quadra collo stesso nome in lista</translation>
+        <translation>C&apos;è già una quadra con lo stesso nome nella lista</translation>
     </message>
     <message>
         <source>round in progress</source>
-        <translation type="unfinished">turno in corso</translation>
+        <translation>turno in corso</translation>
     </message>
     <message>
         <source>restricted</source>
-        <translation type="unfinished">proibito</translation>
+        <translation>proibito</translation>
     </message>
     <message>
         <source>REMOVE_TEAM: no such team</source>
-        <translation type="unfinished">CANCELLA_SQUADRA: squadra non presente</translation>
+        <translation>CANCELLA_SQUADRA: squadra non presente</translation>
     </message>
     <message>
         <source>Not team owner!</source>
-        <translation type="unfinished">Non proprietario della squadra!</translation>
+        <translation>Non proprietario della squadra!</translation>
     </message>
     <message>
         <source>Less than two clans!</source>
-        <translation type="unfinished">Meno di due clan!</translation>
+        <translation>Meno di due clan!</translation>
     </message>
     <message>
         <source>Room with such name already exists</source>
-        <translation type="unfinished">Esiste già una stanza con questo nome</translation>
+        <translation>Esiste già una stanza con questo nome</translation>
     </message>
     <message>
         <source>Nickname already chosen</source>
-        <translation type="unfinished">Nome già scelto</translation>
+        <translation>Nickname già in uso</translation>
     </message>
     <message>
         <source>Illegal nickname</source>
-        <translation type="unfinished">Nome non valido</translation>
+        <translation>Nickname non valido</translation>
     </message>
     <message>
         <source>Protocol already known</source>
-        <translation type="unfinished">Protocollo già conosciuto</translation>
+        <translation>Protocollo già conosciuto</translation>
     </message>
     <message>
         <source>Bad number</source>
-        <translation type="unfinished">Numero non valido</translation>
+        <translation>Numero non valido</translation>
     </message>
     <message>
         <source>Nickname is already in use</source>
-        <translation type="unfinished">Nome già in uso</translation>
+        <translation>Nickname già in uso</translation>
     </message>
     <message>
         <source>Authentication failed</source>
-        <translation type="unfinished">Autenticazione fallita</translation>
+        <translation>Autenticazione fallita</translation>
     </message>
     <message>
         <source>60 seconds cooldown after kick</source>
-        <translation type="unfinished">60 secondi di raffreddamento prima dell&apos;espulsione</translation>
+        <translation>60 secondi di raffreddamento prima dell&apos;espulsione</translation>
     </message>
     <message>
         <source>kicked</source>
-        <translation type="unfinished">espulso</translation>
+        <translation>espulso</translation>
     </message>
     <message>
         <source>Ping timeout</source>
-        <translation type="unfinished">Scadenza ping</translation>
+        <translation>Scadenza ping</translation>
     </message>
     <message>
         <source>bye</source>
-        <translation type="unfinished">ciao</translation>
+        <translation>ciao</translation>
     </message>
     <message>
         <source>Illegal room name</source>
-        <translation type="unfinished">Nome stanza non valido</translation>
+        <translation>Nome stanza non valido</translation>
     </message>
     <message>
         <source>No such room</source>
-        <translation type="unfinished">Stanza non esistente</translation>
+        <translation>Stanza non esistente</translation>
     </message>
     <message>
         <source>Joining restricted</source>
-        <translation type="unfinished">Ingresso riservato</translation>
+        <translation>Ingresso riservato</translation>
     </message>
     <message>
         <source>Registered users only</source>
-        <translation type="unfinished">Solo utenti registrati</translation>
+        <translation>Solo utenti registrati</translation>
     </message>
     <message>
         <source>You are banned in this room</source>
-        <translation type="unfinished">Sei stato espulso dalla stanza</translation>
+        <translation>Sei stato espulso dalla stanza</translation>
     </message>
     <message>
         <source>Empty config entry</source>
-        <translation type="unfinished">Configurazione vuota</translation>
+        <translation>Configurazione vuota</translation>
     </message>
     <message>
         <source>Restricted</source>
-        <translation type="unfinished"></translation>
+        <translation>Riservato</translation>
     </message>
     <message>
         <source>No checker rights</source>
@@ -3571,63 +3579,63 @@
     </message>
     <message>
         <source>Room version incompatible to your hedgewars version</source>
-        <translation type="unfinished"></translation>
+        <translation>Stanza non compatibile con la tua versione di hedgewars</translation>
     </message>
     <message>
         <source>You already have voted</source>
-        <translation type="unfinished"></translation>
+        <translation>Hai già votato</translation>
     </message>
     <message>
         <source>Voting closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Votazioni chiuse</translation>
     </message>
     <message>
         <source>New voting started</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuova votazione avviata</translation>
     </message>
     <message>
         <source>Voting expired</source>
-        <translation type="unfinished"></translation>
+        <translation>Votazione scaduta</translation>
     </message>
     <message>
         <source>kick</source>
-        <translation type="unfinished"></translation>
+        <translation>espelli</translation>
     </message>
     <message>
         <source>map</source>
-        <translation type="unfinished"></translation>
+        <translation>mappa</translation>
     </message>
     <message>
         <source>pause</source>
-        <translation type="unfinished">pausa</translation>
+        <translation>pausa</translation>
     </message>
     <message>
         <source>Reconnected too fast</source>
-        <translation type="unfinished"></translation>
+        <translation>Riconnessione troppo veloce</translation>
     </message>
     <message>
         <source>Warning! Chat flood protection activated</source>
-        <translation type="unfinished"></translation>
+        <translation>Attenzione! Protezione eccessivo numero messaggi attivata</translation>
     </message>
     <message>
         <source>Excess flood</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Eccessivo numero messaggi</translation>
     </message>
     <message>
         <source>Game messages flood detected - 1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rilevato numero messaggi di gioco eccessivo - 1</translation>
     </message>
     <message>
         <source>Game messages flood detected - 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rilevato numero messaggi di gioco eccessivo - 2</translation>
     </message>
     <message>
         <source>Warning! Joins flood protection activated</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Attenzione! Protezione congiunta eccessivo numero messaggi attivata</translation>
     </message>
     <message>
         <source>There&apos;s no voting going on</source>
-        <translation type="unfinished"></translation>
+        <translation>Non ci sono votazioni in questo momento</translation>
     </message>
 </context>
 </TS>
diff -r d08611b52000 -r dae4bb274822 share/hedgewars/Data/misc/CMakeLists.txt
--- a/share/hedgewars/Data/misc/CMakeLists.txt	Fri Feb 07 11:39:31 2014 +0100
+++ b/share/hedgewars/Data/misc/CMakeLists.txt	Sat Nov 08 12:19:35 2014 +0100
@@ -5,5 +5,6 @@
     file(GLOB miscfiles *.xml *.desktop)
 
     install(FILES ${miscfiles} DESTINATION ${SHAREPATH}/Data/misc)
+    install(FILES hedgewars.xpm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
 endif()
 
diff -r d08611b52000 -r dae4bb274822 share/hedgewars/Data/misc/hedgewars.desktop
--- a/share/hedgewars/Data/misc/hedgewars.desktop	Fri Feb 07 11:39:31 2014 +0100
+++ b/share/hedgewars/Data/misc/hedgewars.desktop	Sat Nov 08 12:19:35 2014 +0100
@@ -2,6 +2,7 @@
 Type=Application
 Version=1.0
 Name=Hedgewars
+Keywords=game;strategy;
 GenericName=Fighting Hedgehogs
 GenericName[de]=Kämpfende Igel
 GenericName[es]=Batallas entre erizos
diff -r d08611b52000 -r dae4bb274822 share/hedgewars/Data/misc/hedgewars.xpm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/misc/hedgewars.xpm	Sat Nov 08 12:19:35 2014 +0100
@@ -0,0 +1,239 @@
+/* XPM */
+static char *Icon___x__x__[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 201 2",
+"   c #010101",
+".  c #0A0709",
+"X  c #1A1A1A",
+"o  c #454545",
+"O  c #94005E",
+"+  c #AE005D",
+"@  c #970063",
+"#  c #9B0064",
+"$  c #94066D",
+"%  c #9D036A",
+"&  c #9E086E",
+"*  c #880873",
+"=  c #960E74",
+"-  c #980D73",
+";  c #8C1578",
+":  c #8C1A7D",
+">  c #9D1075",
+",  c #9D177C",
+"<  c #91187D",
+"1  c #9B1C7D",
+"2  c #A20065",
+"3  c #AA0067",
+"4  c #A3046B",
+"5  c #A0096F",
+"6  c #A20C73",
+"7  c #AD0B72",
+"8  c #A41276",
+"9  c #AD1074",
+"0  c #A61479",
+"q  c #A81C7B",
+"w  c #7B2083",
+"e  c #772E8F",
+"r  c #7D2C8E",
+"t  c #732F91",
+"y  c #6B3596",
+"u  c #653B9B",
+"i  c #6D3A9B",
+"p  c #743294",
+"a  c #783092",
+"s  c #713899",
+"d  c #5641A1",
+"f  c #504BA9",
+"g  c #5A4EAD",
+"h  c #4D5AB6",
+"j  c #5652B0",
+"k  c #5058B5",
+"l  c #6444A3",
+"z  c #7C4CA8",
+"x  c #7654B2",
+"c  c #4363BF",
+"v  c #3D67C3",
+"b  c #3A69C5",
+"n  c #3C73CE",
+"m  c #2C77D1",
+"M  c #237CD6",
+"N  c #2C78D2",
+"B  c #2F7ED8",
+"V  c #3E7BD5",
+"C  c #5F71CC",
+"Z  c #6F6ECA",
+"A  c #627FD6",
+"S  c #6C7ED6",
+"D  c #617ED9",
+"F  c #6F7ED9",
+"G  c #881F82",
+"H  c #A11F83",
+"J  c #AC1D82",
+"K  c #872386",
+"L  c #8A2387",
+"P  c #8D2689",
+"I  c #8A2C8F",
+"U  c #952388",
+"Y  c #812F91",
+"T  c #873595",
+"R  c #8D3192",
+"E  c #8A3799",
+"W  c #84399A",
+"Q  c #AE2285",
+"!  c #A32488",
+"~  c #A92D8D",
+"^  c #B1258A",
+"/  c #B32C8C",
+"(  c #BD298E",
+")  c #B5308E",
+"_  c #B72E91",
+"`  c #BE2C91",
+"'  c #BA3495",
+"]  c #BA3895",
+"[  c #BC3C9A",
+"{  c #BF3BA0",
+"}  c #C32E93",
+"|  c #C23391",
+" . c #CF3D9D",
+".. c #C13DA2",
+"X. c #CA3BA0",
+"o. c #BE419C",
+"O. c #8148A4",
+"+. c #8152B0",
+"@. c #C0439E",
+"#. c #C345A3",
+"$. c #C54EA5",
+"%. c #CE4AA3",
+"&. c #C645AA",
+"*. c #C74EA9",
+"=. c #C94AAE",
+"-. c #D045AA",
+";. c #D04BAF",
+":. c #C750A8",
+">. c #CC59AB",
+",. c #CB4DB1",
+"<. c #CC51B4",
+"1. c #CD5AB0",
+"2. c #D45CBF",
+"3. c #D363BA",
+"4. c #D65FC3",
+"5. c #D769C0",
+"6. c #DB6CC3",
+"7. c #DE66C9",
+"8. c #DE6BCE",
+"9. c #DB74C5",
+"0. c #DE76CB",
+"q. c #DF6DD0",
+"w. c #E068CC",
+"e. c #EA7FCF",
+"r. c #E06FD1",
+"t. c #E274D5",
+"y. c #E47BD6",
+"u. c #E376D8",
+"i. c #E479D9",
+"p. c #E87FDE",
+"a. c #1E83DC",
+"s. c #2482DB",
+"d. c #2B80DA",
+"f. c #3682DC",
+"g. c #1B8BE3",
+"h. c #3187E0",
+"j. c #3D8BE4",
+"k. c #2790E8",
+"l. c #3594EC",
+"z. c #3D94EC",
+"x. c #4C90EA",
+"c. c #5494EB",
+"v. c #469CF4",
+"b. c #4C98F1",
+"n. c #5A97F1",
+"m. c #529AF2",
+"M. c #5A9FF8",
+"N. c #6B87E1",
+"B. c #49A1F9",
+"V. c #59A3F6",
+"C. c #52A6FE",
+"Z. c #5DA7FE",
+"A. c #56AFFF",
+"S. c #5CABFF",
+"D. c #56B4FF",
+"F. c #58B5FF",
+"G. c #54BBFF",
+"H. c #898989",
+"J. c #8A918D",
+"K. c #949394",
+"L. c #9C9B9C",
+"P. c #B5B4B5",
+"I. c #E483D2",
+"U. c #E789D6",
+"Y. c #E781DA",
+"T. c #E985DC",
+"R. c #EA89DC",
+"E. c #EC91DE",
+"W. c #EE9BDA",
+"Q. c #EC87E2",
+"!. c #EC8CE2",
+"~. c #EE93E1",
+"^. c #F195E6",
+"/. c #F29BE7",
+"(. c #F49EE9",
+"). c #F4A6E5",
+"_. c #F5A2EB",
+"`. c #F9A6EF",
+"'. c #F6AAED",
+"]. c #F5B2EC",
+"[. c #F6A2F0",
+"{. c #FAA6F1",
+"}. c #FAAAF3",
+"|. c #FBB7F5",
+" X c #FEB1F8",
+".X c #C8C7C8",
+"XX c #CBCBCC",
+"oX c #CDD1CF",
+"OX c #F3D2EB",
+"+X c #F7C6F0",
+"@X c #F8C1F1",
+"#X c #F8CAF2",
+"$X c #FFD1FC",
+"%X c #FDDBFB",
+"&X c #F9E6F7",
+"*X c #FDE5FA",
+"=X c #FDEDFB",
+"-X c #F3FCF5",
+";X c #FCF3FA",
+":X c #FEFEFE",
+">X c None",
+/* pixels */
+">X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>X= & >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>Xp v : >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>Xr k.f.u 4 >X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>Xt z.Z.l.c : 3 >X>X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>Xy l.Z.Z.B.h.l > >X>X>X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X>X4 >X>X>X>X>X>Xt j.Z.A.S.n.C f * % >X>X>X>X>X>X>X>X>X>X>X",
+">X>X>X4 l g l i p r K : T P L R ~ ] [ ] ^ 8 O >X>X>X>X>X>X>X>X>X",
+">X>X>X>Xs g.s.s.s.M M s.d 8 %.I.(._.{.`._.E.3.Q # >X>X>X>X>X>X>X",
+">X>X>X>X4 D C.m.m.b.v.p ' E.}._.(././.(./._.`._.1.& >X>X>X>X>X>X",
+">X>X>X>X>XT A.Z.D.D.W  .}._././.(._.(.(././.^./.}.6.6 >X>X>X>X>X",
+">X>X>X>X>X2 A D.N.W ( _._./.(.(.(.(.(./.'.+X@X_.].$X9.# >X>X>X>X",
+">X>X>X>X>X>X1 E ; 7 i._.(.(.(.(.(._./.].:X:X:X;X:X:X:X$.>X>X>X>X",
+">X>X>X>X4 < i b y -.!.(.(.(._.(.(.(./.*X:X:X:X:X:X:X-XOX6 >X>X>X",
+">X>X6 r k m a.m ! 7.!._.(.(.(.(.(./._.:X:X:XL.P.:XH.  XX>.>X>X>X",
+">X* n a.M B z.C ( t.R._.(.(.(.(.(./.'.;X:X.X  X :Xo   J.W.# >X>X",
+">X# a V v.V.G.z X.t.R._./._.(./.(.(.(.=X:X.X  X :XK.. oX).% >X>X",
+">X>X>X0 F G.S 2 ,.t.Y._./.(.(._.(._.^.#X:X:XK.P.:X:X-X=X~.8 >X>X",
+">X>X>X>X4 x I w ,.u.y.(.(._.(.(._.(.(./.&X:X:X:X=X+X%X'.U.) ] >X",
+">X>X>X>X>X+ h f  .t.7.~.(./.(.(./.(.(.(._.#X&X*X|.{.3.U.U.] ^.q ",
+">X>X>X>X>Xp g.h ` i.t.Q.}._./.(.(.(.(.(./.(.~.6.3.@.$.}.3.#. X) ",
+">X>X>X>X: m d.c.! 7.,...3.E.`./.(._.(.(./._./.| @.r._.}.' 3.U.q ",
+">X>X>X4 c M x.F.O.7 [ :.o.Q 3.{./.(.(._.(./._.{. X_._.R.^ r.J >X",
+">X>X4 j g.z.F.V.U 6.}.}.}.E.Q 9.`./.(./.(.(.(././.).[.] 8 6 >X>X",
+">X>X- l g Z N.x } [.(././.}.9._ (.(.(._._.(.(.(.^.^.,.% >X>X>X>X",
+">X>X>X>X>X4 4 2 &.Q.(.(./._.T.Q t.y.R.~.~.~.Q.Q.Y.=.- >X>X>X>X>X",
+">X>X>X>X>X>X>X>X^ u.R./.(.{.*.[ i.q.8.8.q.r.i.q.' & >X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X% _ 4.r.8.#.& ,.q.t.t.t.q.4.| J | 0 >X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X6 0 6 - &.' Q ^ ^ ^ Q / *.U. X[ >X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>X>X>X6 q.!.~.I.U.*.] }.}._.}.@.>X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>X>X>X>X' u.Q.^.~.Q &.Q.~.(.r.8 >X>X>X>X>X>X",
+">X>X>X>X>X>X>X>X>X>X>X>X>X>X% ^ ,.&.J % 0 ..,...6 >X>X>X>X>X>X>X"
+};