Fiche personnage terminée

Pbm avec deplacements des pions corrigé
Onglet groupe commencé

lib/Actions.py

@@ -13,7 +13,8 @@ class Action(object):
         self._coordCible = None  #coord de la case ciblee par le curseur
         self._cible = None       #cible (case ou pion)
         self._sourceCurseur = ""
-        self._nomBouton = ""     
+        self._nomBouton = ""
+        self._enCours = False
 
     def typeAtt(self):
         return ""
@@ -26,6 +27,8 @@ class Action(object):
         self.activerCurseur()
         self.creerItemsGraphiques()
 
+        self._enCours = True
+
     def majCoordCible(self, coord):
         """met a jour les coordonnees de la cible,
             cad la case actuellement survolee par la souris"""
@@ -38,6 +41,10 @@ class Action(object):
         self.detruireItemsGraphiques()
         self.desactiverCurseur()
         self.enfoncerBouton(False)
+        self._enCours = False
+
+    def enCours(self):
+        return self._enCours
 
     def valider(self):
         #envoyer signal
@@ -105,7 +112,6 @@ class Deplacement(Action):
         self._sourceCurseur = ""
         self._nomBouton = "pi_deplacement" 
 
-
     def typeAtt(self):
         return "dep"
     
@@ -157,7 +163,7 @@ class Deplacement(Action):
         for coord, cout in self._chemin:
             valide = True
             if actif:
-                if cout > self.acteur().deplacement: valide = False
+                if cout > self.acteur().depMarche: valide = False
             else:
                 cout = 0
             self.plateau.cases[coord].majAffichageDeplacement(cout, valide)

lib/EcranEditionCombattant.py

@@ -19,7 +19,7 @@ import ui.dm as dm
 	
 class EcranEditionCombattant(QDialog):
     """interface de creation/edition de terrains"""
-    def __init__(self, combattant=None, parent=None):
+    def __init__(self, combattant=None, pageInitiale = 0, parent=None):
         """initialisation de la fenetre"""
         super (EcranEditionCombattant, self).__init__()
         self.pixGraphique = None
@@ -32,6 +32,8 @@ class EcranEditionCombattant(QDialog):
             self.combattant = combattant
         self.modeCreation = (combattant == None)
         self.ouverture()
+        self.ui.edc_menu.setCurrentCell(pageInitiale, 0)
+        self.ui.edc_pages.setCurrentIndex(pageInitiale)
 
     def nouvelIdCombattant(self):
         """renvoie un identifiant pour un nouveau terrain"""
@@ -72,7 +74,8 @@ class EcranEditionCombattant(QDialog):
         self.construireListeAttributs()
 
         self.construireInventaire()
-        self.connect(self.ui.edc_filtreTypeObjet, SIGNAL("cellClicked(int, int)"), self.filtrerInventaire)
+        self.connect(self.ui.edc_filtreTypeObjet, SIGNAL("currentChanged(int)"), self.filtrerInventaire)
+        self.ui.edc_filtreTypeObjet.stackUnder(self.ui.edc_listeInventaire)
 
     def layoutAtt(self):
         """retourne le layout des attaques"""
@@ -283,8 +286,10 @@ class EcranEditionCombattant(QDialog):
             objet = self.ui.edc_listeInventaire.inventaire()[indexObjet]
         else:
             objet = None
+        typeObjet = self.ui.edc_filtreTypeObjet.currentIndex() - 1
+        
             
-        self.fenetreEO = EcranEditionObjet(objet)
+        self.fenetreEO = EcranEditionObjet(objet, typeObjet)
         self.fenetreEO.show()
         self.fenetreEO.exec_()
         resultat = self.fenetreEO.resultat()
@@ -308,8 +313,8 @@ class EcranEditionCombattant(QDialog):
             poidsTotal += obj.poidsTotal()
         self.ui.edc_inventaire_poids.majTexte("{} kg".format(poidsTotal))
 
-    def filtrerInventaire(self, ligne, colonne):
-        filtre = colonne - 1
+    def filtrerInventaire(self, index):
+        filtre = index - 1
         self.ui.edc_listeInventaire.filtrer(filtre)
 
     #### barre d'outils
@@ -365,8 +370,8 @@ class EcranEditionCombattant(QDialog):
         
         self.combattant.notes = str(self.ui.edc_notes.toPlainText().toUtf8())
 
-        enregistrer(self.combattant.id, self.combattant, "lib\\biblio\\combattant")
-        self.combattant = None
+##        enregistrer(self.combattant.id, self.combattant, "lib\\biblio\\combattant")
+##        self.combattant = None
         self.done(1)
 
     def annuler(self):

lib/EcranEditionObjet.py

@@ -6,16 +6,17 @@ from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from Objet import Objet
 from ui.ecran_editionObjet import Ui_eo_fenetre
+from ui.ecran_editionQuantiteObjet import Ui_eoq_fenetre
 import regles
 
 class EcranEditionObjet(QDialog):
     """interface de creation/edition de terrains"""
-    def __init__(self, objet=None, parent=None):
+    def __init__(self, objet=None, typeObjet = 4, parent=None):
         """initialisation de la fenetre"""
         super (EcranEditionObjet, self).__init__(parent)
         self._resultat = objet
         self.createWidgets()
-        self.ouverture(objet)
+        self.ouverture(objet, typeObjet)
           
     def createWidgets(self):
         """construction de l'interface"""
@@ -31,7 +32,7 @@ class EcranEditionObjet(QDialog):
         self.connect(self.ui.eo_retirer, SIGNAL("clicked()"), self.retirer)
         self.connect(self.ui.eo_nom, SIGNAL("textEdited(QString)"), self.majAffichage)
         
-    def ouverture(self, objet):
+    def ouverture(self, objet, typeObjet):
         """ouverture en mode edition"""
         if objet:
             self.ui.eo_nom.majTexte(objet.nom)
@@ -42,6 +43,7 @@ class EcranEditionObjet(QDialog):
             self.ui.eo_type.setCurrentIndex(objet.typeObjet)
             self.ui.eo_consommable.setChecked(objet.estConsommable)
         else:
+            self.ui.eo_type.setCurrentIndex(typeObjet)
             self.ui.eo_ajouter.setVisible(False)
             self.ui.eo_retirer.setVisible(False)
             self.ui.eo_supprimer.setVisible(False)
@@ -79,10 +81,49 @@ class EcranEditionObjet(QDialog):
         self.ui.eo_enregistrer.setEnabled(len(self.ui.eo_nom.texte()) > 0)
 
     def ajouter(self):
-        pass
+        self.editerQuantite("+")
     
     def retirer(self):
-        pass
+        self.editerQuantite("-")
+
+    def editerQuantite(self, mode):
+        self.ecran = EcranEditionQuantiteObjet(mode)
+        self.ecran.show()
+        self.ecran.exec_()
+        resultat = self.ecran.resultat
+        self.ecran = None
+
+        val = self.ui.eo_quantite.value()
+        val += resultat
+        if val < 0: val = 0
+        self.ui.eo_quantite.setValue(val)
+
+class EcranEditionQuantiteObjet(QDialog):
+    """interface permettant l'ajout/retrait rapide de nombres a une quantites d'objets"""
+    def __init__(self, mode = "+", parent=None):
+        super (EcranEditionQuantiteObjet, self).__init__(parent)
+        self.mode = mode
+        self.resultat = 0
+        self.createWidgets()
+
+    def createWidgets(self):
+        """construction de l'interface"""
+        #construction de l'interface
+        self.ui = Ui_eoq_fenetre()
+        self.ui.setupUi(self)
+        self.setModal(True)
+        self.connect(self.ui.eoq_ok, SIGNAL("clicked()"), self.ok)
+        if self.mode == "+": self.ui.eoq_titre.majTexte("Ajouter :")
+        if self.mode == "-": self.ui.eoq_titre.majTexte("Retirer :")
+        self.ui.eoq_valeur.setFocus()
+        self.ui.eoq_valeur.selectAll()
+        
+    def ok(self):
+        k = 1
+        if self.mode == "-": k = -1
+        self.resultat = (k * self.ui.eoq_valeur.value())
+        self.done(1)
+    
 
 
 if __name__ == "__main__":

lib/Modes.py

@@ -465,8 +465,8 @@ class PionSelectionne(ModeBasePi):
 
     def clic_case(self, coord):
         if self._action:
-            self._action.valider()
-            self._action = None
+            terminee = self._action.valider()
+            if not self._action.enCours(): self._action = None
            
     def clicDroit(self, event):
         if self._action != None:

lib/ui/convertQuantiteObjet.cmd

@@ -0,0 +1 @@
+pyuic4 -x dial_editerQuantiteObjet.ui -o ecran_editionQuantiteObjet.py

lib/ui/dial_editerQuantiteObjet.ui

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>eoq_fenetre</class>
+ <widget class="QDialog" name="eoq_fenetre">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>214</width>
+    <height>51</height>
+   </rect>
+  </property>
+  <property name="font">
+   <font>
+    <family>Verdana</family>
+   </font>
+  </property>
+  <property name="windowTitle">
+   <string>Modifier la quantité</string>
+  </property>
+  <widget class="DmLabel" name="eoq_titre">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>5</y>
+     <width>61</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <weight>75</weight>
+     <bold>true</bold>
+    </font>
+   </property>
+   <property name="text">
+    <string>Retirer : </string>
+   </property>
+  </widget>
+  <widget class="QSpinBox" name="eoq_valeur">
+   <property name="geometry">
+    <rect>
+     <x>80</x>
+     <y>10</y>
+     <width>81</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="maximum">
+    <number>999999999</number>
+   </property>
+  </widget>
+  <widget class="QToolButton" name="eoq_ok">
+   <property name="geometry">
+    <rect>
+     <x>170</x>
+     <y>10</y>
+     <width>31</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset>
+     <normaloff>img/flecheDroite.png</normaloff>img/flecheDroite.png</iconset>
+   </property>
+  </widget>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>DmLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">dm.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

lib/ui/dm.py

@@ -157,6 +157,34 @@ class DmComboBox(QComboBox):
         """renvoie sous forme de QVariant la valeur en cours"""
         return self.itemData(self.currentIndex())
 
+class DmTabInventaire(QTabWidget):
+    """surcharge de QTabWidget stylisee et
+        utilisee pour filtrer les types d'objets affiches"""
+    def __init__(self, parent = None):
+        super(DmTabInventaire, self).__init__(parent)
+##        self.setStyleSheet(QString.fromUtf8("""QTabWidget::tab-bar { alignment: right;
+##                                               background: rgba(0,248,248,200) }"""))
+
+        self.setStyleSheet(QString.fromUtf8("""
+                                             QTabWidget::pane { border-top: 2px solid #C2C7CB; }
+                                             QTabWidget::tab-bar { alignment: right; }
+                                             QTabBar::tab {
+                                                 background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                                                             stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,
+                                                                             stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);
+                                                 border: 2px solid #C4C4C3;
+                                                 border-bottom-color: #C2C7CB;                                                  border-top-left-radius: 4px;
+                                                 border-top-right-radius: 8px;
+                                                 border-top-left-radius: 8px;
+                                                 padding-left: 15px; }
+                                             QTabBar::tab:selected, QTabBar::tab:hover {
+                                                 background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                                                             stop: 0 #fafafa, stop: 0.4 #f4f4f4,
+                                                                             stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); }
+                                             QTabBar::tab:selected { border-color: #9B9B9B;
+                                                                     border-bottom-color: #C2C7CB; }
+                                               """))
+
 class DmTableWidget(QTableWidget):
     """surcharge de QTableWidget"""
     def __init__(self, parent = None):
@@ -381,8 +409,8 @@ class DmTableInventaire(DmTableWidget):
         self.connect(self, SIGNAL("itemClicked(QTableWidgetItem*)"), self.itemClique)
 
     def construire(self):
-        self.setColumnWidth(0, 0);self.setColumnWidth(1, 20);self.setColumnWidth(2, 70)
-        self.setColumnWidth(3, 241);self.setColumnWidth(4, 70);self.setColumnWidth(5, 70)
+        self.setColumnWidth(0, 20);self.setColumnWidth(1, 70)
+        self.setColumnWidth(2, 241);self.setColumnWidth(4, 60)
         self.setColumnWidth(6, 20)
 
     def ajouterObjet(self, objet):
@@ -411,13 +439,11 @@ class DmTableInventaire(DmTableWidget):
     def remplirLigne(self, ligne, objet):
         """remplit les cellules de la ligne avec les donnees de l'objet"""
         imgType = ["pieces.png", "btn_ModeCombat.png", "chimie.png", "diamant.png", "boite_outils.png"]
-        self.creerItem(ligne, 0, "{}{}".format(objet.typeObjet, objet.nom))
-        self.creerItem(ligne, 1, "", imgType[objet.typeObjet])
-        self.creerItem(ligne, 2, objet.quantite)
-        self.creerItem(ligne, 3, objet.nom)
-        self.creerItem(ligne, 4, objet.valeurTotale())
-        self.creerItem(ligne, 5, objet.poidsTotal())
-        self.creerItem(ligne, 6, "")
+        self.creerItem(ligne, 0, "", imgType[objet.typeObjet])
+        self.creerItem(ligne, 1, objet.quantite)
+        self.creerItem(ligne, 2, objet.nom)
+        self.creerItem(ligne, 3, objet.poidsTotal())
+        self.creerItem(ligne, 4, "")
                        
     def inventaire(self):
         """cree un inventaire a partir des donnees de la table"""
@@ -455,7 +481,6 @@ class DmTableInventaire(DmTableWidget):
         """filtre l'affichage des lignes par type d'objet"""
         for ligne in range(0, self.rowCount() - 1):
             self.setRowHidden(ligne, typeObjet >= 0 and typeObjet != self._inventaire[ligne].typeObjet )
-  
 
     def eventFilter(self, widget, event):
         if widget is self.viewport():

lib/ui/ecran_editionCombattant.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'editionCombattant.ui'
 #
-# Created: Tue Jun 23 17:42:33 2015
+# Created: Thu Jun 25 14:08:18 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -565,7 +565,7 @@ class Ui_edc_fenetre(object):
         self.page_invent = QtGui.QWidget()
         self.page_invent.setObjectName(_fromUtf8("page_invent"))
         self.edc_listeInventaire = DmTableInventaire(self.page_invent)
-        self.edc_listeInventaire.setGeometry(QtCore.QRect(0, 0, 491, 391))
+        self.edc_listeInventaire.setGeometry(QtCore.QRect(0, 29, 491, 368))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -590,20 +590,18 @@ class Ui_edc_fenetre(object):
         self.edc_listeInventaire.setShowGrid(True)
         self.edc_listeInventaire.setGridStyle(QtCore.Qt.SolidLine)
         self.edc_listeInventaire.setObjectName(_fromUtf8("edc_listeInventaire"))
-        self.edc_listeInventaire.setColumnCount(7)
+        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()
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
         font.setPointSize(7)
         font.setBold(True)
         font.setWeight(75)
         item.setFont(font)
-        self.edc_listeInventaire.setHorizontalHeaderItem(1, item)
+        self.edc_listeInventaire.setHorizontalHeaderItem(0, item)
         item = QtGui.QTableWidgetItem()
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
@@ -611,7 +609,7 @@ class Ui_edc_fenetre(object):
         font.setBold(True)
         font.setWeight(75)
         item.setFont(font)
-        self.edc_listeInventaire.setHorizontalHeaderItem(2, item)
+        self.edc_listeInventaire.setHorizontalHeaderItem(1, item)
         item = QtGui.QTableWidgetItem()
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
@@ -620,7 +618,7 @@ class Ui_edc_fenetre(object):
         font.setItalic(False)
         font.setWeight(75)
         item.setFont(font)
-        self.edc_listeInventaire.setHorizontalHeaderItem(3, item)
+        self.edc_listeInventaire.setHorizontalHeaderItem(2, item)
         item = QtGui.QTableWidgetItem()
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
@@ -631,7 +629,7 @@ class Ui_edc_fenetre(object):
         icon9 = QtGui.QIcon()
         icon9.addPixmap(QtGui.QPixmap(_fromUtf8("../../img/poids.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         item.setIcon(icon9)
-        self.edc_listeInventaire.setHorizontalHeaderItem(4, item)
+        self.edc_listeInventaire.setHorizontalHeaderItem(3, item)
         item = QtGui.QTableWidgetItem()
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
@@ -639,16 +637,7 @@ class Ui_edc_fenetre(object):
         font.setBold(True)
         font.setWeight(75)
         item.setFont(font)
-        self.edc_listeInventaire.setHorizontalHeaderItem(5, item)
-        item = QtGui.QTableWidgetItem()
-        font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Verdana"))
-        font.setPointSize(7)
-        item.setFont(font)
-        self.edc_listeInventaire.setHorizontalHeaderItem(6, item)
-        item = QtGui.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsDragEnabled|QtCore.Qt.ItemIsDropEnabled|QtCore.Qt.ItemIsUserCheckable|QtCore.Qt.ItemIsEnabled)
-        self.edc_listeInventaire.setItem(0, 0, item)
+        self.edc_listeInventaire.setHorizontalHeaderItem(4, item)
         item = QtGui.QTableWidgetItem()
         item.setTextAlignment(QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter|QtCore.Qt.AlignCenter)
         font = QtGui.QFont()
@@ -656,10 +645,10 @@ class Ui_edc_fenetre(object):
         font.setWeight(50)
         item.setFont(font)
         item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsDragEnabled|QtCore.Qt.ItemIsDropEnabled|QtCore.Qt.ItemIsEnabled)
-        self.edc_listeInventaire.setItem(0, 1, item)
+        self.edc_listeInventaire.setItem(0, 0, item)
         item = QtGui.QTableWidgetItem()
         item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsDragEnabled|QtCore.Qt.ItemIsDropEnabled|QtCore.Qt.ItemIsUserCheckable|QtCore.Qt.ItemIsEnabled)
-        self.edc_listeInventaire.setItem(0, 2, item)
+        self.edc_listeInventaire.setItem(0, 1, item)
         item = QtGui.QTableWidgetItem()
         font = QtGui.QFont()
         font.setFamily(_fromUtf8("Verdana"))
@@ -667,17 +656,14 @@ class Ui_edc_fenetre(object):
         font.setItalic(True)
         item.setFont(font)
         item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsDragEnabled|QtCore.Qt.ItemIsDropEnabled|QtCore.Qt.ItemIsUserCheckable|QtCore.Qt.ItemIsEnabled)
-        self.edc_listeInventaire.setItem(0, 3, item)
-        item = QtGui.QTableWidgetItem()
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsDragEnabled|QtCore.Qt.ItemIsDropEnabled|QtCore.Qt.ItemIsUserCheckable|QtCore.Qt.ItemIsEnabled)
-        self.edc_listeInventaire.setItem(0, 4, item)
+        self.edc_listeInventaire.setItem(0, 2, item)
         item = QtGui.QTableWidgetItem()
         item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsDragEnabled|QtCore.Qt.ItemIsDropEnabled|QtCore.Qt.ItemIsUserCheckable|QtCore.Qt.ItemIsEnabled)
-        self.edc_listeInventaire.setItem(0, 5, item)
+        self.edc_listeInventaire.setItem(0, 3, item)
         item = QtGui.QTableWidgetItem()
         item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsDragEnabled|QtCore.Qt.ItemIsDropEnabled|QtCore.Qt.ItemIsUserCheckable|QtCore.Qt.ItemIsEnabled)
-        self.edc_listeInventaire.setItem(0, 6, item)
-        self.edc_listeInventaire.horizontalHeader().setVisible(True)
+        self.edc_listeInventaire.setItem(0, 4, item)
+        self.edc_listeInventaire.horizontalHeader().setVisible(False)
         self.edc_listeInventaire.horizontalHeader().setCascadingSectionResizes(False)
         self.edc_listeInventaire.horizontalHeader().setDefaultSectionSize(60)
         self.edc_listeInventaire.horizontalHeader().setMinimumSectionSize(32)
@@ -696,87 +682,55 @@ class Ui_edc_fenetre(object):
         font.setItalic(True)
         self.edc_inventaire_poids.setFont(font)
         self.edc_inventaire_poids.setObjectName(_fromUtf8("edc_inventaire_poids"))
-        self.edc_filtreTypeObjet = QtGui.QTableWidget(self.page_invent)
-        self.edc_filtreTypeObjet.setGeometry(QtCore.QRect(320, 390, 171, 34))
+        self.edc_filtreTypeObjet = DmTabInventaire(self.page_invent)
+        self.edc_filtreTypeObjet.setGeometry(QtCore.QRect(0, 5, 491, 28))
         palette = QtGui.QPalette()
-        brush = QtGui.QBrush(QtGui.QColor(254, 254, 254, 150))
+        brush = QtGui.QBrush(QtGui.QColor(170, 0, 0, 100))
         brush.setStyle(QtCore.Qt.SolidPattern)
         palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Base, brush)
-        brush = QtGui.QBrush(QtGui.QColor(229, 229, 229))
-        brush.setStyle(QtCore.Qt.SolidPattern)
-        palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Highlight, brush)
-        brush = QtGui.QBrush(QtGui.QColor(254, 254, 254, 150))
+        brush = QtGui.QBrush(QtGui.QColor(170, 0, 0, 100))
         brush.setStyle(QtCore.Qt.SolidPattern)
         palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Base, brush)
-        brush = QtGui.QBrush(QtGui.QColor(229, 229, 229))
-        brush.setStyle(QtCore.Qt.SolidPattern)
-        palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Highlight, brush)
         brush = QtGui.QBrush(QtGui.QColor(240, 240, 240))
         brush.setStyle(QtCore.Qt.SolidPattern)
         palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
-        brush = QtGui.QBrush(QtGui.QColor(51, 153, 255))
-        brush.setStyle(QtCore.Qt.SolidPattern)
-        palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Highlight, brush)
         self.edc_filtreTypeObjet.setPalette(palette)
-        self.edc_filtreTypeObjet.setFrameShape(QtGui.QFrame.NoFrame)
-        self.edc_filtreTypeObjet.setFrameShadow(QtGui.QFrame.Plain)
-        self.edc_filtreTypeObjet.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.edc_filtreTypeObjet.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.edc_filtreTypeObjet.setIconSize(QtCore.QSize(20, 20))
+        font = QtGui.QFont()
+        font.setStyleStrategy(QtGui.QFont.PreferAntialias)
+        self.edc_filtreTypeObjet.setFont(font)
+        self.edc_filtreTypeObjet.setTabShape(QtGui.QTabWidget.Rounded)
+        self.edc_filtreTypeObjet.setIconSize(QtCore.QSize(19, 21))
         self.edc_filtreTypeObjet.setObjectName(_fromUtf8("edc_filtreTypeObjet"))
-        self.edc_filtreTypeObjet.setColumnCount(6)
-        self.edc_filtreTypeObjet.setRowCount(1)
-        item = QtGui.QTableWidgetItem()
-        self.edc_filtreTypeObjet.setVerticalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.edc_filtreTypeObjet.setHorizontalHeaderItem(0, item)
-        item = QtGui.QTableWidgetItem()
-        self.edc_filtreTypeObjet.setHorizontalHeaderItem(1, item)
-        item = QtGui.QTableWidgetItem()
-        self.edc_filtreTypeObjet.setHorizontalHeaderItem(2, item)
-        item = QtGui.QTableWidgetItem()
-        self.edc_filtreTypeObjet.setHorizontalHeaderItem(3, item)
-        item = QtGui.QTableWidgetItem()
-        self.edc_filtreTypeObjet.setHorizontalHeaderItem(4, item)
-        item = QtGui.QTableWidgetItem()
-        self.edc_filtreTypeObjet.setHorizontalHeaderItem(5, item)
-        item = QtGui.QTableWidgetItem()
-        item.setTextAlignment(QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter|QtCore.Qt.AlignCenter)
+        self.filtre_tout = QtGui.QWidget()
+        self.filtre_tout.setObjectName(_fromUtf8("filtre_tout"))
         icon10 = QtGui.QIcon()
         icon10.addPixmap(QtGui.QPixmap(_fromUtf8("img/etoile.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        item.setIcon(icon10)
-        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsEnabled)
-        self.edc_filtreTypeObjet.setItem(0, 0, item)
-        item = QtGui.QTableWidgetItem()
+        self.edc_filtreTypeObjet.addTab(self.filtre_tout, icon10, _fromUtf8(""))
+        self.filtre_0 = QtGui.QWidget()
+        self.filtre_0.setObjectName(_fromUtf8("filtre_0"))
         icon11 = QtGui.QIcon()
-        icon11.addPixmap(QtGui.QPixmap(_fromUtf8("../../img/pieces.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        item.setIcon(icon11)
-        self.edc_filtreTypeObjet.setItem(0, 1, item)
-        item = QtGui.QTableWidgetItem()
+        icon11.addPixmap(QtGui.QPixmap(_fromUtf8("img/pieces.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.edc_filtreTypeObjet.addTab(self.filtre_0, icon11, _fromUtf8(""))
+        self.filtre_1 = QtGui.QWidget()
+        self.filtre_1.setObjectName(_fromUtf8("filtre_1"))
         icon12 = QtGui.QIcon()
-        icon12.addPixmap(QtGui.QPixmap(_fromUtf8("../../img/armes.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        item.setIcon(icon12)
-        self.edc_filtreTypeObjet.setItem(0, 2, item)
-        item = QtGui.QTableWidgetItem()
+        icon12.addPixmap(QtGui.QPixmap(_fromUtf8("img/armes.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.edc_filtreTypeObjet.addTab(self.filtre_1, icon12, _fromUtf8(""))
+        self.filtre_2 = QtGui.QWidget()
+        self.filtre_2.setObjectName(_fromUtf8("filtre_2"))
         icon13 = QtGui.QIcon()
-        icon13.addPixmap(QtGui.QPixmap(_fromUtf8("../../img/chimie.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        item.setIcon(icon13)
-        self.edc_filtreTypeObjet.setItem(0, 3, item)
-        item = QtGui.QTableWidgetItem()
+        icon13.addPixmap(QtGui.QPixmap(_fromUtf8("img/chimie.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.edc_filtreTypeObjet.addTab(self.filtre_2, icon13, _fromUtf8(""))
+        self.filtre_3 = QtGui.QWidget()
+        self.filtre_3.setObjectName(_fromUtf8("filtre_3"))
         icon14 = QtGui.QIcon()
-        icon14.addPixmap(QtGui.QPixmap(_fromUtf8("../../img/diamant.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        item.setIcon(icon14)
-        self.edc_filtreTypeObjet.setItem(0, 4, item)
-        item = QtGui.QTableWidgetItem()
+        icon14.addPixmap(QtGui.QPixmap(_fromUtf8("img/diamant.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.edc_filtreTypeObjet.addTab(self.filtre_3, icon14, _fromUtf8(""))
+        self.filtre_4 = QtGui.QWidget()
+        self.filtre_4.setObjectName(_fromUtf8("filtre_4"))
         icon15 = QtGui.QIcon()
-        icon15.addPixmap(QtGui.QPixmap(_fromUtf8("../../img/boite_outils.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        item.setIcon(icon15)
-        self.edc_filtreTypeObjet.setItem(0, 5, item)
-        self.edc_filtreTypeObjet.horizontalHeader().setVisible(False)
-        self.edc_filtreTypeObjet.horizontalHeader().setDefaultSectionSize(29)
-        self.edc_filtreTypeObjet.horizontalHeader().setMinimumSectionSize(42)
-        self.edc_filtreTypeObjet.verticalHeader().setVisible(False)
-        self.edc_filtreTypeObjet.verticalHeader().setDefaultSectionSize(34)
+        icon15.addPixmap(QtGui.QPixmap(_fromUtf8("img/boite_outils.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.edc_filtreTypeObjet.addTab(self.filtre_4, icon15, _fromUtf8(""))
         self.edc_pages.addWidget(self.page_invent)
         self.page_notes = QtGui.QWidget()
         self.page_notes.setObjectName(_fromUtf8("page_notes"))
@@ -1106,6 +1060,7 @@ class Ui_edc_fenetre(object):
 
         self.retranslateUi(edc_fenetre)
         self.edc_pages.setCurrentIndex(4)
+        self.edc_filtreTypeObjet.setCurrentIndex(3)
         QtCore.QObject.connect(self.edc_menu, QtCore.SIGNAL(_fromUtf8("cellClicked(int,int)")), self.edc_pages.setCurrentIndex)
         QtCore.QMetaObject.connectSlotsByName(edc_fenetre)
 
@@ -1162,43 +1117,22 @@ class Ui_edc_fenetre(object):
         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", "tri", None))
-        item = self.edc_listeInventaire.horizontalHeaderItem(1)
         item.setText(_translate("edc_fenetre", "Type", None))
-        item = self.edc_listeInventaire.horizontalHeaderItem(2)
+        item = self.edc_listeInventaire.horizontalHeaderItem(1)
         item.setText(_translate("edc_fenetre", "Quantité", None))
-        item = self.edc_listeInventaire.horizontalHeaderItem(3)
+        item = self.edc_listeInventaire.horizontalHeaderItem(2)
         item.setText(_translate("edc_fenetre", "Objet", None))
-        item = self.edc_listeInventaire.horizontalHeaderItem(5)
-        item.setText(_translate("edc_fenetre", " ", None))
-        item = self.edc_listeInventaire.horizontalHeaderItem(6)
-        item.setText(_translate("edc_fenetre", " ", None))
+        item = self.edc_listeInventaire.horizontalHeaderItem(4)
+        item.setText(_translate("edc_fenetre", "...", None))
         __sortingEnabled = self.edc_listeInventaire.isSortingEnabled()
         self.edc_listeInventaire.setSortingEnabled(False)
-        item = self.edc_listeInventaire.item(0, 1)
+        item = self.edc_listeInventaire.item(0, 0)
         item.setText(_translate("edc_fenetre", "*", None))
-        item = self.edc_listeInventaire.item(0, 3)
+        item = self.edc_listeInventaire.item(0, 2)
         item.setText(_translate("edc_fenetre", "(Cliquer pour ajouter un item)", None))
         self.edc_listeInventaire.setSortingEnabled(__sortingEnabled)
         self.label.setText(_translate("edc_fenetre", "Poids total transporté :", None))
         self.edc_inventaire_poids.setText(_translate("edc_fenetre", "... kg", None))
-        item = self.edc_filtreTypeObjet.verticalHeaderItem(0)
-        item.setText(_translate("edc_fenetre", "Nouvelle ligne", None))
-        item = self.edc_filtreTypeObjet.horizontalHeaderItem(0)
-        item.setText(_translate("edc_fenetre", "tout", None))
-        item = self.edc_filtreTypeObjet.horizontalHeaderItem(1)
-        item.setText(_translate("edc_fenetre", "monnaie", None))
-        item = self.edc_filtreTypeObjet.horizontalHeaderItem(2)
-        item.setText(_translate("edc_fenetre", "armes", None))
-        item = self.edc_filtreTypeObjet.horizontalHeaderItem(3)
-        item.setText(_translate("edc_fenetre", "conso", None))
-        item = self.edc_filtreTypeObjet.horizontalHeaderItem(4)
-        item.setText(_translate("edc_fenetre", "butin", None))
-        item = self.edc_filtreTypeObjet.horizontalHeaderItem(5)
-        item.setText(_translate("edc_fenetre", "autre", None))
-        __sortingEnabled = self.edc_filtreTypeObjet.isSortingEnabled()
-        self.edc_filtreTypeObjet.setSortingEnabled(False)
-        self.edc_filtreTypeObjet.setSortingEnabled(__sortingEnabled)
         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))
@@ -1217,7 +1151,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, DmTableInventaire, DmTableMenu, DmLabel, DmLineEdit
+from dm import DmTabInventaire, DmLineEdit, DmLabel, DmLabelChoixImage, DmTableMenu, DmTableInventaire
 
 if __name__ == "__main__":
     import sys

lib/ui/ecran_editionObjet.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'editionObjet.ui'
 #
-# Created: Fri Jun 19 12:49:18 2015
+# Created: Thu Jun 25 14:28:52 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -26,9 +26,12 @@ except AttributeError:
 class Ui_eo_fenetre(object):
     def setupUi(self, eo_fenetre):
         eo_fenetre.setObjectName(_fromUtf8("eo_fenetre"))
-        eo_fenetre.resize(479, 237)
+        eo_fenetre.resize(498, 263)
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        eo_fenetre.setFont(font)
         self.eo_nom = DmLineEdit(eo_fenetre)
-        self.eo_nom.setGeometry(QtCore.QRect(70, 10, 241, 31))
+        self.eo_nom.setGeometry(QtCore.QRect(140, 18, 321, 31))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -42,10 +45,10 @@ class Ui_eo_fenetre(object):
         self.eo_nom.setPalette(palette)
         self.eo_nom.setObjectName(_fromUtf8("eo_nom"))
         self.label = QtGui.QLabel(eo_fenetre)
-        self.label.setGeometry(QtCore.QRect(30, 12, 41, 21))
+        self.label.setGeometry(QtCore.QRect(100, 20, 41, 21))
         self.label.setObjectName(_fromUtf8("label"))
         self.eo_quantite = QtGui.QSpinBox(eo_fenetre)
-        self.eo_quantite.setGeometry(QtCore.QRect(90, 50, 71, 31))
+        self.eo_quantite.setGeometry(QtCore.QRect(200, 80, 91, 31))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -61,10 +64,10 @@ class Ui_eo_fenetre(object):
         self.eo_quantite.setProperty("value", 1)
         self.eo_quantite.setObjectName(_fromUtf8("eo_quantite"))
         self.label_2 = QtGui.QLabel(eo_fenetre)
-        self.label_2.setGeometry(QtCore.QRect(30, 50, 61, 31))
+        self.label_2.setGeometry(QtCore.QRect(120, 80, 71, 31))
         self.label_2.setObjectName(_fromUtf8("label_2"))
-        self.eo_poids = QtGui.QSpinBox(eo_fenetre)
-        self.eo_poids.setGeometry(QtCore.QRect(130, 140, 71, 31))
+        self.eo_poids = QtGui.QDoubleSpinBox(eo_fenetre)
+        self.eo_poids.setGeometry(QtCore.QRect(150, 140, 71, 31))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -76,17 +79,18 @@ class Ui_eo_fenetre(object):
         brush.setStyle(QtCore.Qt.SolidPattern)
         palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
         self.eo_poids.setPalette(palette)
-        self.eo_poids.setMaximum(1000000)
-        self.eo_poids.setProperty("value", 1)
+        self.eo_poids.setDecimals(2)
+        self.eo_poids.setMaximum(99999999.99)
+        self.eo_poids.setSingleStep(1.0)
         self.eo_poids.setObjectName(_fromUtf8("eo_poids"))
         self.label_3 = QtGui.QLabel(eo_fenetre)
         self.label_3.setGeometry(QtCore.QRect(30, 140, 101, 31))
         self.label_3.setObjectName(_fromUtf8("label_3"))
         self.label_4 = QtGui.QLabel(eo_fenetre)
-        self.label_4.setGeometry(QtCore.QRect(250, 140, 101, 31))
+        self.label_4.setGeometry(QtCore.QRect(250, 140, 111, 31))
         self.label_4.setObjectName(_fromUtf8("label_4"))
-        self.eo_valeur = QtGui.QSpinBox(eo_fenetre)
-        self.eo_valeur.setGeometry(QtCore.QRect(350, 140, 71, 31))
+        self.eo_valeur = QtGui.QDoubleSpinBox(eo_fenetre)
+        self.eo_valeur.setGeometry(QtCore.QRect(370, 140, 71, 31))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -98,53 +102,70 @@ class Ui_eo_fenetre(object):
         brush.setStyle(QtCore.Qt.SolidPattern)
         palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
         self.eo_valeur.setPalette(palette)
-        self.eo_valeur.setMaximum(1000000)
-        self.eo_valeur.setProperty("value", 1)
+        self.eo_valeur.setMaximum(999999999.99)
         self.eo_valeur.setObjectName(_fromUtf8("eo_valeur"))
         self.eo_consommable = QtGui.QCheckBox(eo_fenetre)
-        self.eo_consommable.setGeometry(QtCore.QRect(310, 50, 101, 17))
+        self.eo_consommable.setGeometry(QtCore.QRect(310, 180, 161, 17))
         self.eo_consommable.setObjectName(_fromUtf8("eo_consommable"))
-        self.label_5 = QtGui.QLabel(eo_fenetre)
-        self.label_5.setGeometry(QtCore.QRect(280, 70, 211, 41))
-        font = QtGui.QFont()
-        font.setItalic(True)
-        self.label_5.setFont(font)
-        self.label_5.setObjectName(_fromUtf8("label_5"))
         self.eo_enregistrer = QtGui.QPushButton(eo_fenetre)
-        self.eo_enregistrer.setGeometry(QtCore.QRect(350, 190, 111, 31))
+        self.eo_enregistrer.setGeometry(QtCore.QRect(350, 220, 111, 31))
         self.eo_enregistrer.setObjectName(_fromUtf8("eo_enregistrer"))
         self.eo_annuler = QtGui.QPushButton(eo_fenetre)
-        self.eo_annuler.setGeometry(QtCore.QRect(230, 190, 111, 31))
+        self.eo_annuler.setGeometry(QtCore.QRect(230, 220, 111, 31))
         self.eo_annuler.setObjectName(_fromUtf8("eo_annuler"))
         self.eo_type = QtGui.QComboBox(eo_fenetre)
-        self.eo_type.setGeometry(QtCore.QRect(110, 90, 131, 31))
+        self.eo_type.setGeometry(QtCore.QRect(20, 10, 61, 51))
         font = QtGui.QFont()
         font.setBold(True)
         font.setWeight(75)
         self.eo_type.setFont(font)
+        self.eo_type.setIconSize(QtCore.QSize(24, 24))
         self.eo_type.setObjectName(_fromUtf8("eo_type"))
-        self.eo_type.addItem(_fromUtf8(""))
-        self.eo_type.addItem(_fromUtf8(""))
-        self.eo_type.addItem(_fromUtf8(""))
-        self.eo_type.addItem(_fromUtf8(""))
-        self.eo_type.addItem(_fromUtf8(""))
-        self.label_6 = QtGui.QLabel(eo_fenetre)
-        self.label_6.setGeometry(QtCore.QRect(30, 90, 71, 31))
-        self.label_6.setObjectName(_fromUtf8("label_6"))
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(_fromUtf8("img/pieces.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.eo_type.addItem(icon, _fromUtf8(""))
+        self.eo_type.setItemText(0, _fromUtf8(""))
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap(_fromUtf8("img/armes.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.eo_type.addItem(icon1, _fromUtf8(""))
+        self.eo_type.setItemText(1, _fromUtf8(""))
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(QtGui.QPixmap(_fromUtf8("img/chimie.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.eo_type.addItem(icon2, _fromUtf8(""))
+        self.eo_type.setItemText(2, _fromUtf8(""))
+        icon3 = QtGui.QIcon()
+        icon3.addPixmap(QtGui.QPixmap(_fromUtf8("img/diamant.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.eo_type.addItem(icon3, _fromUtf8(""))
+        self.eo_type.setItemText(3, _fromUtf8(""))
+        icon4 = QtGui.QIcon()
+        icon4.addPixmap(QtGui.QPixmap(_fromUtf8("img/boite_outils.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.eo_type.addItem(icon4, _fromUtf8(""))
+        self.eo_type.setItemText(4, _fromUtf8(""))
         self.eo_ajouter = QtGui.QPushButton(eo_fenetre)
-        self.eo_ajouter.setGeometry(QtCore.QRect(180, 50, 31, 31))
+        self.eo_ajouter.setGeometry(QtCore.QRect(350, 80, 31, 31))
+        font = QtGui.QFont()
+        font.setPointSize(11)
+        font.setBold(True)
+        font.setWeight(75)
+        self.eo_ajouter.setFont(font)
         self.eo_ajouter.setObjectName(_fromUtf8("eo_ajouter"))
         self.eo_retirer = QtGui.QPushButton(eo_fenetre)
-        self.eo_retirer.setGeometry(QtCore.QRect(220, 50, 31, 31))
+        self.eo_retirer.setGeometry(QtCore.QRect(310, 80, 31, 31))
+        font = QtGui.QFont()
+        font.setPointSize(13)
+        font.setBold(True)
+        font.setWeight(75)
+        self.eo_retirer.setFont(font)
         self.eo_retirer.setObjectName(_fromUtf8("eo_retirer"))
         self.eo_monnaie = DmLabel(eo_fenetre)
-        self.eo_monnaie.setGeometry(QtCore.QRect(430, 150, 46, 13))
+        self.eo_monnaie.setGeometry(QtCore.QRect(445, 143, 51, 20))
         self.eo_monnaie.setObjectName(_fromUtf8("eo_monnaie"))
         self.eo_supprimer = QtGui.QPushButton(eo_fenetre)
-        self.eo_supprimer.setGeometry(QtCore.QRect(10, 190, 111, 31))
+        self.eo_supprimer.setGeometry(QtCore.QRect(20, 220, 111, 31))
         self.eo_supprimer.setObjectName(_fromUtf8("eo_supprimer"))
 
         self.retranslateUi(eo_fenetre)
+        self.eo_type.setCurrentIndex(4)
         QtCore.QMetaObject.connectSlotsByName(eo_fenetre)
 
     def retranslateUi(self, eo_fenetre):
@@ -153,18 +174,9 @@ class Ui_eo_fenetre(object):
         self.label_2.setText(_translate("eo_fenetre", "Quantité : ", None))
         self.label_3.setText(_translate("eo_fenetre", "Poids d\'un objet : ", None))
         self.label_4.setText(_translate("eo_fenetre", "Valeur d\'un objet : ", None))
-        self.eo_consommable.setText(_translate("eo_fenetre", "Consommable", None))
-        self.label_5.setText(_translate("eo_fenetre", "(la quantité diminue de 1 à l\'utilisation;\n"
-"seuls les consommables apparaissent\n"
-"dans l\'inventaire rapide lors d\'iun combat)", None))
+        self.eo_consommable.setText(_translate("eo_fenetre", "Disparait à l\'utilisation ? ", None))
         self.eo_enregistrer.setText(_translate("eo_fenetre", "Enregistrer", None))
         self.eo_annuler.setText(_translate("eo_fenetre", "Annuler", None))
-        self.eo_type.setItemText(0, _translate("eo_fenetre", "Monnaie", None))
-        self.eo_type.setItemText(1, _translate("eo_fenetre", "Arme / armure", None))
-        self.eo_type.setItemText(2, _translate("eo_fenetre", "Consommable", None))
-        self.eo_type.setItemText(3, _translate("eo_fenetre", "Butin", None))
-        self.eo_type.setItemText(4, _translate("eo_fenetre", "Autre", None))
-        self.label_6.setText(_translate("eo_fenetre", "Type d\'objet : ", None))
         self.eo_ajouter.setText(_translate("eo_fenetre", "+", None))
         self.eo_retirer.setText(_translate("eo_fenetre", "-", None))
         self.eo_monnaie.setText(_translate("eo_fenetre", "po", None))

lib/ui/ecran_editionQuantiteObjet.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'dial_editerQuantiteObjet.ui'
+#
+# Created: Thu Jun 25 14:40:17 2015
+#      by: PyQt4 UI code generator 4.10.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
+
+class Ui_eoq_fenetre(object):
+    def setupUi(self, eoq_fenetre):
+        eoq_fenetre.setObjectName(_fromUtf8("eoq_fenetre"))
+        eoq_fenetre.resize(214, 51)
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        eoq_fenetre.setFont(font)
+        self.eoq_titre = DmLabel(eoq_fenetre)
+        self.eoq_titre.setGeometry(QtCore.QRect(10, 5, 61, 41))
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.eoq_titre.setFont(font)
+        self.eoq_titre.setObjectName(_fromUtf8("eoq_titre"))
+        self.eoq_valeur = QtGui.QSpinBox(eoq_fenetre)
+        self.eoq_valeur.setGeometry(QtCore.QRect(80, 10, 81, 31))
+        self.eoq_valeur.setMaximum(999999999)
+        self.eoq_valeur.setObjectName(_fromUtf8("eoq_valeur"))
+        self.eoq_ok = QtGui.QToolButton(eoq_fenetre)
+        self.eoq_ok.setGeometry(QtCore.QRect(170, 10, 31, 31))
+        self.eoq_ok.setText(_fromUtf8(""))
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(_fromUtf8("img/flecheDroite.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.eoq_ok.setIcon(icon)
+        self.eoq_ok.setObjectName(_fromUtf8("eoq_ok"))
+
+        self.retranslateUi(eoq_fenetre)
+        QtCore.QMetaObject.connectSlotsByName(eoq_fenetre)
+
+    def retranslateUi(self, eoq_fenetre):
+        eoq_fenetre.setWindowTitle(_translate("eoq_fenetre", "Modifier la quantité", None))
+        self.eoq_titre.setText(_translate("eoq_fenetre", "Retirer : ", None))
+
+from dm import DmLabel
+
+if __name__ == "__main__":
+    import sys
+    app = QtGui.QApplication(sys.argv)
+    eoq_fenetre = QtGui.QDialog()
+    ui = Ui_eoq_fenetre()
+    ui.setupUi(eoq_fenetre)
+    eoq_fenetre.show()
+    sys.exit(app.exec_())
+

lib/ui/editionCombattant.ui

@@ -508,7 +508,7 @@
           </font>
          </property>
          <property name="currentIndex">
-          <number>4</number>
+          <number>3</number>
          </property>
          <widget class="QWidget" name="page_nom">
           <widget class="DmLineEdit" name="edc_nom">
@@ -1550,9 +1550,9 @@ image</string>
            <property name="geometry">
             <rect>
              <x>0</x>
-             <y>20</y>
+             <y>29</y>
              <width>491</width>
-             <height>371</height>
+             <height>368</height>
             </rect>
            </property>
            <property name="palette">
@@ -1628,7 +1628,7 @@ image</string>
             <bool>true</bool>
            </property>
            <attribute name="horizontalHeaderVisible">
-            <bool>true</bool>
+            <bool>false</bool>
            </attribute>
            <attribute name="horizontalHeaderCascadingSectionResizes">
             <bool>false</bool>
@@ -1653,11 +1653,6 @@ image</string>
              <string>Nouvelle ligne</string>
             </property>
            </row>
-           <column>
-            <property name="text">
-             <string>tri</string>
-            </property>
-           </column>
            <column>
             <property name="text">
              <string>Type</string>
@@ -1717,7 +1712,7 @@ image</string>
            </column>
            <column>
             <property name="text">
-             <string/>
+             <string>...</string>
             </property>
             <property name="font">
              <font>
@@ -1728,26 +1723,7 @@ image</string>
              </font>
             </property>
            </column>
-           <column>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="font">
-             <font>
-              <family>Verdana</family>
-              <pointsize>7</pointsize>
-             </font>
-            </property>
-           </column>
            <item row="0" column="0">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="flags">
-             <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsUserCheckable|ItemIsEnabled</set>
-            </property>
-           </item>
-           <item row="0" column="1">
             <property name="text">
              <string>*</string>
             </property>
@@ -1764,7 +1740,7 @@ image</string>
              <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsEnabled</set>
             </property>
            </item>
-           <item row="0" column="2">
+           <item row="0" column="1">
             <property name="text">
              <string/>
             </property>
@@ -1772,7 +1748,7 @@ image</string>
              <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsUserCheckable|ItemIsEnabled</set>
             </property>
            </item>
-           <item row="0" column="3">
+           <item row="0" column="2">
             <property name="text">
              <string>(Cliquer pour ajouter un item)</string>
             </property>
@@ -1787,15 +1763,7 @@ image</string>
              <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsUserCheckable|ItemIsEnabled</set>
             </property>
            </item>
-           <item row="0" column="4">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="flags">
-             <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsUserCheckable|ItemIsEnabled</set>
-            </property>
-           </item>
-           <item row="0" column="5">
+           <item row="0" column="3">
             <property name="text">
              <string/>
             </property>
@@ -1803,7 +1771,7 @@ image</string>
              <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsUserCheckable|ItemIsEnabled</set>
             </property>
            </item>
-           <item row="0" column="6">
+           <item row="0" column="4">
             <property name="text">
              <string/>
             </property>
@@ -1848,13 +1816,13 @@ image</string>
             <string>... kg</string>
            </property>
           </widget>
-          <widget class="QTableWidget" name="edc_filtreTypeObjet">
+          <widget class="DmTabInventaire" name="edc_filtreTypeObjet">
            <property name="geometry">
             <rect>
-             <x>320</x>
-             <y>390</y>
-             <width>171</width>
-             <height>34</height>
+             <x>0</x>
+             <y>5</y>
+             <width>491</width>
+             <height>28</height>
             </rect>
            </property>
            <property name="palette">
@@ -1862,19 +1830,10 @@ image</string>
              <active>
               <colorrole role="Base">
                <brush brushstyle="SolidPattern">
-                <color alpha="150">
-                 <red>254</red>
-                 <green>254</green>
-                 <blue>254</blue>
-                </color>
-               </brush>
-              </colorrole>
-              <colorrole role="Highlight">
-               <brush brushstyle="SolidPattern">
-                <color alpha="255">
-                 <red>229</red>
-                 <green>229</green>
-                 <blue>229</blue>
+                <color alpha="100">
+                 <red>170</red>
+                 <green>0</green>
+                 <blue>0</blue>
                 </color>
                </brush>
               </colorrole>
@@ -1882,19 +1841,10 @@ image</string>
              <inactive>
               <colorrole role="Base">
                <brush brushstyle="SolidPattern">
-                <color alpha="150">
-                 <red>254</red>
-                 <green>254</green>
-                 <blue>254</blue>
-                </color>
-               </brush>
-              </colorrole>
-              <colorrole role="Highlight">
-               <brush brushstyle="SolidPattern">
-                <color alpha="255">
-                 <red>229</red>
-                 <green>229</green>
-                 <blue>229</blue>
+                <color alpha="100">
+                 <red>170</red>
+                 <green>0</green>
+                 <blue>0</blue>
                 </color>
                </brush>
               </colorrole>
@@ -1909,190 +1859,78 @@ image</string>
                 </color>
                </brush>
               </colorrole>
-              <colorrole role="Highlight">
-               <brush brushstyle="SolidPattern">
-                <color alpha="255">
-                 <red>51</red>
-                 <green>153</green>
-                 <blue>255</blue>
-                </color>
-               </brush>
-              </colorrole>
              </disabled>
             </palette>
            </property>
-           <property name="frameShape">
-            <enum>QFrame::NoFrame</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Plain</enum>
+           <property name="font">
+            <font>
+             <stylestrategy>PreferAntialias</stylestrategy>
+            </font>
            </property>
-           <property name="verticalScrollBarPolicy">
-            <enum>Qt::ScrollBarAlwaysOff</enum>
+           <property name="tabShape">
+            <enum>QTabWidget::Rounded</enum>
            </property>
-           <property name="horizontalScrollBarPolicy">
-            <enum>Qt::ScrollBarAlwaysOff</enum>
+           <property name="currentIndex">
+            <number>3</number>
            </property>
            <property name="iconSize">
             <size>
-             <width>20</width>
-             <height>20</height>
+             <width>19</width>
+             <height>21</height>
             </size>
            </property>
-           <attribute name="horizontalHeaderVisible">
-            <bool>false</bool>
-           </attribute>
-           <attribute name="horizontalHeaderDefaultSectionSize">
-            <number>29</number>
-           </attribute>
-           <attribute name="horizontalHeaderMinimumSectionSize">
-            <number>42</number>
-           </attribute>
-           <attribute name="verticalHeaderVisible">
-            <bool>false</bool>
-           </attribute>
-           <attribute name="verticalHeaderDefaultSectionSize">
-            <number>34</number>
-           </attribute>
-           <row>
-            <property name="text">
-             <string>Nouvelle ligne</string>
-            </property>
-           </row>
-           <column>
-            <property name="text">
-             <string>tout</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>monnaie</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>armes</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>conso</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>butin</string>
-            </property>
-           </column>
-           <column>
-            <property name="text">
-             <string>autre</string>
-            </property>
-           </column>
-           <item row="0" column="0">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="textAlignment">
-             <set>AlignHCenter|AlignVCenter|AlignCenter</set>
-            </property>
-            <property name="icon">
+           <widget class="QWidget" name="filtre_tout">
+            <attribute name="icon">
              <iconset>
               <normaloff>img/etoile.png</normaloff>img/etoile.png</iconset>
-            </property>
-            <property name="flags">
-             <set>ItemIsSelectable|ItemIsEnabled</set>
-            </property>
-           </item>
-           <item row="0" column="1">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>../../img/pieces.png</normaloff>../../img/pieces.png</iconset>
-            </property>
-           </item>
-           <item row="0" column="2">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>../../img/armes.png</normaloff>../../img/armes.png</iconset>
-            </property>
-           </item>
-           <item row="0" column="3">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>../../img/chimie.png</normaloff>../../img/chimie.png</iconset>
-            </property>
-           </item>
-           <item row="0" column="4">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>../../img/diamant.png</normaloff>../../img/diamant.png</iconset>
-            </property>
-           </item>
-           <item row="0" column="5">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>../../img/boite_outils.png</normaloff>../../img/boite_outils.png</iconset>
-            </property>
-           </item>
-          </widget>
-          <widget class="QTabWidget" name="tabWidget">
-           <property name="geometry">
-            <rect>
-             <x>0</x>
-             <y>0</y>
-             <width>491</width>
-             <height>21</height>
-            </rect>
-           </property>
-           <property name="tabShape">
-            <enum>QTabWidget::Rounded</enum>
-           </property>
-           <property name="currentIndex">
-            <number>3</number>
-           </property>
-           <widget class="QWidget" name="tab">
+            </attribute>
             <attribute name="title">
-             <string>Tab 1</string>
+             <string/>
             </attribute>
            </widget>
-           <widget class="QWidget" name="tab_4">
+           <widget class="QWidget" name="filtre_0">
+            <attribute name="icon">
+             <iconset>
+              <normaloff>img/pieces.png</normaloff>img/pieces.png</iconset>
+            </attribute>
             <attribute name="title">
-             <string>Page</string>
+             <string/>
             </attribute>
            </widget>
-           <widget class="QWidget" name="tab_5">
+           <widget class="QWidget" name="filtre_1">
+            <attribute name="icon">
+             <iconset>
+              <normaloff>img/armes.png</normaloff>img/armes.png</iconset>
+            </attribute>
             <attribute name="title">
-             <string>Page</string>
+             <string/>
             </attribute>
            </widget>
-           <widget class="QWidget" name="tab_6">
+           <widget class="QWidget" name="filtre_2">
+            <attribute name="icon">
+             <iconset>
+              <normaloff>img/chimie.png</normaloff>img/chimie.png</iconset>
+            </attribute>
             <attribute name="title">
-             <string>Page</string>
+             <string/>
             </attribute>
            </widget>
-           <widget class="QWidget" name="tab_3">
+           <widget class="QWidget" name="filtre_3">
+            <attribute name="icon">
+             <iconset>
+              <normaloff>img/diamant.png</normaloff>img/diamant.png</iconset>
+            </attribute>
             <attribute name="title">
-             <string>Page</string>
+             <string/>
             </attribute>
            </widget>
-           <widget class="QWidget" name="tab_2">
+           <widget class="QWidget" name="filtre_4">
+            <attribute name="icon">
+             <iconset>
+              <normaloff>img/boite_outils.png</normaloff>img/boite_outils.png</iconset>
+            </attribute>
             <attribute name="title">
-             <string>Tab 2</string>
+             <string/>
             </attribute>
            </widget>
           </widget>
@@ -2100,7 +1938,6 @@ image</string>
           <zorder>edc_listeInventaire</zorder>
           <zorder>label</zorder>
           <zorder>edc_inventaire_poids</zorder>
-          <zorder>tabWidget</zorder>
          </widget>
          <widget class="QWidget" name="page_notes">
           <widget class="DmLineEdit" name="edc_detail_age">
@@ -3080,6 +2917,12 @@ parlées : </string>
    <extends>QLabel</extends>
    <header location="global">dm.h</header>
   </customwidget>
+  <customwidget>
+   <class>DmTabInventaire</class>
+   <extends>QTabWidget</extends>
+   <header>dm.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>

lib/ui/editionObjet.ui

@@ -6,19 +6,24 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>479</width>
-    <height>237</height>
+    <width>498</width>
+    <height>263</height>
    </rect>
   </property>
+  <property name="font">
+   <font>
+    <family>Verdana</family>
+   </font>
+  </property>
   <property name="windowTitle">
    <string>Créer / éditer un objet</string>
   </property>
   <widget class="DmLineEdit" name="eo_nom">
    <property name="geometry">
     <rect>
-     <x>70</x>
-     <y>10</y>
-     <width>241</width>
+     <x>140</x>
+     <y>18</y>
+     <width>321</width>
      <height>31</height>
     </rect>
    </property>
@@ -63,8 +68,8 @@
   <widget class="QLabel" name="label">
    <property name="geometry">
     <rect>
-     <x>30</x>
-     <y>12</y>
+     <x>100</x>
+     <y>20</y>
      <width>41</width>
      <height>21</height>
     </rect>
@@ -76,9 +81,9 @@
   <widget class="QSpinBox" name="eo_quantite">
    <property name="geometry">
     <rect>
-     <x>90</x>
-     <y>50</y>
-     <width>71</width>
+     <x>200</x>
+     <y>80</y>
+     <width>91</width>
      <height>31</height>
     </rect>
    </property>
@@ -129,9 +134,9 @@
   <widget class="QLabel" name="label_2">
    <property name="geometry">
     <rect>
-     <x>30</x>
-     <y>50</y>
-     <width>61</width>
+     <x>120</x>
+     <y>80</y>
+     <width>71</width>
      <height>31</height>
     </rect>
    </property>
@@ -142,7 +147,7 @@
   <widget class="QDoubleSpinBox" name="eo_poids">
    <property name="geometry">
     <rect>
-     <x>130</x>
+     <x>150</x>
      <y>140</y>
      <width>71</width>
      <height>31</height>
@@ -213,7 +218,7 @@
     <rect>
      <x>250</x>
      <y>140</y>
-     <width>101</width>
+     <width>111</width>
      <height>31</height>
     </rect>
    </property>
@@ -224,7 +229,7 @@
   <widget class="QDoubleSpinBox" name="eo_valeur">
    <property name="geometry">
     <rect>
-     <x>350</x>
+     <x>370</x>
      <y>140</y>
      <width>71</width>
      <height>31</height>
@@ -275,40 +280,20 @@
    <property name="geometry">
     <rect>
      <x>310</x>
-     <y>50</y>
-     <width>101</width>
+     <y>180</y>
+     <width>161</width>
      <height>17</height>
     </rect>
    </property>
    <property name="text">
-    <string>Consommable</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_5">
-   <property name="geometry">
-    <rect>
-     <x>280</x>
-     <y>70</y>
-     <width>211</width>
-     <height>41</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <italic>true</italic>
-    </font>
-   </property>
-   <property name="text">
-    <string>(la quantité diminue de 1 à l'utilisation;
-seuls les consommables apparaissent
-dans l'inventaire rapide lors d'iun combat)</string>
+    <string>Disparait à l'utilisation ? </string>
    </property>
   </widget>
   <widget class="QPushButton" name="eo_enregistrer">
    <property name="geometry">
     <rect>
      <x>350</x>
-     <y>190</y>
+     <y>220</y>
      <width>111</width>
      <height>31</height>
     </rect>
@@ -321,7 +306,7 @@ dans l'inventaire rapide lors d'iun combat)</string>
    <property name="geometry">
     <rect>
      <x>230</x>
-     <y>190</y>
+     <y>220</y>
      <width>111</width>
      <height>31</height>
     </rect>
@@ -333,10 +318,10 @@ dans l'inventaire rapide lors d'iun combat)</string>
   <widget class="QComboBox" name="eo_type">
    <property name="geometry">
     <rect>
-     <x>110</x>
-     <y>90</y>
-     <width>131</width>
-     <height>31</height>
+     <x>20</x>
+     <y>10</y>
+     <width>61</width>
+     <height>51</height>
     </rect>
    </property>
    <property name="font">
@@ -345,54 +330,77 @@ dans l'inventaire rapide lors d'iun combat)</string>
      <bold>true</bold>
     </font>
    </property>
+   <property name="currentIndex">
+    <number>4</number>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>24</width>
+     <height>24</height>
+    </size>
+   </property>
    <item>
     <property name="text">
-     <string>Monnaie</string>
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset>
+      <normaloff>img/pieces.png</normaloff>img/pieces.png</iconset>
     </property>
    </item>
    <item>
     <property name="text">
-     <string>Arme / armure</string>
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset>
+      <normaloff>img/armes.png</normaloff>img/armes.png</iconset>
     </property>
    </item>
    <item>
     <property name="text">
-     <string>Consommable</string>
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset>
+      <normaloff>img/chimie.png</normaloff>img/chimie.png</iconset>
     </property>
    </item>
    <item>
     <property name="text">
-     <string>Butin</string>
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset>
+      <normaloff>img/diamant.png</normaloff>img/diamant.png</iconset>
     </property>
    </item>
    <item>
     <property name="text">
-     <string>Autre</string>
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset>
+      <normaloff>img/boite_outils.png</normaloff>img/boite_outils.png</iconset>
     </property>
    </item>
   </widget>
-  <widget class="QLabel" name="label_6">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>90</y>
-     <width>71</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Type d'objet : </string>
-   </property>
-  </widget>
   <widget class="QPushButton" name="eo_ajouter">
    <property name="geometry">
     <rect>
-     <x>180</x>
-     <y>50</y>
+     <x>350</x>
+     <y>80</y>
      <width>31</width>
      <height>31</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>11</pointsize>
+     <weight>75</weight>
+     <bold>true</bold>
+    </font>
+   </property>
    <property name="text">
     <string>+</string>
    </property>
@@ -400,12 +408,19 @@ dans l'inventaire rapide lors d'iun combat)</string>
   <widget class="QPushButton" name="eo_retirer">
    <property name="geometry">
     <rect>
-     <x>220</x>
-     <y>50</y>
+     <x>310</x>
+     <y>80</y>
      <width>31</width>
      <height>31</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>13</pointsize>
+     <weight>75</weight>
+     <bold>true</bold>
+    </font>
+   </property>
    <property name="text">
     <string>-</string>
    </property>
@@ -413,10 +428,10 @@ dans l'inventaire rapide lors d'iun combat)</string>
   <widget class="DmLabel" name="eo_monnaie">
    <property name="geometry">
     <rect>
-     <x>430</x>
-     <y>150</y>
-     <width>46</width>
-     <height>13</height>
+     <x>445</x>
+     <y>143</y>
+     <width>51</width>
+     <height>20</height>
     </rect>
    </property>
    <property name="text">
@@ -426,8 +441,8 @@ dans l'inventaire rapide lors d'iun combat)</string>
   <widget class="QPushButton" name="eo_supprimer">
    <property name="geometry">
     <rect>
-     <x>10</x>
-     <y>190</y>
+     <x>20</x>
+     <y>220</y>
      <width>111</width>
      <height>31</height>
     </rect>