Creation de l'inventaire dans la fiche de perso

(manque la fenetre 'nouvel objet / editer objet')

Signed-off-by: unknown <olivier.massot@DSI5301067.cg67.fr>

lib/EcranEditionCombattant.py

@@ -12,6 +12,7 @@ from outilsSvg import *
 from VueEditionForme import VueEditionForme
 import regles
 import Actions
+from Objet import Objet
 import ui.dm as dm
 
 	
@@ -68,14 +69,9 @@ class EcranEditionCombattant(QDialog):
         self.vueForme = VueEditionForme(self)
 
         self.construireListeAttributs()
-##        self.ui.edc_listeAttributs.setColumnWidth(0, (0.4*self.ui.edc_listeAttributs.width())) 
-##        self.ui.edc_listeAttributs.setColumnWidth(1, (0.4*self.ui.edc_listeAttributs.width()))
-##        self.connect(self.ui.edc_listeAttributs, SIGNAL("cellChanged(int,int)"), self.listeAttributCelluleModifiee, Qt.UniqueConnection)
-
-##        self.ui.listeInventaireCombattant.setColumnWidth(0, (0.2*self.ui.listeInventaireCombattant.width()))
-##        self.ui.listeInventaireCombattant.setColumnWidth(1, (0.8*self.ui.listeInventaireCombattant.width()))
-##        self.connect(self.ui.listeInventaireCombattant, SIGNAL("clicked()"), self.listeInventaireCelluleModifiee)
-##        self.connect(self.ui.supprimerInventaireCombattant, SIGNAL("clicked()"), self.supprimerLigneListeInventaire)
+
+        self.construireInventaire()
+
 ##        self.connect(self.ui.ajouterInventaireCombattant, SIGNAL("clicked()"), self.ajouterLigneListeInventaire)
 
     def layoutAtt(self):
@@ -200,18 +196,18 @@ class EcranEditionCombattant(QDialog):
                 lay = QHBoxLayout()
                 lay.setMargin(0)
                 lay.setSpacing(2)
-                
+
                 etiquette = dm.DmLabel()
                 etiquette.majTexte(regles.attribut(nomAttribut).nom)        
                 etiquette.setObjectName("{}_etiquette".format(nomAttribut))
                 etiquette.setAlignment(Qt.AlignLeft|Qt.AlignVCenter)
-                etiquette.setMinimumSize(QSize(110, 22))
-                etiquette.setMaximumSize(QSize(110, 22))
+                etiquette.setMinimumSize(QSize(110, 24))
+                etiquette.setMaximumSize(QSize(110, 24))
                 lay.addWidget(etiquette)
                 
                 champ = dm.DmLineEdit()
-                champ.setMinimumSize(QSize(80, 22))
-                champ.setMaximumSize(QSize(80, 22))
+                champ.setMinimumSize(QSize(80, 24))
+                champ.setMaximumSize(QSize(80, 24))
                 champ.setAlignment(Qt.AlignCenter)
                 champ.majTexte(regles.listeAttributs()[nomAttribut])
                 champ.setObjectName("{}_champ".format(nomAttribut))
@@ -222,8 +218,8 @@ class EcranEditionCombattant(QDialog):
             else:
                 lay = QHBoxLayout()
                 etiquetteVide = dm.DmLabel()
-                etiquetteVide.setMinimumHeight(10)
-                etiquetteVide.setMaximumHeight(10)
+                etiquetteVide.setMinimumHeight(9)
+                etiquetteVide.setMaximumHeight(9)
                 lay.addWidget(etiquetteVide)
                 lay.addWidget(etiquetteVide)
                 self.layoutCarac().addLayout(lay)
@@ -269,6 +265,29 @@ class EcranEditionCombattant(QDialog):
         panneau = self.findChild(QFrame, "att_frame_{}".format(index))
         self.layoutAtt().removeWidget(panneau)
 
+    ### page inventaire
+    def construireInventaire(self):
+        """construction de la page inventaire"""
+        self.ui.edc_listeInventaire.construire()
+        self.connect(self.ui.edc_listeInventaire, SIGNAL("objetClique(int)"), self.editerObjet)
+        
+        objet = Objet(2, "caillou", 1, 1)
+        self.ui.edc_listeInventaire.ajouterObjet(objet)
+
+    def chargerInventaire(self, inventaire):
+        pass
+
+    def editerObjet(self, indexObjet):
+        print len(self.ui.edc_listeInventaire.inventaire())
+        if indexObjet < len(self.ui.edc_listeInventaire.inventaire()):
+            objet = self.ui.edc_listeInventaire.inventaire()[indexObjet]
+        else:
+            objet = None
+        if objet:
+            print "editer {}".format(objet.nom)
+        else:
+            print "nouvel objet"
+
     #### barre d'outils
     def majActivationEnregistrer(self):
         """verifie la validite des saisies"""
@@ -326,87 +345,11 @@ class EcranEditionCombattant(QDialog):
         self.combattant = None
         self.done(1)
 
-##    def supprimer(self):
-##        """supprimer l'enregistrement de ce terrain"""
-##        supprSvg("lib\\biblio\\combattant", self.combattant.id)
-##        self.done(1)
-
     def annuler(self):
         """annule la creation/edition"""
         self.combattant = None
         self.done(0)
 
-##    def majListeInventaire(self):
-##        """met a jour la liste de l'inventaire de la Combattant"""
-##        self.disconnect(self.ui.listeInventaireCombattant, SIGNAL("cellChanged(int,int)"), self.listeInventaireCelluleModifiee)
-##        
-##        #on vide la liste
-##        while self.ui.listeInventaireCombattant.rowCount() > 0:
-##            self.ui.listeInventaireCombattant.removeRow(0)
-##        ligne = 0
-##        #attributs issus des regles utilisees
-##        for objet in self.combattant.inventaire:
-##            self.ui.listeInventaireCombattant.insertRow(ligne)
-##            self.ui.listeInventaireCombattant.setItem(ligne, 0, QTableWidgetItem(QString.fromUtf8(self.combattant.inventaire[objet])))
-##            self.ui.listeInventaireCombattant.setItem(ligne, 1, QTableWidgetItem(QString.fromUtf8(objet)))
-##            ligne += 1
-##        self.connect(self.ui.listeInventaireCombattant, SIGNAL("cellChanged(int,int)"), self.listeInventaireCelluleModifiee)
-##
-##    def listeInventaireCelluleModifiee(self, ligne, colonne):
-##        """une cellule de la liste des attributs a ete modifiee"""
-##        nouvelleVal = str(self.ui.listeInventaireCombattant.item(ligne, colonne).text().toUtf8())
-##        val = None
-##        if colonne == 0:
-##            try:
-##                nbre = int(nouvelleVal)
-##            except:
-##                nbre = -1
-##            if nbre >= 0: val = str(nbre)
-##        else:
-##            val = str(nouvelleVal)
-##            if val in self.combattant.inventaire or len(val) == 0:
-##                print("cet objet existe deja ou a un nom invalide")
-##                val = None
-##
-##        if colonne == 0:    
-##            if val != None:
-##                self.combattant.inventaire[str(self.ui.listeInventaireCombattant.item(ligne, 1).text().toUtf8())] = val
-##            else:
-##                self.ui.listeInventaireCombattant.setItem(ligne, 0, QTableWidgetItem(QString.fromUtf8(\
-##                                                        str(self.combattant.inventaire[str(self.ui.listeInventaireCombattant.item(ligne, 1).text().toUtf8())]))))
-##        else:
-##            txt = str(self.ui.listeInventaireCombattant.item(ligne, 1).text().toUtf8())
-##            if txt in self.combattant.inventaire:
-##                del self.combattant.inventaire[txt]
-##            if val != None:
-##                self.combattant.inventaire[val] = txt
-##            else:    
-##                self.ui.listeInventaireCombattant.removeRow(ligne)
-##
-##    def ajouterLigneListeInventaire(self, objet=""):
-##        num = -1
-##        for i in range(0, self.ui.listeInventaireCombattant.rowCount()):   #si un objet de la liste a deja un nom vide, on ne cree pas de nouvelle ligne
-##            if len(str(self.ui.listeInventaireCombattant.item(i, 0).text().toUtf8())) == 0:
-##                num = i
-##                break 
-##        if num < 0:           
-##            self.disconnect(self.ui.listeInventaireCombattant, SIGNAL("cellChanged(int,int)"), self.listeInventaireCelluleModifiee)
-##            ligne = self.ui.listeInventaireCombattant.rowCount()
-##            self.ui.listeInventaireCombattant.insertRow(ligne)
-##            self.ui.listeInventaireCombattant.setItem(ligne, 0, QTableWidgetItem(QString.fromUtf8("0")))
-##            self.ui.listeInventaireCombattant.setItem(ligne, 1, QTableWidgetItem(QString.fromUtf8(objet)))
-##            self.connect(self.ui.listeInventaireCombattant, SIGNAL("cellChanged(int,int)"), self.listeInventaireCelluleModifiee)
-##        else:
-##            self.ui.listeInventaireCombattant.setCurrentRow(num)
-##            
-##    def supprimerLigneListeInventaire(self):
-##        self.disconnect(self.ui.listeInventaireCombattant, SIGNAL("cellChanged(int,int)"), self.listeInventaireCelluleModifiee)
-##        ligne = self.ui.listeInventaireCombattant.currentRow()
-##        del self.combattant.inventaire[str(self.ui.listeInventaireCombattant.item(ligne, 1).text().toUtf8())]
-##        self.ui.listeInventaireCombattant.removeRow(ligne)
-##        self.connect(self.ui.listeInventaireCombattant, SIGNAL("cellChanged(int,int)"), self.listeInventaireCelluleModifiee)        
-
-
 if __name__ == "__main__":
    app = QApplication(sys.argv)
    #settrace(trace_calls)

lib/Objet.py

@@ -1,13 +1,18 @@
 #from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
+import regles
+
+class ActionObjet():
+    def __init__(self):
+        pass
 
 class Objet():
     """objets tels qu'ils apparaissent dans l'inventaire"""
-    def __init__(self, nom = "Objet", poids = 0, valeur = 0, \
-                 monnaie = "", description = "", typeObjet = "autre", \
-                 estConsommable = False, actionObjet = ActionObjet())):
-
-        self.id = nouvelId("objet")
+    def __init__(self, quantite = 1, nom = "Objet", poids = 0, valeur = 0, \
+                 monnaie = regles.nomMonnaie(), description = "", typeObjet = "autre", \
+                 estConsommable = False):
+        self.id = ""
+        self.quantite = quantite
         self.nom = nom
         self.poids = poids    #unite depend des regles, kg par defaut
         self.valeur = valeur  
@@ -15,14 +20,21 @@ class Objet():
         self.description = description
         self.typeObjet = typeObjet    #arme, consommable, defense, butin, monnaie, autre...
         self.estConsommable = estConsommable
-        self.estConsomme = False
-        self.action = actionObjet
+        self._estConsomme = False
+##        self.action = actionObjet
 
     def utiliser(self):
         """l'objet est utilise, il renvoie son action"""
-        self.action.executer()
+##        self.action.executer()
         if self.estConsommable:
-            self.estConsomme = True
+            self._estConsomme = True
+
+    def estConsomme(self):
+        return self._estConsomme
+
+    def poidsTotal(self):
+        return (self.quantite * self.poids)
 
+    def valeurTotale(self):
+        return (self.quantite * self.valeur)    
 
-        

lib/VueEditionForme.py

@@ -16,7 +16,7 @@ class VueEditionForme(QGraphicsScene):
         
         self._vefImage = VefImage(self)
         self._vefEtiquette = VefEtiquette(self)
-        self._couleur = QColor("grey")
+        self._couleur = QColor(190,190,190,255)
 
         self._cases = {}
         self._formeCases = "H"
@@ -28,7 +28,7 @@ class VueEditionForme(QGraphicsScene):
 
         self.fenetre.ui.edc_vueForme.setScene(self)    
         self.fenetre.ui.edc_vueForme.centerOn(self.fenetre.ui.edc_vueForme.mapFromScene(QPointF(60,60)))   #centre la vue sur la case 0,0
-        self.fenetre.ui.edc_vueForme.scale(0.25, 0.25)
+        self.fenetre.ui.edc_vueForme.scale(0.22, 0.22)
 
     def setCursor(self, curseur):
         self.fenetre.ui.edc_vueForme.setCursor(curseur)
@@ -80,10 +80,10 @@ class VueEditionForme(QGraphicsScene):
         
         for x in range(-5,6):
             for y in range(-5,6):
-                c = VefCase(self)
-                c.creer(x, y, self._couleur, self._formeCases)
-                self._cases[(x,y)] = c
-                
+                if not ((x%2)==1 and y == -5):
+                    c = VefCase(self)
+                    c.creer(x, y, self._couleur, self._formeCases)
+                    self._cases[(x,y)] = c
 
     def vider(self):
         for coord in self._cases:
@@ -142,43 +142,7 @@ class VueEditionForme(QGraphicsScene):
 
     def afficherMsg(self, msg):
         print msg
-
-
-##    def mousePressEvent(self, event):
-##        self.selection = None
-##        for item in self.fenetre.ui.edc_vueForme.scene().items(event.scenePos()):
-##            if item.__class__.__name__ == "VefImage":
-##                self.selection = item
-##                self.setCursor(Qt.SizeAllCursor)
-##                break
-##        super(VueEditionForme, self).mousePressEvent(event)
-##
-##    def mouseMoveEvent(self, event):
-##        if self.selection and event.buttons() == Qt.NoButton:
-##            item = self.selection
-##            position = event.scenePos()
-##            if ((position.x() - item.scenePos().x()) + (position.y() - item.scenePos().y()))**2 < 5:
-##                #coin superieur gauche
-##                self.setCursor(Qt.SizeFDiagCursor)
-##            elif ((position.x() - (item.scenePos().x() + item.width())) + (position.y() - item.scenePos().y()))**2 < 5:
-##                #coin sup droit
-##                self.setCursor(Qt.SizeBDiagCursor)
-##            elif ((position.x() - (item.scenePos().x() + item.width())) + (position.y() - (item.scenePos().y() + item.height())))**2 < 5:
-##                #coin inf droit
-##                self.setCursor(Qt.SizeFDiagCursor)
-##            elif ((position.x() - item.scenePos().x()) + (position.y() - (item.scenePos().y() + item.height())))**2 < 5:
-##                #coin inf gauche
-##                self.setCursor(Qt.SizeBDiagCursor)
-##            else:
-##                if position.x() > item.scenePos().x() and \
-##                   position.x() < (item.scenePos().x() + item.width()) and \
-##                   position.y() > item.scenePos().y() and \
-##                   position.y() < (item.scenePos().y() + item.height()):
-##                     #au milieu de l'item
-##                     self.setCursor(Qt.SizeAllCursor)               
-##                else:
-##                     self.setCursor(Qt.ArrowCursor)
-##        super(VueEditionForme, self).mouseMoveEvent(event)    
+  
 
 
 class VefCase(QGraphicsPolygonItem):
@@ -216,7 +180,7 @@ class VefCase(QGraphicsPolygonItem):
         
         if formeCases == "H":
             my = 0
-            if 1 == (x % 2): my = -0.5
+            if (x % 2) == 1: my = -0.5
             polygone  << QPointF(((x*0.866)+0.2886)*120, (y+my)*120) \
                       << QPointF(((x*0.866)+0.866)*120,  (y+my)*120) \
                       << QPointF(((x*0.866)+1.1547)*120, (y+my+0.5)*120) \
@@ -232,10 +196,7 @@ class VefCase(QGraphicsPolygonItem):
 
         #enregistrement des cases voisines:       
         if formeCases == "H":
-            if 1 == (x % 2):
-                self._voisins = [(x, y-1), (x+1, y), (x+1, y+1), (x,  y+1), (x-1, y+1), (x-1, y)]
-            else:
-                self._voisins = [(x, y-1), (x+1, y-1), (x+1, y), (x,  y+1), (x-1, y), (x-1, y-1)]
+            self._voisins = [(x, y-1), (x+1, y-1), (x+1, y), (x,  y+1), (x-1, y), (x-1, y-1)]
         else:
             self._voisins.append((x,   y-1))
             self._voisins.append((x,   y+1))
@@ -243,12 +204,12 @@ class VefCase(QGraphicsPolygonItem):
             self._voisins.append((x+1, y))
 
         #pour afficher les coordonnees des cases:        
-##        text = QGraphicsSimpleTextItem("{}-{}".format(x, y), parent=self)
+##        text = QGraphicsSimpleTextItem("{} {}".format(x, y), parent=self)
 ##        police = QFont()
 ##        police.setPointSize(20)
 ##        text.setFont(police)
 ##        k = 0
-##        if 1 == (x % 2): k = 0.5
+##        if (x % 2) == 1: k = - 0.5
 ##        text.setPos(QPointF(((x*0.866)+0.5773)*120, (y+0.5+k)*120))
 
         #couleur de fond par defaut

lib/regles.py

@@ -11,13 +11,7 @@ def sensTriOrdreJeu():
     """renvoie le type de tri pour l'ordre de jeu: 0 = croissant / 1 = decroissant"""
     return 1
 
-def valeurDefaut(nom):
-    """renvoie la valeur par defaut demandee"""
-    retour = None
-    dico = {"depMarche": 9, "depNage": 6, "depEscalade": 3, "depVol": 0, "saut": 6}
-    if nom in dico:
-        retour = dico[nom]
-    return retour
+
 
 def ordreAttributs():
     """renvoie la liste des attributs avec leur position relative (pour l'affichage en combat)"""
@@ -46,23 +40,23 @@ def listeControle():
     """retourne la liste de controle des attributs de la creature ou joueur"""
     dico = {\
            "F": Attribut("Force", "F", "entier", 0, None, 10, True, False, False), \
-           "D": Attribut("Dexterite", "D", "entier", 0, None, 10, True, False, False), \
+           "D": Attribut("Dexterité", "D", "entier", 0, None, 10, True, False, False), \
            "C": Attribut("Constitution", "C", "entier", 0, None, 10, True, False, False), \
            "I": Attribut("Intelligence", "I", "entier", 0, None, 10, True, False, False), \
            "S": Attribut("Sagesse", "S", "entier", 0, None, 10, True, False, False), \
            "Ch": Attribut("Charisme", "Ch", "entier", 0, None, 10, True, False, False), \
-           "Ref": Attribut("Reflexes", "Ref", "entier", None, None, 0, True, False, False), \
+           "Ref": Attribut("Réflexes", "Ref", "entier", None, None, 0, True, False, False), \
            "Vig": Attribut("Vigueur", "Vig", "entier", None, None, 0, True, False, False), \
-           "Vol": Attribut("Volonte", "Vol", "entier", None, None, 0, True, False, False), \
+           "Vol": Attribut("Volonté", "Vol", "entier", None, None, 0, True, False, False), \
            "TotalPV": Attribut("Points de vie\ntotaux", "TotalPV", "entier", None, None, 0, True, False, False), \
            "PV": Attribut("Points de vie", "PV", "entier", None, None, 0, True, True, False), \
-           "CA": Attribut("Capacite d'armure", "CA", "entier", 0, None, 10, True, False, False), \
+           "CA": Attribut("Capacité d'armure", "CA", "entier", 0, None, 10, True, False, False), \
            "BBA": Attribut("Bonus de base\nà l'attaque", "BBA", "entier", 0, None, 0, True, False, False), \
            "B_init": Attribut("Bonus d'initiative", "B_init", "entier", None, None, 0, True, False, False), \
            "init": Attribut("Initiative", "B_init", "entier", None, None, 10, True, True, False), \
            "Classe": Attribut("Classe", "Classe", "texte", None, None, "", False, False, False), \
            "Niv": Attribut("Niveau", "Niv", "entier", 0, None, 0, True, False, False), \
-           "Exp": Attribut("Experience", "Exp", "entier", 0, None, 0, False, False, True)
+           "Exp": Attribut("Expérience", "Exp", "entier", 0, None, 0, False, False, True)
            }
     return dico 
 
@@ -159,6 +153,20 @@ class Attribut():
         return retour
 
 
+#### autres donnees liees aux regles
+def valeurDefaut(nom):
+    """renvoie la valeur par defaut demandee"""
+    retour = None
+    dico = {"depMarche": 9, "depNage": 6, "depEscalade": 3, "depVol": 0, "saut": 6}
+    if nom in dico:
+        retour = dico[nom]
+    return retour
+
+def nomMonnaie():
+    """retourne la monnaie par defaut utilisee dans le jeu"""
+    return "po"
+
+
 
 if __name__ == "__main__":
      val = "3"

lib/ui/dm.py

@@ -240,6 +240,7 @@ class DmTableWidget(QTableWidget):
     def selectionner(self, ligne, colonne):
         self.setCurrentCell(ligne, colonne, QItemSelectionModel.Select)
 
+
 class DmTableBiblio(DmTableWidget):
     """table utilisee pour afficher les bibliotheques d'objets:
         terrains, decors, creatures"""
@@ -347,6 +348,106 @@ class DmTableAttributsPi(DmTableWidget):
         return objet
 
 
+class DmTableInventaire(DmTableWidget):
+    """table utilisee pour afficher l'inventaire d'un combattant"""
+    itemExited = pyqtSignal(QTableWidgetItem)
+    def __init__(self, parent = None):
+        super(DmTableInventaire, self).__init__(parent)
+        self._inventaire = []
+        self._ligneSurvolee = None
+        
+        #pour la gestion des survols
+        self.setMouseTracking(True)
+        self._last_index = QPersistentModelIndex()
+        self.viewport().installEventFilter(self)
+        
+        self.connect(self, SIGNAL("itemEntered(QTableWidgetItem*)"), self.itemSurvole)
+        self.connect(self, SIGNAL("itemExited(QTableWidgetItem*)"), self.itemSurvoleFin)
+        self.connect(self, SIGNAL("itemClicked(QTableWidgetItem*)"), self.itemClique)
+
+    def construire(self):
+        self.setColumnWidth(0, 40)
+        self.setColumnWidth(1, 311)
+        self.setColumnWidth(2, 60)
+        self.setColumnWidth(3, 60)
+        self.setColumnWidth(4, 20)
+        
+##        for col in self.colonnes():
+##            item = QTableWidgetItem()
+##            item.setFlags(Qt.NoItemFlags)
+##            if col == 1:
+##                item.setText(0, " ")
+##                item.setData(0, " ")
+##            self.setItem(ligne, col, item)
+##        self._inventaire.append(objet)
+
+    def ajouterObjet(self, objet):
+        ligne = self.rowCount() - 1   #avant la ligne 'ajouter'
+        self.insertRow(ligne)
+        donnees = [objet.quantite, objet.nom, objet.valeurTotale(), objet.poidsTotal(), ""]
+        for col in self.colonnes():
+            item = QTableWidgetItem()
+            item.setFlags(Qt.NoItemFlags)
+            item.setData(0, donnees[col])
+            self.setItem(ligne, col, item)
+        self._inventaire.append(objet)
+
+    def charger(self, inventaire):
+        """charge l'inventaire en parametre"""
+        self._inventaire = inventaire
+        for objet in inventaire:
+            self.ajouterObjet(objet)
+
+    def majObjet(self, objet):
+        """maj la ligne correspondant a l'objet"""
+        pass    
+
+    def supprimerObjet(self, objet):
+        """ajoute la ligne correspondant a l'objet"""
+        pass        
+
+    def inventaire(self):
+        """cree un inventaire a partir des donnees de la table"""
+        return self._inventaire
+
+    def itemSurvole(self, item):
+        ligne = item.row()
+        self.majCouleurLigne(ligne, QColor(150, 50, 50, 150))
+
+    def itemSurvoleFin(self, item):
+        ligne = item.row()
+        self.majCouleurLigne(ligne, QColor(248, 248, 248, 150))
+
+    def itemClique(self, item):
+        ligne = item.row()
+        self.emit(SIGNAL("objetClique(int)"), ligne)
+
+    def majCouleurLigne(self, ligne, couleur):
+        """modifie la couleur de fond des items de la lignes"""
+        for col in self.colonnes():
+            item = self.item(ligne, col)
+            if item:
+                item.setBackground(QBrush(couleur))
+
+    def eventFilter(self, widget, event):
+        if widget is self.viewport():
+            index = self._last_index
+            if event.type() == QEvent.MouseMove:
+                index = self.indexAt(event.pos())
+            elif event.type() == QEvent.Leave:
+                index = QModelIndex()
+            if index != self._last_index:
+                row = self._last_index.row()
+                column = self._last_index.column()
+                item = self.item(row, column)
+                if item is not None:
+                    self.itemExited.emit(item)
+                self._last_index = QPersistentModelIndex(index)
+        return QTableWidget.eventFilter(self, widget, event)
+
+
+            
+
 ##class DmTableListeAttaques(DmTableWidget):
 ##    """liste des attaques du combattant"""
 ##    def __init__(self, parent = None):

lib/ui/ecran_editionCombattant.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'editionCombattant.ui'
 #
-# Created: Wed Jun 17 15:59:41 2015
+# Created: Fri Jun 19 11:41:43 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -27,7 +27,7 @@ class Ui_edc_fenetre(object):
     def setupUi(self, edc_fenetre):
         edc_fenetre.setObjectName(_fromUtf8("edc_fenetre"))
         edc_fenetre.setWindowModality(QtCore.Qt.ApplicationModal)
-        edc_fenetre.resize(677, 484)
+        edc_fenetre.resize(679, 484)
         edc_fenetre.setMinimumSize(QtCore.QSize(0, 484))
         edc_fenetre.setMaximumSize(QtCore.QSize(16777215, 10000))
         self.horizontalLayout_2 = QtGui.QHBoxLayout(edc_fenetre)
@@ -219,7 +219,7 @@ class Ui_edc_fenetre(object):
         self.page_nom = QtGui.QWidget()
         self.page_nom.setObjectName(_fromUtf8("page_nom"))
         self.edc_nom = DmLineEdit(self.page_nom)
-        self.edc_nom.setGeometry(QtCore.QRect(160, 10, 271, 31))
+        self.edc_nom.setGeometry(QtCore.QRect(160, 20, 281, 31))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -246,19 +246,20 @@ class Ui_edc_fenetre(object):
         self.edc_logo.setAlignment(QtCore.Qt.AlignCenter)
         self.edc_logo.setObjectName(_fromUtf8("edc_logo"))
         self.label_8 = QtGui.QLabel(self.page_nom)
-        self.label_8.setGeometry(QtCore.QRect(110, 15, 131, 21))
+        self.label_8.setGeometry(QtCore.QRect(110, 20, 51, 31))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
+        font.setItalic(True)
         self.label_8.setFont(font)
         self.label_8.setObjectName(_fromUtf8("label_8"))
         self.frame_2 = QtGui.QFrame(self.page_nom)
-        self.frame_2.setGeometry(QtCore.QRect(110, 60, 371, 361))
-        self.frame_2.setFrameShape(QtGui.QFrame.WinPanel)
+        self.frame_2.setGeometry(QtCore.QRect(50, 70, 401, 351))
+        self.frame_2.setFrameShape(QtGui.QFrame.NoFrame)
         self.frame_2.setFrameShadow(QtGui.QFrame.Raised)
         self.frame_2.setObjectName(_fromUtf8("frame_2"))
         self.edc_vueForme = QtGui.QGraphicsView(self.frame_2)
-        self.edc_vueForme.setGeometry(QtCore.QRect(10, 10, 311, 321))
+        self.edc_vueForme.setGeometry(QtCore.QRect(40, 28, 293, 296))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(244, 244, 244))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -270,35 +271,36 @@ class Ui_edc_fenetre(object):
         brush.setStyle(QtCore.Qt.SolidPattern)
         palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
         self.edc_vueForme.setPalette(palette)
-        self.edc_vueForme.setFrameShape(QtGui.QFrame.NoFrame)
+        self.edc_vueForme.setFrameShape(QtGui.QFrame.WinPanel)
         self.edc_vueForme.setFrameShadow(QtGui.QFrame.Raised)
         self.edc_vueForme.setRenderHints(QtGui.QPainter.Antialiasing|QtGui.QPainter.HighQualityAntialiasing|QtGui.QPainter.TextAntialiasing)
         self.edc_vueForme.setObjectName(_fromUtf8("edc_vueForme"))
         self.edc_image = QtGui.QToolButton(self.frame_2)
-        self.edc_image.setGeometry(QtCore.QRect(330, 260, 31, 31))
+        self.edc_image.setGeometry(QtCore.QRect(340, 70, 31, 31))
         icon6 = QtGui.QIcon()
         icon6.addPixmap(QtGui.QPixmap(_fromUtf8("img/portrait.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.edc_image.setIcon(icon6)
         self.edc_image.setIconSize(QtCore.QSize(22, 22))
         self.edc_image.setObjectName(_fromUtf8("edc_image"))
         self.edc_couleur = QtGui.QToolButton(self.frame_2)
-        self.edc_couleur.setGeometry(QtCore.QRect(330, 220, 31, 31))
+        self.edc_couleur.setGeometry(QtCore.QRect(340, 30, 31, 31))
+        self.edc_couleur.setText(_fromUtf8(""))
         icon7 = QtGui.QIcon()
         icon7.addPixmap(QtGui.QPixmap(_fromUtf8("img/btnCouleurs.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.edc_couleur.setIcon(icon7)
         self.edc_couleur.setObjectName(_fromUtf8("edc_couleur"))
         self.edc_aideForme = QtGui.QToolButton(self.frame_2)
-        self.edc_aideForme.setGeometry(QtCore.QRect(330, 300, 31, 31))
+        self.edc_aideForme.setGeometry(QtCore.QRect(340, 290, 31, 31))
         icon8 = QtGui.QIcon()
         icon8.addPixmap(QtGui.QPixmap(_fromUtf8("img/aide.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.edc_aideForme.setIcon(icon8)
         self.edc_aideForme.setObjectName(_fromUtf8("edc_aideForme"))
         self.edc_casesHexa = QtGui.QRadioButton(self.frame_2)
-        self.edc_casesHexa.setGeometry(QtCore.QRect(30, 330, 131, 31))
+        self.edc_casesHexa.setGeometry(QtCore.QRect(40, 320, 151, 31))
         self.edc_casesHexa.setChecked(True)
         self.edc_casesHexa.setObjectName(_fromUtf8("edc_casesHexa"))
         self.edc_casesCarrees = QtGui.QRadioButton(self.frame_2)
-        self.edc_casesCarrees.setGeometry(QtCore.QRect(170, 330, 111, 31))
+        self.edc_casesCarrees.setGeometry(QtCore.QRect(220, 320, 111, 31))
         self.edc_casesCarrees.setObjectName(_fromUtf8("edc_casesCarrees"))
         self.edc_pages.addWidget(self.page_nom)
         self.page_dep = QtGui.QWidget()
@@ -506,44 +508,6 @@ class Ui_edc_fenetre(object):
         self.edc_pages.addWidget(self.page_dep)
         self.page_attr = QtGui.QWidget()
         self.page_attr.setObjectName(_fromUtf8("page_attr"))
-        self.edc_listeAttributs = QtGui.QTableWidget(self.page_attr)
-        self.edc_listeAttributs.setGeometry(QtCore.QRect(340, 40, 121, 351))
-        palette = QtGui.QPalette()
-        brush = QtGui.QBrush(QtGui.QColor(255, 255, 255, 150))
-        brush.setStyle(QtCore.Qt.SolidPattern)
-        palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Base, brush)
-        brush = QtGui.QBrush(QtGui.QColor(255, 255, 255, 150))
-        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.edc_listeAttributs.setPalette(palette)
-        font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Verdana"))
-        self.edc_listeAttributs.setFont(font)
-        self.edc_listeAttributs.setFrameShape(QtGui.QFrame.WinPanel)
-        self.edc_listeAttributs.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.edc_listeAttributs.setEditTriggers(QtGui.QAbstractItemView.AllEditTriggers)
-        self.edc_listeAttributs.setAlternatingRowColors(True)
-        self.edc_listeAttributs.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
-        self.edc_listeAttributs.setShowGrid(True)
-        self.edc_listeAttributs.setObjectName(_fromUtf8("edc_listeAttributs"))
-        self.edc_listeAttributs.setColumnCount(2)
-        self.edc_listeAttributs.setRowCount(0)
-        item = QtGui.QTableWidgetItem()
-        self.edc_listeAttributs.setHorizontalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.edc_listeAttributs.setHorizontalHeaderItem(1, item)
-        self.edc_listeAttributs.horizontalHeader().setVisible(False)
-        self.edc_listeAttributs.horizontalHeader().setDefaultSectionSize(50)
-        self.edc_listeAttributs.verticalHeader().setVisible(False)
-        self.label_18 = QtGui.QLabel(self.page_attr)
-        self.label_18.setGeometry(QtCore.QRect(320, 20, 171, 16))
-        font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Verdana"))
-        self.label_18.setFont(font)
-        self.label_18.setObjectName(_fromUtf8("label_18"))
         self.edc_deroulementAttributs = QtGui.QScrollArea(self.page_attr)
         self.edc_deroulementAttributs.setGeometry(QtCore.QRect(10, 10, 231, 411))
         self.edc_deroulementAttributs.setFrameShape(QtGui.QFrame.StyledPanel)
@@ -558,6 +522,30 @@ class Ui_edc_fenetre(object):
         self.edc_deroulementAttributs_layout.setMargin(3)
         self.edc_deroulementAttributs_layout.setObjectName(_fromUtf8("edc_deroulementAttributs_layout"))
         self.edc_deroulementAttributs.setWidget(self.scrollAreaWidgetContents_2)
+        self.edc_notes = QtGui.QTextEdit(self.page_attr)
+        self.edc_notes.setGeometry(QtCore.QRect(270, 30, 181, 391))
+        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.edc_notes.setPalette(palette)
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.edc_notes.setFont(font)
+        self.edc_notes.setObjectName(_fromUtf8("edc_notes"))
+        self.label_23 = QtGui.QLabel(self.page_attr)
+        self.label_23.setGeometry(QtCore.QRect(280, 9, 141, 21))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        font.setItalic(True)
+        self.label_23.setFont(font)
+        self.label_23.setObjectName(_fromUtf8("label_23"))
         self.edc_pages.addWidget(self.page_attr)
         self.page_att = QtGui.QWidget()
         self.page_att.setObjectName(_fromUtf8("page_att"))
@@ -576,8 +564,8 @@ class Ui_edc_fenetre(object):
         self.edc_pages.addWidget(self.page_att)
         self.page_invent = QtGui.QWidget()
         self.page_invent.setObjectName(_fromUtf8("page_invent"))
-        self.edc_listeInventaire = QtGui.QTableWidget(self.page_invent)
-        self.edc_listeInventaire.setGeometry(QtCore.QRect(20, 50, 381, 311))
+        self.edc_listeInventaire = DmTableInventaire(self.page_invent)
+        self.edc_listeInventaire.setGeometry(QtCore.QRect(0, 80, 491, 341))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(255, 255, 255, 150))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -593,67 +581,87 @@ class Ui_edc_fenetre(object):
         font.setFamily(_fromUtf8("Verdana"))
         self.edc_listeInventaire.setFont(font)
         self.edc_listeInventaire.setFrameShape(QtGui.QFrame.WinPanel)
+        self.edc_listeInventaire.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
         self.edc_listeInventaire.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.edc_listeInventaire.setEditTriggers(QtGui.QAbstractItemView.AllEditTriggers)
-        self.edc_listeInventaire.setAlternatingRowColors(True)
+        self.edc_listeInventaire.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
+        self.edc_listeInventaire.setProperty("showDropIndicator", False)
+        self.edc_listeInventaire.setDragDropOverwriteMode(False)
+        self.edc_listeInventaire.setAlternatingRowColors(False)
         self.edc_listeInventaire.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
         self.edc_listeInventaire.setShowGrid(True)
+        self.edc_listeInventaire.setGridStyle(QtCore.Qt.SolidLine)
         self.edc_listeInventaire.setObjectName(_fromUtf8("edc_listeInventaire"))
-        self.edc_listeInventaire.setColumnCount(2)
-        self.edc_listeInventaire.setRowCount(0)
+        self.edc_listeInventaire.setColumnCount(5)
+        self.edc_listeInventaire.setRowCount(1)
+        item = QtGui.QTableWidgetItem()
+        self.edc_listeInventaire.setVerticalHeaderItem(0, item)
         item = QtGui.QTableWidgetItem()
         self.edc_listeInventaire.setHorizontalHeaderItem(0, item)
         item = QtGui.QTableWidgetItem()
         self.edc_listeInventaire.setHorizontalHeaderItem(1, item)
+        item = QtGui.QTableWidgetItem()
+        self.edc_listeInventaire.setHorizontalHeaderItem(2, item)
+        item = QtGui.QTableWidgetItem()
+        self.edc_listeInventaire.setHorizontalHeaderItem(3, item)
+        item = QtGui.QTableWidgetItem()
+        self.edc_listeInventaire.setHorizontalHeaderItem(4, item)
+        item = QtGui.QTableWidgetItem()
+        self.edc_listeInventaire.setItem(0, 0, item)
+        item = QtGui.QTableWidgetItem()
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        font.setPointSize(8)
+        font.setItalic(True)
+        item.setFont(font)
+        self.edc_listeInventaire.setItem(0, 1, item)
+        item = QtGui.QTableWidgetItem()
+        self.edc_listeInventaire.setItem(0, 2, item)
+        item = QtGui.QTableWidgetItem()
+        self.edc_listeInventaire.setItem(0, 3, item)
+        item = QtGui.QTableWidgetItem()
+        self.edc_listeInventaire.setItem(0, 4, item)
         self.edc_listeInventaire.horizontalHeader().setVisible(False)
-        self.edc_listeInventaire.horizontalHeader().setDefaultSectionSize(50)
+        self.edc_listeInventaire.horizontalHeader().setCascadingSectionResizes(False)
+        self.edc_listeInventaire.horizontalHeader().setDefaultSectionSize(60)
+        self.edc_listeInventaire.horizontalHeader().setMinimumSectionSize(32)
         self.edc_listeInventaire.verticalHeader().setVisible(False)
+        self.edc_listeInventaire.verticalHeader().setDefaultSectionSize(18)
+        self.edc_listeInventaire.verticalHeader().setMinimumSectionSize(14)
         self.edc_inventaire_supprimer = QtGui.QToolButton(self.page_invent)
-        self.edc_inventaire_supprimer.setGeometry(QtCore.QRect(380, 360, 21, 20))
+        self.edc_inventaire_supprimer.setGeometry(QtCore.QRect(200, 10, 31, 31))
         icon9 = QtGui.QIcon()
         icon9.addPixmap(QtGui.QPixmap(_fromUtf8("img/gomme.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.edc_inventaire_supprimer.setIcon(icon9)
         self.edc_inventaire_supprimer.setObjectName(_fromUtf8("edc_inventaire_supprimer"))
-        self.label_24 = QtGui.QLabel(self.page_invent)
-        self.label_24.setGeometry(QtCore.QRect(20, 20, 131, 20))
-        font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Verdana"))
-        self.label_24.setFont(font)
-        self.label_24.setObjectName(_fromUtf8("label_24"))
         self.edc_inventaire_nouveau = QtGui.QToolButton(self.page_invent)
-        self.edc_inventaire_nouveau.setGeometry(QtCore.QRect(350, 360, 21, 20))
+        self.edc_inventaire_nouveau.setGeometry(QtCore.QRect(160, 10, 31, 31))
         icon10 = QtGui.QIcon()
         icon10.addPixmap(QtGui.QPixmap(_fromUtf8("img/plus.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.edc_inventaire_nouveau.setIcon(icon10)
         self.edc_inventaire_nouveau.setObjectName(_fromUtf8("edc_inventaire_nouveau"))
+        self.edc_inventaire_e1 = QtGui.QLabel(self.page_invent)
+        self.edc_inventaire_e1.setGeometry(QtCore.QRect(3, 50, 61, 21))
+        self.edc_inventaire_e1.setObjectName(_fromUtf8("edc_inventaire_e1"))
+        self.edc_inventaire_e2 = QtGui.QLabel(self.page_invent)
+        self.edc_inventaire_e2.setGeometry(QtCore.QRect(70, 50, 211, 21))
+        self.edc_inventaire_e2.setObjectName(_fromUtf8("edc_inventaire_e2"))
+        self.edc_inventaire_e5 = QtGui.QLabel(self.page_invent)
+        self.edc_inventaire_e5.setGeometry(QtCore.QRect(410, 50, 20, 20))
+        self.edc_inventaire_e5.setText(_fromUtf8(""))
+        self.edc_inventaire_e5.setPixmap(QtGui.QPixmap(_fromUtf8("img/pieces.png")))
+        self.edc_inventaire_e5.setScaledContents(True)
+        self.edc_inventaire_e5.setObjectName(_fromUtf8("edc_inventaire_e5"))
+        self.edc_inventaire_e6 = QtGui.QLabel(self.page_invent)
+        self.edc_inventaire_e6.setGeometry(QtCore.QRect(450, 50, 21, 21))
+        self.edc_inventaire_e6.setText(_fromUtf8(""))
+        self.edc_inventaire_e6.setPixmap(QtGui.QPixmap(_fromUtf8("img/poids.png")))
+        self.edc_inventaire_e6.setScaledContents(True)
+        self.edc_inventaire_e6.setObjectName(_fromUtf8("edc_inventaire_e6"))
         self.edc_pages.addWidget(self.page_invent)
         self.page_notes = QtGui.QWidget()
         self.page_notes.setObjectName(_fromUtf8("page_notes"))
-        self.label_23 = QtGui.QLabel(self.page_notes)
-        self.label_23.setGeometry(QtCore.QRect(20, 240, 151, 20))
-        font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Verdana"))
-        self.label_23.setFont(font)
-        self.label_23.setObjectName(_fromUtf8("label_23"))
-        self.edc_notes = QtGui.QTextEdit(self.page_notes)
-        self.edc_notes.setGeometry(QtCore.QRect(20, 270, 411, 171))
-        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.edc_notes.setPalette(palette)
-        font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Verdana"))
-        self.edc_notes.setFont(font)
-        self.edc_notes.setObjectName(_fromUtf8("edc_notes"))
         self.edc_detail_age = DmLineEdit(self.page_notes)
-        self.edc_detail_age.setGeometry(QtCore.QRect(350, 20, 81, 20))
+        self.edc_detail_age.setGeometry(QtCore.QRect(100, 181, 81, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -670,21 +678,21 @@ class Ui_edc_fenetre(object):
         self.edc_detail_age.setFont(font)
         self.edc_detail_age.setObjectName(_fromUtf8("edc_detail_age"))
         self.label_16 = QtGui.QLabel(self.page_notes)
-        self.label_16.setGeometry(QtCore.QRect(300, 19, 41, 21))
+        self.label_16.setGeometry(QtCore.QRect(50, 180, 41, 21))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_16.setFont(font)
         self.label_16.setObjectName(_fromUtf8("label_16"))
         self.label_17 = QtGui.QLabel(self.page_notes)
-        self.label_17.setGeometry(QtCore.QRect(300, 49, 41, 21))
+        self.label_17.setGeometry(QtCore.QRect(50, 210, 41, 21))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_17.setFont(font)
         self.label_17.setObjectName(_fromUtf8("label_17"))
         self.edc_detail_sexe = DmLineEdit(self.page_notes)
-        self.edc_detail_sexe.setGeometry(QtCore.QRect(350, 49, 81, 20))
+        self.edc_detail_sexe.setGeometry(QtCore.QRect(100, 210, 81, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -701,7 +709,7 @@ class Ui_edc_fenetre(object):
         self.edc_detail_sexe.setFont(font)
         self.edc_detail_sexe.setObjectName(_fromUtf8("edc_detail_sexe"))
         self.edc_detail_yeux = DmLineEdit(self.page_notes)
-        self.edc_detail_yeux.setGeometry(QtCore.QRect(100, 140, 91, 20))
+        self.edc_detail_yeux.setGeometry(QtCore.QRect(350, 180, 91, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -719,14 +727,14 @@ class Ui_edc_fenetre(object):
         self.edc_detail_yeux.setText(_fromUtf8(""))
         self.edc_detail_yeux.setObjectName(_fromUtf8("edc_detail_yeux"))
         self.label_37 = QtGui.QLabel(self.page_notes)
-        self.label_37.setGeometry(QtCore.QRect(20, 140, 71, 21))
+        self.label_37.setGeometry(QtCore.QRect(240, 180, 71, 21))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_37.setFont(font)
         self.label_37.setObjectName(_fromUtf8("label_37"))
         self.edc_detail_peau = DmLineEdit(self.page_notes)
-        self.edc_detail_peau.setGeometry(QtCore.QRect(100, 170, 91, 20))
+        self.edc_detail_peau.setGeometry(QtCore.QRect(350, 210, 91, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -744,21 +752,21 @@ class Ui_edc_fenetre(object):
         self.edc_detail_peau.setText(_fromUtf8(""))
         self.edc_detail_peau.setObjectName(_fromUtf8("edc_detail_peau"))
         self.label_38 = QtGui.QLabel(self.page_notes)
-        self.label_38.setGeometry(QtCore.QRect(20, 170, 61, 21))
+        self.label_38.setGeometry(QtCore.QRect(240, 210, 61, 21))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_38.setFont(font)
         self.label_38.setObjectName(_fromUtf8("label_38"))
         self.label_39 = QtGui.QLabel(self.page_notes)
-        self.label_39.setGeometry(QtCore.QRect(210, 140, 101, 21))
+        self.label_39.setGeometry(QtCore.QRect(240, 240, 101, 21))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_39.setFont(font)
         self.label_39.setObjectName(_fromUtf8("label_39"))
         self.edc_detail_cheveux = DmLineEdit(self.page_notes)
-        self.edc_detail_cheveux.setGeometry(QtCore.QRect(320, 140, 91, 20))
+        self.edc_detail_cheveux.setGeometry(QtCore.QRect(350, 240, 91, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -776,7 +784,7 @@ class Ui_edc_fenetre(object):
         self.edc_detail_cheveux.setText(_fromUtf8(""))
         self.edc_detail_cheveux.setObjectName(_fromUtf8("edc_detail_cheveux"))
         self.edc_detail_lieuNaissance = DmLineEdit(self.page_notes)
-        self.edc_detail_lieuNaissance.setGeometry(QtCore.QRect(100, 110, 171, 20))
+        self.edc_detail_lieuNaissance.setGeometry(QtCore.QRect(130, 140, 171, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -794,21 +802,21 @@ class Ui_edc_fenetre(object):
         self.edc_detail_lieuNaissance.setText(_fromUtf8(""))
         self.edc_detail_lieuNaissance.setObjectName(_fromUtf8("edc_detail_lieuNaissance"))
         self.label_40 = QtGui.QLabel(self.page_notes)
-        self.label_40.setGeometry(QtCore.QRect(20, 100, 71, 31))
+        self.label_40.setGeometry(QtCore.QRect(50, 130, 71, 31))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_40.setFont(font)
         self.label_40.setObjectName(_fromUtf8("label_40"))
         self.label_41 = QtGui.QLabel(self.page_notes)
-        self.label_41.setGeometry(QtCore.QRect(300, 79, 41, 21))
+        self.label_41.setGeometry(QtCore.QRect(50, 240, 41, 21))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_41.setFont(font)
         self.label_41.setObjectName(_fromUtf8("label_41"))
         self.edc_detail_poids = DmLineEdit(self.page_notes)
-        self.edc_detail_poids.setGeometry(QtCore.QRect(350, 80, 81, 20))
+        self.edc_detail_poids.setGeometry(QtCore.QRect(100, 241, 81, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -825,14 +833,14 @@ class Ui_edc_fenetre(object):
         self.edc_detail_poids.setFont(font)
         self.edc_detail_poids.setObjectName(_fromUtf8("edc_detail_poids"))
         self.label_43 = QtGui.QLabel(self.page_notes)
-        self.label_43.setGeometry(QtCore.QRect(20, 20, 61, 21))
+        self.label_43.setGeometry(QtCore.QRect(50, 50, 61, 21))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_43.setFont(font)
         self.label_43.setObjectName(_fromUtf8("label_43"))
         self.edc_detail_espece = DmLineEdit(self.page_notes)
-        self.edc_detail_espece.setGeometry(QtCore.QRect(100, 21, 171, 20))
+        self.edc_detail_espece.setGeometry(QtCore.QRect(130, 51, 171, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -850,14 +858,14 @@ class Ui_edc_fenetre(object):
         self.edc_detail_espece.setText(_fromUtf8(""))
         self.edc_detail_espece.setObjectName(_fromUtf8("edc_detail_espece"))
         self.label_44 = QtGui.QLabel(self.page_notes)
-        self.label_44.setGeometry(QtCore.QRect(20, 49, 81, 21))
+        self.label_44.setGeometry(QtCore.QRect(50, 79, 81, 21))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_44.setFont(font)
         self.label_44.setObjectName(_fromUtf8("label_44"))
         self.edc_detail_profession = DmLineEdit(self.page_notes)
-        self.edc_detail_profession.setGeometry(QtCore.QRect(100, 50, 171, 20))
+        self.edc_detail_profession.setGeometry(QtCore.QRect(130, 80, 171, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -875,14 +883,14 @@ class Ui_edc_fenetre(object):
         self.edc_detail_profession.setText(_fromUtf8(""))
         self.edc_detail_profession.setObjectName(_fromUtf8("edc_detail_profession"))
         self.label_45 = QtGui.QLabel(self.page_notes)
-        self.label_45.setGeometry(QtCore.QRect(300, 109, 41, 21))
+        self.label_45.setGeometry(QtCore.QRect(50, 270, 41, 21))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_45.setFont(font)
         self.label_45.setObjectName(_fromUtf8("label_45"))
         self.edc_detail_taille = DmLineEdit(self.page_notes)
-        self.edc_detail_taille.setGeometry(QtCore.QRect(350, 109, 81, 21))
+        self.edc_detail_taille.setGeometry(QtCore.QRect(100, 270, 81, 21))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -900,7 +908,7 @@ class Ui_edc_fenetre(object):
         self.edc_detail_taille.setText(_fromUtf8(""))
         self.edc_detail_taille.setObjectName(_fromUtf8("edc_detail_taille"))
         self.edc_detail_religion = DmLineEdit(self.page_notes)
-        self.edc_detail_religion.setGeometry(QtCore.QRect(100, 80, 171, 21))
+        self.edc_detail_religion.setGeometry(QtCore.QRect(130, 110, 171, 21))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -918,14 +926,14 @@ class Ui_edc_fenetre(object):
         self.edc_detail_religion.setText(_fromUtf8(""))
         self.edc_detail_religion.setObjectName(_fromUtf8("edc_detail_religion"))
         self.label_42 = QtGui.QLabel(self.page_notes)
-        self.label_42.setGeometry(QtCore.QRect(20, 70, 81, 31))
+        self.label_42.setGeometry(QtCore.QRect(50, 100, 81, 31))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
         self.label_42.setFont(font)
         self.label_42.setObjectName(_fromUtf8("label_42"))
         self.edc_detail_langues = DmLineEdit(self.page_notes)
-        self.edc_detail_langues.setGeometry(QtCore.QRect(100, 200, 331, 20))
+        self.edc_detail_langues.setGeometry(QtCore.QRect(130, 320, 291, 20))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -939,7 +947,7 @@ class Ui_edc_fenetre(object):
         self.edc_detail_langues.setPalette(palette)
         self.edc_detail_langues.setObjectName(_fromUtf8("edc_detail_langues"))
         self.label_47 = QtGui.QLabel(self.page_notes)
-        self.label_47.setGeometry(QtCore.QRect(20, 190, 61, 41))
+        self.label_47.setGeometry(QtCore.QRect(50, 310, 61, 41))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(8)
@@ -966,7 +974,7 @@ class Ui_edc_fenetre(object):
         self.edc_enregistrer.setFont(font)
         self.edc_enregistrer.setObjectName(_fromUtf8("edc_enregistrer"))
         self.edc_annuler = QtGui.QPushButton(self.frame)
-        self.edc_annuler.setGeometry(QtCore.QRect(10, 10, 81, 31))
+        self.edc_annuler.setGeometry(QtCore.QRect(280, 10, 81, 31))
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         self.edc_annuler.setFont(font)
@@ -977,7 +985,7 @@ class Ui_edc_fenetre(object):
         self.horizontalLayout_2.addLayout(self.horizontalLayout)
 
         self.retranslateUi(edc_fenetre)
-        self.edc_pages.setCurrentIndex(2)
+        self.edc_pages.setCurrentIndex(4)
         QtCore.QObject.connect(self.edc_menu, QtCore.SIGNAL(_fromUtf8("cellClicked(int,int)")), self.edc_pages.setCurrentIndex)
         QtCore.QMetaObject.connectSlotsByName(edc_fenetre)
 
@@ -1012,14 +1020,13 @@ class Ui_edc_fenetre(object):
         item = self.edc_menu.item(4, 1)
         item.setText(_translate("edc_fenetre", " INVENTAIRE ", None))
         item = self.edc_menu.item(5, 1)
-        item.setText(_translate("edc_fenetre", " NOTES ", None))
+        item.setText(_translate("edc_fenetre", " DIVERS", None))
         self.edc_menu.setSortingEnabled(__sortingEnabled)
         self.edc_logo.setText(_translate("edc_fenetre", "Choisissez \n"
 "un fichier\n"
 "image", None))
         self.label_8.setText(_translate("edc_fenetre", "Nom : ", None))
         self.edc_image.setText(_translate("edc_fenetre", "...", None))
-        self.edc_couleur.setText(_translate("edc_fenetre", "...", None))
         self.edc_aideForme.setText(_translate("edc_fenetre", "...", None))
         self.edc_casesHexa.setText(_translate("edc_fenetre", "Cases hexagonales", None))
         self.edc_casesCarrees.setText(_translate("edc_fenetre", "Cases carrées", None))
@@ -1030,19 +1037,36 @@ class Ui_edc_fenetre(object):
         self.label_13.setText(_translate("edc_fenetre", "Vol      ", None))
         self.label_14.setText(_translate("edc_fenetre", "Hauteur maximum pour les sauts : ", None))
         self.label_15.setText(_translate("edc_fenetre", "Taille de la créature (en cases) : ", None))
-        item = self.edc_listeAttributs.horizontalHeaderItem(0)
-        item.setText(_translate("edc_fenetre", "Nouvelle colonne", None))
-        item = self.edc_listeAttributs.horizontalHeaderItem(1)
-        item.setText(_translate("edc_fenetre", "Valeur", None))
-        self.label_18.setText(_translate("edc_fenetre", "Attributs / caractéristiques :  ", None))
+        self.label_23.setText(_translate("edc_fenetre", "Autre :", None))
+        item = self.edc_listeInventaire.verticalHeaderItem(0)
+        item.setText(_translate("edc_fenetre", "Nouvelle ligne", None))
         item = self.edc_listeInventaire.horizontalHeaderItem(0)
-        item.setText(_translate("edc_fenetre", "nombre", None))
+        item.setText(_translate("edc_fenetre", "Nombre", None))
         item = self.edc_listeInventaire.horizontalHeaderItem(1)
-        item.setText(_translate("edc_fenetre", "objet", None))
+        item.setText(_translate("edc_fenetre", "Objet", None))
+        item = self.edc_listeInventaire.horizontalHeaderItem(2)
+        item.setText(_translate("edc_fenetre", "Poids", None))
+        item = self.edc_listeInventaire.horizontalHeaderItem(3)
+        item.setText(_translate("edc_fenetre", "Valeur", None))
+        item = self.edc_listeInventaire.horizontalHeaderItem(4)
+        item.setText(_translate("edc_fenetre", "vide", None))
+        __sortingEnabled = self.edc_listeInventaire.isSortingEnabled()
+        self.edc_listeInventaire.setSortingEnabled(False)
+        item = self.edc_listeInventaire.item(0, 0)
+        item.setText(_translate("edc_fenetre", " ", None))
+        item = self.edc_listeInventaire.item(0, 1)
+        item.setText(_translate("edc_fenetre", "(Cliquer pour ajouter un item)", None))
+        item = self.edc_listeInventaire.item(0, 2)
+        item.setText(_translate("edc_fenetre", " ", None))
+        item = self.edc_listeInventaire.item(0, 3)
+        item.setText(_translate("edc_fenetre", " ", None))
+        item = self.edc_listeInventaire.item(0, 4)
+        item.setText(_translate("edc_fenetre", " ", None))
+        self.edc_listeInventaire.setSortingEnabled(__sortingEnabled)
         self.edc_inventaire_supprimer.setText(_translate("edc_fenetre", "...", None))
-        self.label_24.setText(_translate("edc_fenetre", "Inventaire :", None))
         self.edc_inventaire_nouveau.setText(_translate("edc_fenetre", "...", None))
-        self.label_23.setText(_translate("edc_fenetre", "Notes :", None))
+        self.edc_inventaire_e1.setText(_translate("edc_fenetre", "Quantité", None))
+        self.edc_inventaire_e2.setText(_translate("edc_fenetre", "Objet", None))
         self.label_16.setText(_translate("edc_fenetre", "Age : ", None))
         self.label_17.setText(_translate("edc_fenetre", "Sexe : ", None))
         self.label_37.setText(_translate("edc_fenetre", "Yeux :", None))
@@ -1061,7 +1085,7 @@ class Ui_edc_fenetre(object):
         self.edc_enregistrer.setText(_translate("edc_fenetre", "Enregistrer", None))
         self.edc_annuler.setText(_translate("edc_fenetre", "Annuler", None))
 
-from dm import DmLabelChoixImage, DmTableMenu, DmLineEdit
+from dm import DmLabelChoixImage, DmTableInventaire, DmTableMenu, DmLineEdit
 
 if __name__ == "__main__":
     import sys

lib/ui/editionCombattant.ui

@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>677</width>
+    <width>679</width>
     <height>484</height>
    </rect>
   </property>
@@ -477,7 +477,7 @@
        </item>
        <item row="5" column="1">
         <property name="text">
-         <string> NOTES </string>
+         <string> DIVERS</string>
         </property>
         <property name="textAlignment">
          <set>AlignHCenter|AlignVCenter|AlignCenter</set>
@@ -508,15 +508,15 @@
           </font>
          </property>
          <property name="currentIndex">
-          <number>2</number>
+          <number>4</number>
          </property>
          <widget class="QWidget" name="page_nom">
           <widget class="DmLineEdit" name="edc_nom">
            <property name="geometry">
             <rect>
              <x>160</x>
-             <y>10</y>
-             <width>271</width>
+             <y>20</y>
+             <width>281</width>
              <height>31</height>
             </rect>
            </property>
@@ -597,15 +597,16 @@ image</string>
            <property name="geometry">
             <rect>
              <x>110</x>
-             <y>15</y>
-             <width>131</width>
-             <height>21</height>
+             <y>20</y>
+             <width>51</width>
+             <height>31</height>
             </rect>
            </property>
            <property name="font">
             <font>
              <family>Verdana</family>
              <pointsize>8</pointsize>
+             <italic>true</italic>
             </font>
            </property>
            <property name="text">
@@ -615,14 +616,14 @@ image</string>
           <widget class="QFrame" name="frame_2">
            <property name="geometry">
             <rect>
-             <x>110</x>
-             <y>60</y>
-             <width>371</width>
-             <height>361</height>
+             <x>50</x>
+             <y>70</y>
+             <width>401</width>
+             <height>351</height>
             </rect>
            </property>
            <property name="frameShape">
-            <enum>QFrame::WinPanel</enum>
+            <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
@@ -630,10 +631,10 @@ image</string>
            <widget class="QGraphicsView" name="edc_vueForme">
             <property name="geometry">
              <rect>
-              <x>10</x>
-              <y>10</y>
-              <width>311</width>
-              <height>321</height>
+              <x>40</x>
+              <y>28</y>
+              <width>293</width>
+              <height>296</height>
              </rect>
             </property>
             <property name="palette">
@@ -674,7 +675,7 @@ image</string>
              </palette>
             </property>
             <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
+             <enum>QFrame::WinPanel</enum>
             </property>
             <property name="frameShadow">
              <enum>QFrame::Raised</enum>
@@ -686,8 +687,8 @@ image</string>
            <widget class="QToolButton" name="edc_image">
             <property name="geometry">
              <rect>
-              <x>330</x>
-              <y>260</y>
+              <x>340</x>
+              <y>70</y>
               <width>31</width>
               <height>31</height>
              </rect>
@@ -709,14 +710,14 @@ image</string>
            <widget class="QToolButton" name="edc_couleur">
             <property name="geometry">
              <rect>
-              <x>330</x>
-              <y>220</y>
+              <x>340</x>
+              <y>30</y>
               <width>31</width>
               <height>31</height>
              </rect>
             </property>
             <property name="text">
-             <string>...</string>
+             <string/>
             </property>
             <property name="icon">
              <iconset>
@@ -726,8 +727,8 @@ image</string>
            <widget class="QToolButton" name="edc_aideForme">
             <property name="geometry">
              <rect>
-              <x>330</x>
-              <y>300</y>
+              <x>340</x>
+              <y>290</y>
               <width>31</width>
               <height>31</height>
              </rect>
@@ -743,9 +744,9 @@ image</string>
            <widget class="QRadioButton" name="edc_casesHexa">
             <property name="geometry">
              <rect>
-              <x>30</x>
-              <y>330</y>
-              <width>131</width>
+              <x>40</x>
+              <y>320</y>
+              <width>151</width>
               <height>31</height>
              </rect>
             </property>
@@ -759,8 +760,8 @@ image</string>
            <widget class="QRadioButton" name="edc_casesCarrees">
             <property name="geometry">
              <rect>
-              <x>170</x>
-              <y>330</y>
+              <x>220</x>
+              <y>320</y>
               <width>111</width>
               <height>31</height>
              </rect>
@@ -1384,13 +1385,59 @@ image</string>
           </widget>
          </widget>
          <widget class="QWidget" name="page_attr">
-          <widget class="QTableWidget" name="edc_listeAttributs">
+          <widget class="QScrollArea" name="edc_deroulementAttributs">
            <property name="geometry">
             <rect>
-             <x>340</x>
-             <y>40</y>
-             <width>121</width>
-             <height>351</height>
+             <x>10</x>
+             <y>10</y>
+             <width>231</width>
+             <height>411</height>
+            </rect>
+           </property>
+           <property name="frameShape">
+            <enum>QFrame::StyledPanel</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Raised</enum>
+           </property>
+           <property name="widgetResizable">
+            <bool>true</bool>
+           </property>
+           <widget class="QWidget" name="scrollAreaWidgetContents_2">
+            <property name="geometry">
+             <rect>
+              <x>0</x>
+              <y>0</y>
+              <width>229</width>
+              <height>409</height>
+             </rect>
+            </property>
+            <layout class="QVBoxLayout" name="edc_deroulementAttributs_layout">
+             <property name="spacing">
+              <number>1</number>
+             </property>
+             <property name="leftMargin">
+              <number>3</number>
+             </property>
+             <property name="topMargin">
+              <number>3</number>
+             </property>
+             <property name="rightMargin">
+              <number>3</number>
+             </property>
+             <property name="bottomMargin">
+              <number>3</number>
+             </property>
+            </layout>
+           </widget>
+          </widget>
+          <widget class="QTextEdit" name="edc_notes">
+           <property name="geometry">
+            <rect>
+             <x>270</x>
+             <y>30</y>
+             <width>181</width>
+             <height>391</height>
             </rect>
            </property>
            <property name="palette">
@@ -1398,10 +1445,10 @@ image</string>
              <active>
               <colorrole role="Base">
                <brush brushstyle="SolidPattern">
-                <color alpha="150">
-                 <red>255</red>
-                 <green>255</green>
-                 <blue>255</blue>
+                <color alpha="255">
+                 <red>248</red>
+                 <green>248</green>
+                 <blue>248</blue>
                 </color>
                </brush>
               </colorrole>
@@ -1409,10 +1456,10 @@ image</string>
              <inactive>
               <colorrole role="Base">
                <brush brushstyle="SolidPattern">
-                <color alpha="150">
-                 <red>255</red>
-                 <green>255</green>
-                 <blue>255</blue>
+                <color alpha="255">
+                 <red>248</red>
+                 <green>248</green>
+                 <blue>248</blue>
                 </color>
                </brush>
               </colorrole>
@@ -1435,108 +1482,26 @@ image</string>
              <family>Verdana</family>
             </font>
            </property>
-           <property name="frameShape">
-            <enum>QFrame::WinPanel</enum>
-           </property>
-           <property name="horizontalScrollBarPolicy">
-            <enum>Qt::ScrollBarAlwaysOff</enum>
-           </property>
-           <property name="editTriggers">
-            <set>QAbstractItemView::AllEditTriggers</set>
-           </property>
-           <property name="alternatingRowColors">
-            <bool>true</bool>
-           </property>
-           <property name="selectionMode">
-            <enum>QAbstractItemView::NoSelection</enum>
-           </property>
-           <property name="showGrid">
-            <bool>true</bool>
-           </property>
-           <attribute name="horizontalHeaderVisible">
-            <bool>false</bool>
-           </attribute>
-           <attribute name="horizontalHeaderDefaultSectionSize">
-            <number>50</number>
-           </attribute>
-           <attribute name="verticalHeaderVisible">
-            <bool>false</bool>
-           </attribute>
-           <column>
-            <property name="text">
-             <string>Nouvelle colonne</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>Valeur</string>
-            </property>
-           </column>
           </widget>
-          <widget class="QLabel" name="label_18">
+          <widget class="QLabel" name="label_23">
            <property name="geometry">
             <rect>
-             <x>320</x>
-             <y>20</y>
-             <width>171</width>
-             <height>16</height>
+             <x>280</x>
+             <y>9</y>
+             <width>141</width>
+             <height>21</height>
             </rect>
            </property>
            <property name="font">
             <font>
              <family>Verdana</family>
+             <italic>true</italic>
             </font>
            </property>
            <property name="text">
-            <string>Attributs / caractéristiques :  </string>
+            <string>Autre :</string>
            </property>
           </widget>
-          <widget class="QScrollArea" name="edc_deroulementAttributs">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>10</y>
-             <width>231</width>
-             <height>411</height>
-            </rect>
-           </property>
-           <property name="frameShape">
-            <enum>QFrame::StyledPanel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <property name="widgetResizable">
-            <bool>true</bool>
-           </property>
-           <widget class="QWidget" name="scrollAreaWidgetContents_2">
-            <property name="geometry">
-             <rect>
-              <x>0</x>
-              <y>0</y>
-              <width>229</width>
-              <height>409</height>
-             </rect>
-            </property>
-            <layout class="QVBoxLayout" name="edc_deroulementAttributs_layout">
-             <property name="spacing">
-              <number>1</number>
-             </property>
-             <property name="leftMargin">
-              <number>3</number>
-             </property>
-             <property name="topMargin">
-              <number>3</number>
-             </property>
-             <property name="rightMargin">
-              <number>3</number>
-             </property>
-             <property name="bottomMargin">
-              <number>3</number>
-             </property>
-            </layout>
-           </widget>
-          </widget>
          </widget>
          <widget class="QWidget" name="page_att">
           <widget class="QScrollArea" name="edc_deroulementAttaques">
@@ -1581,13 +1546,13 @@ image</string>
           </widget>
          </widget>
          <widget class="QWidget" name="page_invent">
-          <widget class="QTableWidget" name="edc_listeInventaire">
+          <widget class="DmTableInventaire" name="edc_listeInventaire">
            <property name="geometry">
             <rect>
-             <x>20</x>
+             <x>0</x>
              <y>50</y>
-             <width>381</width>
-             <height>311</height>
+             <width>491</width>
+             <height>351</height>
             </rect>
            </property>
            <property name="palette">
@@ -1635,14 +1600,23 @@ image</string>
            <property name="frameShape">
             <enum>QFrame::WinPanel</enum>
            </property>
+           <property name="verticalScrollBarPolicy">
+            <enum>Qt::ScrollBarAsNeeded</enum>
+           </property>
            <property name="horizontalScrollBarPolicy">
             <enum>Qt::ScrollBarAlwaysOff</enum>
            </property>
            <property name="editTriggers">
-            <set>QAbstractItemView::AllEditTriggers</set>
+            <set>QAbstractItemView::NoEditTriggers</set>
+           </property>
+           <property name="showDropIndicator" stdset="0">
+            <bool>false</bool>
+           </property>
+           <property name="dragDropOverwriteMode">
+            <bool>false</bool>
            </property>
            <property name="alternatingRowColors">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="selectionMode">
             <enum>QAbstractItemView::NoSelection</enum>
@@ -1650,155 +1624,218 @@ image</string>
            <property name="showGrid">
             <bool>true</bool>
            </property>
+           <property name="gridStyle">
+            <enum>Qt::SolidLine</enum>
+           </property>
            <attribute name="horizontalHeaderVisible">
             <bool>false</bool>
            </attribute>
+           <attribute name="horizontalHeaderCascadingSectionResizes">
+            <bool>false</bool>
+           </attribute>
            <attribute name="horizontalHeaderDefaultSectionSize">
-            <number>50</number>
+            <number>60</number>
+           </attribute>
+           <attribute name="horizontalHeaderMinimumSectionSize">
+            <number>32</number>
            </attribute>
            <attribute name="verticalHeaderVisible">
             <bool>false</bool>
            </attribute>
+           <attribute name="verticalHeaderDefaultSectionSize">
+            <number>18</number>
+           </attribute>
+           <attribute name="verticalHeaderMinimumSectionSize">
+            <number>14</number>
+           </attribute>
+           <row>
+            <property name="text">
+             <string>Nouvelle ligne</string>
+            </property>
+           </row>
+           <column>
+            <property name="text">
+             <string>Nombre</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Objet</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Poids</string>
+            </property>
+           </column>
            <column>
             <property name="text">
-             <string>nombre</string>
+             <string>Valeur</string>
             </property>
            </column>
            <column>
             <property name="text">
-             <string>objet</string>
+             <string>vide</string>
             </property>
            </column>
+           <item row="0" column="0">
+            <property name="text">
+             <string> </string>
+            </property>
+           </item>
+           <item row="0" column="1">
+            <property name="text">
+             <string>(Cliquer pour ajouter un item)</string>
+            </property>
+            <property name="font">
+             <font>
+              <family>Verdana</family>
+              <pointsize>8</pointsize>
+              <italic>true</italic>
+             </font>
+            </property>
+           </item>
+           <item row="0" column="2">
+            <property name="text">
+             <string> </string>
+            </property>
+           </item>
+           <item row="0" column="3">
+            <property name="text">
+             <string> </string>
+            </property>
+           </item>
+           <item row="0" column="4">
+            <property name="text">
+             <string> </string>
+            </property>
+           </item>
           </widget>
-          <widget class="QToolButton" name="edc_inventaire_supprimer">
+          <widget class="QLabel" name="edc_inventaire_e1">
            <property name="geometry">
             <rect>
-             <x>380</x>
-             <y>360</y>
-             <width>21</width>
-             <height>20</height>
+             <x>3</x>
+             <y>20</y>
+             <width>61</width>
+             <height>21</height>
             </rect>
            </property>
            <property name="text">
-            <string>...</string>
+            <string>Quantité</string>
            </property>
-           <property name="icon">
-            <iconset>
-             <normaloff>img/gomme.png</normaloff>img/gomme.png</iconset>
+          </widget>
+          <widget class="QLabel" name="edc_inventaire_e2">
+           <property name="geometry">
+            <rect>
+             <x>70</x>
+             <y>20</y>
+             <width>211</width>
+             <height>21</height>
+            </rect>
+           </property>
+           <property name="text">
+            <string>Objet</string>
            </property>
           </widget>
-          <widget class="QLabel" name="label_24">
+          <widget class="QLabel" name="edc_inventaire_e5">
            <property name="geometry">
             <rect>
-             <x>20</x>
+             <x>410</x>
              <y>20</y>
-             <width>131</width>
+             <width>20</width>
              <height>20</height>
             </rect>
            </property>
-           <property name="font">
-            <font>
-             <family>Verdana</family>
-            </font>
-           </property>
            <property name="text">
-            <string>Inventaire :</string>
+            <string/>
+           </property>
+           <property name="pixmap">
+            <pixmap>img/pieces.png</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
            </property>
           </widget>
-          <widget class="QToolButton" name="edc_inventaire_nouveau">
+          <widget class="QLabel" name="edc_inventaire_e6">
            <property name="geometry">
             <rect>
-             <x>350</x>
-             <y>360</y>
+             <x>450</x>
+             <y>20</y>
              <width>21</width>
-             <height>20</height>
+             <height>21</height>
             </rect>
            </property>
            <property name="text">
-            <string>...</string>
+            <string/>
+           </property>
+           <property name="pixmap">
+            <pixmap>img/poids.png</pixmap>
            </property>
-           <property name="icon">
-            <iconset>
-             <normaloff>img/plus.png</normaloff>img/plus.png</iconset>
+           <property name="scaledContents">
+            <bool>true</bool>
            </property>
           </widget>
-         </widget>
-         <widget class="QWidget" name="page_notes">
-          <widget class="QLabel" name="label_23">
+          <widget class="QLabel" name="label">
            <property name="geometry">
             <rect>
-             <x>20</x>
-             <y>240</y>
-             <width>151</width>
-             <height>20</height>
+             <x>10</x>
+             <y>400</y>
+             <width>51</width>
+             <height>21</height>
             </rect>
            </property>
            <property name="font">
             <font>
-             <family>Verdana</family>
+             <italic>true</italic>
             </font>
            </property>
            <property name="text">
-            <string>Notes :</string>
+            <string>Au total : </string>
            </property>
           </widget>
-          <widget class="QTextEdit" name="edc_notes">
+          <widget class="QLabel" name="label_6">
            <property name="geometry">
             <rect>
-             <x>20</x>
-             <y>270</y>
-             <width>411</width>
-             <height>171</height>
+             <x>345</x>
+             <y>400</y>
+             <width>61</width>
+             <height>20</height>
             </rect>
            </property>
-           <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 name="font">
+            <font>
+             <italic>true</italic>
+            </font>
+           </property>
+           <property name="text">
+            <string>... po</string>
+           </property>
+          </widget>
+          <widget class="QLabel" name="label_7">
+           <property name="geometry">
+            <rect>
+             <x>435</x>
+             <y>400</y>
+             <width>61</width>
+             <height>20</height>
+            </rect>
            </property>
            <property name="font">
             <font>
-             <family>Verdana</family>
+             <italic>true</italic>
             </font>
            </property>
+           <property name="text">
+            <string>... kg</string>
+           </property>
           </widget>
+         </widget>
+         <widget class="QWidget" name="page_notes">
           <widget class="DmLineEdit" name="edc_detail_age">
            <property name="geometry">
             <rect>
-             <x>350</x>
-             <y>20</y>
+             <x>100</x>
+             <y>181</y>
              <width>81</width>
              <height>20</height>
             </rect>
@@ -1849,8 +1886,8 @@ image</string>
           <widget class="QLabel" name="label_16">
            <property name="geometry">
             <rect>
-             <x>300</x>
-             <y>19</y>
+             <x>50</x>
+             <y>180</y>
              <width>41</width>
              <height>21</height>
             </rect>
@@ -1868,8 +1905,8 @@ image</string>
           <widget class="QLabel" name="label_17">
            <property name="geometry">
             <rect>
-             <x>300</x>
-             <y>49</y>
+             <x>50</x>
+             <y>210</y>
              <width>41</width>
              <height>21</height>
             </rect>
@@ -1887,8 +1924,8 @@ image</string>
           <widget class="DmLineEdit" name="edc_detail_sexe">
            <property name="geometry">
             <rect>
-             <x>350</x>
-             <y>49</y>
+             <x>100</x>
+             <y>210</y>
              <width>81</width>
              <height>20</height>
             </rect>
@@ -1939,8 +1976,8 @@ image</string>
           <widget class="DmLineEdit" name="edc_detail_yeux">
            <property name="geometry">
             <rect>
-             <x>100</x>
-             <y>140</y>
+             <x>350</x>
+             <y>180</y>
              <width>91</width>
              <height>20</height>
             </rect>
@@ -1994,8 +2031,8 @@ image</string>
           <widget class="QLabel" name="label_37">
            <property name="geometry">
             <rect>
-             <x>20</x>
-             <y>140</y>
+             <x>240</x>
+             <y>180</y>
              <width>71</width>
              <height>21</height>
             </rect>
@@ -2013,8 +2050,8 @@ image</string>
           <widget class="DmLineEdit" name="edc_detail_peau">
            <property name="geometry">
             <rect>
-             <x>100</x>
-             <y>170</y>
+             <x>350</x>
+             <y>210</y>
              <width>91</width>
              <height>20</height>
             </rect>
@@ -2068,8 +2105,8 @@ image</string>
           <widget class="QLabel" name="label_38">
            <property name="geometry">
             <rect>
-             <x>20</x>
-             <y>170</y>
+             <x>240</x>
+             <y>210</y>
              <width>61</width>
              <height>21</height>
             </rect>
@@ -2087,8 +2124,8 @@ image</string>
           <widget class="QLabel" name="label_39">
            <property name="geometry">
             <rect>
-             <x>210</x>
-             <y>140</y>
+             <x>240</x>
+             <y>240</y>
              <width>101</width>
              <height>21</height>
             </rect>
@@ -2106,8 +2143,8 @@ image</string>
           <widget class="DmLineEdit" name="edc_detail_cheveux">
            <property name="geometry">
             <rect>
-             <x>320</x>
-             <y>140</y>
+             <x>350</x>
+             <y>240</y>
              <width>91</width>
              <height>20</height>
             </rect>
@@ -2161,8 +2198,8 @@ image</string>
           <widget class="DmLineEdit" name="edc_detail_lieuNaissance">
            <property name="geometry">
             <rect>
-             <x>100</x>
-             <y>110</y>
+             <x>130</x>
+             <y>140</y>
              <width>171</width>
              <height>20</height>
             </rect>
@@ -2216,8 +2253,8 @@ image</string>
           <widget class="QLabel" name="label_40">
            <property name="geometry">
             <rect>
-             <x>20</x>
-             <y>100</y>
+             <x>50</x>
+             <y>130</y>
              <width>71</width>
              <height>31</height>
             </rect>
@@ -2236,8 +2273,8 @@ naissance :</string>
           <widget class="QLabel" name="label_41">
            <property name="geometry">
             <rect>
-             <x>300</x>
-             <y>79</y>
+             <x>50</x>
+             <y>240</y>
              <width>41</width>
              <height>21</height>
             </rect>
@@ -2255,8 +2292,8 @@ naissance :</string>
           <widget class="DmLineEdit" name="edc_detail_poids">
            <property name="geometry">
             <rect>
-             <x>350</x>
-             <y>80</y>
+             <x>100</x>
+             <y>241</y>
              <width>81</width>
              <height>20</height>
             </rect>
@@ -2307,8 +2344,8 @@ naissance :</string>
           <widget class="QLabel" name="label_43">
            <property name="geometry">
             <rect>
-             <x>20</x>
-             <y>20</y>
+             <x>50</x>
+             <y>50</y>
              <width>61</width>
              <height>21</height>
             </rect>
@@ -2326,8 +2363,8 @@ naissance :</string>
           <widget class="DmLineEdit" name="edc_detail_espece">
            <property name="geometry">
             <rect>
-             <x>100</x>
-             <y>21</y>
+             <x>130</x>
+             <y>51</y>
              <width>171</width>
              <height>20</height>
             </rect>
@@ -2381,8 +2418,8 @@ naissance :</string>
           <widget class="QLabel" name="label_44">
            <property name="geometry">
             <rect>
-             <x>20</x>
-             <y>49</y>
+             <x>50</x>
+             <y>79</y>
              <width>81</width>
              <height>21</height>
             </rect>
@@ -2400,8 +2437,8 @@ naissance :</string>
           <widget class="DmLineEdit" name="edc_detail_profession">
            <property name="geometry">
             <rect>
-             <x>100</x>
-             <y>50</y>
+             <x>130</x>
+             <y>80</y>
              <width>171</width>
              <height>20</height>
             </rect>
@@ -2455,8 +2492,8 @@ naissance :</string>
           <widget class="QLabel" name="label_45">
            <property name="geometry">
             <rect>
-             <x>300</x>
-             <y>109</y>
+             <x>50</x>
+             <y>270</y>
              <width>41</width>
              <height>21</height>
             </rect>
@@ -2474,8 +2511,8 @@ naissance :</string>
           <widget class="DmLineEdit" name="edc_detail_taille">
            <property name="geometry">
             <rect>
-             <x>350</x>
-             <y>109</y>
+             <x>100</x>
+             <y>270</y>
              <width>81</width>
              <height>21</height>
             </rect>
@@ -2529,8 +2566,8 @@ naissance :</string>
           <widget class="DmLineEdit" name="edc_detail_religion">
            <property name="geometry">
             <rect>
-             <x>100</x>
-             <y>80</y>
+             <x>130</x>
+             <y>110</y>
              <width>171</width>
              <height>21</height>
             </rect>
@@ -2584,8 +2621,8 @@ naissance :</string>
           <widget class="QLabel" name="label_42">
            <property name="geometry">
             <rect>
-             <x>20</x>
-             <y>70</y>
+             <x>50</x>
+             <y>100</y>
              <width>81</width>
              <height>31</height>
             </rect>
@@ -2604,9 +2641,9 @@ Croyances :</string>
           <widget class="DmLineEdit" name="edc_detail_langues">
            <property name="geometry">
             <rect>
-             <x>100</x>
-             <y>200</y>
-             <width>331</width>
+             <x>130</x>
+             <y>320</y>
+             <width>291</width>
              <height>20</height>
             </rect>
            </property>
@@ -2651,8 +2688,8 @@ Croyances :</string>
           <widget class="QLabel" name="label_47">
            <property name="geometry">
             <rect>
-             <x>20</x>
-             <y>190</y>
+             <x>50</x>
+             <y>310</y>
              <width>61</width>
              <height>41</height>
             </rect>
@@ -2722,7 +2759,7 @@ parlées : </string>
          <widget class="QPushButton" name="edc_annuler">
           <property name="geometry">
            <rect>
-            <x>10</x>
+            <x>280</x>
             <y>10</y>
             <width>81</width>
             <height>31</height>
@@ -2761,6 +2798,11 @@ parlées : </string>
    <extends>QLineEdit</extends>
    <header location="global">dm.h</header>
   </customwidget>
+  <customwidget>
+   <class>DmTableInventaire</class>
+   <extends>QTableWidget</extends>
+   <header location="global">dm.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>

lib/ui/inventaire.ui

@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>764</width>
+    <height>504</height>
+   </rect>
+  </property>
+  <property name="font">
+   <font>
+    <family>Verdana</family>
+   </font>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>10</y>
+     <width>211</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>10</pointsize>
+     <weight>75</weight>
+     <bold>true</bold>
+    </font>
+   </property>
+   <property name="text">
+    <string>INVENTAIRE</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButton">
+   <property name="geometry">
+    <rect>
+     <x>610</x>
+     <y>460</y>
+     <width>121</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Enregistrer</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="pushButton_2">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>460</y>
+     <width>121</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Annuler</string>
+   </property>
+  </widget>
+  <widget class="QTableView" name="monnaie">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>70</y>
+     <width>171</width>
+     <height>111</height>
+    </rect>
+   </property>
+   <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="font">
+    <font>
+     <family>Verdana</family>
+    </font>
+   </property>
+  </widget>
+  <widget class="QTableView" name="armesEtArmures">
+   <property name="geometry">
+    <rect>
+     <x>200</x>
+     <y>70</y>
+     <width>171</width>
+     <height>371</height>
+    </rect>
+   </property>
+   <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="font">
+    <font>
+     <family>Verdana</family>
+    </font>
+   </property>
+  </widget>
+  <widget class="QTableView" name="consommables">
+   <property name="geometry">
+    <rect>
+     <x>380</x>
+     <y>70</y>
+     <width>171</width>
+     <height>371</height>
+    </rect>
+   </property>
+   <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="font">
+    <font>
+     <family>Verdana</family>
+    </font>
+   </property>
+  </widget>
+  <widget class="QTableView" name="autre">
+   <property name="geometry">
+    <rect>
+     <x>560</x>
+     <y>70</y>
+     <width>171</width>
+     <height>371</height>
+    </rect>
+   </property>
+   <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="font">
+    <font>
+     <family>Verdana</family>
+    </font>
+   </property>
+  </widget>
+  <widget class="QTableView" name="butin">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>220</y>
+     <width>171</width>
+     <height>221</height>
+    </rect>
+   </property>
+   <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="font">
+    <font>
+     <family>Verdana</family>
+    </font>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_2">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>40</y>
+     <width>21</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap>img/pieces.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_3">
+   <property name="geometry">
+    <rect>
+     <x>200</x>
+     <y>40</y>
+     <width>21</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap>img/btn_ModeCombat.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_4">
+   <property name="geometry">
+    <rect>
+     <x>380</x>
+     <y>40</y>
+     <width>21</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap>img/chimie.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_5">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>190</y>
+     <width>21</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap>img/diamant.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_6">
+   <property name="geometry">
+    <rect>
+     <x>560</x>
+     <y>40</y>
+     <width>21</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap>img/boite_outils.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_7">
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>40</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Argent ------------------------</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_8">
+   <property name="geometry">
+    <rect>
+     <x>230</x>
+     <y>40</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Armes et armures -----------</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_9">
+   <property name="geometry">
+    <rect>
+     <x>410</x>
+     <y>40</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Consommables --------------</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_10">
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>190</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Butin ----------------------------</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_11">
+   <property name="geometry">
+    <rect>
+     <x>590</x>
+     <y>40</y>
+     <width>141</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Autre ---------------------------</string>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>