Refonte de l'interface -> réécriture du code en fonction (1)

DMonde.py

@@ -69,17 +69,17 @@ class DMonde(QMainWindow):
         self.ui = Ui_principal()
         self.ui.setupUi(self)
         self.majVisibilitePanneauxPlateau("")
-        self.connect(self.ui.sauverPlateau, SIGNAL("clicked()"), self.sauverPlateau)   
-        self.connect(self.ui.fermerPlateau, SIGNAL("clicked()"), self.fermerPlateau)
-        self.ui.vuePlateau.setViewportUpdateMode(QGraphicsView.BoundingRectViewportUpdate)
+        self.connect(self.ui.cbt_sauver, SIGNAL("clicked()"), self.sauverPlateau)   
+        self.connect(self.ui.cbt_fermer, SIGNAL("clicked()"), self.fermerPlateau)
+        self.ui.cbt_vue.setViewportUpdateMode(QGraphicsView.BoundingRectViewportUpdate)
 
         self.majFichierInfosSvg()
         self.creerEcranFondPlateau()
         
     def creerEcranFondPlateau(self):
         ecranFondPlateau = EcranFondPlateau(self)
-        self.ui.vuePlateau.resetTransform()
-        self.ui.vuePlateau.setScene(ecranFondPlateau)
+        self.ui.cbt_vue.resetTransform()
+        self.ui.cbt_vue.setScene(ecranFondPlateau)
         
     def afficherEcranCreationPlateau(self):
         """ouvre la fenetre de creation de plateau"""
@@ -173,38 +173,23 @@ class DMonde(QMainWindow):
         conditionModeCombat = (len(mode) > 0 and mode == "combat")
 
         #panneaux d'infos
-        self.ui.infoOrdreJeu.setVisible(conditionPlateau)   
-        self.ui.infoPion.setVisible(conditionPlateau)
-        self.ui.infoDecor.setVisible(conditionPlateau)
-        self.ui.infoCase.setVisible(conditionPlateau)
-
-        #autre
-        self.ui.nomPlateau.setVisible(conditionPlateau)
-        self.ui.sauverPlateau.setVisible(conditionPlateau)
-        self.ui.fermerPlateau.setVisible(conditionPlateau)
-        self.ui.etiquetteModeAffichagePlateau.setVisible(conditionPlateau)
-        self.ui.modeAffichagePlateau.setVisible(conditionPlateau)
-        self.ui.combatTour.setVisible(conditionPlateau)
+        self.ui.inf_panneau.setVisible(conditionPlateau)
+        self.ui.cbt_barreHaut.setVisible(conditionPlateau)
         
-        #barre de combat:
-        if len(mode) > 0:
-            self.majVisibiliteBarreCombat("menu")
-        else:
-            self.majVisibiliteBarreCombat("aucun")
-        self.ui.combatPasserTour.setVisible(conditionPlateau)
-        self.ui.combatInventaire.setVisible(conditionPlateau)
-
         #modes creation/combat
-        self.ui.modeCombatPlateau.setVisible(conditionModeCreation)
-        self.ui.outilsEditionPlateau.setVisible(conditionModeCreation)
-        self.ui.outilsCombatPlateau.setVisible(conditionModeCombat)
-        self.ui.modeCreationPlateau.setVisible(conditionModeCombat)
+        self.ui.cbt_modeCombat.setVisible(conditionModeCreation)
+        self.ui.cp_panneau.setVisible(conditionModeCreation)
+
+        self.ui.cbt_modeCreation.setVisible(conditionModeCombat)
+        self.ui.pi_panneau.setVisible(conditionModeCombat)
+        
 
     def reinitialiserPanneauxPlateau(self):
         """remet a neuf les commandes liees au plateau"""
-        for panneau in [self.ui.panneauInfosPlateau, \
-                         self.ui.outilsEditionPlateau, \
-                         self.ui.outilsCombatPlateau]:
+        for panneau in [self.ui.inf_panneau, \
+                         self.ui.cbt_barreHaut, \
+                         self.ui.cp_panneau, \
+                         self.ui.pi_panneau]:
             #listes
             for liste in panneau.findChildren(QTableWidget):
                 while liste.rowCount() > 0:
@@ -224,56 +209,6 @@ class DMonde(QMainWindow):
             for item in panneau.findChildren(QDoubleSpinBox):
                 item.setValue(0)                
 
-    def barreCombatMenu(self):
-        self.majVisibiliteBarreCombat("menu")
-
-    def barreCombatVol(self):
-        self.majVisibiliteBarreCombat("vol")
-
-    def barreCombatZone(self):
-        self.majVisibiliteBarreCombat("zone")        
-
-    def majVisibiliteBarreCombat(self, mode = ""):
-        """affiche ou cache les commandes de la barre de combat"""
-        #modes : "aucun", "menu", "vol", "zone"
-        for item in self.ui.barreBasCombat.children():
-            try:
-                item.setVisible(False)
-            except:
-                pass
-            
-        if mode != "aucun":
-            self.ui.combatPionSelectionne.setVisible(True)
-            self.ui.combatPionSelectionne_img.setVisible(True)
-            self.ui.combatPionSelectionne_img.setPixmap(QPixmap())   
-            self.ui.combatPasserTour.setVisible(True)
-            self.ui.combatInventaire.setVisible(True)
-        
-        if mode == "menu" or mode == "":
-            self.ui.combatDeplacement.setVisible(True)
-            self.ui.combatAttaqueCaC.setVisible(True)
-            self.ui.combatAttaqueDist.setVisible(True)
-            self.ui.combatAttaqueZone.setVisible(True)
-            self.ui.combatVol.setVisible(True)
-            
-        elif mode == "vol":
-            self.ui.combatVol.setVisible(True)
-            self.ui.combatVol_altitude.setVisible(True)
-            self.ui.combatRetour.setVisible(True)
-            
-        elif mode == "zone":
-            self.ui.combatZone_ligne.setVisible(True)
-            self.ui.combatZone_disque.setVisible(True)
-            self.ui.combatZone_disqueRayon.setVisible(True)
-            self.ui.combatZone_cone.setVisible(True)
-            self.ui.combatRetour.setVisible(True)
-
-
-
-
-
-
-
 
         
 if __name__ == "__main__":

lib/Plateau.py

@@ -40,40 +40,51 @@ class Plateau(QGraphicsScene):
     def __init__(self, fenetre, parent=None):
         super(Plateau, self).__init__()
         #parametres et variables
+
+        self.fenetre = fenetre
+
+        ##partie et infos plateau
         self.id = ""
         self.nom = ""
         self.chapitre = 0
-        self.fenetre = fenetre
+        self.tour = 1
+        
+        self.enCours = False
+        self.public = False
+        self.dateCreation = ""
+        self.dateSvg = ""
+        self.notes = ""
+        
+        #carac 
         self.nbCasesX = 0
         self.nbCasesY = 0
         self.hCase = 0
+        self.modePrincipal = "creation"
+        self.modeActif = ""
+        self.modeCombat = ""
+        
+        #interface
+        self.nbZoomActuel = 0
+        self.epaisseurpinceau = 0
+
+        #objets
         self.cases = {}   #dict des cases du plateau   (coordonnées: case)
         self.pions = {}   #liste de pions positionnes sur le plateau
         self.decors = {}  #liste des decors places sur le plateau
-        self.ordreJeu = {}  #numero du pion: ordre de jeu
-        self.numPionEnCours = 0
-        self.tour = 1
         self.cacheEnCours = 1
         self.caches = {}
         self.polygonesCaches = {}
         for i in range(1,5):
             self.caches[i] = {"actif":False,"listeCases":[]}
             self.polygonesCaches[i] = None
-            
         self.listeCasesZonePlacement = []
         self.polygoneZonePlacement = None
-        self.entreesSorties = []
-        self.modePrincipal = "creation"
-        self.modeActif = ""
-        self.modeCombat = ""
-        self.nbZoomActuel = 0
-        self.epaisseurpinceau = 0
-        self.enCours = False
-        self.public = False
-        self.dateCreation = ""
-        self.dateSvg = ""
-        self.notes = ""
-        
+        self.entreesSorties = []    
+            
+        #infos combat
+        self.numPionEnCours = 0
+        self.ordreJeu = {}  #numero du pion: ordre de jeu
+            
         #note: la hauteur Z (qui gere l'empilement des objets graphiques est distribuee de cette maniere:
         #cases : 0 a 9
         #pions : 10 et +
@@ -173,25 +184,57 @@ class Plateau(QGraphicsScene):
 
     def connexions(self):
         """connecte le plateau aux differents widgets de la fenetre principale"""
-        self.fenetre.connect(self.fenetre.ui.modeCreationPlateau, SIGNAL("clicked()"), self.plateauModeCreation, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.modeCombatPlateau, SIGNAL("clicked()"), self.plateauModeCombat, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.afficherGestionCombat, SIGNAL("clicked()"), self.afficheEcranGestionCombat, Qt.UniqueConnection)
+        #modes d'interaction
+        self.fenetre.connect(self.fenetre.ui.cbt_modeCreation, SIGNAL("clicked()"), self.plateauModeCreation, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.cbt_modeCombat, SIGNAL("clicked()"), self.plateauModeCombat, Qt.UniqueConnection)
+##        self.fenetre.connect(self.fenetre.ui.modeAffichagePlateau, SIGNAL("currentIndexChanged(int)"), self.majModeAffichage, Qt.UniqueConnection)
+
+
+        #affichage de fenetres
+        self.fenetre.connect(self.fenetre.ui.cbt_afficherGestion, SIGNAL("clicked()"), self.afficheEcranGestionCombat, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.listeAttributs, SIGNAL("cellChanged(int,int)"), self.listeAttributCelluleModifiee, Qt.UniqueConnection)
+
         self.fenetre.connect(self.fenetre.ui.terrainCouleur, SIGNAL("clicked()"), self.modePeintureCase, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.terrainCopie, SIGNAL("clicked()"), self.modeCopieTerrain, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.pionCouleur, SIGNAL("clicked()"), self.majCouleurPion, Qt.UniqueConnection)
+##        self.fenetre.connect(self.fenetre.ui.pionCouleur, SIGNAL("clicked()"), self.majCouleurPion, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.agrandirNotesMjPlateau, SIGNAL("clicked()"), self.agrandirNotesMjPlateau, Qt.UniqueConnection)
+
+
+        #listes
+        self.fenetre.connect(self.fenetre.ui.listTerrains, SIGNAL("cellClicked(int,int)"), self.modeMajTerrainCase, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.listCreatures, SIGNAL("cellClicked(int,int)"), self.modeCreationCreaturePion, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.listDecors, SIGNAL("cellClicked(int,int)"), self.modeCreationDecor, Qt.UniqueConnection)
+        
         self.fenetre.connect(self.fenetre.ui.terrainEdit, SIGNAL("clicked()"), self.terrainEdit, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.terrainNouveau, SIGNAL("clicked()"), self.terrainNouveau, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.creatureEdit, SIGNAL("clicked()"), self.creatureEdit, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.creatureNouveau, SIGNAL("clicked()"), self.creatureNouveau, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.pionSimpleCreer, SIGNAL("clicked()"), self.modeCreationPion, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.pionSupprimer, SIGNAL("clicked()"), self.majModePionSupprimer, Qt.UniqueConnection)
+##        self.fenetre.connect(self.fenetre.ui.pionSimpleCreer, SIGNAL("clicked()"), self.modeCreationPion, Qt.UniqueConnection)
+##        self.fenetre.connect(self.fenetre.ui.pionSupprimer, SIGNAL("clicked()"), self.majModePionSupprimer, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.decorEdit, SIGNAL("clicked()"), self.decorEdit, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.decorNouveau, SIGNAL("clicked()"), self.decorNouveau, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.decorSupprimer, SIGNAL("clicked()"), self.majModePionSupprimer, Qt.UniqueConnection)
+##        self.fenetre.connect(self.fenetre.ui.decorSupprimer, SIGNAL("clicked()"), self.majModePionSupprimer, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.editerAttaques, SIGNAL("clicked()"), self.afficheEcranEditionAttaques, Qt.UniqueConnection)
+
+        
+        #creation
+        self.fenetre.connect(self.fenetre.ui.epaisseurPinceau, SIGNAL("valueChanged(int)"), self.majEpaisseurPinceau, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.altitudeCase, SIGNAL("valueChanged(double)"), self.modeMajAltitudeCase, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.infoOrdreJeu, SIGNAL("cellClicked(int,int)"), self.clicListOrdreJeu, Qt.UniqueConnection)
+
+        #autres:
+        #ajouter effet
         self.fenetre.connect(self.fenetre.ui.definirEntree, SIGNAL("clicked()"), self.majModeDefinirEntree, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.definirSortie, SIGNAL("clicked()"), self.majModeDefinirSortie, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.definirZonePlacement, SIGNAL("clicked()"), self.majModeZonePlacement, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.cacheActif, SIGNAL("clicked()"), self.majEtatCacheEnCours, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.cacheVoir, SIGNAL("clicked()"), self.voirCacheEnCours, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.cachePlacer, SIGNAL("clicked()"), self.placerCacheEnCours, Qt.UniqueConnection)
+
+        self.fenetre.connect(self.fenetre.ui.notesMjPlateau, SIGNAL("textChanged()"), self.majNotesPlateau, Qt.UniqueConnection)
+        self.fenetre.connect(self.fenetre.ui.notesPion, SIGNAL("textChanged()"), self.majNotesPion, Qt.UniqueConnection)
 
+        #formes (dessin)
         self.fenetre.connect(self.fenetre.ui.formeSimple, SIGNAL("clicked()"), self.majModeForme, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.formeLigne, SIGNAL("clicked()"), self.majModeForme, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.formeLigneOrientee, SIGNAL("clicked()"), self.majModeForme, Qt.UniqueConnection)
@@ -200,52 +243,26 @@ class Plateau(QGraphicsScene):
         self.fenetre.connect(self.fenetre.ui.formeRectVide, SIGNAL("clicked()"), self.majModeForme, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.formeRectPlein, SIGNAL("clicked()"), self.majModeForme, Qt.UniqueConnection)
 
-        self.fenetre.connect(self.fenetre.ui.effFeu, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.effEau, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.effGlace, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.effPoison, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.effEffacer, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
-
-        self.fenetre.connect(self.fenetre.ui.cacheActif, SIGNAL("clicked()"), self.majEtatCacheEnCours, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.cacheVoir, SIGNAL("clicked()"), self.voirCacheEnCours, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.cachePlacer, SIGNAL("clicked()"), self.placerCacheEnCours, Qt.UniqueConnection)
+        
+##        self.fenetre.connect(self.fenetre.ui.effFeu, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
+##        self.fenetre.connect(self.fenetre.ui.effEau, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
+##        self.fenetre.connect(self.fenetre.ui.effGlace, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
+##        self.fenetre.connect(self.fenetre.ui.effPoison, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
+##        self.fenetre.connect(self.fenetre.ui.effEffacer, SIGNAL("clicked()"), self.modeCaseEffet, Qt.UniqueConnection)
 
         self.fenetre.connect(self.fenetre.ui.combatDeplacement, SIGNAL("clicked()"), self.majModeCombatDeplacement, Qt.UniqueConnection)
-        self.fenetre.ui.combatDeplacement.setCheckable(True)
         self.fenetre.connect(self.fenetre.ui.combatAttaqueCaC, SIGNAL("clicked()"), self.majModeCombatAttaqueCaC, Qt.UniqueConnection)
-        self.fenetre.ui.combatAttaqueCaC.setCheckable(True)
         self.fenetre.connect(self.fenetre.ui.combatAttaqueDist, SIGNAL("clicked()"), self.majModeCombatAttaqueDist, Qt.UniqueConnection)
-        self.fenetre.ui.combatAttaqueDist.setCheckable(True)
         self.fenetre.connect(self.fenetre.ui.combatAttaqueZone, SIGNAL("clicked()"), self.fenetre.barreCombatZone, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.combatAttaqueZone, SIGNAL("clicked()"), self.majModeCombatZone, Qt.UniqueConnection)
-        self.fenetre.ui.combatAttaqueZone.setCheckable(True)
         self.fenetre.connect(self.fenetre.ui.combatVol, SIGNAL("clicked()"), self.fenetre.barreCombatVol, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.combatVol_altitude, SIGNAL("valueChanged(int)"), self.majZPion, Qt.UniqueConnection)
-        #self.fenetre.connect(self.fenetre.ui.combatVol_altitude, SIGNAL("editingFinished()"), self.majVisibiliteBarreCombat)
         self.fenetre.connect(self.fenetre.ui.combatZone_ligne, SIGNAL("clicked()"), self.majModeCombatZoneForme, Qt.UniqueConnection)
-        self.fenetre.ui.combatZone_ligne.setCheckable(True)
         self.fenetre.connect(self.fenetre.ui.combatZone_disque, SIGNAL("clicked()"), self.majModeCombatZoneForme, Qt.UniqueConnection)
-        self.fenetre.ui.combatZone_disque.setCheckable(True)
         self.fenetre.connect(self.fenetre.ui.combatZone_cone, SIGNAL("clicked()"), self.majModeCombatZoneForme, Qt.UniqueConnection)
-        self.fenetre.ui.combatZone_cone.setCheckable(True)
-        self.fenetre.connect(self.fenetre.ui.combatRetour, SIGNAL("clicked()"), self.fenetre.barreCombatMenu, Qt.UniqueConnection)
         self.fenetre.connect(self.fenetre.ui.combatPasserTour, SIGNAL("clicked()"), self.pionSuivant, Qt.UniqueConnection)
-        #self.connect(self.ui.combatInventaire, SIGNAL("clicked()"), self.majModePionSupprimer)
-
-        self.fenetre.connect(self.fenetre.ui.modeAffichagePlateau, SIGNAL("currentIndexChanged(int)"), self.majModeAffichage, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.listTerrains, SIGNAL("cellClicked(int,int)"), self.modeMajTerrainCase, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.listCreatures, SIGNAL("cellClicked(int,int)"), self.modeCreationCreaturePion, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.listDecors, SIGNAL("cellClicked(int,int)"), self.modeCreationDecor, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.epaisseurPinceau, SIGNAL("valueChanged(int)"), self.majEpaisseurPinceau, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.altitudeCase, SIGNAL("valueChanged(double)"), self.modeMajAltitudeCase, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.infoOrdreJeu, SIGNAL("cellClicked(int,int)"), self.clicListOrdreJeu, Qt.UniqueConnection)
-        
-        self.fenetre.connect(self.fenetre.ui.listeAttributs, SIGNAL("cellChanged(int,int)"), self.listeAttributCelluleModifiee, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.editerAttaques, SIGNAL("clicked()"), self.afficheEcranEditionAttaques, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.notesPion, SIGNAL("textChanged()"), self.majNotesPion, Qt.UniqueConnection)
+        #self.fenetre.connect(self.fenetre.ui.combatVol_altitude, SIGNAL("editingFinished()"), self.majVisibiliteBarreCombat)
 
-        self.fenetre.connect(self.fenetre.ui.notesMjPlateau, SIGNAL("textChanged()"), self.majNotesPlateau, Qt.UniqueConnection)
-        self.fenetre.connect(self.fenetre.ui.agrandirNotesMjPlateau, SIGNAL("clicked()"), self.agrandirNotesMjPlateau, Qt.UniqueConnection)
         
 
     def initialisationGraphique(self):
@@ -299,6 +316,14 @@ class Plateau(QGraphicsScene):
         self.initListeOrdreJeu()
         self.initListeAttaques()
         self.fenetre.ui.notesMjPlateau.setText(QString.fromUtf8(self.notes))
+
+        self.fenetre.ui.combatDeplacement.setCheckable(True)
+        self.fenetre.ui.combatAttaqueCaC.setCheckable(True)
+        self.fenetre.ui.combatAttaqueDist.setCheckable(True)
+        self.fenetre.ui.combatAttaqueZone.setCheckable(True)
+        self.fenetre.ui.combatZone_ligne.setCheckable(True)
+        self.fenetre.ui.combatZone_disque.setCheckable(True)
+        self.fenetre.ui.combatZone_cone.setCheckable(True)
         
         if self.modeParam["couleurPion"].isValid(): 
             self.fenetre.ui.pionCouleur.setStyleSheet("QPushButton {backGround:%s}" %(self.modeParam["couleurPion"].name()))

lib/ui/ecran_creationPlateau.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'creationPlateau.ui'
 #
-# Created: Mon May 04 16:45:50 2015
+# Created: Wed May 13 14:55:35 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -172,6 +172,8 @@ class Ui_creationPlateau(object):
         self.plateauEC_nom.setObjectName(_fromUtf8("plateauEC_nom"))
         self.plateauEC_apercu = QtGui.QLabel(self.page)
         self.plateauEC_apercu.setGeometry(QtCore.QRect(60, 90, 241, 191))
+        self.plateauEC_apercu.setFrameShape(QtGui.QFrame.StyledPanel)
+        self.plateauEC_apercu.setAlignment(QtCore.Qt.AlignCenter)
         self.plateauEC_apercu.setObjectName(_fromUtf8("plateauEC_apercu"))
         self.chargerPlateauEC = QtGui.QPushButton(self.page)
         self.chargerPlateauEC.setEnabled(False)
@@ -259,6 +261,7 @@ class Ui_creationPlateau(object):
         font = QtGui.QFont()
         font.setPointSize(10)
         self.creerPlateau.setFont(font)
+        self.creerPlateau.setDefault(True)
         self.creerPlateau.setObjectName(_fromUtf8("creerPlateau"))
         self.label_10 = QtGui.QLabel(self.page_2)
         self.label_10.setGeometry(QtCore.QRect(15, 50, 61, 21))
@@ -317,7 +320,7 @@ class Ui_creationPlateau(object):
         self.supprimerPlateau.setFont(font)
         self.supprimerPlateau.setObjectName(_fromUtf8("supprimerPlateau"))
         self.listPlateau = QtGui.QTableWidget(self.page_3)
-        self.listPlateau.setGeometry(QtCore.QRect(10, 40, 471, 201))
+        self.listPlateau.setGeometry(QtCore.QRect(10, 40, 471, 211))
         palette = QtGui.QPalette()
         brush = QtGui.QBrush(QtGui.QColor(247, 247, 247))
         brush.setStyle(QtCore.Qt.SolidPattern)
@@ -457,11 +460,13 @@ class Ui_creationPlateau(object):
         self.label_14.setObjectName(_fromUtf8("label_14"))
         self.modele_apercu = QtGui.QLabel(self.page_4)
         self.modele_apercu.setGeometry(QtCore.QRect(270, 80, 201, 161))
+        self.modele_apercu.setFrameShape(QtGui.QFrame.StyledPanel)
+        self.modele_apercu.setAlignment(QtCore.Qt.AlignCenter)
         self.modele_apercu.setObjectName(_fromUtf8("modele_apercu"))
         self.menus.addWidget(self.page_4)
 
         self.retranslateUi(creationPlateau)
-        self.menus.setCurrentIndex(0)
+        self.menus.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(creationPlateau)
 
     def retranslateUi(self, creationPlateau):
@@ -489,7 +494,7 @@ class Ui_creationPlateau(object):
         self.listeMenus.setSortingEnabled(__sortingEnabled)
         self.label.setText(_translate("creationPlateau", "Reprendre le dernier plateau : ", None))
         self.plateauEC_nom.setText(_translate("creationPlateau", "nom", None))
-        self.plateauEC_apercu.setText(_translate("creationPlateau", "aperçu", None))
+        self.plateauEC_apercu.setText(_translate("creationPlateau", "(Non disponible)", None))
         self.chargerPlateauEC.setText(_translate("creationPlateau", "Ok", None))
         self.label_2.setText(_translate("creationPlateau", "Chapitre:", None))
         self.plateauEC_chap.setText(_translate("creationPlateau", "chap", None))
@@ -548,7 +553,7 @@ class Ui_creationPlateau(object):
         self.modele_dimensions.setText(_translate("creationPlateau", "dim", None))
         self.chargerModele.setText(_translate("creationPlateau", "Ok", None))
         self.label_14.setText(_translate("creationPlateau", "Utiliser un plateau tout fait : ", None))
-        self.modele_apercu.setText(_translate("creationPlateau", "apercu", None))
+        self.modele_apercu.setText(_translate("creationPlateau", "(Non disponible)", None))
 
 
 if __name__ == "__main__":

lib/ui/gestionCombat.ui

@@ -78,12 +78,95 @@
      <height>281</height>
     </size>
    </property>
+   <property name="palette">
+    <palette>
+     <active>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>245</red>
+         <green>245</green>
+         <blue>245</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </active>
+     <inactive>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>245</red>
+         <green>245</green>
+         <blue>245</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </inactive>
+     <disabled>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>240</red>
+         <green>240</green>
+         <blue>240</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </disabled>
+    </palette>
+   </property>
    <property name="frameShape">
-    <enum>QFrame::StyledPanel</enum>
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Sunken</enum>
    </property>
    <property name="selectionBehavior">
     <enum>QAbstractItemView::SelectRows</enum>
    </property>
+   <attribute name="verticalHeaderVisible">
+    <bool>true</bool>
+   </attribute>
+   <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>Nouvelle colonne</string>
+    </property>
+   </column>
+   <column>
+    <property name="text">
+     <string>Nouvelle colonne</string>
+    </property>
+   </column>
+   <column>
+    <property name="text">
+     <string>Nouvelle colonne</string>
+    </property>
+   </column>
+   <column>
+    <property name="text">
+     <string>Nouvelle colonne</string>
+    </property>
+   </column>
   </widget>
   <widget class="QFrame" name="panneauGestionCombat">
    <property name="geometry">
@@ -265,7 +348,7 @@
     </property>
     <property name="icon">
      <iconset>
-      <normaloff>img/de.png</normaloff>img/de.png</iconset>
+      <normaloff>../../img/de.png</normaloff>../../img/de.png</iconset>
     </property>
    </widget>
    <widget class="QCheckBox" name="masquerHorsCombat">