Jelajahi Sumber

Mise en place du filtre des types d'objet dans l'inventaire

unknown 10 tahun lalu
induk
melakukan
0957bb4c1c
20 mengubah file dengan 715 tambahan dan 198 penghapusan
  1. TEMPAT SAMPAH
      img/armes.png
  2. TEMPAT SAMPAH
      img/etoile.png
  3. 14 9
      lib/EcranEditionCombattant.py
  4. 2 2
      lib/Objet.py
  5. 34 30
      lib/VueEditionForme.py
  6. TEMPAT SAMPAH
      lib/img/armes.png
  7. TEMPAT SAMPAH
      lib/img/etoile.png
  8. 22 1
      lib/ui/dm.py
  9. 158 43
      lib/ui/ecran_editionCombattant.py
  10. 1 1
      lib/ui/ecran_principal.py
  11. 366 103
      lib/ui/editionCombattant.ui
  12. TEMPAT SAMPAH
      lib/ui/img/armes.png
  13. TEMPAT SAMPAH
      lib/ui/img/cur/cur_dep.png
  14. TEMPAT SAMPAH
      lib/ui/img/cur/cur_doigt.png
  15. TEMPAT SAMPAH
      lib/ui/img/cur/cur_plus.png
  16. TEMPAT SAMPAH
      lib/ui/img/cur/cur_style.png
  17. TEMPAT SAMPAH
      lib/ui/img/dep_pied.png
  18. TEMPAT SAMPAH
      lib/ui/img/etoile.png
  19. 116 8
      lib/ui/test.ui
  20. 2 1
      lib/ui/test_ui.py

TEMPAT SAMPAH
img/armes.png


TEMPAT SAMPAH
img/etoile.png


+ 14 - 9
lib/EcranEditionCombattant.py

@@ -30,6 +30,7 @@ class EcranEditionCombattant(QDialog):
             self.combattant = Combattant()
         else:
             self.combattant = combattant
+        self.modeCreation = (combattant == None)
         self.ouverture()
 
     def nouvelIdCombattant(self):
@@ -64,7 +65,6 @@ class EcranEditionCombattant(QDialog):
         self.connect(self.ui.edc_casesCarrees, SIGNAL("clicked()"), self.majFormeCases)
         self.connect(self.ui.edc_couleur, SIGNAL("clicked()"), self.selectionCouleur)
         self.connect(self.ui.edc_image, SIGNAL("clicked()"), self.selectionImage)
-##        self.connect(self.ui.edc_aideForme, SIGNAL("clicked()"), self.afficherAideForme)
 
         self.connect(self.ui.edc_logo, SIGNAL("imageModifiee()"), self.logoModifie)
         self.vueForme = VueEditionForme(self)
@@ -72,8 +72,7 @@ class EcranEditionCombattant(QDialog):
         self.construireListeAttributs()
 
         self.construireInventaire()
-
-##        self.connect(self.ui.ajouterInventaireCombattant, SIGNAL("clicked()"), self.ajouterLigneListeInventaire)
+        self.connect(self.ui.edc_filtreTypeObjet, SIGNAL("cellClicked(int, int)"), self.filtrerInventaire)
 
     def layoutAtt(self):
         """retourne le layout des attaques"""
@@ -87,14 +86,14 @@ class EcranEditionCombattant(QDialog):
         """premier affichage: on met a jour les champs"""
        
         #page_nom
-##        self.ui.edc_nom.majTexte(self.combattant.nom)
-        self.ui.edc_nom.majTexte("test")
+        self.ui.edc_nom.majTexte(self.combattant.nom)
         if self.combattant.logo:
             self.ui.edc_logo.chargerImage(self.combattant.logo)
         else:
             self.ui.edc_logo.majTexte("Choisissez \nun fichier\nimage")
 
         self.vueForme.creer(self.formeCases())
+        self.vueForme.autoriserModifForme(self.modeCreation)
         self.vueForme.majCouleur(self.combattant.couleur)
         self.vueForme.chargerFormeDef(self.combattant.formeDef[self.formeCases()])
         self.vueForme.chargerImageDef(self.combattant.img)
@@ -213,6 +212,7 @@ class EcranEditionCombattant(QDialog):
                 champ.setAlignment(Qt.AlignCenter)
                 champ.majTexte(regles.listeAttributs()[nomAttribut])
                 champ.setObjectName("{}_champ".format(nomAttribut))
+                champ.setStyleSheet("background-color: rgb({},{},{});".format(248,248,248))
     ##            self.connect(champ, SIGNAL("textChanged()"), self.controlerAttribut)
                 lay.addWidget(champ)
 
@@ -272,6 +272,11 @@ class EcranEditionCombattant(QDialog):
         """construction de la page inventaire"""
         self.ui.edc_listeInventaire.construire()
         self.connect(self.ui.edc_listeInventaire, SIGNAL("objetClique(int)"), self.editerObjet)
+        self.ui.edc_listeInventaire.ajouterObjet(Objet(1,"a",0))
+        self.ui.edc_listeInventaire.ajouterObjet(Objet(1,"b",1))
+        self.ui.edc_listeInventaire.ajouterObjet(Objet(1,"c",2))
+        self.ui.edc_listeInventaire.ajouterObjet(Objet(1,"d",3))
+        self.ui.edc_listeInventaire.ajouterObjet(Objet(1,"e",4))
 
     def editerObjet(self, indexObjet):
         if indexObjet < len(self.ui.edc_listeInventaire.inventaire()):
@@ -298,14 +303,14 @@ class EcranEditionCombattant(QDialog):
 
     def majTotauxInventaire(self):
         inv = self.ui.edc_listeInventaire.inventaire()
-        valeurTotale = 0.00
         poidsTotal = 0.00
         for obj in inv:
-            valeurTotale += obj.valeurTotale()
             poidsTotal += obj.poidsTotal()
-        self.ui.edc_inventaire_valeur.majTexte("{} {}".format(valeurTotale, regles.nomMonnaie()))
         self.ui.edc_inventaire_poids.majTexte("{} kg".format(poidsTotal))
-        
+
+    def filtrerInventaire(self, ligne, colonne):
+        filtre = colonne - 1
+        self.ui.edc_listeInventaire.filtrer(filtre)
 
     #### barre d'outils
     def majActivationEnregistrer(self):

+ 2 - 2
lib/Objet.py

@@ -8,8 +8,8 @@ class ActionObjet():
 
 class Objet():
     """objets tels qu'ils apparaissent dans l'inventaire"""
-    def __init__(self, quantite = 1, nom = "Objet", poids = 0, valeur = 0, \
-                 monnaie = regles.nomMonnaie(), description = "", typeObjet = 4, \
+    def __init__(self, quantite = 1, nom = "Objet", typeObjet = 4, poids = 0, valeur = 0, \
+                 monnaie = regles.nomMonnaie(), description = "", \
                  estConsommable = False):
         self.id = ""
         self.quantite = quantite

+ 34 - 30
lib/VueEditionForme.py

@@ -20,6 +20,7 @@ class VueEditionForme(QGraphicsScene):
 
         self._cases = {}
         self._formeCases = "H"
+        self._autoriseModifForme = False
        
         self._l0 = 0
         self._h0 = 0
@@ -109,40 +110,43 @@ class VueEditionForme(QGraphicsScene):
 
     def majSelection(self, coord):
          """met a jour l'affichage des cases selectionnees pour l'affichage de la forme"""
-         if self._cases[coord].estSelectionnee():
-             valide = True
-             for coordVerif in self._cases:
-                 #on parcourt les autres cases selectionnees
-                 if coordVerif != (0,0) and coordVerif != coord and self._cases[coordVerif].estSelectionnee():
-                     #on liste les cases connectees a cette case, de proche en proche
-                     connectees = [coordVerif]
-                     for coordVerif2 in connectees:
-                         for coordVoisin in self._cases[coordVerif2].voisins():
-                             if coordVoisin in self._cases and not coordVoisin in connectees:
-                                 if self._cases[coordVoisin].estSelectionnee():
-                                     connectees.append(coordVoisin)
-                     if not (0,0) in connectees:
-                         valide = False
-                         break
-             if valide:
-                 self._cases[coord].selectionner(False)
-         else:
-             #on s'assure que la case est bien adjacente a une case selectionnee
-             valide = False
-             for coordVerif in self._cases[coord].voisins():
-                if coordVerif in self._cases:
-                    if self._cases[coordVerif].estSelectionnee():
-                        valide = True
-                        break
-             if valide:
-                 self._cases[coord].selectionner(True)
-                 
-         self._majCouleurGraphique()
+         if self._autoriseModifForme:
+             if self._cases[coord].estSelectionnee():
+                 valide = True
+                 for coordVerif in self._cases:
+                     #on parcourt les autres cases selectionnees
+                     if coordVerif != (0,0) and coordVerif != coord and self._cases[coordVerif].estSelectionnee():
+                         #on liste les cases connectees a cette case, de proche en proche
+                         connectees = [coordVerif]
+                         for coordVerif2 in connectees:
+                             for coordVoisin in self._cases[coordVerif2].voisins():
+                                 if coordVoisin in self._cases and not coordVoisin in connectees:
+                                     if self._cases[coordVoisin].estSelectionnee():
+                                         connectees.append(coordVoisin)
+                         if not (0,0) in connectees:
+                             valide = False
+                             break
+                 if valide:
+                     self._cases[coord].selectionner(False)
+             else:
+                 #on s'assure que la case est bien adjacente a une case selectionnee
+                 valide = False
+                 for coordVerif in self._cases[coord].voisins():
+                    if coordVerif in self._cases:
+                        if self._cases[coordVerif].estSelectionnee():
+                            valide = True
+                            break
+                 if valide:
+                     self._cases[coord].selectionner(True)
+                     
+             self._majCouleurGraphique()
 
 
     def afficherMsg(self, msg):
         print msg
-  
+
+    def autoriserModifForme(self, actif):
+        self._autoriseModifForme = actif
 
 
 class VefCase(QGraphicsPolygonItem):

TEMPAT SAMPAH
lib/img/armes.png


TEMPAT SAMPAH
lib/img/etoile.png


+ 22 - 1
lib/ui/dm.py

@@ -14,6 +14,22 @@ except:
         from Actions import *
     except:
         pass
+
+
+class Biblio():
+    """cette classe fournit une liste spreciale"""
+    def __init__(self):
+        self.dico = {}
+        self.ordre = []
+
+    def trierPar(self, param):
+        """trie en fonction du parametre des objets"""
+        ordre = []
+        return ordre
+
+    def elt(self, index):
+        return self.dict[index]
+
         
 class DmLabel(QLabel):
     """surcharge de QLabel"""
@@ -434,7 +450,12 @@ class DmTableInventaire(DmTableWidget):
             pix = QPixmap("img\\{}".format(img))
             item.setIcon(QIcon(pix))
         self.setItem(ligne, colonne, item)
-        
+
+    def filtrer(self, typeObjet):
+        """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():

+ 158 - 43
lib/ui/ecran_editionCombattant.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'editionCombattant.ui'
 #
-# Created: Fri Jun 19 17:14:53 2015
+# Created: Tue Jun 23 17:42:33 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -565,12 +565,12 @@ 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, 80, 491, 321))
+        self.edc_listeInventaire.setGeometry(QtCore.QRect(0, 0, 491, 391))
         palette = QtGui.QPalette()
-        brush = QtGui.QBrush(QtGui.QColor(255, 255, 255, 150))
+        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(255, 255, 255, 150))
+        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))
@@ -584,10 +584,9 @@ class Ui_edc_fenetre(object):
         self.edc_listeInventaire.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
         self.edc_listeInventaire.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         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.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
         self.edc_listeInventaire.setShowGrid(True)
         self.edc_listeInventaire.setGridStyle(QtCore.Qt.SolidLine)
         self.edc_listeInventaire.setObjectName(_fromUtf8("edc_listeInventaire"))
@@ -598,26 +597,68 @@ class Ui_edc_fenetre(object):
         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)
         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(2, item)
         item = QtGui.QTableWidgetItem()
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        font.setPointSize(7)
+        font.setBold(True)
+        font.setItalic(False)
+        font.setWeight(75)
+        item.setFont(font)
         self.edc_listeInventaire.setHorizontalHeaderItem(3, item)
         item = QtGui.QTableWidgetItem()
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        font.setPointSize(7)
+        font.setBold(True)
+        font.setWeight(75)
+        item.setFont(font)
+        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)
         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(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)
+        item = QtGui.QTableWidgetItem()
         item.setTextAlignment(QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter|QtCore.Qt.AlignCenter)
         font = QtGui.QFont()
         font.setBold(False)
         font.setWeight(50)
         item.setFont(font)
-        item.setFlags(QtCore.Qt.NoItemFlags)
+        item.setFlags(QtCore.Qt.ItemIsSelectable|QtCore.Qt.ItemIsDragEnabled|QtCore.Qt.ItemIsDropEnabled|QtCore.Qt.ItemIsEnabled)
         self.edc_listeInventaire.setItem(0, 1, 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)
         item = QtGui.QTableWidgetItem()
         font = QtGui.QFont()
@@ -625,56 +666,117 @@ class Ui_edc_fenetre(object):
         font.setPointSize(8)
         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)
         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)
         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(False)
+        self.edc_listeInventaire.horizontalHeader().setVisible(True)
         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_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(370, 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(430, 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.label = QtGui.QLabel(self.page_invent)
-        self.label.setGeometry(QtCore.QRect(10, 400, 51, 21))
+        self.label.setGeometry(QtCore.QRect(10, 400, 151, 21))
         font = QtGui.QFont()
         font.setItalic(True)
         self.label.setFont(font)
         self.label.setObjectName(_fromUtf8("label"))
-        self.edc_inventaire_valeur = DmLabel(self.page_invent)
-        self.edc_inventaire_valeur.setGeometry(QtCore.QRect(345, 400, 61, 20))
-        font = QtGui.QFont()
-        font.setItalic(True)
-        self.edc_inventaire_valeur.setFont(font)
-        self.edc_inventaire_valeur.setObjectName(_fromUtf8("edc_inventaire_valeur"))
         self.edc_inventaire_poids = DmLabel(self.page_invent)
-        self.edc_inventaire_poids.setGeometry(QtCore.QRect(435, 400, 61, 20))
+        self.edc_inventaire_poids.setGeometry(QtCore.QRect(150, 400, 61, 20))
         font = QtGui.QFont()
         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))
+        palette = QtGui.QPalette()
+        brush = QtGui.QBrush(QtGui.QColor(254, 254, 254, 150))
+        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.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))
+        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)
+        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()
+        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()
+        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()
+        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()
+        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()
+        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)
         self.edc_pages.addWidget(self.page_invent)
         self.page_notes = QtGui.QWidget()
         self.page_notes.setObjectName(_fromUtf8("page_notes"))
@@ -1056,6 +1158,7 @@ class Ui_edc_fenetre(object):
         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))
         self.label_23.setText(_translate("edc_fenetre", "Autre :", None))
+        self.edc_listeInventaire.setSortingEnabled(True)
         item = self.edc_listeInventaire.verticalHeaderItem(0)
         item.setText(_translate("edc_fenetre", "Nouvelle ligne", None))
         item = self.edc_listeInventaire.horizontalHeaderItem(0)
@@ -1063,15 +1166,13 @@ class Ui_edc_fenetre(object):
         item = self.edc_listeInventaire.horizontalHeaderItem(1)
         item.setText(_translate("edc_fenetre", "Type", None))
         item = self.edc_listeInventaire.horizontalHeaderItem(2)
-        item.setText(_translate("edc_fenetre", "Nombre", None))
+        item.setText(_translate("edc_fenetre", "Quantité", None))
         item = self.edc_listeInventaire.horizontalHeaderItem(3)
         item.setText(_translate("edc_fenetre", "Objet", None))
-        item = self.edc_listeInventaire.horizontalHeaderItem(4)
-        item.setText(_translate("edc_fenetre", "Poids", None))
         item = self.edc_listeInventaire.horizontalHeaderItem(5)
-        item.setText(_translate("edc_fenetre", "Valeur", None))
+        item.setText(_translate("edc_fenetre", " ", None))
         item = self.edc_listeInventaire.horizontalHeaderItem(6)
-        item.setText(_translate("edc_fenetre", "vide", None))
+        item.setText(_translate("edc_fenetre", " ", None))
         __sortingEnabled = self.edc_listeInventaire.isSortingEnabled()
         self.edc_listeInventaire.setSortingEnabled(False)
         item = self.edc_listeInventaire.item(0, 1)
@@ -1079,11 +1180,25 @@ class Ui_edc_fenetre(object):
         item = self.edc_listeInventaire.item(0, 3)
         item.setText(_translate("edc_fenetre", "(Cliquer pour ajouter un item)", None))
         self.edc_listeInventaire.setSortingEnabled(__sortingEnabled)
-        self.edc_inventaire_e1.setText(_translate("edc_fenetre", "Quantité", None))
-        self.edc_inventaire_e2.setText(_translate("edc_fenetre", "Objet", None))
-        self.label.setText(_translate("edc_fenetre", "Au total : ", None))
-        self.edc_inventaire_valeur.setText(_translate("edc_fenetre", "... po", None))
+        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))

+ 1 - 1
lib/ui/ecran_principal.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'mainwindow.ui'
 #
-# Created: Wed Jun 03 15:15:24 2015
+# Created: Tue Jun 23 17:39:56 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!

+ 366 - 103
lib/ui/editionCombattant.ui

@@ -1416,7 +1416,16 @@ image</string>
              <property name="spacing">
               <number>1</number>
              </property>
-             <property name="margin">
+             <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>
@@ -1520,7 +1529,16 @@ image</string>
              <property name="spacing">
               <number>1</number>
              </property>
-             <property name="margin">
+             <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>
@@ -1532,9 +1550,9 @@ image</string>
            <property name="geometry">
             <rect>
              <x>0</x>
-             <y>80</y>
+             <y>20</y>
              <width>491</width>
-             <height>321</height>
+             <height>371</height>
             </rect>
            </property>
            <property name="palette">
@@ -1542,10 +1560,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>
@@ -1553,10 +1571,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>
@@ -1591,26 +1609,26 @@ image</string>
            <property name="editTriggers">
             <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>false</bool>
            </property>
            <property name="selectionMode">
             <enum>QAbstractItemView::NoSelection</enum>
            </property>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
            <property name="showGrid">
             <bool>true</bool>
            </property>
            <property name="gridStyle">
             <enum>Qt::SolidLine</enum>
            </property>
+           <property name="sortingEnabled">
+            <bool>true</bool>
+           </property>
            <attribute name="horizontalHeaderVisible">
-            <bool>false</bool>
+            <bool>true</bool>
            </attribute>
            <attribute name="horizontalHeaderCascadingSectionResizes">
             <bool>false</bool>
@@ -1644,32 +1662,91 @@ image</string>
             <property name="text">
              <string>Type</string>
             </property>
+            <property name="font">
+             <font>
+              <family>Verdana</family>
+              <pointsize>7</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
            </column>
            <column>
             <property name="text">
-             <string>Nombre</string>
+             <string>Quantité</string>
+            </property>
+            <property name="font">
+             <font>
+              <family>Verdana</family>
+              <pointsize>7</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
             </property>
            </column>
            <column>
             <property name="text">
              <string>Objet</string>
             </property>
+            <property name="font">
+             <font>
+              <family>Verdana</family>
+              <pointsize>7</pointsize>
+              <weight>75</weight>
+              <italic>false</italic>
+              <bold>true</bold>
+             </font>
+            </property>
            </column>
            <column>
             <property name="text">
-             <string>Poids</string>
+             <string/>
+            </property>
+            <property name="font">
+             <font>
+              <family>Verdana</family>
+              <pointsize>7</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="icon">
+             <iconset>
+              <normaloff>../../img/poids.png</normaloff>../../img/poids.png</iconset>
             </property>
            </column>
            <column>
             <property name="text">
-             <string>Valeur</string>
+             <string/>
+            </property>
+            <property name="font">
+             <font>
+              <family>Verdana</family>
+              <pointsize>7</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
             </property>
            </column>
            <column>
             <property name="text">
-             <string>vide</string>
+             <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>
@@ -1684,13 +1761,16 @@ image</string>
              <set>AlignHCenter|AlignVCenter|AlignCenter</set>
             </property>
             <property name="flags">
-             <set>NoItemFlags</set>
+             <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsEnabled</set>
             </property>
            </item>
            <item row="0" column="2">
             <property name="text">
              <string/>
             </property>
+            <property name="flags">
+             <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsUserCheckable|ItemIsEnabled</set>
+            </property>
            </item>
            <item row="0" column="3">
             <property name="text">
@@ -1703,93 +1783,41 @@ image</string>
               <italic>true</italic>
              </font>
             </property>
+            <property name="flags">
+             <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">
             <property name="text">
              <string/>
             </property>
+            <property name="flags">
+             <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsUserCheckable|ItemIsEnabled</set>
+            </property>
            </item>
            <item row="0" column="6">
             <property name="text">
              <string/>
             </property>
+            <property name="flags">
+             <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsDropEnabled|ItemIsUserCheckable|ItemIsEnabled</set>
+            </property>
            </item>
           </widget>
-          <widget class="QLabel" name="edc_inventaire_e1">
-           <property name="geometry">
-            <rect>
-             <x>3</x>
-             <y>50</y>
-             <width>61</width>
-             <height>21</height>
-            </rect>
-           </property>
-           <property name="text">
-            <string>Quantité</string>
-           </property>
-          </widget>
-          <widget class="QLabel" name="edc_inventaire_e2">
-           <property name="geometry">
-            <rect>
-             <x>70</x>
-             <y>50</y>
-             <width>211</width>
-             <height>21</height>
-            </rect>
-           </property>
-           <property name="text">
-            <string>Objet</string>
-           </property>
-          </widget>
-          <widget class="QLabel" name="edc_inventaire_e5">
-           <property name="geometry">
-            <rect>
-             <x>370</x>
-             <y>50</y>
-             <width>20</width>
-             <height>20</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="edc_inventaire_e6">
-           <property name="geometry">
-            <rect>
-             <x>430</x>
-             <y>50</y>
-             <width>21</width>
-             <height>21</height>
-            </rect>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="pixmap">
-            <pixmap>img/poids.png</pixmap>
-           </property>
-           <property name="scaledContents">
-            <bool>true</bool>
-           </property>
-          </widget>
           <widget class="QLabel" name="label">
            <property name="geometry">
             <rect>
              <x>10</x>
              <y>400</y>
-             <width>51</width>
+             <width>151</width>
              <height>21</height>
             </rect>
            </property>
@@ -1799,13 +1827,13 @@ image</string>
             </font>
            </property>
            <property name="text">
-            <string>Au total : </string>
+            <string>Poids total transporté :</string>
            </property>
           </widget>
-          <widget class="DmLabel" name="edc_inventaire_valeur">
+          <widget class="DmLabel" name="edc_inventaire_poids">
            <property name="geometry">
             <rect>
-             <x>345</x>
+             <x>150</x>
              <y>400</y>
              <width>61</width>
              <height>20</height>
@@ -1817,27 +1845,262 @@ image</string>
             </font>
            </property>
            <property name="text">
-            <string>... po</string>
+            <string>... kg</string>
            </property>
           </widget>
-          <widget class="DmLabel" name="edc_inventaire_poids">
+          <widget class="QTableWidget" name="edc_filtreTypeObjet">
            <property name="geometry">
             <rect>
-             <x>435</x>
-             <y>400</y>
-             <width>61</width>
+             <x>320</x>
+             <y>390</y>
+             <width>171</width>
+             <height>34</height>
+            </rect>
+           </property>
+           <property name="palette">
+            <palette>
+             <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>
+               </brush>
+              </colorrole>
+             </active>
+             <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>
+               </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>
+              <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>
+           <property name="verticalScrollBarPolicy">
+            <enum>Qt::ScrollBarAlwaysOff</enum>
+           </property>
+           <property name="horizontalScrollBarPolicy">
+            <enum>Qt::ScrollBarAlwaysOff</enum>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>20</width>
              <height>20</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">
+             <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="font">
-            <font>
-             <italic>true</italic>
-            </font>
+           <property name="tabShape">
+            <enum>QTabWidget::Rounded</enum>
            </property>
-           <property name="text">
-            <string>... kg</string>
+           <property name="currentIndex">
+            <number>3</number>
            </property>
+           <widget class="QWidget" name="tab">
+            <attribute name="title">
+             <string>Tab 1</string>
+            </attribute>
+           </widget>
+           <widget class="QWidget" name="tab_4">
+            <attribute name="title">
+             <string>Page</string>
+            </attribute>
+           </widget>
+           <widget class="QWidget" name="tab_5">
+            <attribute name="title">
+             <string>Page</string>
+            </attribute>
+           </widget>
+           <widget class="QWidget" name="tab_6">
+            <attribute name="title">
+             <string>Page</string>
+            </attribute>
+           </widget>
+           <widget class="QWidget" name="tab_3">
+            <attribute name="title">
+             <string>Page</string>
+            </attribute>
+           </widget>
+           <widget class="QWidget" name="tab_2">
+            <attribute name="title">
+             <string>Tab 2</string>
+            </attribute>
+           </widget>
           </widget>
+          <zorder>edc_filtreTypeObjet</zorder>
+          <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">

TEMPAT SAMPAH
lib/ui/img/armes.png


TEMPAT SAMPAH
lib/ui/img/cur/cur_dep.png


TEMPAT SAMPAH
lib/ui/img/cur/cur_doigt.png


TEMPAT SAMPAH
lib/ui/img/cur/cur_plus.png


TEMPAT SAMPAH
lib/ui/img/cur/cur_style.png


TEMPAT SAMPAH
lib/ui/img/dep_pied.png


TEMPAT SAMPAH
lib/ui/img/etoile.png


+ 116 - 8
lib/ui/test.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>340</width>
+    <width>469</width>
     <height>404</height>
    </rect>
   </property>
@@ -14,18 +14,126 @@
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="QComboBox" name="comboBox">
+   <widget class="QTableWidget" name="table">
     <property name="geometry">
      <rect>
-      <x>60</x>
-      <y>40</y>
-      <width>91</width>
-      <height>31</height>
+      <x>20</x>
+      <y>20</y>
+      <width>441</width>
+      <height>321</height>
      </rect>
     </property>
-    <property name="frame">
+    <property name="editTriggers">
+     <set>QAbstractItemView::NoEditTriggers</set>
+    </property>
+    <property name="dragEnabled">
      <bool>true</bool>
     </property>
+    <property name="dragDropOverwriteMode">
+     <bool>false</bool>
+    </property>
+    <property name="dragDropMode">
+     <enum>QAbstractItemView::DragDrop</enum>
+    </property>
+    <property name="defaultDropAction">
+     <enum>Qt::MoveAction</enum>
+    </property>
+    <property name="selectionMode">
+     <enum>QAbstractItemView::SingleSelection</enum>
+    </property>
+    <property name="selectionBehavior">
+     <enum>QAbstractItemView::SelectRows</enum>
+    </property>
+    <row>
+     <property name="text">
+      <string>Nouvelle ligne</string>
+     </property>
+    </row>
+    <row>
+     <property name="text">
+      <string>Nouvelle ligne</string>
+     </property>
+    </row>
+    <row>
+     <property name="text">
+      <string>Nouvelle ligne</string>
+     </property>
+    </row>
+    <row>
+     <property name="text">
+      <string>Nouvelle ligne</string>
+     </property>
+    </row>
+    <row>
+     <property name="text">
+      <string>Nouvelle ligne</string>
+     </property>
+    </row>
+    <row>
+     <property name="text">
+      <string>Nouvelle ligne</string>
+     </property>
+    </row>
+    <column>
+     <property name="text">
+      <string>a</string>
+     </property>
+    </column>
+    <column>
+     <property name="text">
+      <string>b</string>
+     </property>
+    </column>
+    <column>
+     <property name="text">
+      <string>c</string>
+     </property>
+    </column>
+    <item row="0" column="0">
+     <property name="text">
+      <string>a1</string>
+     </property>
+    </item>
+    <item row="0" column="1">
+     <property name="text">
+      <string>b1</string>
+     </property>
+    </item>
+    <item row="0" column="2">
+     <property name="text">
+      <string>c1</string>
+     </property>
+    </item>
+    <item row="1" column="0">
+     <property name="text">
+      <string>a2</string>
+     </property>
+    </item>
+    <item row="1" column="1">
+     <property name="text">
+      <string>b2</string>
+     </property>
+    </item>
+    <item row="1" column="2">
+     <property name="text">
+      <string>c2</string>
+     </property>
+    </item>
+    <item row="2" column="0">
+     <property name="text">
+      <string>a3</string>
+     </property>
+    </item>
+    <item row="2" column="1">
+     <property name="text">
+      <string>b3</string>
+     </property>
+    </item>
+    <item row="2" column="2">
+     <property name="text">
+      <string>c3</string>
+     </property>
+    </item>
    </widget>
   </widget>
   <widget class="QMenuBar" name="menubar">
@@ -33,7 +141,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>340</width>
+     <width>469</width>
      <height>21</height>
     </rect>
    </property>

+ 2 - 1
lib/ui/test_ui.py

@@ -8,7 +8,7 @@ Ui, _ = uic.loadUiType(os.path.join(
     os.path.dirname(__file__), 'test.ui'))
 
 class FenetreTest(QMainWindow, Ui):
-    """affiche une fenetre permettant l'accesen lecture/ecriture aux differents parametres utilises par le plugin""" 
+    """affiche une fenetre permettant l'acces en lecture/ecriture aux differents parametres utilises par le plugin""" 
     def __init__(self, parent=None):
         """Construction de la fenetre, remplissage des listes, et maj de l'affichage"""
         super(FenetreTest, self).__init__(parent)
@@ -18,6 +18,7 @@ class FenetreTest(QMainWindow, Ui):
 
     def majInterface(self):
         pass
+
     
 app = QApplication(argv)
 dm = FenetreTest()