Apparence fenetre principale amelioree

Fenetre selection Pj commencee

DMonde.py

@@ -79,6 +79,8 @@ class DMonde(QMainWindow):
         self.creerEcranFondPlateau()
         self.chargerListePj()
         self.connect(self.ui.grp_nouveauPj, SIGNAL("clicked()"), self.nouveauPj)
+
+        self.showMaximized()
         
     def creerEcranFondPlateau(self):
         ecranFondPlateau = EcranFondPlateau(self)
@@ -136,6 +138,17 @@ class DMonde(QMainWindow):
         else:
             self.plateau = Plateau(self)
         QApplication.restoreOverrideCursor()    
+
+    def chargerDernierPlateau(self):
+        """charge le dernier plateau sauvegarde"""
+        infosSvg = afficheSvg("parties\\{}\\svg\\infos_sauvegarde".format(self.partie))
+        ligne  = 0
+        dernier = None
+        for id_svg in infosSvg:
+            if not dernier or infosSvg[id_svg]["dateSvg"] > infosSvg[dernier]["dateSvg"]:
+                dernier = id_svg
+        if dernier:
+            self.chargerPlateau(dernier)
                                    
     def sauverPlateau(self):
         QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
@@ -154,7 +167,7 @@ class DMonde(QMainWindow):
         self.plateau.fermer()
         self.plateau = None
         self.creerEcranFondPlateau()
-##        self.majVisibilitePanneauxPlateau("") 
+        self.majVisibilitePanneauxPlateau("") 
 
     def majFichierInfosSvg(self):
         """construit/maj le fichier contenant la liste des
@@ -194,15 +207,17 @@ class DMonde(QMainWindow):
         conditionModeCreation = (len(mode) > 0 and mode == "creation")
         conditionModeCombat = (len(mode) > 0 and mode == "combat")
 
-        #panneaux d'infos
+        #panneaux d'infos, barre du haut et journal
         self.ui.inf_panneau.setVisible(conditionPlateau)
         self.ui.cbt_barreHaut.setVisible(conditionPlateau)
+        self.ui.histo_agrandir.setVisible(conditionPlateau)
+        self.ui.histo_liste.setVisible(conditionPlateau)
         
         #modes creation/combat
-        self.ui.cbt_modeCombat.setVisible(conditionModeCreation)
+        self.ui.cbt_modeCombat.setChecked(conditionModeCombat)
         self.ui.cp_panneau.setVisible(conditionModeCreation)
 
-        self.ui.cbt_modeCreation.setVisible(conditionModeCombat)
+        self.ui.cbt_modeCreation.setChecked(conditionModeCreation)
         self.ui.pi_panneau.setVisible(conditionModeCombat)
 
     def reinitialiserPanneauxPlateau(self):
@@ -261,7 +276,7 @@ class DMonde(QMainWindow):
 
     def resizeEvent(self, event):
         val = (self.ui.dm_panneauCentre.width() - 20) / 3
-        self.ui.dm_panneauCentre.setStyleSheet("QTabBar::tab { width: "+str(val)+"px; }")
+        self.ui.dm_panneauCentre.setStyleSheet("QTabBar::tab { height: 25; width: "+str(val)+"px; }")
         
         
 if __name__ == "__main__":

EcranSelectionPj.py

@@ -0,0 +1,66 @@
+#from __future__ import unicode_literals
+# -*- coding: utf-8 -*-
+from __future__ import division
+from time import time, sleep, strftime, localtime
+from sys import argv
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+from lib.Combattant import Combattant
+from lib.ui.ecran_selectionPj import Ui_spj_fenetre
+
+from lib.outilsSvg import *
+
+class EcranSelectionPj(QDialog):
+    """interface de creation/chargement de plateau"""
+    def __init__(self, terrain=None, parent=None):
+        """initialisation de la fenetre"""
+        super (EcranSelectionPj, self).__init__(parent)
+        self._pjs = []
+        self._nbLignes = 0
+        self.createWidgets()
+
+    def createWidgets(self):
+        """construction de l'interface"""
+        #construction de l'interface
+        self.ui = Ui_spj_fenetre()
+        self.ui.setupUi(self)
+        self.connect(self.ui.spj_ok, SIGNAL("clicked()"), self.ok)
+        self.connect(self.ui.spj_annuler, SIGNAL("clicked()"), self.annuler)
+
+    def charger(self, listePj):
+        idPj = 0
+        for pj in listePj:
+            item = QListWidgetItem()
+            item.setData(0, idPj)
+            item.setIcon(QIcon("img\\{}".format(pj.logo)))
+            item.setText(QString().fromUtf8(pj.nom))
+            police = QFont(QString("Verdana"))
+            police.setBold(True)
+            item.setFont(police)
+            self.ui.spj_liste.insertItem(idPj, item)
+            idPj += 1
+        self._nbLignes = idPj
+            
+    def selection(self):
+        return self._pjs
+
+    def ok(self):
+        for ligne in range(0, self._nbLignes):
+            item = self.ui.spj_liste.item(ligne)
+            if self.ui.spj_liste.isItemSelected(item):
+                self._pjs.append(str(item.data(ligne).toString().toUtf8()))
+        self.done(1)
+
+    def annuler(self):
+        self.done(0)
+    
+        
+if __name__ == "__main__":
+   app = QApplication(argv)
+   lst = chargerUnique("F:\\DMonde\\parties\\Partie1\\groupe")
+   dm = EcranSelectionPj()
+   dm.charger(lst)
+   dm.show()
+   r = app.exec_()
+   print dm.selection()
+   exit(r)      

a faire.txt

@@ -1,19 +1,15 @@
-Améliorer la gestion des ressources (images, sons)
+installer un qstackedwidget pour basculer entre l'ecran de creation et le plateau
 
 Permettre l'envoi de sons par le chat :)
 
 améliorer la gestion des sauvegardes et bibliothèques
 
-Gérer l'affichage et l'enregistrement des fiches de perso
-
 Créer des fiches de PJ en mode création, permettant des saisies aléatoires
 
 Améliorer apparence de l'onglet groupe
 
 Ajouter commande: 'ajouter PJ au plateau'
 
-Trouver une solution pour rassembler plusieurs plateaux en un combat
-
 creer une frame qui montre une vue en coupe de l'altitude et des obstacles (a la place du journal)
 lors des deplacements, attaques à distance ou de zone
 

lib/EcranFondPlateau.py

@@ -14,11 +14,11 @@ class EcranFondPlateau(QGraphicsScene):
         
         self.connect(self.fenetre.ui.cbt_vue, SIGNAL("resizeEvent()"), self.actu)
         self.fenetre.connect(self.fenetre.ui.cbt_vue, SIGNAL("resizeEvent()"), self.actu)
-        self.cmdEnCours = CommandeFondPlateau(self, "creer", ":/interface/512/ressource/armes_512.png", "Afficher le dernier combat", 15, 15, 30, 60)
+        self.cmdEnCours = CommandeFondPlateau(self, "enCours", ":/interface/512/ressource/armes_512.png", "Afficher le dernier combat", 40, 60, 30, 60)
         self.cmdEnCours.creer()
         self.cmdCharger = CommandeFondPlateau(self, "charger", ":/interface/512/ressource/dossier_512.png", "Charger un combat", 65, 15, 30, 60)
         self.cmdCharger.creer()
-        self.cmdCreer = CommandeFondPlateau(self, "enCours", ":/interface/512/ressource/plus_512.png", "Créer un nouveau combat", 40, 60, 30, 60)
+        self.cmdCreer = CommandeFondPlateau(self, "creer", ":/interface/512/ressource/plus_512.png", "Créer un nouveau combat", 15, 15, 30, 60)
         self.cmdCreer.creer()
 
         self.setSceneRect(QRectF())
@@ -27,8 +27,7 @@ class EcranFondPlateau(QGraphicsScene):
         self.txt = QGraphicsTextItem()
         self.txt.setPos(QPointF(0,0))
         self.txt.setFont(QFont("Stencil", 18))
-##        self.txt.setGraphicsEffect(QGraphicsColorizeEffect())
-        self.txt.setDefaultTextColor(QColor(100,150,200))
+        self.txt.setDefaultTextColor(QColor(170,170,170))
         self.txt.setVisible(False)
         self.addItem(self.txt)
 
@@ -45,7 +44,7 @@ class EcranFondPlateau(QGraphicsScene):
         elif cmdId == "charger":
             self.fenetre.afficherEcranChargerPlateau()
         elif cmdId == "enCours":
-            print "en cours"
+            self.fenetre.chargerDernierPlateau()
         else:
             print "Commande invalide"
 
@@ -108,7 +107,7 @@ class CommandeFondPlateau(QGraphicsPixmapItem):
 
     def hoverEnterEvent(self, event):
         effet = QGraphicsColorizeEffect()
-        effet.setColor(QColor(40, 90, 200))
+        effet.setColor(QColor(170, 170, 170))
         self.setGraphicsEffect(effet)
         self.ecran.majTexte(self.txt)
 

lib/Plateau.py

@@ -124,6 +124,8 @@ class Plateau(QGraphicsScene):
                 c.creer(x, y, couleur)
                 self.cases[(x,y)] = c
 
+        self.plateauModeCreation()
+
     def recreer(self, fenetre):
         self.fenetre = fenetre
         self.gestionCombat = None
@@ -160,6 +162,8 @@ class Plateau(QGraphicsScene):
         for i in range(1,5):
             self.polygonesCaches[i] = None
 
+        self.plateauModeCombat()
+
     def fermer(self):
         """ferme le plateau 'proprement'"""
         self.miniature()

lib/ui/chargerPlateau.ui

@@ -187,7 +187,7 @@
    </column>
    <column>
     <property name="text">
-     <string>  </string>
+     <string/>
     </property>
    </column>
    <column>
@@ -273,7 +273,7 @@
     <rect>
      <x>19</x>
      <y>258</y>
-     <width>81</width>
+     <width>31</width>
      <height>31</height>
     </rect>
    </property>
@@ -284,7 +284,11 @@
     </font>
    </property>
    <property name="text">
-    <string>Suppr</string>
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="ressource.qrc">
+     <normaloff>:/interface/16/ressource/corbeille_16.png</normaloff>:/interface/16/ressource/corbeille_16.png</iconset>
    </property>
   </widget>
   <widget class="QSpinBox" name="chp_chapitre">

lib/ui/convertSelPj.cmd

@@ -0,0 +1 @@
+pyuic4 -x selectionPj.ui -o ecran_selectionPj.py

lib/ui/ecran_chargerPlateau.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'chargerPlateau.ui'
 #
-# Created: Fri Jun 26 16:44:36 2015
+# Created: Fri Jun 26 17:01:04 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -117,11 +117,15 @@ class Ui_chp_fenetre(object):
         self.label_11.setObjectName(_fromUtf8("label_11"))
         self.chp_supprimer = QtGui.QPushButton(chp_fenetre)
         self.chp_supprimer.setEnabled(False)
-        self.chp_supprimer.setGeometry(QtCore.QRect(19, 258, 81, 31))
+        self.chp_supprimer.setGeometry(QtCore.QRect(19, 258, 31, 31))
         font = QtGui.QFont()
         font.setPointSize(10)
         font.setItalic(True)
         self.chp_supprimer.setFont(font)
+        self.chp_supprimer.setText(_fromUtf8(""))
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/corbeille_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.chp_supprimer.setIcon(icon)
         self.chp_supprimer.setObjectName(_fromUtf8("chp_supprimer"))
         self.chp_chapitre = QtGui.QSpinBox(chp_fenetre)
         self.chp_chapitre.setGeometry(QtCore.QRect(309, 5, 61, 31))
@@ -155,8 +159,6 @@ class Ui_chp_fenetre(object):
         chp_fenetre.setWindowTitle(_translate("chp_fenetre", "Charger un plateau", None))
         item = self.chp_liste.horizontalHeaderItem(0)
         item.setText(_translate("chp_fenetre", "idSvg", None))
-        item = self.chp_liste.horizontalHeaderItem(1)
-        item.setText(_translate("chp_fenetre", "  ", None))
         item = self.chp_liste.horizontalHeaderItem(2)
         item.setText(_translate("chp_fenetre", "Ch.", None))
         item = self.chp_liste.horizontalHeaderItem(3)
@@ -167,7 +169,6 @@ class Ui_chp_fenetre(object):
         item.setText(_translate("chp_fenetre", "date_tri", None))
         self.chp_ok.setText(_translate("chp_fenetre", "Ok", None))
         self.label_11.setText(_translate("chp_fenetre", "Reprendre un plateau du chapitre:", None))
-        self.chp_supprimer.setText(_translate("chp_fenetre", "Suppr", None))
         self.label_12.setText(_translate("chp_fenetre", "Tout afficher:", None))
 
 from dm import DmTableWidget

lib/ui/ecran_principal.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'mainwindow.ui'
 #
-# Created: Fri Jun 26 11:37:55 2015
+# Created: Fri Jun 26 17:34:58 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -26,8 +26,11 @@ except AttributeError:
 class Ui_principal(object):
     def setupUi(self, principal):
         principal.setObjectName(_fromUtf8("principal"))
-        principal.resize(1274, 790)
+        principal.resize(1274, 691)
         principal.setMinimumSize(QtCore.QSize(882, 623))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("MS Shell Dlg 2"))
+        principal.setFont(font)
         principal.setAcceptDrops(True)
         self.baseWidget = QtGui.QWidget(principal)
         self.baseWidget.setObjectName(_fromUtf8("baseWidget"))
@@ -36,6 +39,9 @@ class Ui_principal(object):
         self.dm_panneauCentre = QtGui.QTabWidget(self.baseWidget)
         self.dm_panneauCentre.setEnabled(True)
         self.dm_panneauCentre.setMinimumSize(QtCore.QSize(641, 561))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.dm_panneauCentre.setFont(font)
         self.dm_panneauCentre.setAcceptDrops(False)
         self.dm_panneauCentre.setObjectName(_fromUtf8("dm_panneauCentre"))
         self.Combats_tab = QtGui.QWidget()
@@ -45,128 +51,132 @@ class Ui_principal(object):
         self.layoutCombat = QtGui.QVBoxLayout()
         self.layoutCombat.setObjectName(_fromUtf8("layoutCombat"))
         self.cbt_barreHaut = QtGui.QFrame(self.Combats_tab)
-        self.cbt_barreHaut.setMinimumSize(QtCore.QSize(0, 25))
-        self.cbt_barreHaut.setMaximumSize(QtCore.QSize(16777215, 25))
+        self.cbt_barreHaut.setMinimumSize(QtCore.QSize(0, 27))
+        self.cbt_barreHaut.setMaximumSize(QtCore.QSize(16777215, 27))
         self.cbt_barreHaut.setFrameShape(QtGui.QFrame.StyledPanel)
         self.cbt_barreHaut.setFrameShadow(QtGui.QFrame.Raised)
         self.cbt_barreHaut.setObjectName(_fromUtf8("cbt_barreHaut"))
-        self.layoutWidget = QtGui.QWidget(self.cbt_barreHaut)
-        self.layoutWidget.setGeometry(QtCore.QRect(0, 0, 933, 26))
-        self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
-        self.ppal_layout = QtGui.QHBoxLayout(self.layoutWidget)
-        self.ppal_layout.setSpacing(1)
-        self.ppal_layout.setMargin(0)
+        self.horizontalLayout_4 = QtGui.QHBoxLayout(self.cbt_barreHaut)
+        self.horizontalLayout_4.setSpacing(0)
+        self.horizontalLayout_4.setMargin(0)
+        self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4"))
+        self.ppal_layout = QtGui.QHBoxLayout()
+        self.ppal_layout.setSpacing(8)
         self.ppal_layout.setObjectName(_fromUtf8("ppal_layout"))
-        self.cbt_proprietes = QtGui.QToolButton(self.layoutWidget)
+        self.cbt_afficherGestion = QtGui.QToolButton(self.cbt_barreHaut)
+        self.cbt_afficherGestion.setMinimumSize(QtCore.QSize(34, 24))
+        self.cbt_afficherGestion.setMaximumSize(QtCore.QSize(34, 24))
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/param_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cbt_proprietes.setIcon(icon)
-        self.cbt_proprietes.setObjectName(_fromUtf8("cbt_proprietes"))
-        self.ppal_layout.addWidget(self.cbt_proprietes)
-        self.cbt_nom = DmLabel(self.layoutWidget)
-        self.cbt_nom.setMaximumSize(QtCore.QSize(200, 16777215))
-        self.cbt_nom.setObjectName(_fromUtf8("cbt_nom"))
-        self.ppal_layout.addWidget(self.cbt_nom)
-        self.cbt_toutPrecedent = QtGui.QToolButton(self.layoutWidget)
-        self.cbt_toutPrecedent.setMaximumSize(QtCore.QSize(20, 16777215))
+        icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/tableau_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cbt_afficherGestion.setIcon(icon)
+        self.cbt_afficherGestion.setObjectName(_fromUtf8("cbt_afficherGestion"))
+        self.ppal_layout.addWidget(self.cbt_afficherGestion)
+        self.cbt_ajouterPj = QtGui.QToolButton(self.cbt_barreHaut)
+        self.cbt_ajouterPj.setMinimumSize(QtCore.QSize(34, 24))
+        self.cbt_ajouterPj.setMaximumSize(QtCore.QSize(34, 24))
         icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/flecheGauche_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cbt_toutPrecedent.setIcon(icon1)
+        icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/nouveauJoueur_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cbt_ajouterPj.setIcon(icon1)
+        self.cbt_ajouterPj.setObjectName(_fromUtf8("cbt_ajouterPj"))
+        self.ppal_layout.addWidget(self.cbt_ajouterPj)
+        spacerItem = QtGui.QSpacerItem(30, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
+        self.ppal_layout.addItem(spacerItem)
+        self.cbt_toutPrecedent = QtGui.QToolButton(self.cbt_barreHaut)
+        self.cbt_toutPrecedent.setMaximumSize(QtCore.QSize(20, 16777215))
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/flecheGauche_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cbt_toutPrecedent.setIcon(icon2)
         self.cbt_toutPrecedent.setIconSize(QtCore.QSize(13, 16))
         self.cbt_toutPrecedent.setObjectName(_fromUtf8("cbt_toutPrecedent"))
         self.ppal_layout.addWidget(self.cbt_toutPrecedent)
-        self.cbt_tour = DmLabel(self.layoutWidget)
+        self.cbt_tour = DmLabel(self.cbt_barreHaut)
         self.cbt_tour.setMaximumSize(QtCore.QSize(45, 16777215))
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.cbt_tour.setFont(font)
         self.cbt_tour.setObjectName(_fromUtf8("cbt_tour"))
         self.ppal_layout.addWidget(self.cbt_tour)
-        self.cbt_tourSuivant = QtGui.QToolButton(self.layoutWidget)
+        self.cbt_tourSuivant = QtGui.QToolButton(self.cbt_barreHaut)
         self.cbt_tourSuivant.setMaximumSize(QtCore.QSize(20, 16777215))
-        icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/flecheDroite_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cbt_tourSuivant.setIcon(icon2)
+        icon3 = QtGui.QIcon()
+        icon3.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/flecheDroite_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cbt_tourSuivant.setIcon(icon3)
         self.cbt_tourSuivant.setIconSize(QtCore.QSize(13, 16))
         self.cbt_tourSuivant.setObjectName(_fromUtf8("cbt_tourSuivant"))
         self.ppal_layout.addWidget(self.cbt_tourSuivant)
-        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Maximum, QtGui.QSizePolicy.Minimum)
-        self.ppal_layout.addItem(spacerItem)
-        self.label_4 = QtGui.QLabel(self.layoutWidget)
-        self.label_4.setMinimumSize(QtCore.QSize(115, 24))
-        self.label_4.setMaximumSize(QtCore.QSize(115, 24))
-        font = QtGui.QFont()
-        font.setBold(True)
-        font.setWeight(75)
-        self.label_4.setFont(font)
-        self.label_4.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_4.setObjectName(_fromUtf8("label_4"))
-        self.ppal_layout.addWidget(self.label_4)
-        self.cbt_nomPlateau = QtGui.QComboBox(self.layoutWidget)
+        spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.ppal_layout.addItem(spacerItem1)
+        self.cbt_nom = DmLabel(self.cbt_barreHaut)
+        self.cbt_nom.setMaximumSize(QtCore.QSize(200, 16777215))
         font = QtGui.QFont()
         font.setBold(True)
         font.setWeight(75)
-        self.cbt_nomPlateau.setFont(font)
-        self.cbt_nomPlateau.setObjectName(_fromUtf8("cbt_nomPlateau"))
-        self.cbt_nomPlateau.addItem(_fromUtf8(""))
-        self.cbt_nomPlateau.addItem(_fromUtf8(""))
-        self.ppal_layout.addWidget(self.cbt_nomPlateau)
-        self.cbt_publierPlateau = QtGui.QToolButton(self.layoutWidget)
+        self.cbt_nom.setFont(font)
+        self.cbt_nom.setObjectName(_fromUtf8("cbt_nom"))
+        self.ppal_layout.addWidget(self.cbt_nom)
+        self.cbt_publierPlateau = QtGui.QToolButton(self.cbt_barreHaut)
         self.cbt_publierPlateau.setMinimumSize(QtCore.QSize(34, 24))
         self.cbt_publierPlateau.setMaximumSize(QtCore.QSize(34, 24))
-        icon3 = QtGui.QIcon()
-        icon3.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/oeilBarre2_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cbt_publierPlateau.setIcon(icon3)
+        icon4 = QtGui.QIcon()
+        icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/oeilBarre2_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cbt_publierPlateau.setIcon(icon4)
         self.cbt_publierPlateau.setObjectName(_fromUtf8("cbt_publierPlateau"))
         self.ppal_layout.addWidget(self.cbt_publierPlateau)
-        spacerItem1 = QtGui.QSpacerItem(60, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.ppal_layout.addItem(spacerItem1)
-        self.cbt_afficherGestion = QtGui.QToolButton(self.layoutWidget)
-        self.cbt_afficherGestion.setMinimumSize(QtCore.QSize(34, 24))
-        self.cbt_afficherGestion.setMaximumSize(QtCore.QSize(34, 24))
-        icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/tableau_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cbt_afficherGestion.setIcon(icon4)
-        self.cbt_afficherGestion.setObjectName(_fromUtf8("cbt_afficherGestion"))
-        self.ppal_layout.addWidget(self.cbt_afficherGestion)
-        self.cbt_modeCombat = QtGui.QPushButton(self.layoutWidget)
-        self.cbt_modeCombat.setMinimumSize(QtCore.QSize(34, 24))
-        self.cbt_modeCombat.setMaximumSize(QtCore.QSize(34, 24))
-        self.cbt_modeCombat.setText(_fromUtf8(""))
+        self.cbt_proprietes = QtGui.QToolButton(self.cbt_barreHaut)
+        self.cbt_proprietes.setMinimumSize(QtCore.QSize(34, 24))
+        self.cbt_proprietes.setMaximumSize(QtCore.QSize(34, 24))
         icon5 = QtGui.QIcon()
-        icon5.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/armes_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cbt_modeCombat.setIcon(icon5)
-        self.cbt_modeCombat.setObjectName(_fromUtf8("cbt_modeCombat"))
-        self.ppal_layout.addWidget(self.cbt_modeCombat)
-        self.cbt_modeCreation = QtGui.QPushButton(self.layoutWidget)
+        icon5.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/param_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cbt_proprietes.setIcon(icon5)
+        self.cbt_proprietes.setObjectName(_fromUtf8("cbt_proprietes"))
+        self.ppal_layout.addWidget(self.cbt_proprietes)
+        spacerItem2 = QtGui.QSpacerItem(60, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.ppal_layout.addItem(spacerItem2)
+        self.cbt_modeCreation = QtGui.QPushButton(self.cbt_barreHaut)
         self.cbt_modeCreation.setMinimumSize(QtCore.QSize(34, 24))
         self.cbt_modeCreation.setMaximumSize(QtCore.QSize(34, 24))
-        self.cbt_modeCreation.setText(_fromUtf8(""))
         icon6 = QtGui.QIcon()
         icon6.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/creation_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.cbt_modeCreation.setIcon(icon6)
+        self.cbt_modeCreation.setCheckable(True)
         self.cbt_modeCreation.setObjectName(_fromUtf8("cbt_modeCreation"))
         self.ppal_layout.addWidget(self.cbt_modeCreation)
-        spacerItem2 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.ppal_layout.addItem(spacerItem2)
-        self.cbt_sauver = QtGui.QPushButton(self.layoutWidget)
+        self.cbt_modeCombat = QtGui.QPushButton(self.cbt_barreHaut)
+        self.cbt_modeCombat.setMinimumSize(QtCore.QSize(34, 24))
+        self.cbt_modeCombat.setMaximumSize(QtCore.QSize(34, 24))
+        self.cbt_modeCombat.setText(_fromUtf8(""))
+        icon7 = QtGui.QIcon()
+        icon7.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/armes_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cbt_modeCombat.setIcon(icon7)
+        self.cbt_modeCombat.setCheckable(True)
+        self.cbt_modeCombat.setObjectName(_fromUtf8("cbt_modeCombat"))
+        self.ppal_layout.addWidget(self.cbt_modeCombat)
+        spacerItem3 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
+        self.ppal_layout.addItem(spacerItem3)
+        self.cbt_sauver = QtGui.QPushButton(self.cbt_barreHaut)
         self.cbt_sauver.setMinimumSize(QtCore.QSize(34, 24))
         self.cbt_sauver.setMaximumSize(QtCore.QSize(34, 24))
         self.cbt_sauver.setText(_fromUtf8(""))
-        icon7 = QtGui.QIcon()
-        icon7.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/enregistrer_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cbt_sauver.setIcon(icon7)
+        icon8 = QtGui.QIcon()
+        icon8.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/enregistrer_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cbt_sauver.setIcon(icon8)
         self.cbt_sauver.setIconSize(QtCore.QSize(19, 19))
         self.cbt_sauver.setObjectName(_fromUtf8("cbt_sauver"))
         self.ppal_layout.addWidget(self.cbt_sauver)
-        self.cbt_fermer = QtGui.QPushButton(self.layoutWidget)
+        self.cbt_fermer = QtGui.QPushButton(self.cbt_barreHaut)
         self.cbt_fermer.setMinimumSize(QtCore.QSize(34, 24))
         self.cbt_fermer.setMaximumSize(QtCore.QSize(34, 24))
         self.cbt_fermer.setText(_fromUtf8(""))
-        icon8 = QtGui.QIcon()
-        icon8.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/fermer_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cbt_fermer.setIcon(icon8)
+        icon9 = QtGui.QIcon()
+        icon9.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/fermer_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cbt_fermer.setIcon(icon9)
         self.cbt_fermer.setObjectName(_fromUtf8("cbt_fermer"))
         self.ppal_layout.addWidget(self.cbt_fermer)
+        self.horizontalLayout_4.addLayout(self.ppal_layout)
         self.layoutCombat.addWidget(self.cbt_barreHaut)
         self.plateauLayoutH = QtGui.QHBoxLayout()
+        self.plateauLayoutH.setSpacing(3)
         self.plateauLayoutH.setObjectName(_fromUtf8("plateauLayoutH"))
         self.inf_panneau = QtGui.QFrame(self.Combats_tab)
         self.inf_panneau.setMinimumSize(QtCore.QSize(90, 0))
@@ -342,9 +352,9 @@ class Ui_principal(object):
         self.histo_agrandir.setMinimumSize(QtCore.QSize(0, 12))
         self.histo_agrandir.setMaximumSize(QtCore.QSize(16777215, 12))
         self.histo_agrandir.setText(_fromUtf8(""))
-        icon9 = QtGui.QIcon()
-        icon9.addPixmap(QtGui.QPixmap(_fromUtf8("C:/Users/olivier.massot/.designer/backup/img/flecheHaut.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.histo_agrandir.setIcon(icon9)
+        icon10 = QtGui.QIcon()
+        icon10.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/flecheHaut_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.histo_agrandir.setIcon(icon10)
         self.histo_agrandir.setCheckable(False)
         self.histo_agrandir.setChecked(False)
         self.histo_agrandir.setAutoDefault(False)
@@ -352,8 +362,8 @@ class Ui_principal(object):
         self.histo_agrandir.setFlat(True)
         self.histo_agrandir.setObjectName(_fromUtf8("histo_agrandir"))
         self.layoutCombatCentre.addWidget(self.histo_agrandir)
-        self.histo_combat = QtGui.QListWidget(self.Combats_tab)
-        self.histo_combat.setMaximumSize(QtCore.QSize(16777215, 55))
+        self.histo_liste = QtGui.QListWidget(self.Combats_tab)
+        self.histo_liste.setMaximumSize(QtCore.QSize(16777215, 55))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(204, 204, 204))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -364,22 +374,25 @@ class Ui_principal(object):
         brush = QtGui.QBrush(QtGui.QColor(240, 240, 240))
         brush.setStyle(QtCore.Qt.SolidPattern)
         palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
-        self.histo_combat.setPalette(palette)
-        self.histo_combat.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.histo_combat.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
-        self.histo_combat.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
-        self.histo_combat.setUniformItemSizes(False)
-        self.histo_combat.setWordWrap(True)
-        self.histo_combat.setObjectName(_fromUtf8("histo_combat"))
+        self.histo_liste.setPalette(palette)
+        font = QtGui.QFont()
+        font.setPointSize(8)
+        self.histo_liste.setFont(font)
+        self.histo_liste.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.histo_liste.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
+        self.histo_liste.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
+        self.histo_liste.setUniformItemSizes(False)
+        self.histo_liste.setWordWrap(True)
+        self.histo_liste.setObjectName(_fromUtf8("histo_liste"))
         item = QtGui.QListWidgetItem()
-        self.histo_combat.addItem(item)
+        self.histo_liste.addItem(item)
         item = QtGui.QListWidgetItem()
-        self.histo_combat.addItem(item)
+        self.histo_liste.addItem(item)
         item = QtGui.QListWidgetItem()
-        self.histo_combat.addItem(item)
+        self.histo_liste.addItem(item)
         item = QtGui.QListWidgetItem()
-        self.histo_combat.addItem(item)
-        self.layoutCombatCentre.addWidget(self.histo_combat)
+        self.histo_liste.addItem(item)
+        self.layoutCombatCentre.addWidget(self.histo_liste)
         self.plateauLayoutH.addLayout(self.layoutCombatCentre)
         self.cp_panneau = QtGui.QFrame(self.Combats_tab)
         self.cp_panneau.setMinimumSize(QtCore.QSize(170, 0))
@@ -389,6 +402,8 @@ class Ui_principal(object):
         self.cp_panneau.setFrameShadow(QtGui.QFrame.Raised)
         self.cp_panneau.setObjectName(_fromUtf8("cp_panneau"))
         self.verticalLayout_3 = QtGui.QVBoxLayout(self.cp_panneau)
+        self.verticalLayout_3.setSpacing(5)
+        self.verticalLayout_3.setMargin(5)
         self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
         self.cp_boiteCouleurs = QtGui.QFrame(self.cp_panneau)
         self.cp_boiteCouleurs.setMinimumSize(QtCore.QSize(152, 60))
@@ -454,17 +469,17 @@ class Ui_principal(object):
         self.cp_couleur11.setObjectName(_fromUtf8("cp_couleur11"))
         self.cp_pipetteCouleur = QtGui.QToolButton(self.cp_boiteCouleurs)
         self.cp_pipetteCouleur.setGeometry(QtCore.QRect(40, 38, 31, 21))
-        icon10 = QtGui.QIcon()
-        icon10.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/seringue_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_pipetteCouleur.setIcon(icon10)
+        icon11 = QtGui.QIcon()
+        icon11.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/seringue_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_pipetteCouleur.setIcon(icon11)
         self.cp_pipetteCouleur.setObjectName(_fromUtf8("cp_pipetteCouleur"))
         self.cp_dialogueCouleurs = QtGui.QPushButton(self.cp_boiteCouleurs)
         self.cp_dialogueCouleurs.setGeometry(QtCore.QRect(81, 38, 31, 21))
         self.cp_dialogueCouleurs.setContextMenuPolicy(QtCore.Qt.DefaultContextMenu)
         self.cp_dialogueCouleurs.setText(_fromUtf8(""))
-        icon11 = QtGui.QIcon()
-        icon11.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/palette_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_dialogueCouleurs.setIcon(icon11)
+        icon12 = QtGui.QIcon()
+        icon12.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/palette_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_dialogueCouleurs.setIcon(icon12)
         self.cp_dialogueCouleurs.setObjectName(_fromUtf8("cp_dialogueCouleurs"))
         self.cp_couleur8 = QtGui.QToolButton(self.cp_boiteCouleurs)
         self.cp_couleur8.setGeometry(QtCore.QRect(112, 0, 16, 16))
@@ -494,27 +509,27 @@ class Ui_principal(object):
         self.cp_formeEllipseVide.setMinimumSize(QtCore.QSize(37, 21))
         self.cp_formeEllipseVide.setMaximumSize(QtCore.QSize(37, 21))
         self.cp_formeEllipseVide.setStatusTip(_fromUtf8(""))
-        icon12 = QtGui.QIcon()
-        icon12.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/ellipseVide_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_formeEllipseVide.setIcon(icon12)
+        icon13 = QtGui.QIcon()
+        icon13.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/ellipseVide_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_formeEllipseVide.setIcon(icon13)
         self.cp_formeEllipseVide.setObjectName(_fromUtf8("cp_formeEllipseVide"))
         self.cp_formeRectPlein = QtGui.QToolButton(self.cP_boiteFormes)
         self.cp_formeRectPlein.setGeometry(QtCore.QRect(111, 20, 37, 21))
         self.cp_formeRectPlein.setMinimumSize(QtCore.QSize(37, 21))
         self.cp_formeRectPlein.setMaximumSize(QtCore.QSize(37, 21))
         self.cp_formeRectPlein.setStatusTip(_fromUtf8(""))
-        icon13 = QtGui.QIcon()
-        icon13.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/rectPlein_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_formeRectPlein.setIcon(icon13)
+        icon14 = QtGui.QIcon()
+        icon14.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/rectPlein_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_formeRectPlein.setIcon(icon14)
         self.cp_formeRectPlein.setObjectName(_fromUtf8("cp_formeRectPlein"))
         self.cp_formeRectVide = QtGui.QToolButton(self.cP_boiteFormes)
         self.cp_formeRectVide.setGeometry(QtCore.QRect(74, 20, 37, 21))
         self.cp_formeRectVide.setMinimumSize(QtCore.QSize(37, 21))
         self.cp_formeRectVide.setMaximumSize(QtCore.QSize(37, 21))
         self.cp_formeRectVide.setStatusTip(_fromUtf8(""))
-        icon14 = QtGui.QIcon()
-        icon14.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/rectVide_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_formeRectVide.setIcon(icon14)
+        icon15 = QtGui.QIcon()
+        icon15.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/rectVide_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_formeRectVide.setIcon(icon15)
         self.cp_formeRectVide.setIconSize(QtCore.QSize(13, 16))
         self.cp_formeRectVide.setObjectName(_fromUtf8("cp_formeRectVide"))
         self.cp_valeurEpaisseurPinceau = QtGui.QLabel(self.cP_boiteFormes)
@@ -533,36 +548,36 @@ class Ui_principal(object):
         self.cp_formeLigneOrientee.setMinimumSize(QtCore.QSize(50, 21))
         self.cp_formeLigneOrientee.setMaximumSize(QtCore.QSize(50, 21))
         self.cp_formeLigneOrientee.setStatusTip(_fromUtf8(""))
-        icon15 = QtGui.QIcon()
-        icon15.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/ligneOrientee_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_formeLigneOrientee.setIcon(icon15)
+        icon16 = QtGui.QIcon()
+        icon16.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/ligneOrientee_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_formeLigneOrientee.setIcon(icon16)
         self.cp_formeLigneOrientee.setIconSize(QtCore.QSize(13, 16))
         self.cp_formeLigneOrientee.setObjectName(_fromUtf8("cp_formeLigneOrientee"))
         self.cp_formeLigne = QtGui.QToolButton(self.cP_boiteFormes)
         self.cp_formeLigne.setGeometry(QtCore.QRect(50, 0, 50, 21))
         self.cp_formeLigne.setMinimumSize(QtCore.QSize(50, 21))
         self.cp_formeLigne.setMaximumSize(QtCore.QSize(50, 21))
-        icon16 = QtGui.QIcon()
-        icon16.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/ligne_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_formeLigne.setIcon(icon16)
+        icon17 = QtGui.QIcon()
+        icon17.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/ligne_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_formeLigne.setIcon(icon17)
         self.cp_formeLigne.setIconSize(QtCore.QSize(13, 16))
         self.cp_formeLigne.setObjectName(_fromUtf8("cp_formeLigne"))
         self.cp_formeSimple = QtGui.QToolButton(self.cP_boiteFormes)
         self.cp_formeSimple.setGeometry(QtCore.QRect(0, 0, 50, 21))
         self.cp_formeSimple.setMinimumSize(QtCore.QSize(50, 21))
         self.cp_formeSimple.setMaximumSize(QtCore.QSize(50, 21))
-        icon17 = QtGui.QIcon()
-        icon17.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/pinceau_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_formeSimple.setIcon(icon17)
+        icon18 = QtGui.QIcon()
+        icon18.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/pinceau_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_formeSimple.setIcon(icon18)
         self.cp_formeSimple.setObjectName(_fromUtf8("cp_formeSimple"))
         self.cp_formeEllipsePlein = QtGui.QToolButton(self.cP_boiteFormes)
         self.cp_formeEllipsePlein.setGeometry(QtCore.QRect(37, 20, 37, 21))
         self.cp_formeEllipsePlein.setMinimumSize(QtCore.QSize(37, 21))
         self.cp_formeEllipsePlein.setMaximumSize(QtCore.QSize(37, 21))
         self.cp_formeEllipsePlein.setStatusTip(_fromUtf8(""))
-        icon18 = QtGui.QIcon()
-        icon18.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/ellipsePleine_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_formeEllipsePlein.setIcon(icon18)
+        icon19 = QtGui.QIcon()
+        icon19.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/ellipsePleine_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_formeEllipsePlein.setIcon(icon19)
         self.cp_formeEllipsePlein.setIconSize(QtCore.QSize(19, 19))
         self.cp_formeEllipsePlein.setObjectName(_fromUtf8("cp_formeEllipsePlein"))
         self.cp_epaisseurPinceau = QtGui.QSlider(self.cP_boiteFormes)
@@ -608,9 +623,9 @@ class Ui_principal(object):
         self.cp_editerTerrain = QtGui.QPushButton(self.cp_afficherTerrains)
         self.cp_editerTerrain.setObjectName(_fromUtf8("cp_editerTerrain"))
         self.verticalLayout_4.addWidget(self.cp_editerTerrain)
-        icon19 = QtGui.QIcon()
-        icon19.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/montagne_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_ongletsListes.addTab(self.cp_afficherTerrains, icon19, _fromUtf8(""))
+        icon20 = QtGui.QIcon()
+        icon20.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/montagne_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_ongletsListes.addTab(self.cp_afficherTerrains, icon20, _fromUtf8(""))
         self.cp_afficherDecors = QtGui.QWidget()
         self.cp_afficherDecors.setObjectName(_fromUtf8("cp_afficherDecors"))
         self.verticalLayout_7 = QtGui.QVBoxLayout(self.cp_afficherDecors)
@@ -641,9 +656,9 @@ class Ui_principal(object):
         self.cp_supprimerPion = QtGui.QPushButton(self.cp_afficherDecors)
         self.cp_supprimerPion.setObjectName(_fromUtf8("cp_supprimerPion"))
         self.verticalLayout_7.addWidget(self.cp_supprimerPion)
-        icon20 = QtGui.QIcon()
-        icon20.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/decor_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_ongletsListes.addTab(self.cp_afficherDecors, icon20, _fromUtf8(""))
+        icon21 = QtGui.QIcon()
+        icon21.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/decor_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_ongletsListes.addTab(self.cp_afficherDecors, icon21, _fromUtf8(""))
         self.cp_afficherCreatures = QtGui.QWidget()
         self.cp_afficherCreatures.setObjectName(_fromUtf8("cp_afficherCreatures"))
         self.verticalLayout_6 = QtGui.QVBoxLayout(self.cp_afficherCreatures)
@@ -671,9 +686,9 @@ class Ui_principal(object):
         self.cp_editerCombattant = QtGui.QPushButton(self.cp_afficherCreatures)
         self.cp_editerCombattant.setObjectName(_fromUtf8("cp_editerCombattant"))
         self.verticalLayout_6.addWidget(self.cp_editerCombattant)
-        icon21 = QtGui.QIcon()
-        icon21.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/creature_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_ongletsListes.addTab(self.cp_afficherCreatures, icon21, _fromUtf8(""))
+        icon22 = QtGui.QIcon()
+        icon22.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/creature_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_ongletsListes.addTab(self.cp_afficherCreatures, icon22, _fromUtf8(""))
         self.cp_afficherCaches = QtGui.QWidget()
         self.cp_afficherCaches.setObjectName(_fromUtf8("cp_afficherCaches"))
         self.verticalLayout_5 = QtGui.QVBoxLayout(self.cp_afficherCaches)
@@ -697,9 +712,9 @@ class Ui_principal(object):
         self.cp_listeCaches.horizontalHeader().setDefaultSectionSize(28)
         self.cp_listeCaches.verticalHeader().setVisible(False)
         self.verticalLayout_5.addWidget(self.cp_listeCaches)
-        icon22 = QtGui.QIcon()
-        icon22.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/mainCache_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_ongletsListes.addTab(self.cp_afficherCaches, icon22, _fromUtf8(""))
+        icon23 = QtGui.QIcon()
+        icon23.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/mainCache_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_ongletsListes.addTab(self.cp_afficherCaches, icon23, _fromUtf8(""))
         self.verticalLayout_3.addWidget(self.cp_ongletsListes)
         self.creationPlateau_sousPanneauBas = QtGui.QFrame(self.cp_panneau)
         self.creationPlateau_sousPanneauBas.setMinimumSize(QtCore.QSize(141, 81))
@@ -712,64 +727,64 @@ class Ui_principal(object):
         self.cp_placerEntree = QtGui.QToolButton(self.creationPlateau_sousPanneauBas)
         self.cp_placerEntree.setMinimumSize(QtCore.QSize(41, 31))
         self.cp_placerEntree.setMaximumSize(QtCore.QSize(41, 31))
-        icon23 = QtGui.QIcon()
-        icon23.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/entree_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_placerEntree.setIcon(icon23)
+        icon24 = QtGui.QIcon()
+        icon24.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/entree_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_placerEntree.setIcon(icon24)
         self.cp_placerEntree.setObjectName(_fromUtf8("cp_placerEntree"))
         self.gridLayout_3.addWidget(self.cp_placerEntree, 2, 1, 1, 1)
         self.cp_placerSortie = QtGui.QToolButton(self.creationPlateau_sousPanneauBas)
         self.cp_placerSortie.setMinimumSize(QtCore.QSize(41, 31))
         self.cp_placerSortie.setMaximumSize(QtCore.QSize(41, 31))
-        icon24 = QtGui.QIcon()
-        icon24.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/sortie_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_placerSortie.setIcon(icon24)
+        icon25 = QtGui.QIcon()
+        icon25.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/sortie_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_placerSortie.setIcon(icon25)
         self.cp_placerSortie.setObjectName(_fromUtf8("cp_placerSortie"))
         self.gridLayout_3.addWidget(self.cp_placerSortie, 2, 2, 1, 1)
         self.cp_altitudes = QtGui.QToolButton(self.creationPlateau_sousPanneauBas)
         self.cp_altitudes.setMinimumSize(QtCore.QSize(41, 31))
         self.cp_altitudes.setMaximumSize(QtCore.QSize(41, 31))
-        self.cp_altitudes.setIcon(icon19)
+        self.cp_altitudes.setIcon(icon20)
         self.cp_altitudes.setObjectName(_fromUtf8("cp_altitudes"))
         self.gridLayout_3.addWidget(self.cp_altitudes, 0, 2, 1, 1)
         self.cp_effets = QtGui.QComboBox(self.creationPlateau_sousPanneauBas)
         self.cp_effets.setMinimumSize(QtCore.QSize(41, 31))
         self.cp_effets.setMaximumSize(QtCore.QSize(41, 31))
         self.cp_effets.setObjectName(_fromUtf8("cp_effets"))
-        icon25 = QtGui.QIcon()
-        icon25.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/feu_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_effets.addItem(icon25, _fromUtf8(""))
-        self.cp_effets.setItemText(0, _fromUtf8(""))
         icon26 = QtGui.QIcon()
-        icon26.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/eau_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon26.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/feu_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.cp_effets.addItem(icon26, _fromUtf8(""))
-        self.cp_effets.setItemText(1, _fromUtf8(""))
+        self.cp_effets.setItemText(0, _fromUtf8(""))
         icon27 = QtGui.QIcon()
-        icon27.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/glace_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon27.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/eau_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.cp_effets.addItem(icon27, _fromUtf8(""))
-        self.cp_effets.setItemText(2, _fromUtf8(""))
+        self.cp_effets.setItemText(1, _fromUtf8(""))
         icon28 = QtGui.QIcon()
-        icon28.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/poison_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon28.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/glace_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.cp_effets.addItem(icon28, _fromUtf8(""))
-        self.cp_effets.setItemText(3, _fromUtf8(""))
+        self.cp_effets.setItemText(2, _fromUtf8(""))
         icon29 = QtGui.QIcon()
-        icon29.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/gomme_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon29.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/poison_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.cp_effets.addItem(icon29, _fromUtf8(""))
+        self.cp_effets.setItemText(3, _fromUtf8(""))
+        icon30 = QtGui.QIcon()
+        icon30.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/gomme_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_effets.addItem(icon30, _fromUtf8(""))
         self.cp_effets.setItemText(4, _fromUtf8(""))
         self.gridLayout_3.addWidget(self.cp_effets, 0, 1, 1, 1)
         self.cp_afficherNotes = QtGui.QToolButton(self.creationPlateau_sousPanneauBas)
         self.cp_afficherNotes.setMinimumSize(QtCore.QSize(41, 31))
         self.cp_afficherNotes.setMaximumSize(QtCore.QSize(41, 31))
-        icon30 = QtGui.QIcon()
-        icon30.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/note_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_afficherNotes.setIcon(icon30)
+        icon31 = QtGui.QIcon()
+        icon31.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/note_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_afficherNotes.setIcon(icon31)
         self.cp_afficherNotes.setObjectName(_fromUtf8("cp_afficherNotes"))
         self.gridLayout_3.addWidget(self.cp_afficherNotes, 0, 4, 1, 1)
         self.cp_defPlacement = QtGui.QToolButton(self.creationPlateau_sousPanneauBas)
         self.cp_defPlacement.setMinimumSize(QtCore.QSize(41, 31))
         self.cp_defPlacement.setMaximumSize(QtCore.QSize(41, 31))
-        icon31 = QtGui.QIcon()
-        icon31.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/deplacement2_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.cp_defPlacement.setIcon(icon31)
+        icon32 = QtGui.QIcon()
+        icon32.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/depart_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.cp_defPlacement.setIcon(icon32)
         self.cp_defPlacement.setObjectName(_fromUtf8("cp_defPlacement"))
         self.gridLayout_3.addWidget(self.cp_defPlacement, 2, 4, 1, 1)
         self.verticalLayout_3.addWidget(self.creationPlateau_sousPanneauBas)
@@ -782,6 +797,7 @@ class Ui_principal(object):
         self.pi_panneau.setFrameShadow(QtGui.QFrame.Raised)
         self.pi_panneau.setObjectName(_fromUtf8("pi_panneau"))
         self.verticalLayout_10 = QtGui.QVBoxLayout(self.pi_panneau)
+        self.verticalLayout_10.setMargin(5)
         self.verticalLayout_10.setObjectName(_fromUtf8("verticalLayout_10"))
         self.pi_infosPion = QtGui.QFrame(self.pi_panneau)
         self.pi_infosPion.setMinimumSize(QtCore.QSize(151, 41))
@@ -826,49 +842,49 @@ class Ui_principal(object):
         self.pi_deplacement.setMinimumSize(QtCore.QSize(0, 0))
         self.pi_deplacement.setMaximumSize(QtCore.QSize(100, 100))
         self.pi_deplacement.setText(_fromUtf8(""))
-        icon32 = QtGui.QIcon()
-        icon32.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/deplacement_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.pi_deplacement.setIcon(icon32)
+        icon33 = QtGui.QIcon()
+        icon33.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/deplacement_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pi_deplacement.setIcon(icon33)
         self.pi_deplacement.setObjectName(_fromUtf8("pi_deplacement"))
         self.pi_formeAttaqueZone = QtGui.QComboBox(self.pi_actions)
         self.pi_formeAttaqueZone.setGeometry(QtCore.QRect(50, 91, 41, 29))
         self.pi_formeAttaqueZone.setObjectName(_fromUtf8("pi_formeAttaqueZone"))
-        self.pi_formeAttaqueZone.addItem(icon16, _fromUtf8(""))
+        self.pi_formeAttaqueZone.addItem(icon17, _fromUtf8(""))
         self.pi_formeAttaqueZone.setItemText(0, _fromUtf8(""))
-        self.pi_formeAttaqueZone.addItem(icon18, _fromUtf8(""))
+        self.pi_formeAttaqueZone.addItem(icon19, _fromUtf8(""))
         self.pi_formeAttaqueZone.setItemText(1, _fromUtf8(""))
-        icon33 = QtGui.QIcon()
-        icon33.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/cone_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.pi_formeAttaqueZone.addItem(icon33, _fromUtf8(""))
+        icon34 = QtGui.QIcon()
+        icon34.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/cone_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pi_formeAttaqueZone.addItem(icon34, _fromUtf8(""))
         self.pi_formeAttaqueZone.setItemText(2, _fromUtf8(""))
         self.pi_attaqueCac = QtGui.QToolButton(self.pi_actions)
         self.pi_attaqueCac.setGeometry(QtCore.QRect(10, 50, 61, 31))
         self.pi_attaqueCac.setMinimumSize(QtCore.QSize(0, 0))
         self.pi_attaqueCac.setMaximumSize(QtCore.QSize(100, 100))
-        icon34 = QtGui.QIcon()
-        icon34.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/epee_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.pi_attaqueCac.setIcon(icon34)
+        icon35 = QtGui.QIcon()
+        icon35.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/epee_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pi_attaqueCac.setIcon(icon35)
         self.pi_attaqueCac.setObjectName(_fromUtf8("pi_attaqueCac"))
         self.pi_vol = QtGui.QToolButton(self.pi_actions)
         self.pi_vol.setGeometry(QtCore.QRect(80, 10, 61, 31))
-        icon35 = QtGui.QIcon()
-        icon35.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/oiseau_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.pi_vol.setIcon(icon35)
+        icon36 = QtGui.QIcon()
+        icon36.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/oiseau_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pi_vol.setIcon(icon36)
         self.pi_vol.setObjectName(_fromUtf8("pi_vol"))
         self.pi_attaqueDist = QtGui.QToolButton(self.pi_actions)
         self.pi_attaqueDist.setGeometry(QtCore.QRect(80, 50, 61, 31))
         self.pi_attaqueDist.setMinimumSize(QtCore.QSize(0, 0))
         self.pi_attaqueDist.setMaximumSize(QtCore.QSize(100, 100))
-        icon36 = QtGui.QIcon()
-        icon36.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/arc_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.pi_attaqueDist.setIcon(icon36)
+        icon37 = QtGui.QIcon()
+        icon37.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/arc_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pi_attaqueDist.setIcon(icon37)
         self.pi_attaqueDist.setObjectName(_fromUtf8("pi_attaqueDist"))
         self.pi_attaqueZone = QtGui.QToolButton(self.pi_actions)
         self.pi_attaqueZone.setGeometry(QtCore.QRect(10, 90, 31, 31))
         self.pi_attaqueZone.setText(_fromUtf8(""))
-        icon37 = QtGui.QIcon()
-        icon37.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/bombe_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.pi_attaqueZone.setIcon(icon37)
+        icon38 = QtGui.QIcon()
+        icon38.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/bombe_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pi_attaqueZone.setIcon(icon38)
         self.pi_attaqueZone.setObjectName(_fromUtf8("pi_attaqueZone"))
         self.verticalLayout_10.addWidget(self.pi_actions)
         self.pi_ongletsListes = QtGui.QTabWidget(self.pi_panneau)
@@ -908,9 +924,9 @@ class Ui_principal(object):
         self.pi_listeAttributs.horizontalHeader().setDefaultSectionSize(50)
         self.pi_listeAttributs.verticalHeader().setVisible(False)
         self.verticalLayout_9.addWidget(self.pi_listeAttributs)
-        icon38 = QtGui.QIcon()
-        icon38.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/profil_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.pi_ongletsListes.addTab(self.pi_afficherAttributs, icon38, _fromUtf8(""))
+        icon39 = QtGui.QIcon()
+        icon39.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/profil_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pi_ongletsListes.addTab(self.pi_afficherAttributs, icon39, _fromUtf8(""))
         self.pi_afficherAttaques = QtGui.QWidget()
         self.pi_afficherAttaques.setObjectName(_fromUtf8("pi_afficherAttaques"))
         self.pi_panneauAttaqueEC = QtGui.QGroupBox(self.pi_afficherAttaques)
@@ -1008,14 +1024,14 @@ class Ui_principal(object):
         self.pi_listeAttaques.horizontalHeader().setVisible(False)
         self.pi_listeAttaques.horizontalHeader().setDefaultSectionSize(50)
         self.pi_listeAttaques.verticalHeader().setVisible(False)
-        icon39 = QtGui.QIcon()
-        icon39.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/attaque_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.pi_ongletsListes.addTab(self.pi_afficherAttaques, icon39, _fromUtf8(""))
+        icon40 = QtGui.QIcon()
+        icon40.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/attaque_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pi_ongletsListes.addTab(self.pi_afficherAttaques, icon40, _fromUtf8(""))
         self.pi_afficherInventaire = QtGui.QWidget()
         self.pi_afficherInventaire.setObjectName(_fromUtf8("pi_afficherInventaire"))
-        icon40 = QtGui.QIcon()
-        icon40.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/sac_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.pi_ongletsListes.addTab(self.pi_afficherInventaire, icon40, _fromUtf8(""))
+        icon41 = QtGui.QIcon()
+        icon41.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/16/ressource/sac_16.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pi_ongletsListes.addTab(self.pi_afficherInventaire, icon41, _fromUtf8(""))
         self.pi_afficherNotes = QtGui.QWidget()
         self.pi_afficherNotes.setObjectName(_fromUtf8("pi_afficherNotes"))
         self.verticalLayout_8 = QtGui.QVBoxLayout(self.pi_afficherNotes)
@@ -1024,7 +1040,7 @@ class Ui_principal(object):
         self.pi_notes.setDocumentTitle(_fromUtf8(""))
         self.pi_notes.setObjectName(_fromUtf8("pi_notes"))
         self.verticalLayout_8.addWidget(self.pi_notes)
-        self.pi_ongletsListes.addTab(self.pi_afficherNotes, icon30, _fromUtf8(""))
+        self.pi_ongletsListes.addTab(self.pi_afficherNotes, icon31, _fromUtf8(""))
         self.verticalLayout_10.addWidget(self.pi_ongletsListes)
         self.pi_finTour = QtGui.QPushButton(self.pi_panneau)
         self.pi_finTour.setMinimumSize(QtCore.QSize(152, 41))
@@ -1115,7 +1131,7 @@ class Ui_principal(object):
         self.grp_deroulement.setWidgetResizable(True)
         self.grp_deroulement.setObjectName(_fromUtf8("grp_deroulement"))
         self.grp_deroulement_contenu = QtGui.QWidget()
-        self.grp_deroulement_contenu.setGeometry(QtCore.QRect(0, 0, 877, 687))
+        self.grp_deroulement_contenu.setGeometry(QtCore.QRect(0, 0, 877, 590))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(0, 0, 0))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -1214,15 +1230,13 @@ class Ui_principal(object):
         self.verticalLayout_12 = QtGui.QVBoxLayout(self.grp_panneauCommande)
         self.verticalLayout_12.setMargin(2)
         self.verticalLayout_12.setObjectName(_fromUtf8("verticalLayout_12"))
-        spacerItem3 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout_12.addItem(spacerItem3)
+        spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout_12.addItem(spacerItem4)
         self.grp_nouveauPj = QtGui.QPushButton(self.grp_panneauCommande)
         self.grp_nouveauPj.setMinimumSize(QtCore.QSize(50, 50))
         self.grp_nouveauPj.setMaximumSize(QtCore.QSize(50, 50))
         self.grp_nouveauPj.setText(_fromUtf8(""))
-        icon41 = QtGui.QIcon()
-        icon41.addPixmap(QtGui.QPixmap(_fromUtf8(":/interface/32/ressource/nouveauJoueur_32.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.grp_nouveauPj.setIcon(icon41)
+        self.grp_nouveauPj.setIcon(icon1)
         self.grp_nouveauPj.setIconSize(QtCore.QSize(24, 24))
         self.grp_nouveauPj.setObjectName(_fromUtf8("grp_nouveauPj"))
         self.verticalLayout_12.addWidget(self.grp_nouveauPj)
@@ -1426,7 +1440,7 @@ class Ui_principal(object):
         self.horizontalLayout.addWidget(self.dm_panneauDroite)
         principal.setCentralWidget(self.baseWidget)
         self.menubar = QtGui.QMenuBar(principal)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 1274, 21))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 1274, 20))
         self.menubar.setObjectName(_fromUtf8("menubar"))
         self.menuFichier = QtGui.QMenu(self.menubar)
         self.menuFichier.setObjectName(_fromUtf8("menuFichier"))
@@ -1470,20 +1484,21 @@ class Ui_principal(object):
 
     def retranslateUi(self, principal):
         principal.setWindowTitle(_translate("principal", "Bienvenue sur le Dé-Monde", None))
-        self.cbt_proprietes.setText(_translate("principal", "...", None))
-        self.cbt_nom.setText(_translate("principal", "Combat: La tour sombre", None))
+        self.cbt_afficherGestion.setToolTip(_translate("principal", "Afficher le tableau de gestion du combat (MJ)", None))
+        self.cbt_afficherGestion.setText(_translate("principal", "...", None))
+        self.cbt_ajouterPj.setToolTip(_translate("principal", "Ajouter un ou des personnages du groupe", None))
+        self.cbt_toutPrecedent.setToolTip(_translate("principal", "Tour précédent", None))
         self.cbt_toutPrecedent.setText(_translate("principal", "...", None))
         self.cbt_tour.setText(_translate("principal", "Tour: 10", None))
+        self.cbt_tourSuivant.setToolTip(_translate("principal", "Tour suivant", None))
         self.cbt_tourSuivant.setText(_translate("principal", "...", None))
-        self.label_4.setText(_translate("principal", "Plateau en cours:  ", None))
-        self.cbt_nomPlateau.setItemText(0, _translate("principal", "1er étage", None))
-        self.cbt_nomPlateau.setItemText(1, _translate("principal", "2ème étage", None))
-        self.cbt_publierPlateau.setToolTip(_translate("principal", "Rendre le plateau public", None))
+        self.cbt_nom.setText(_translate("principal", "La tour sombre", None))
+        self.cbt_publierPlateau.setToolTip(_translate("principal", "Rendre le plateau publique", None))
         self.cbt_publierPlateau.setText(_translate("principal", "...", None))
-        self.cbt_afficherGestion.setToolTip(_translate("principal", "Afficher le tableau de gestion du combat (MJ)", None))
-        self.cbt_afficherGestion.setText(_translate("principal", "...", None))
-        self.cbt_modeCombat.setToolTip(_translate("principal", "Passer en mode Combat", None))
+        self.cbt_proprietes.setToolTip(_translate("principal", "Afficher les paramètres du plateau", None))
+        self.cbt_proprietes.setText(_translate("principal", "...", None))
         self.cbt_modeCreation.setToolTip(_translate("principal", "Passer en mode Création", None))
+        self.cbt_modeCombat.setToolTip(_translate("principal", "Passer en mode Combat", None))
         self.cbt_sauver.setToolTip(_translate("principal", "Enregistrer le combat", None))
         self.cbt_fermer.setToolTip(_translate("principal", "Fermer le combat", None))
         self.inf_listeOrdreJeu.setSortingEnabled(True)
@@ -1521,17 +1536,17 @@ class Ui_principal(object):
         self.inf_caseTerrain.setText(_translate("principal", "terrain", None))
         self.inf_caseCoord.setText(_translate("principal", "coord", None))
         self.inf_caseAltitude.setText(_translate("principal", "alt", None))
-        __sortingEnabled = self.histo_combat.isSortingEnabled()
-        self.histo_combat.setSortingEnabled(False)
-        item = self.histo_combat.item(0)
+        __sortingEnabled = self.histo_liste.isSortingEnabled()
+        self.histo_liste.setSortingEnabled(False)
+        item = self.histo_liste.item(0)
         item.setText(_translate("principal", "Début du tour 1", None))
-        item = self.histo_combat.item(1)
+        item = self.histo_liste.item(1)
         item.setText(_translate("principal", "Tour 1 - Orc 1 attaque Soldat 2 avec une boule de feu", None))
-        item = self.histo_combat.item(2)
+        item = self.histo_liste.item(2)
         item.setText(_translate("principal", "Tour 1 -[MJ] Orc 1 jette 10D6 > Il obtient 51", None))
-        item = self.histo_combat.item(3)
+        item = self.histo_liste.item(3)
         item.setText(_translate("principal", "Début du tour 2", None))
-        self.histo_combat.setSortingEnabled(__sortingEnabled)
+        self.histo_liste.setSortingEnabled(__sortingEnabled)
         self.cp_pipetteCouleur.setToolTip(_translate("principal", "Ligne", None))
         self.cp_pipetteCouleur.setText(_translate("principal", "...", None))
         self.cp_dialogueCouleurs.setToolTip(_translate("principal", "Autres couleurs", None))

lib/ui/ecran_selectionPj.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'selectionPj.ui'
+#
+# Created: Fri Jun 26 17:51:01 2015
+#      by: PyQt4 UI code generator 4.10.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_spj_fenetre(object):
+    def setupUi(self, spj_fenetre):
+        spj_fenetre.setObjectName(_fromUtf8("spj_fenetre"))
+        spj_fenetre.setWindowModality(QtCore.Qt.ApplicationModal)
+        spj_fenetre.resize(266, 203)
+        spj_fenetre.setMinimumSize(QtCore.QSize(192, 203))
+        spj_fenetre.setMaximumSize(QtCore.QSize(266, 1000))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        spj_fenetre.setFont(font)
+        self.verticalLayout = QtGui.QVBoxLayout(spj_fenetre)
+        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
+        self.spj_liste = QtGui.QListWidget(spj_fenetre)
+        palette = QtGui.QPalette()
+        brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(240, 240, 240))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
+        self.spj_liste.setPalette(palette)
+        self.spj_liste.setFrameShape(QtGui.QFrame.WinPanel)
+        self.spj_liste.setEditTriggers(QtGui.QAbstractItemView.EditKeyPressed)
+        self.spj_liste.setProperty("showDropIndicator", False)
+        self.spj_liste.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
+        self.spj_liste.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
+        self.spj_liste.setObjectName(_fromUtf8("spj_liste"))
+        self.verticalLayout.addWidget(self.spj_liste)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setContentsMargins(-1, 0, -1, -1)
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.spj_annuler = QtGui.QPushButton(spj_fenetre)
+        self.spj_annuler.setMinimumSize(QtCore.QSize(0, 25))
+        self.spj_annuler.setObjectName(_fromUtf8("spj_annuler"))
+        self.horizontalLayout.addWidget(self.spj_annuler)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
+        self.spj_ok = QtGui.QPushButton(spj_fenetre)
+        self.spj_ok.setMinimumSize(QtCore.QSize(120, 25))
+        self.spj_ok.setObjectName(_fromUtf8("spj_ok"))
+        self.horizontalLayout.addWidget(self.spj_ok)
+        self.verticalLayout.addLayout(self.horizontalLayout)
+
+        self.retranslateUi(spj_fenetre)
+        QtCore.QMetaObject.connectSlotsByName(spj_fenetre)
+
+    def retranslateUi(self, spj_fenetre):
+        spj_fenetre.setWindowTitle(_translate("spj_fenetre", "Ajouter un ou des personnages", None))
+        self.spj_annuler.setText(_translate("spj_fenetre", "Annuler", None))
+        self.spj_ok.setText(_translate("spj_fenetre", "Ajouter", None))
+
+
+if __name__ == "__main__":
+    import sys
+    app = QtGui.QApplication(sys.argv)
+    spj_fenetre = QtGui.QDialog()
+    ui = Ui_spj_fenetre()
+    ui.setupUi(spj_fenetre)
+    spj_fenetre.show()
+    sys.exit(app.exec_())
+

lib/ui/mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1274</width>
-    <height>790</height>
+    <height>691</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -16,6 +16,11 @@
     <height>623</height>
    </size>
   </property>
+  <property name="font">
+   <font>
+    <family>MS Shell Dlg 2</family>
+   </font>
+  </property>
   <property name="acceptDrops">
    <bool>true</bool>
   </property>
@@ -35,6 +40,11 @@
         <height>561</height>
        </size>
       </property>
+      <property name="font">
+       <font>
+        <family>Verdana</family>
+       </font>
+      </property>
       <property name="acceptDrops">
        <bool>false</bool>
       </property>
@@ -53,13 +63,13 @@
             <property name="minimumSize">
              <size>
               <width>0</width>
-              <height>25</height>
+              <height>27</height>
              </size>
             </property>
             <property name="maximumSize">
              <size>
               <width>16777215</width>
-              <height>25</height>
+              <height>27</height>
              </size>
             </property>
             <property name="frameShape">
@@ -68,366 +78,420 @@
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
             </property>
-            <widget class="QWidget" name="layoutWidget">
-             <property name="geometry">
-              <rect>
-               <x>0</x>
-               <y>0</y>
-               <width>933</width>
-               <height>26</height>
-              </rect>
+            <layout class="QHBoxLayout" name="horizontalLayout_4">
+             <property name="spacing">
+              <number>0</number>
              </property>
-             <layout class="QHBoxLayout" name="ppal_layout">
-              <property name="spacing">
-               <number>1</number>
-              </property>
-              <item>
-               <widget class="QToolButton" name="cbt_proprietes">
-                <property name="text">
-                 <string>...</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="ressource.qrc">
-                  <normaloff>:/interface/32/ressource/param_32.png</normaloff>:/interface/32/ressource/param_32.png</iconset>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="DmLabel" name="cbt_nom">
-                <property name="maximumSize">
-                 <size>
-                  <width>200</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Combat: La tour sombre</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="cbt_toutPrecedent">
-                <property name="maximumSize">
-                 <size>
-                  <width>20</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>...</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="ressource.qrc">
-                  <normaloff>:/interface/16/ressource/flecheGauche_16.png</normaloff>:/interface/16/ressource/flecheGauche_16.png</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>13</width>
-                  <height>16</height>
-                 </size>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="DmLabel" name="cbt_tour">
-                <property name="maximumSize">
-                 <size>
-                  <width>45</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Tour: 10</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="cbt_tourSuivant">
-                <property name="maximumSize">
-                 <size>
-                  <width>20</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>...</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="ressource.qrc">
-                  <normaloff>:/interface/16/ressource/flecheDroite_16.png</normaloff>:/interface/16/ressource/flecheDroite_16.png</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>13</width>
-                  <height>16</height>
-                 </size>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::Maximum</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QLabel" name="label_4">
-                <property name="minimumSize">
-                 <size>
-                  <width>115</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>115</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="font">
-                 <font>
-                  <weight>75</weight>
-                  <bold>true</bold>
-                 </font>
-                </property>
-                <property name="text">
-                 <string>Plateau en cours:  </string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QComboBox" name="cbt_nomPlateau">
-                <property name="font">
-                 <font>
-                  <weight>75</weight>
-                  <bold>true</bold>
-                 </font>
-                </property>
-                <item>
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <layout class="QHBoxLayout" name="ppal_layout">
+               <property name="spacing">
+                <number>8</number>
+               </property>
+               <item>
+                <widget class="QToolButton" name="cbt_afficherGestion">
+                 <property name="minimumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Afficher le tableau de gestion du combat (MJ)</string>
+                 </property>
                  <property name="text">
-                  <string>1er étage</string>
+                  <string>...</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/32/ressource/tableau_32.png</normaloff>:/interface/32/ressource/tableau_32.png</iconset>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QToolButton" name="cbt_ajouterPj">
+                 <property name="minimumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Ajouter un ou des personnages du groupe</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/32/ressource/nouveauJoueur_32.png</normaloff>:/interface/32/ressource/nouveauJoueur_32.png</iconset>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_4">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::Fixed</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>30</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item>
+                <widget class="QToolButton" name="cbt_toutPrecedent">
+                 <property name="maximumSize">
+                  <size>
+                   <width>20</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Tour précédent</string>
                  </property>
-                </item>
-                <item>
                  <property name="text">
-                  <string>2ème étage</string>
+                  <string>...</string>
                  </property>
-                </item>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="cbt_publierPlateau">
-                <property name="minimumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="toolTip">
-                 <string>Rendre le plateau public</string>
-                </property>
-                <property name="text">
-                 <string>...</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="ressource.qrc">
-                  <normaloff>:/interface/32/ressource/oeilBarre2_32.png</normaloff>:/interface/32/ressource/oeilBarre2_32.png</iconset>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_2">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::Fixed</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>60</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QToolButton" name="cbt_afficherGestion">
-                <property name="minimumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="toolTip">
-                 <string>Afficher le tableau de gestion du combat (MJ)</string>
-                </property>
-                <property name="text">
-                 <string>...</string>
-                </property>
-                <property name="icon">
-                 <iconset resource="ressource.qrc">
-                  <normaloff>:/interface/32/ressource/tableau_32.png</normaloff>:/interface/32/ressource/tableau_32.png</iconset>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="cbt_modeCombat">
-                <property name="minimumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="toolTip">
-                 <string>Passer en mode Combat</string>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="ressource.qrc">
-                  <normaloff>:/interface/16/ressource/armes_16.png</normaloff>:/interface/16/ressource/armes_16.png</iconset>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="cbt_modeCreation">
-                <property name="minimumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="toolTip">
-                 <string>Passer en mode Création</string>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="ressource.qrc">
-                  <normaloff>:/interface/16/ressource/creation_16.png</normaloff>:/interface/16/ressource/creation_16.png</iconset>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_3">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::Fixed</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>20</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QPushButton" name="cbt_sauver">
-                <property name="minimumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="toolTip">
-                 <string>Enregistrer le combat</string>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="ressource.qrc">
-                  <normaloff>:/interface/16/ressource/enregistrer_16.png</normaloff>:/interface/16/ressource/enregistrer_16.png</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>19</width>
-                  <height>19</height>
-                 </size>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="cbt_fermer">
-                <property name="minimumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>34</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="toolTip">
-                 <string>Fermer le combat</string>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset resource="ressource.qrc">
-                  <normaloff>:/interface/16/ressource/fermer_16.png</normaloff>:/interface/16/ressource/fermer_16.png</iconset>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/16/ressource/flecheGauche_16.png</normaloff>:/interface/16/ressource/flecheGauche_16.png</iconset>
+                 </property>
+                 <property name="iconSize">
+                  <size>
+                   <width>13</width>
+                   <height>16</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="DmLabel" name="cbt_tour">
+                 <property name="minimumSize">
+                  <size>
+                   <width>60</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>45</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="font">
+                  <font>
+                   <weight>75</weight>
+                   <bold>true</bold>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Tour: 10</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QToolButton" name="cbt_tourSuivant">
+                 <property name="maximumSize">
+                  <size>
+                   <width>20</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Tour suivant</string>
+                 </property>
+                 <property name="text">
+                  <string>...</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/16/ressource/flecheDroite_16.png</normaloff>:/interface/16/ressource/flecheDroite_16.png</iconset>
+                 </property>
+                 <property name="iconSize">
+                  <size>
+                   <width>13</width>
+                   <height>16</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::Expanding</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item>
+                <widget class="DmLabel" name="cbt_nom">
+                 <property name="minimumSize">
+                  <size>
+                   <width>200</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>200</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                 <property name="font">
+                  <font>
+                   <weight>75</weight>
+                   <bold>true</bold>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>La tour sombre</string>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QToolButton" name="cbt_publierPlateau">
+                 <property name="minimumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Rendre le plateau publique</string>
+                 </property>
+                 <property name="text">
+                  <string>...</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/32/ressource/oeilBarre2_32.png</normaloff>:/interface/32/ressource/oeilBarre2_32.png</iconset>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QToolButton" name="cbt_proprietes">
+                 <property name="minimumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Afficher les paramètres du plateau</string>
+                 </property>
+                 <property name="text">
+                  <string>...</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/32/ressource/param_32.png</normaloff>:/interface/32/ressource/param_32.png</iconset>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_2">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::Expanding</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>60</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item>
+                <widget class="QPushButton" name="cbt_modeCreation">
+                 <property name="minimumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Passer en mode Création</string>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/16/ressource/creation_16.png</normaloff>:/interface/16/ressource/creation_16.png</iconset>
+                 </property>
+                 <property name="checkable">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="cbt_modeCombat">
+                 <property name="minimumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Passer en mode Combat</string>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/16/ressource/armes_16.png</normaloff>:/interface/16/ressource/armes_16.png</iconset>
+                 </property>
+                 <property name="checkable">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_3">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::Fixed</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item>
+                <widget class="QPushButton" name="cbt_sauver">
+                 <property name="minimumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Enregistrer le combat</string>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/16/ressource/enregistrer_16.png</normaloff>:/interface/16/ressource/enregistrer_16.png</iconset>
+                 </property>
+                 <property name="iconSize">
+                  <size>
+                   <width>19</width>
+                   <height>19</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="cbt_fermer">
+                 <property name="minimumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>34</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="toolTip">
+                  <string>Fermer le combat</string>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="icon">
+                  <iconset resource="ressource.qrc">
+                   <normaloff>:/interface/16/ressource/fermer_16.png</normaloff>:/interface/16/ressource/fermer_16.png</iconset>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+            </layout>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="plateauLayoutH">
+            <property name="spacing">
+             <number>3</number>
+            </property>
             <item>
              <widget class="QFrame" name="inf_panneau">
               <property name="minimumSize">
@@ -1056,8 +1120,8 @@
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset>
-                  <normaloff>C:/Users/olivier.massot/.designer/backup/img/flecheHaut.png</normaloff>C:/Users/olivier.massot/.designer/backup/img/flecheHaut.png</iconset>
+                 <iconset resource="ressource.qrc">
+                  <normaloff>:/interface/16/ressource/flecheHaut_16.png</normaloff>:/interface/16/ressource/flecheHaut_16.png</iconset>
                 </property>
                 <property name="checkable">
                  <bool>false</bool>
@@ -1077,7 +1141,7 @@
                </widget>
               </item>
               <item>
-               <widget class="QListWidget" name="histo_combat">
+               <widget class="QListWidget" name="histo_liste">
                 <property name="maximumSize">
                  <size>
                   <width>16777215</width>
@@ -1121,6 +1185,11 @@
                   </disabled>
                  </palette>
                 </property>
+                <property name="font">
+                 <font>
+                  <pointsize>8</pointsize>
+                 </font>
+                </property>
                 <property name="horizontalScrollBarPolicy">
                  <enum>Qt::ScrollBarAlwaysOff</enum>
                 </property>
@@ -1184,6 +1253,21 @@
                <enum>QFrame::Raised</enum>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_3">
+               <property name="spacing">
+                <number>5</number>
+               </property>
+               <property name="leftMargin">
+                <number>5</number>
+               </property>
+               <property name="topMargin">
+                <number>5</number>
+               </property>
+               <property name="rightMargin">
+                <number>5</number>
+               </property>
+               <property name="bottomMargin">
+                <number>5</number>
+               </property>
                <item>
                 <widget class="QFrame" name="cp_boiteCouleurs">
                  <property name="minimumSize">
@@ -2349,7 +2433,7 @@
                     </property>
                     <property name="icon">
                      <iconset resource="ressource.qrc">
-                      <normaloff>:/interface/32/ressource/deplacement2_32.png</normaloff>:/interface/32/ressource/deplacement2_32.png</iconset>
+                      <normaloff>:/interface/16/ressource/depart_16.png</normaloff>:/interface/16/ressource/depart_16.png</iconset>
                     </property>
                    </widget>
                   </item>
@@ -2387,6 +2471,18 @@
                <enum>QFrame::Raised</enum>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_10">
+               <property name="leftMargin">
+                <number>5</number>
+               </property>
+               <property name="topMargin">
+                <number>5</number>
+               </property>
+               <property name="rightMargin">
+                <number>5</number>
+               </property>
+               <property name="bottomMargin">
+                <number>5</number>
+               </property>
                <item>
                 <widget class="QFrame" name="pi_infosPion">
                  <property name="minimumSize">
@@ -3414,7 +3510,7 @@ selectionné</string>
              <x>0</x>
              <y>0</y>
              <width>877</width>
-             <height>687</height>
+             <height>590</height>
             </rect>
            </property>
            <property name="palette">
@@ -4311,7 +4407,7 @@ selectionné</string>
      <x>0</x>
      <y>0</y>
      <width>1274</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFichier">

lib/ui/ressource.qrc

@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/interface/16" lang="fr">
+    <qresource lang="fr" prefix="/interface/16">
         <file>ressource/ellipsePleine_16.png</file>
         <file>ressource/ellipseVide_16.png</file>
         <file>ressource/flecheHaut_16.png</file>
@@ -48,14 +48,16 @@
         <file>ressource/vol_16.png</file>
         <file>ressource/eclair_16.png</file>
         <file>ressource/glace_16.png</file>
+        <file>ressource/corbeille_16.png</file>
+        <file>ressource/depart_16.png</file>
     </qresource>
-    <qresource prefix="/interface/24" lang="fr">
+    <qresource lang="fr" prefix="/interface/24">
         <file>ressource/poids_24.png</file>
         <file>ressource/nage_24.png</file>
         <file>ressource/plume_24.png</file>
         <file>ressource/escalade_24.png</file>
     </qresource>
-    <qresource prefix="/interface/32" lang="fr">
+    <qresource lang="fr" prefix="/interface/32">
         <file>ressource/armes_32.png</file>
         <file>ressource/etoile_32.png</file>
         <file>ressource/boiteOutils_32.png</file>
@@ -93,10 +95,10 @@
         <file>ressource/tableau_32.png</file>
         <file>ressource/nouveauJoueur_32.png</file>
     </qresource>
-    <qresource prefix="/interface/512" lang="fr">
+    <qresource lang="fr" prefix="/interface/512">
         <file>ressource/armes_512.png</file>
         <file>ressource/dossier_512.png</file>
         <file>ressource/plus_512.png</file>
     </qresource>
-    <qresource prefix="/curseur" lang="fr"/>
+    <qresource lang="fr" prefix="/curseur"/>
 </RCC>

lib/ui/ressource_rc.py

@@ -2,7 +2,7 @@
 
 # Resource object code
 #
-# Created: ven. 26. juin 11:38:21 2015
+# Created: ven. 26. juin 17:18:53 2015
 #      by: The Resource Compiler for PyQt (Qt v4.8.5)
 #
 # WARNING! All changes made in this file will be lost!
@@ -2599,6 +2599,50 @@ qt_resource_data = "\
 \x19\xf7\xb1\x2e\x9e\x3d\xad\x9e\x8f\x9c\x60\x56\xe0\x40\xd7\x30\
 \x60\xae\xb0\xc4\x2b\x16\x18\xb4\x8c\xf7\x06\x65\x5f\xe4\xc7\xee\
 \x81\x2b\x78\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x28\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\
+\x00\x00\x00\xef\x49\x44\x41\x54\x38\x8d\xbd\xd0\xbb\x2e\x44\x61\
+\x14\xc5\xf1\x9f\x99\x04\x51\xa2\x14\x0f\x80\x56\x88\x07\x18\x2a\
+\x9d\x42\x33\x5e\x81\xc6\x1b\x8c\x44\x41\x41\x2b\x3a\x89\x08\xad\
+\xe8\x24\x0a\xd1\x08\xa5\x42\x5c\x1e\x40\x5c\x0a\x11\xb7\xa3\xb0\
+\x47\x4e\x4e\xce\x99\x39\x22\xb1\x92\x9d\x7c\x59\xff\xbd\x57\xbe\
+\xbd\xf9\x47\x55\xa3\x5a\xaa\x82\x0d\x6c\xe5\xb0\xed\xa8\x4a\xde\
+\xe0\x38\x56\x70\x85\x04\x9f\x18\x4b\xf1\x89\xf0\x12\x5c\x60\x19\
+\xc3\x4d\xb8\x19\x20\x5b\x87\xc1\x3b\x70\x9c\xc3\x3f\xd0\x80\x93\
+\x82\x80\x04\x53\x98\x69\xc1\x4f\xa1\x56\x00\xdf\x71\x8e\x4b\xbc\
+\x14\xf4\x4c\x36\xd7\x38\x0a\xe3\x0e\x3b\xa8\xc7\x8e\xaf\x78\xc2\
+\x20\xe6\xb0\x87\x87\xcc\x8a\x3f\x47\x5a\x43\x4f\xca\xeb\xc7\x23\
+\x6e\xd1\x95\xf2\xfb\xb0\x8b\x51\x6d\xb4\x8e\xeb\x08\x59\x68\xd7\
+\x9c\xd5\x88\xef\x1b\x4c\x63\x11\xf7\xe8\xfd\x4d\xc0\x3e\x0e\xe2\
+\xdd\x8d\x1b\x2c\x95\x1d\xae\xe1\x0d\x43\x29\xaf\x8e\x67\x0c\x94\
+\x09\x98\xc7\x6a\xc6\xab\xe2\x0c\xb3\x65\x7f\x91\xa7\xce\xbf\x0c\
+\x17\xea\x0b\x27\x63\x4e\x1f\x4d\x3a\x90\x25\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x4a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\
+\x00\x00\x01\x11\x49\x44\x41\x54\x38\x8d\x8d\xd3\x3b\x2f\x44\x51\
+\x14\xc5\xf1\x5f\xa6\x98\x78\xf4\x1e\xe1\x23\x50\x51\x0e\x25\x1d\
+\x9f\x81\x62\x3e\x00\x85\x62\x1a\x0a\x4a\x1a\x7a\x5a\x85\x47\x89\
+\xca\xa3\x99\x44\x65\x24\x74\x8a\x51\x78\x84\xca\x14\xa2\x18\xc5\
+\xec\x9b\xdc\x70\xe6\x66\x4e\xb2\x92\xbd\xf7\x5a\xe7\x7f\x6e\x76\
+\x72\x49\x9f\x75\xb4\xff\x68\xa3\x4b\x36\x79\x0e\x51\xcd\xf5\xd5\
+\x98\x15\x9e\x1d\x7c\x86\xbe\xd1\xca\xf5\xad\x98\x65\xfd\x76\x0a\
+\xb0\x8a\x8b\x1e\xb5\x92\x02\x54\x70\xdb\xa3\x2a\x29\xc0\xb4\xce\
+\xb2\x3e\xb0\x15\xf5\x19\xce\xa3\xde\x8c\xcf\x6f\x63\x2a\x05\x18\
+\x0d\xf3\x01\xc3\x51\xaf\x85\xda\x18\xc2\x63\xd4\x23\x29\x40\x09\
+\x3f\x78\x41\x39\x01\x28\xe3\x35\x32\xa5\x14\x00\x9e\x75\xb6\x4d\
+\x67\xf3\x19\xe0\x2b\x66\xdf\x68\x76\xbb\x0c\xf5\x78\x6d\x20\x60\
+\x19\xa0\x89\xc1\xf0\xea\x45\x80\xe3\x08\x8d\xa1\x91\x03\xdc\x61\
+\x3c\xbc\xa3\x22\xc0\x5e\x84\x26\x70\x95\x03\x5c\x62\x32\xbc\xdd\
+\x22\x40\x2d\x42\x33\x38\xcd\x01\x4e\x30\x1b\x5e\xad\x08\xb0\x1c\
+\xa1\x05\x1c\xe4\x00\xfb\x58\x0c\x6f\xa9\x08\x30\x1f\xa1\x06\xde\
+\xf1\x14\x7a\xc3\x7d\x78\x73\x45\x80\x7e\xdc\xf8\xff\x2b\x67\xba\
+\x46\x5f\xfe\xc2\x2f\x49\xaf\x6c\x66\x2d\xab\xa2\x88\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
 \x00\x00\x01\xd3\
 \x89\
 \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
@@ -4535,6 +4579,14 @@ qt_resource_name = "\
 \x00\x70\
 \x00\x69\x00\x6e\x00\x63\x00\x65\x00\x61\x00\x75\x00\x5f\x00\x31\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\
 \x00\x0d\
+\x07\xc4\x45\xa7\
+\x00\x64\
+\x00\x65\x00\x70\x00\x61\x00\x72\x00\x74\x00\x5f\x00\x31\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x10\
+\x03\x23\xa8\x07\
+\x00\x63\
+\x00\x6f\x00\x72\x00\x62\x00\x65\x00\x69\x00\x6c\x00\x6c\x00\x65\x00\x5f\x00\x31\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0d\
 \x05\x0c\x56\xe7\
 \x00\x65\
 \x00\x63\x00\x6c\x00\x61\x00\x69\x00\x72\x00\x5f\x00\x31\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\
@@ -4611,9 +4663,9 @@ qt_resource_struct = "\
 \x00\x00\x00\x38\x00\x02\x00\x00\x00\x01\x00\x00\x00\x0a\
 \x00\x00\x00\x22\x00\x02\x00\x00\x00\x01\x00\x00\x00\x06\
 \x00\x00\x00\x42\x00\x02\x00\x00\x00\x03\x00\x00\x00\x07\
-\x00\x00\x0b\xc0\x00\x00\x00\x4a\x00\x25\x00\x00\xe6\xe4\
-\x00\x00\x0b\xa0\x00\x00\x00\x4a\x00\x25\x00\x00\xb6\xb0\
-\x00\x00\x0b\x7c\x00\x00\x00\x4a\x00\x25\x00\x00\xa3\xdc\
+\x00\x00\x0c\x06\x00\x00\x00\x4a\x00\x25\x00\x00\xe9\x5e\
+\x00\x00\x0b\xe6\x00\x00\x00\x4a\x00\x25\x00\x00\xb9\x2a\
+\x00\x00\x0b\xc2\x00\x00\x00\x4a\x00\x25\x00\x00\xa6\x56\
 \x00\x00\x00\x42\x00\x02\x00\x00\x00\x24\x00\x00\x00\x0b\
 \x00\x00\x01\xfe\x00\x00\x00\x4a\x00\x25\x00\x00\x20\xd7\
 \x00\x00\x00\x5a\x00\x00\x00\x4a\x00\x25\x00\x00\x00\x00\
@@ -4652,11 +4704,11 @@ qt_resource_struct = "\
 \x00\x00\x00\xec\x00\x00\x00\x4a\x00\x25\x00\x00\x0a\xeb\
 \x00\x00\x01\x6a\x00\x00\x00\x4a\x00\x25\x00\x00\x14\xfe\
 \x00\x00\x00\x42\x00\x02\x00\x00\x00\x04\x00\x00\x00\x30\
-\x00\x00\x0b\xde\x00\x00\x00\x4a\x00\x25\x00\x00\xf2\xb8\
-\x00\x00\x0c\x3e\x00\x00\x00\x4a\x00\x25\x00\x00\xf7\xe9\
-\x00\x00\x0c\x20\x00\x00\x00\x4a\x00\x25\x00\x00\xf6\x79\
-\x00\x00\x0c\x02\x00\x00\x00\x4a\x00\x25\x00\x00\xf4\xcb\
-\x00\x00\x00\x42\x00\x02\x00\x00\x00\x30\x00\x00\x00\x35\
+\x00\x00\x0c\x24\x00\x00\x00\x4a\x00\x25\x00\x00\xf5\x32\
+\x00\x00\x0c\x84\x00\x00\x00\x4a\x00\x25\x00\x00\xfa\x63\
+\x00\x00\x0c\x66\x00\x00\x00\x4a\x00\x25\x00\x00\xf8\xf3\
+\x00\x00\x0c\x48\x00\x00\x00\x4a\x00\x25\x00\x00\xf7\x45\
+\x00\x00\x00\x42\x00\x02\x00\x00\x00\x32\x00\x00\x00\x35\
 \x00\x00\x07\xf6\x00\x00\x00\x4a\x00\x25\x00\x00\x81\x42\
 \x00\x00\x05\xea\x00\x00\x00\x4a\x00\x25\x00\x00\x6e\x83\
 \x00\x00\x07\x3e\x00\x00\x00\x4a\x00\x25\x00\x00\x7a\xca\
@@ -4666,28 +4718,30 @@ qt_resource_struct = "\
 \x00\x00\x07\xdc\x00\x00\x00\x4a\x00\x25\x00\x00\x7f\xef\
 \x00\x00\x08\xdc\x00\x00\x00\x4a\x00\x25\x00\x00\x8b\x6d\
 \x00\x00\x07\x24\x00\x00\x00\x4a\x00\x25\x00\x00\x79\xb9\
-\x00\x00\x0a\x8c\x00\x00\x00\x4a\x00\x25\x00\x00\x9a\x7f\
+\x00\x00\x0a\xd2\x00\x00\x00\x4a\x00\x25\x00\x00\x9c\xf9\
 \x00\x00\x05\x92\x00\x00\x00\x4a\x00\x25\x00\x00\x6a\xf2\
 \x00\x00\x09\x16\x00\x00\x00\x4a\x00\x25\x00\x00\x8c\xad\
 \x00\x00\x09\xe2\x00\x00\x00\x4a\x00\x25\x00\x00\x94\xa0\
 \x00\x00\x06\x58\x00\x00\x00\x4a\x00\x25\x00\x00\x71\x9a\
-\x00\x00\x0a\xd4\x00\x00\x00\x4a\x00\x25\x00\x00\x9d\x0c\
+\x00\x00\x0b\x1a\x00\x00\x00\x4a\x00\x25\x00\x00\x9f\x86\
 \x00\x00\x09\x2e\x00\x00\x00\x4a\x00\x25\x00\x00\x8e\x21\
 \x00\x00\x0a\x22\x00\x00\x00\x4a\x00\x25\x00\x00\x96\x49\
+\x00\x00\x0a\x64\x00\x00\x00\x4a\x00\x25\x00\x00\x98\xb9\
 \x00\x00\x09\x92\x00\x00\x00\x4a\x00\x25\x00\x00\x92\x15\
-\x00\x00\x0a\xa6\x00\x00\x00\x4a\x00\x25\x00\x00\x9b\xeb\
+\x00\x00\x0a\xec\x00\x00\x00\x4a\x00\x25\x00\x00\x9e\x65\
 \x00\x00\x05\xac\x00\x00\x00\x4a\x00\x25\x00\x00\x6c\x6f\
 \x00\x00\x08\x58\x00\x00\x00\x4a\x00\x25\x00\x00\x84\x88\
-\x00\x00\x0a\x44\x00\x00\x00\x4a\x00\x25\x00\x00\x97\x8d\
+\x00\x00\x0a\x8a\x00\x00\x00\x4a\x00\x25\x00\x00\x9a\x07\
 \x00\x00\x09\x4a\x00\x00\x00\x4a\x00\x25\x00\x00\x8f\x06\
-\x00\x00\x0a\xf0\x00\x00\x00\x4a\x00\x25\x00\x00\x9e\xe9\
+\x00\x00\x0b\x36\x00\x00\x00\x4a\x00\x25\x00\x00\xa1\x63\
 \x00\x00\x08\x7a\x00\x00\x00\x4a\x00\x25\x00\x00\x86\x2a\
 \x00\x00\x07\x00\x00\x00\x00\x4a\x00\x25\x00\x00\x78\x41\
 \x00\x00\x08\x9a\x00\x00\x00\x4a\x00\x25\x00\x00\x88\x56\
 \x00\x00\x08\xf6\x00\x00\x00\x4a\x00\x25\x00\x00\x8c\x21\
 \x00\x00\x09\xfe\x00\x00\x00\x4a\x00\x25\x00\x00\x95\xef\
+\x00\x00\x0a\x44\x00\x00\x00\x4a\x00\x25\x00\x00\x97\x8d\
 \x00\x00\x06\x2e\x00\x00\x00\x4a\x00\x25\x00\x00\x70\x5f\
-\x00\x00\x0b\x52\x00\x00\x00\x4a\x00\x25\x00\x00\xa2\xd8\
+\x00\x00\x0b\x98\x00\x00\x00\x4a\x00\x25\x00\x00\xa5\x52\
 \x00\x00\x06\xd2\x00\x00\x00\x4a\x00\x25\x00\x00\x77\x3d\
 \x00\x00\x08\x1a\x00\x00\x00\x4a\x00\x25\x00\x00\x82\xb1\
 \x00\x00\x05\x28\x00\x00\x00\x4a\x00\x25\x00\x00\x67\x1a\
@@ -4698,11 +4752,11 @@ qt_resource_struct = "\
 \x00\x00\x06\x74\x00\x00\x00\x4a\x00\x25\x00\x00\x72\xe8\
 \x00\x00\x05\x4a\x00\x00\x00\x4a\x00\x25\x00\x00\x68\xa4\
 \x00\x00\x09\xb6\x00\x00\x00\x4a\x00\x25\x00\x00\x93\x93\
-\x00\x00\x0a\x64\x00\x00\x00\x4a\x00\x25\x00\x00\x99\x64\
+\x00\x00\x0a\xaa\x00\x00\x00\x4a\x00\x25\x00\x00\x9b\xde\
 \x00\x00\x06\x10\x00\x00\x00\x4a\x00\x25\x00\x00\x6f\x58\
-\x00\x00\x0b\x10\x00\x00\x00\x4a\x00\x25\x00\x00\xa0\x30\
+\x00\x00\x0b\x56\x00\x00\x00\x4a\x00\x25\x00\x00\xa2\xaa\
 \x00\x00\x05\x74\x00\x00\x00\x4a\x00\x25\x00\x00\x69\xf5\
-\x00\x00\x0b\x34\x00\x00\x00\x4a\x00\x25\x00\x00\xa0\xd1\
+\x00\x00\x0b\x7a\x00\x00\x00\x4a\x00\x25\x00\x00\xa3\x4b\
 \x00\x00\x07\x6c\x00\x00\x00\x4a\x00\x25\x00\x00\x7b\xe8\
 \x00\x00\x08\x3a\x00\x00\x00\x4a\x00\x25\x00\x00\x83\x3b\
 "

lib/ui/selectionPj.ui

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>spj_fenetre</class>
+ <widget class="QDialog" name="spj_fenetre">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>266</width>
+    <height>203</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>192</width>
+    <height>203</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>266</width>
+    <height>1000</height>
+   </size>
+  </property>
+  <property name="font">
+   <font>
+    <family>Verdana</family>
+   </font>
+  </property>
+  <property name="windowTitle">
+   <string>Ajouter un ou des personnages</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QListWidget" name="spj_liste">
+     <property name="palette">
+      <palette>
+       <active>
+        <colorrole role="Base">
+         <brush brushstyle="SolidPattern">
+          <color alpha="255">
+           <red>248</red>
+           <green>248</green>
+           <blue>248</blue>
+          </color>
+         </brush>
+        </colorrole>
+       </active>
+       <inactive>
+        <colorrole role="Base">
+         <brush brushstyle="SolidPattern">
+          <color alpha="255">
+           <red>248</red>
+           <green>248</green>
+           <blue>248</blue>
+          </color>
+         </brush>
+        </colorrole>
+       </inactive>
+       <disabled>
+        <colorrole role="Base">
+         <brush brushstyle="SolidPattern">
+          <color alpha="255">
+           <red>240</red>
+           <green>240</green>
+           <blue>240</blue>
+          </color>
+         </brush>
+        </colorrole>
+       </disabled>
+      </palette>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::WinPanel</enum>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::EditKeyPressed</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::MultiSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="spj_annuler">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>25</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Annuler</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="spj_ok">
+       <property name="minimumSize">
+        <size>
+         <width>120</width>
+         <height>25</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Ajouter</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

parties/Partie1/svg/infos_sauvegarde

@@ -1 +1 @@
-€}q
.
+€}q
U
0}q(UnomqUtestqUdateCreationqGAÕc[Ã,í‘UdateSvgqGAÕc[ÃÔí‘UchapitreqU
1UenCoursq‰Upublicq	‰us.