Maj de l'interface d'édition des terrains

a faire.txt

@@ -1,3 +1,6 @@
+creer une frame qui montre une vue en coupe de l'altitude et des obstacles (a la place du journal)
+lors des deplacements, attaques à distance ou de zone
+
 creer une forme de dessin 'pot de peinture'
 
 creer des id uniques pour les plateaux et objets ("p"+partie++chapitre+nom? ou tps en s a la creation + préfixe?)

creation.txt

@@ -2,15 +2,13 @@
 
 3 origines (4?): Commun, Perso, Ce plateau seulement (, règles?)
 
-Parties:
-
 Général:
   Id
   Nom
+  Logo
   notes
 
 Pion:
-  logo
   hauteur
   Forme
   couleur
@@ -19,7 +17,7 @@ Pion:
 
 Terrain:
   couleur
-  imgTexture
+  texture
   franchissable
   franchissableNage
   franchissableEscalade

lib/EcranEditionTerrain.py

@@ -1,14 +1,11 @@
 #from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 from __future__ import division
-
+import os
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-
 from Terrain import Terrain
-
-from ui.ecran_editionTerrain import Ui_editionTerrain
-
+from ui.ecran_editionTerrain import Ui_et_fenetre
 from outilsSvg import *
 
 class EcranEditionTerrain(QDialog):
@@ -16,10 +13,11 @@ class EcranEditionTerrain(QDialog):
     def __init__(self, terrain=None, parent=None):
         """initialisation de la fenetre"""
         super (EcranEditionTerrain, self).__init__()
+        self.nomImg = ""
         self.createWidgets()
         self.terrain = terrain
         if terrain == None:
-            self.accesCreation()
+            self.terrain = Terrain()
         else:
             self.accesEdition()
         self.majAffichage("")    
@@ -27,46 +25,42 @@ class EcranEditionTerrain(QDialog):
     def createWidgets(self):
         """construction de l'interface"""
         #construction de l'interface
-        self.ui = Ui_editionTerrain()
+        self.ui = Ui_et_fenetre()
         self.ui.setupUi(self)
-        self.connect(self.ui.enregistrerTerrain, SIGNAL("clicked()"), self.enregistrer)
-        self.connect(self.ui.annulerTerrain, SIGNAL("clicked()"), self.annuler)
-        self.connect(self.ui.supprimerTerrain, SIGNAL("clicked()"), self.supprimer)
-        self.connect(self.ui.idTerrain, SIGNAL("textEdited(QString)"), self.majAffichage)
-        self.connect(self.ui.nomTerrain, SIGNAL("textEdited(QString)"), self.majAffichage)
-        self.connect(self.ui.couleurTerrain, SIGNAL("clicked()"), self.selectionCouleur)
+        self.connect(self.ui.et_enregistrer, SIGNAL("clicked()"), self.enregistrer)
+        self.connect(self.ui.et_annuler, SIGNAL("clicked()"), self.annuler)
+        self.connect(self.ui.et_supprimer, SIGNAL("clicked()"), self.supprimer)
+        self.connect(self.ui.et_nom, SIGNAL("textEdited(QString)"), self.majAffichage)
+        self.connect(self.ui.et_selectionCouleur, SIGNAL("clicked()"), self.selectionCouleur)
+        self.connect(self.ui.et_selectionFichier, SIGNAL("clicked()"), self.selectionFichier)
         
     def accesEdition(self):
         """ouverture en mode edition"""
-        self.ui.idTerrain.setEnabled(True)
-       
-        self.ui.idTerrain.setText(QString.fromUtf8(str(self.terrain.id)))
-        self.ui.nomTerrain.setText(QString.fromUtf8(str(self.terrain.nom)))        
-        if self.terrain.couleur.isValid():
-            self.ui.affichageCouleurTerrain.setStyleSheet("QLabel {backGround:%s}" %(self.terrain.couleur.name()))
-        self.ui.imgTextureTerrain.setText(QString.fromUtf8(str(self.terrain.imgTexture)))      
-        self.ui.modDeplacementTerrain.setValue(self.terrain.modDeplacement)
-        if self.terrain.visibilite:
-            self.ui.visibiliteTerrain.setCheckState(2)
-        else:
-            self.ui.visibiliteTerrain.setCheckState(0)
-        if self.terrain.franchissable:    
-            self.ui.franchissableTerrain.setCheckState(2)
-        else:
-            self.ui.franchissableTerrain.setCheckState(0)
-        self.ui.supprimerTerrain.setEnabled(True)
-        self.ui.idTerrain.setEnabled(False)
-
-    def accesCreation(self):
-        """ouverture en mode creation"""
-        self.terrain = Terrain()
-        self.ui.idTerrain.setEnabled(True)
-        self.ui.idTerrain.setText(QString.fromUtf8(str(self.nouvelIdTerrain())))
-        self.ui.idTerrain.setEnabled(False)
+        self.ui.et_nom.setText(QString.fromUtf8(str(self.terrain.nom)))
+        if os.path.exists(self.terrain.imgTexture):
+            pix = QPixmap(QString.fromUtf8(str(self.terrain.imgTexture)))
+            if not pix.isNull():
+                self.ui.et_apercu.setText(QString(""))
+                pix = QPixmap(QString.fromUtf8(str(self.terrain.imgTexture)))
+                self.ui.et_apercu.setPixmap(pix)
+        else:    
+            if self.terrain.couleur.isValid():
+                self.ui.et_apercu.setText(QString(""))
+                self.ui.et_apercu.setStyleSheet("QLabel {backGround:%s}" %(self.terrain.couleur.name()))
+     
+##        if self.terrain.visibilite:
+##            self.ui.visibiliteTerrain.setCheckState(2)
+##        else:
+##            self.ui.visibiliteTerrain.setCheckState(0)
+##        if self.terrain.franchissable:    
+##            self.ui.franchissableTerrain.setCheckState(2)
+##        else:
+##            self.ui.franchissableTerrain.setCheckState(0)
+        self.ui.et_supprimer.setEnabled(True)
 
     def majAffichage(self, txt):
         """verifie la validite des saisies"""
-        self.ui.enregistrerTerrain.setEnabled(len(self.ui.idTerrain.text().toUtf8()) > 0 and len(self.ui.nomTerrain.text().toUtf8()) > 0)
+        self.ui.et_enregistrer.setEnabled(len(self.ui.et_nom.text().toUtf8()) > 0)
 
     def nouvelIdTerrain(self):
         """renvoie un identifiant pour un nouveau terrain"""
@@ -81,17 +75,35 @@ class EcranEditionTerrain(QDialog):
         couleur = QColorDialog(self).getColor(QColor("white"), self)
         if couleur.isValid():
             nomCouleur = couleur.name()
-            self.ui.affichageCouleurTerrain.setStyleSheet("QLabel {backGround:%s}" %(nomCouleur))
+            self.ui.et_apercu.setText(QString(""))
+            self.ui.et_apercu.setStyleSheet("QLabel {backGround:%s}" %(nomCouleur))
             self.terrain.couleur = couleur    
+
+    def selectionFichier(self):
+        """selectionne le fichier de texture dans la boite de dialogue dediee"""
+        fichier = QFileDialog.getOpenFileName(self, 
+                                              "Selectionnez une image", 
+                                              "\\img", 
+                                              "Images (*.png *.jpg)")
+        pix = QPixmap(fichier)
+        if not pix.isNull():
+            self.nomImg = fichier
+            self.ui.et_apercu.setText(QString(""))
+            self.ui.et_apercu.setPixmap(pix)
+        else:    
+            dial = QMessageBox(self)
+            dial.setText("Format non reconnu")
+            dial.setWindowTitle("Erreur")
+            dial.setStandardButtons(QMessageBox.Ok)
+            dial.exec_()
             
+           
     def enregistrer(self):
         """enregistre le terrain cree/edite"""
-        self.terrain.id = str(self.ui.idTerrain.text().toUtf8())
-        self.terrain.nom = str(self.ui.nomTerrain.text().toUtf8())
-        self.terrain.imgTexture = str(self.ui.imgTextureTerrain.text().toUtf8())
-        self.terrain.modDeplacement = float(self.ui.modDeplacementTerrain.value())
-        self.terrain.visibilite = bool(self.ui.visibiliteTerrain.checkState())
-        self.terrain.franchissable = bool(self.ui.franchissableTerrain.checkState())
+        self.terrain.id = self.nouvelIdTerrain()
+        self.terrain.nom = str(self.ui.et_nom.text().toUtf8())
+        self.terrain.imgTexture = self.nomImg
+##        self.terrain.franchissable = bool(self.ui.franchissableTerrain.checkState())
         enregistrer(self.terrain.id, self.terrain, "lib\\biblio\\terrain")
         self.terrain = None
         self.done(1)

lib/ui/ecran_editionCombattant.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'editionCombattant.ui'
 #
-# Created: Tue May 19 10:11:02 2015
+# Created: Wed May 20 14:53:21 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -111,7 +111,7 @@ class Ui_editionCombattant(object):
         self.tabForme = QtGui.QWidget()
         self.tabForme.setObjectName(_fromUtf8("tabForme"))
         self.groupBox_2 = QtGui.QGroupBox(self.tabForme)
-        self.groupBox_2.setGeometry(QtCore.QRect(460, 20, 131, 291))
+        self.groupBox_2.setGeometry(QtCore.QRect(490, 20, 171, 291))
         self.groupBox_2.setObjectName(_fromUtf8("groupBox_2"))
         self.txtAfficherCombattant = QtGui.QCheckBox(self.groupBox_2)
         self.txtAfficherCombattant.setGeometry(QtCore.QRect(100, 10, 21, 21))
@@ -119,7 +119,7 @@ class Ui_editionCombattant(object):
         self.txtAfficherCombattant.setChecked(True)
         self.txtAfficherCombattant.setObjectName(_fromUtf8("txtAfficherCombattant"))
         self.txtPosYCombattant = QtGui.QSlider(self.groupBox_2)
-        self.txtPosYCombattant.setGeometry(QtCore.QRect(10, 210, 111, 19))
+        self.txtPosYCombattant.setGeometry(QtCore.QRect(10, 180, 141, 19))
         self.txtPosYCombattant.setMinimum(-1000)
         self.txtPosYCombattant.setMaximum(1000)
         self.txtPosYCombattant.setOrientation(QtCore.Qt.Horizontal)
@@ -128,17 +128,17 @@ class Ui_editionCombattant(object):
         self.label_17.setGeometry(QtCore.QRect(10, 70, 111, 20))
         self.label_17.setObjectName(_fromUtf8("label_17"))
         self.label_19 = QtGui.QLabel(self.groupBox_2)
-        self.label_19.setGeometry(QtCore.QRect(10, 150, 111, 20))
+        self.label_19.setGeometry(QtCore.QRect(10, 120, 111, 20))
         self.label_19.setObjectName(_fromUtf8("label_19"))
         self.txtTaillePoliceCombattant = QtGui.QSlider(self.groupBox_2)
-        self.txtTaillePoliceCombattant.setGeometry(QtCore.QRect(10, 90, 111, 19))
+        self.txtTaillePoliceCombattant.setGeometry(QtCore.QRect(10, 90, 141, 19))
         self.txtTaillePoliceCombattant.setMinimum(8)
         self.txtTaillePoliceCombattant.setMaximum(99)
         self.txtTaillePoliceCombattant.setProperty("value", 20)
         self.txtTaillePoliceCombattant.setOrientation(QtCore.Qt.Horizontal)
         self.txtTaillePoliceCombattant.setObjectName(_fromUtf8("txtTaillePoliceCombattant"))
         self.txtRotationCombattant = QtGui.QSlider(self.groupBox_2)
-        self.txtRotationCombattant.setGeometry(QtCore.QRect(10, 50, 111, 19))
+        self.txtRotationCombattant.setGeometry(QtCore.QRect(10, 50, 141, 19))
         self.txtRotationCombattant.setMinimum(-180)
         self.txtRotationCombattant.setMaximum(180)
         self.txtRotationCombattant.setOrientation(QtCore.Qt.Horizontal)
@@ -147,22 +147,22 @@ class Ui_editionCombattant(object):
         self.label_20.setGeometry(QtCore.QRect(10, 30, 111, 20))
         self.label_20.setObjectName(_fromUtf8("label_20"))
         self.txtPosXCombattant = QtGui.QSlider(self.groupBox_2)
-        self.txtPosXCombattant.setGeometry(QtCore.QRect(10, 170, 111, 19))
+        self.txtPosXCombattant.setGeometry(QtCore.QRect(10, 140, 141, 19))
         self.txtPosXCombattant.setMinimum(-800)
         self.txtPosXCombattant.setMaximum(800)
         self.txtPosXCombattant.setOrientation(QtCore.Qt.Horizontal)
         self.txtPosXCombattant.setObjectName(_fromUtf8("txtPosXCombattant"))
         self.label_21 = QtGui.QLabel(self.groupBox_2)
-        self.label_21.setGeometry(QtCore.QRect(10, 190, 111, 20))
+        self.label_21.setGeometry(QtCore.QRect(10, 160, 111, 20))
         self.label_21.setObjectName(_fromUtf8("label_21"))
         self.txtReinitCombattant = QtGui.QPushButton(self.groupBox_2)
-        self.txtReinitCombattant.setGeometry(QtCore.QRect(10, 240, 111, 20))
+        self.txtReinitCombattant.setGeometry(QtCore.QRect(10, 260, 111, 20))
         self.txtReinitCombattant.setObjectName(_fromUtf8("txtReinitCombattant"))
         self.txtGrasCombattant = QtGui.QCheckBox(self.groupBox_2)
-        self.txtGrasCombattant.setGeometry(QtCore.QRect(10, 120, 41, 21))
+        self.txtGrasCombattant.setGeometry(QtCore.QRect(10, 210, 41, 21))
         self.txtGrasCombattant.setObjectName(_fromUtf8("txtGrasCombattant"))
         self.groupBox = QtGui.QGroupBox(self.tabForme)
-        self.groupBox.setGeometry(QtCore.QRect(310, 20, 131, 291))
+        self.groupBox.setGeometry(QtCore.QRect(310, 20, 171, 291))
         self.groupBox.setObjectName(_fromUtf8("groupBox"))
         self.imgAfficherCombattant = QtGui.QCheckBox(self.groupBox)
         self.imgAfficherCombattant.setGeometry(QtCore.QRect(100, 10, 21, 21))
@@ -170,7 +170,7 @@ class Ui_editionCombattant(object):
         self.imgAfficherCombattant.setChecked(True)
         self.imgAfficherCombattant.setObjectName(_fromUtf8("imgAfficherCombattant"))
         self.imgPosYCombattant = QtGui.QSlider(self.groupBox)
-        self.imgPosYCombattant.setGeometry(QtCore.QRect(10, 200, 111, 19))
+        self.imgPosYCombattant.setGeometry(QtCore.QRect(10, 200, 141, 19))
         self.imgPosYCombattant.setMinimum(-400)
         self.imgPosYCombattant.setMaximum(400)
         self.imgPosYCombattant.setOrientation(QtCore.Qt.Horizontal)
@@ -185,13 +185,13 @@ class Ui_editionCombattant(object):
         self.label_14.setGeometry(QtCore.QRect(10, 140, 111, 20))
         self.label_14.setObjectName(_fromUtf8("label_14"))
         self.imgTailleXCombattant = QtGui.QSlider(self.groupBox)
-        self.imgTailleXCombattant.setGeometry(QtCore.QRect(10, 80, 111, 19))
+        self.imgTailleXCombattant.setGeometry(QtCore.QRect(10, 80, 141, 19))
         self.imgTailleXCombattant.setMinimum(0)
         self.imgTailleXCombattant.setProperty("value", 10)
         self.imgTailleXCombattant.setOrientation(QtCore.Qt.Horizontal)
         self.imgTailleXCombattant.setObjectName(_fromUtf8("imgTailleXCombattant"))
         self.imgRotationCombattant = QtGui.QSlider(self.groupBox)
-        self.imgRotationCombattant.setGeometry(QtCore.QRect(10, 40, 111, 19))
+        self.imgRotationCombattant.setGeometry(QtCore.QRect(10, 40, 141, 19))
         self.imgRotationCombattant.setMinimum(-180)
         self.imgRotationCombattant.setMaximum(180)
         self.imgRotationCombattant.setOrientation(QtCore.Qt.Horizontal)
@@ -200,7 +200,7 @@ class Ui_editionCombattant(object):
         self.label_16.setGeometry(QtCore.QRect(10, 20, 111, 20))
         self.label_16.setObjectName(_fromUtf8("label_16"))
         self.imgPosXCombattant = QtGui.QSlider(self.groupBox)
-        self.imgPosXCombattant.setGeometry(QtCore.QRect(10, 160, 111, 19))
+        self.imgPosXCombattant.setGeometry(QtCore.QRect(10, 160, 141, 19))
         self.imgPosXCombattant.setMinimum(-400)
         self.imgPosXCombattant.setMaximum(400)
         self.imgPosXCombattant.setOrientation(QtCore.Qt.Horizontal)
@@ -209,7 +209,7 @@ class Ui_editionCombattant(object):
         self.label_15.setGeometry(QtCore.QRect(10, 180, 111, 20))
         self.label_15.setObjectName(_fromUtf8("label_15"))
         self.imgTailleYCombattant = QtGui.QSlider(self.groupBox)
-        self.imgTailleYCombattant.setGeometry(QtCore.QRect(10, 120, 111, 19))
+        self.imgTailleYCombattant.setGeometry(QtCore.QRect(10, 120, 141, 19))
         self.imgTailleYCombattant.setMinimum(0)
         self.imgTailleYCombattant.setProperty("value", 10)
         self.imgTailleYCombattant.setOrientation(QtCore.Qt.Horizontal)
@@ -223,9 +223,6 @@ class Ui_editionCombattant(object):
         self.imgMasqueCombattant = QtGui.QCheckBox(self.groupBox)
         self.imgMasqueCombattant.setGeometry(QtCore.QRect(10, 240, 101, 17))
         self.imgMasqueCombattant.setObjectName(_fromUtf8("imgMasqueCombattant"))
-        self.label_9 = QtGui.QLabel(self.tabForme)
-        self.label_9.setGeometry(QtCore.QRect(20, 0, 251, 20))
-        self.label_9.setObjectName(_fromUtf8("label_9"))
         self.vueForme = QtGui.QGraphicsView(self.tabForme)
         self.vueForme.setGeometry(QtCore.QRect(20, 20, 281, 291))
         self.vueForme.setRenderHints(QtGui.QPainter.Antialiasing|QtGui.QPainter.HighQualityAntialiasing|QtGui.QPainter.TextAntialiasing)
@@ -321,7 +318,7 @@ class Ui_editionCombattant(object):
         self.ongletsCreation.addTab(self.tabAttaques, _fromUtf8(""))
 
         self.retranslateUi(editionCombattant)
-        self.ongletsCreation.setCurrentIndex(1)
+        self.ongletsCreation.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(editionCombattant)
 
     def retranslateUi(self, editionCombattant):
@@ -354,7 +351,6 @@ class Ui_editionCombattant(object):
         self.imgReinitCombattant.setText(_translate("editionCombattant", "Ré-initialiser", None))
         self.imgPivoteCombattant.setText(_translate("editionCombattant", "Image pivote", None))
         self.imgMasqueCombattant.setText(_translate("editionCombattant", "Masque auto.", None))
-        self.label_9.setText(_translate("editionCombattant", "Forme du pion : ", None))
         self.ongletsCreation.setTabText(self.ongletsCreation.indexOf(self.tabForme), _translate("editionCombattant", "Forme et apparence", None))
         item = self.listeAttributs.horizontalHeaderItem(0)
         item.setText(_translate("editionCombattant", "Nouvelle colonne", None))

lib/ui/ecran_editionTerrain.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'editionTerrain.ui'
 #
-# Created: Tue Oct 07 16:41:54 2014
+# Created: Thu May 21 09:45:14 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -23,106 +23,156 @@ except AttributeError:
     def _translate(context, text, disambig):
         return QtGui.QApplication.translate(context, text, disambig)
 
-class Ui_editionTerrain(object):
-    def setupUi(self, editionTerrain):
-        editionTerrain.setObjectName(_fromUtf8("editionTerrain"))
-        editionTerrain.resize(400, 273)
-        self.label_5 = QtGui.QLabel(editionTerrain)
-        self.label_5.setGeometry(QtCore.QRect(170, 70, 191, 21))
+class Ui_et_fenetre(object):
+    def setupUi(self, et_fenetre):
+        et_fenetre.setObjectName(_fromUtf8("et_fenetre"))
+        et_fenetre.resize(395, 252)
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(_fromUtf8("img/paysage.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        et_fenetre.setWindowIcon(icon)
+        self.et_apercu = QtGui.QLabel(et_fenetre)
+        self.et_apercu.setGeometry(QtCore.QRect(20, 10, 71, 71))
         font = QtGui.QFont()
-        font.setItalic(True)
-        self.label_5.setFont(font)
-        self.label_5.setObjectName(_fromUtf8("label_5"))
-        self.franchissableTerrain = QtGui.QCheckBox(editionTerrain)
-        self.franchissableTerrain.setGeometry(QtCore.QRect(20, 190, 91, 17))
-        self.franchissableTerrain.setChecked(True)
-        self.franchissableTerrain.setTristate(False)
-        self.franchissableTerrain.setObjectName(_fromUtf8("franchissableTerrain"))
-        self.label_2 = QtGui.QLabel(editionTerrain)
-        self.label_2.setGeometry(QtCore.QRect(150, 110, 71, 21))
-        self.label_2.setObjectName(_fromUtf8("label_2"))
-        self.affichageCouleurTerrain = QtGui.QLabel(editionTerrain)
-        self.affichageCouleurTerrain.setGeometry(QtCore.QRect(100, 70, 51, 21))
-        self.affichageCouleurTerrain.setFrameShape(QtGui.QFrame.Box)
-        self.affichageCouleurTerrain.setFrameShadow(QtGui.QFrame.Sunken)
-        self.affichageCouleurTerrain.setText(_fromUtf8(""))
-        self.affichageCouleurTerrain.setObjectName(_fromUtf8("affichageCouleurTerrain"))
-        self.supprimerTerrain = QtGui.QPushButton(editionTerrain)
-        self.supprimerTerrain.setEnabled(False)
-        self.supprimerTerrain.setGeometry(QtCore.QRect(210, 230, 75, 23))
-        self.supprimerTerrain.setObjectName(_fromUtf8("supprimerTerrain"))
-        self.label = QtGui.QLabel(editionTerrain)
-        self.label.setGeometry(QtCore.QRect(20, 110, 141, 20))
-        self.label.setObjectName(_fromUtf8("label"))
-        self.enregistrerTerrain = QtGui.QPushButton(editionTerrain)
-        self.enregistrerTerrain.setEnabled(False)
-        self.enregistrerTerrain.setGeometry(QtCore.QRect(20, 230, 81, 23))
+        font.setFamily(_fromUtf8("Verdana"))
+        font.setPointSize(7)
+        self.et_apercu.setFont(font)
+        self.et_apercu.setFrameShape(QtGui.QFrame.Box)
+        self.et_apercu.setFrameShadow(QtGui.QFrame.Sunken)
+        self.et_apercu.setAlignment(QtCore.Qt.AlignCenter)
+        self.et_apercu.setObjectName(_fromUtf8("et_apercu"))
+        self.et_supprimer = QtGui.QPushButton(et_fenetre)
+        self.et_supprimer.setEnabled(False)
+        self.et_supprimer.setGeometry(QtCore.QRect(20, 200, 75, 31))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.et_supprimer.setFont(font)
+        self.et_supprimer.setObjectName(_fromUtf8("et_supprimer"))
+        self.et_enregistrer = QtGui.QPushButton(et_fenetre)
+        self.et_enregistrer.setEnabled(False)
+        self.et_enregistrer.setGeometry(QtCore.QRect(280, 200, 91, 31))
         font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
         font.setBold(True)
         font.setWeight(75)
-        self.enregistrerTerrain.setFont(font)
-        self.enregistrerTerrain.setObjectName(_fromUtf8("enregistrerTerrain"))
-        self.imgTextureTerrain = QtGui.QLineEdit(editionTerrain)
-        self.imgTextureTerrain.setGeometry(QtCore.QRect(200, 110, 161, 20))
-        self.imgTextureTerrain.setObjectName(_fromUtf8("imgTextureTerrain"))
-        self.annulerTerrain = QtGui.QPushButton(editionTerrain)
-        self.annulerTerrain.setGeometry(QtCore.QRect(290, 230, 81, 23))
-        self.annulerTerrain.setObjectName(_fromUtf8("annulerTerrain"))
-        self.modDeplacementTerrain = QtGui.QDoubleSpinBox(editionTerrain)
-        self.modDeplacementTerrain.setGeometry(QtCore.QRect(170, 140, 62, 22))
-        self.modDeplacementTerrain.setSingleStep(0.1)
-        self.modDeplacementTerrain.setProperty("value", 1.0)
-        self.modDeplacementTerrain.setObjectName(_fromUtf8("modDeplacementTerrain"))
-        self.couleurTerrain = QtGui.QPushButton(editionTerrain)
-        self.couleurTerrain.setGeometry(QtCore.QRect(10, 70, 75, 23))
-        self.couleurTerrain.setObjectName(_fromUtf8("couleurTerrain"))
-        self.idTerrain = QtGui.QLineEdit(editionTerrain)
-        self.idTerrain.setEnabled(False)
-        self.idTerrain.setGeometry(QtCore.QRect(90, 10, 113, 20))
-        self.idTerrain.setObjectName(_fromUtf8("idTerrain"))
-        self.label_6 = QtGui.QLabel(editionTerrain)
-        self.label_6.setGeometry(QtCore.QRect(20, 140, 151, 21))
-        self.label_6.setObjectName(_fromUtf8("label_6"))
-        self.visibiliteTerrain = QtGui.QCheckBox(editionTerrain)
-        self.visibiliteTerrain.setGeometry(QtCore.QRect(20, 170, 70, 17))
-        self.visibiliteTerrain.setChecked(True)
-        self.visibiliteTerrain.setObjectName(_fromUtf8("visibiliteTerrain"))
-        self.label_4 = QtGui.QLabel(editionTerrain)
-        self.label_4.setGeometry(QtCore.QRect(20, 40, 46, 16))
+        self.et_enregistrer.setFont(font)
+        self.et_enregistrer.setObjectName(_fromUtf8("et_enregistrer"))
+        self.et_annuler = QtGui.QPushButton(et_fenetre)
+        self.et_annuler.setGeometry(QtCore.QRect(190, 200, 81, 31))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.et_annuler.setFont(font)
+        self.et_annuler.setObjectName(_fromUtf8("et_annuler"))
+        self.et_selectionCouleur = QtGui.QPushButton(et_fenetre)
+        self.et_selectionCouleur.setGeometry(QtCore.QRect(20, 80, 31, 31))
+        self.et_selectionCouleur.setText(_fromUtf8(""))
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap(_fromUtf8("img/btnCouleurs.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.et_selectionCouleur.setIcon(icon1)
+        self.et_selectionCouleur.setObjectName(_fromUtf8("et_selectionCouleur"))
+        self.label_4 = QtGui.QLabel(et_fenetre)
+        self.label_4.setGeometry(QtCore.QRect(100, 5, 131, 21))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        font.setPointSize(8)
+        self.label_4.setFont(font)
         self.label_4.setObjectName(_fromUtf8("label_4"))
-        self.label_3 = QtGui.QLabel(editionTerrain)
-        self.label_3.setGeometry(QtCore.QRect(20, 10, 46, 16))
-        self.label_3.setObjectName(_fromUtf8("label_3"))
-        self.nomTerrain = QtGui.QLineEdit(editionTerrain)
-        self.nomTerrain.setGeometry(QtCore.QRect(90, 40, 113, 20))
-        self.nomTerrain.setObjectName(_fromUtf8("nomTerrain"))
+        self.et_nom = QtGui.QLineEdit(et_fenetre)
+        self.et_nom.setGeometry(QtCore.QRect(100, 30, 271, 31))
+        palette = QtGui.QPalette()
+        brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(240, 240, 240))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
+        self.et_nom.setPalette(palette)
+        self.et_nom.setObjectName(_fromUtf8("et_nom"))
+        self.et_selectionFichier = QtGui.QToolButton(et_fenetre)
+        self.et_selectionFichier.setGeometry(QtCore.QRect(60, 80, 31, 31))
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(QtGui.QPixmap(_fromUtf8("img/loupe.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.et_selectionFichier.setIcon(icon2)
+        self.et_selectionFichier.setObjectName(_fromUtf8("et_selectionFichier"))
+        self.et_tags = QtGui.QLineEdit(et_fenetre)
+        self.et_tags.setGeometry(QtCore.QRect(170, 70, 201, 21))
+        palette = QtGui.QPalette()
+        brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(248, 248, 248))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(240, 240, 240))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
+        self.et_tags.setPalette(palette)
+        self.et_tags.setObjectName(_fromUtf8("et_tags"))
+        self.label = QtGui.QLabel(et_fenetre)
+        self.label.setGeometry(QtCore.QRect(110, 70, 51, 21))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.label.setFont(font)
+        self.label.setObjectName(_fromUtf8("label"))
+        self.et_groupeDep = QtGui.QGroupBox(et_fenetre)
+        self.et_groupeDep.setGeometry(QtCore.QRect(20, 120, 351, 61))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.et_groupeDep.setFont(font)
+        self.et_groupeDep.setObjectName(_fromUtf8("et_groupeDep"))
+        self.et_depMarche = QtGui.QRadioButton(self.et_groupeDep)
+        self.et_depMarche.setGeometry(QtCore.QRect(50, 20, 51, 31))
+        self.et_depMarche.setText(_fromUtf8(""))
+        icon3 = QtGui.QIcon()
+        icon3.addPixmap(QtGui.QPixmap(_fromUtf8("img/btnZonePlacement.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.et_depMarche.setIcon(icon3)
+        self.et_depMarche.setIconSize(QtCore.QSize(19, 19))
+        self.et_depMarche.setChecked(True)
+        self.et_depMarche.setObjectName(_fromUtf8("et_depMarche"))
+        self.et_depNage = QtGui.QRadioButton(self.et_groupeDep)
+        self.et_depNage.setGeometry(QtCore.QRect(160, 20, 71, 31))
+        self.et_depNage.setText(_fromUtf8(""))
+        icon4 = QtGui.QIcon()
+        icon4.addPixmap(QtGui.QPixmap(_fromUtf8("img/nage.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.et_depNage.setIcon(icon4)
+        self.et_depNage.setIconSize(QtCore.QSize(19, 19))
+        self.et_depNage.setObjectName(_fromUtf8("et_depNage"))
+        self.et_depAucun = QtGui.QRadioButton(self.et_groupeDep)
+        self.et_depAucun.setGeometry(QtCore.QRect(270, 20, 61, 31))
+        self.et_depAucun.setText(_fromUtf8(""))
+        icon5 = QtGui.QIcon()
+        icon5.addPixmap(QtGui.QPixmap(_fromUtf8("img/interdit.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.et_depAucun.setIcon(icon5)
+        self.et_depAucun.setIconSize(QtCore.QSize(19, 19))
+        self.et_depAucun.setObjectName(_fromUtf8("et_depAucun"))
 
-        self.retranslateUi(editionTerrain)
-        QtCore.QMetaObject.connectSlotsByName(editionTerrain)
+        self.retranslateUi(et_fenetre)
+        QtCore.QMetaObject.connectSlotsByName(et_fenetre)
 
-    def retranslateUi(self, editionTerrain):
-        editionTerrain.setWindowTitle(_translate("editionTerrain", "Dialog", None))
-        self.label_5.setText(_translate("editionTerrain", "(Couleur du terrain si pas de texture)", None))
-        self.franchissableTerrain.setText(_translate("editionTerrain", "Franchissable", None))
-        self.label_2.setText(_translate("editionTerrain", "...img\\", None))
-        self.supprimerTerrain.setText(_translate("editionTerrain", "Supprimer", None))
-        self.label.setText(_translate("editionTerrain", "Texture (.png, .jpg)", None))
-        self.enregistrerTerrain.setText(_translate("editionTerrain", "Enregistrer", None))
-        self.annulerTerrain.setText(_translate("editionTerrain", "Annuler", None))
-        self.modDeplacementTerrain.setPrefix(_translate("editionTerrain", "x", None))
-        self.couleurTerrain.setText(_translate("editionTerrain", "Couleur", None))
-        self.label_6.setText(_translate("editionTerrain", "Coût de déplacement : ", None))
-        self.visibiliteTerrain.setText(_translate("editionTerrain", "Visibilité", None))
-        self.label_4.setText(_translate("editionTerrain", "Nom : ", None))
-        self.label_3.setText(_translate("editionTerrain", "Id : ", None))
+    def retranslateUi(self, et_fenetre):
+        et_fenetre.setWindowTitle(_translate("et_fenetre", "Créer / Editer un terrain", None))
+        self.et_apercu.setText(_translate("et_fenetre", "Choisissez \n"
+"une couleur\n"
+"et/ou un \n"
+"fichier\n"
+"texture", None))
+        self.et_supprimer.setText(_translate("et_fenetre", "Supprimer", None))
+        self.et_enregistrer.setText(_translate("et_fenetre", "Enregistrer", None))
+        self.et_annuler.setText(_translate("et_fenetre", "Annuler", None))
+        self.label_4.setText(_translate("et_fenetre", "Nom du terrain : ", None))
+        self.et_selectionFichier.setText(_translate("et_fenetre", "...", None))
+        self.label.setText(_translate("et_fenetre", "Tags : ", None))
+        self.et_groupeDep.setTitle(_translate("et_fenetre", "Déplacement", None))
 
 
 if __name__ == "__main__":
     import sys
     app = QtGui.QApplication(sys.argv)
-    editionTerrain = QtGui.QDialog()
-    ui = Ui_editionTerrain()
-    ui.setupUi(editionTerrain)
-    editionTerrain.show()
+    et_fenetre = QtGui.QDialog()
+    ui = Ui_et_fenetre()
+    ui.setupUi(et_fenetre)
+    et_fenetre.show()
     sys.exit(app.exec_())
 

lib/ui/editionCombattant.ui

@@ -306,7 +306,7 @@
     </rect>
    </property>
    <property name="currentIndex">
-    <number>1</number>
+    <number>0</number>
    </property>
    <widget class="QWidget" name="tabForme">
     <attribute name="title">
@@ -315,9 +315,9 @@
     <widget class="QGroupBox" name="groupBox_2">
      <property name="geometry">
       <rect>
-       <x>460</x>
+       <x>490</x>
        <y>20</y>
-       <width>131</width>
+       <width>171</width>
        <height>291</height>
       </rect>
      </property>
@@ -344,8 +344,8 @@
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>210</y>
-        <width>111</width>
+        <y>180</y>
+        <width>141</width>
         <height>19</height>
        </rect>
       </property>
@@ -376,7 +376,7 @@
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>150</y>
+        <y>120</y>
         <width>111</width>
         <height>20</height>
        </rect>
@@ -390,7 +390,7 @@
        <rect>
         <x>10</x>
         <y>90</y>
-        <width>111</width>
+        <width>141</width>
         <height>19</height>
        </rect>
       </property>
@@ -412,7 +412,7 @@
        <rect>
         <x>10</x>
         <y>50</y>
-        <width>111</width>
+        <width>141</width>
         <height>19</height>
        </rect>
       </property>
@@ -443,8 +443,8 @@
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>170</y>
-        <width>111</width>
+        <y>140</y>
+        <width>141</width>
         <height>19</height>
        </rect>
       </property>
@@ -462,7 +462,7 @@
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>190</y>
+        <y>160</y>
         <width>111</width>
         <height>20</height>
        </rect>
@@ -475,7 +475,7 @@
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>240</y>
+        <y>260</y>
         <width>111</width>
         <height>20</height>
        </rect>
@@ -488,7 +488,7 @@
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>120</y>
+        <y>210</y>
         <width>41</width>
         <height>21</height>
        </rect>
@@ -503,7 +503,7 @@
       <rect>
        <x>310</x>
        <y>20</y>
-       <width>131</width>
+       <width>171</width>
        <height>291</height>
       </rect>
      </property>
@@ -531,7 +531,7 @@
        <rect>
         <x>10</x>
         <y>200</y>
-        <width>111</width>
+        <width>141</width>
         <height>19</height>
        </rect>
       </property>
@@ -589,7 +589,7 @@
        <rect>
         <x>10</x>
         <y>80</y>
-        <width>111</width>
+        <width>141</width>
         <height>19</height>
        </rect>
       </property>
@@ -608,7 +608,7 @@
        <rect>
         <x>10</x>
         <y>40</y>
-        <width>111</width>
+        <width>141</width>
         <height>19</height>
        </rect>
       </property>
@@ -640,7 +640,7 @@
        <rect>
         <x>10</x>
         <y>160</y>
-        <width>111</width>
+        <width>141</width>
         <height>19</height>
        </rect>
       </property>
@@ -672,7 +672,7 @@
        <rect>
         <x>10</x>
         <y>120</y>
-        <width>111</width>
+        <width>141</width>
         <height>19</height>
        </rect>
       </property>
@@ -726,19 +726,6 @@
       </property>
      </widget>
     </widget>
-    <widget class="QLabel" name="label_9">
-     <property name="geometry">
-      <rect>
-       <x>20</x>
-       <y>0</y>
-       <width>251</width>
-       <height>20</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>Forme du pion : </string>
-     </property>
-    </widget>
     <widget class="QGraphicsView" name="vueForme">
      <property name="geometry">
       <rect>

lib/ui/editionTerrain.ui

@@ -1,58 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>editionTerrain</class>
- <widget class="QDialog" name="editionTerrain">
+ <class>et_fenetre</class>
+ <widget class="QDialog" name="et_fenetre">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>242</height>
+    <width>395</width>
+    <height>252</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Créer / Editer un terrain</string>
   </property>
-  <widget class="QCheckBox" name="franchissableTerrain">
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>img/paysage.png</normaloff>img/paysage.png</iconset>
+  </property>
+  <widget class="QLabel" name="et_apercu">
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>160</y>
-     <width>91</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Franchissable</string>
-   </property>
-   <property name="checked">
-    <bool>true</bool>
-   </property>
-   <property name="tristate">
-    <bool>false</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>150</x>
-     <y>80</y>
+     <y>10</y>
      <width>71</width>
-     <height>21</height>
+     <height>71</height>
     </rect>
    </property>
-   <property name="text">
-    <string>...img\</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="affichageCouleurTerrain">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>40</y>
-     <width>51</width>
-     <height>21</height>
-    </rect>
+   <property name="font">
+    <font>
+     <family>Verdana</family>
+     <pointsize>7</pointsize>
+    </font>
    </property>
    <property name="frameShape">
     <enum>QFrame::Box</enum>
@@ -61,52 +39,52 @@
     <enum>QFrame::Sunken</enum>
    </property>
    <property name="text">
-    <string/>
+    <string>Choisissez 
+une couleur
+et/ou un 
+fichier
+texture</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
    </property>
   </widget>
-  <widget class="QPushButton" name="supprimerTerrain">
+  <widget class="QPushButton" name="et_supprimer">
    <property name="enabled">
     <bool>false</bool>
    </property>
    <property name="geometry">
     <rect>
-     <x>210</x>
+     <x>20</x>
      <y>200</y>
      <width>75</width>
-     <height>23</height>
+     <height>31</height>
     </rect>
    </property>
-   <property name="text">
-    <string>Supprimer</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>80</y>
-     <width>141</width>
-     <height>20</height>
-    </rect>
+   <property name="font">
+    <font>
+     <family>Verdana</family>
+    </font>
    </property>
    <property name="text">
-    <string>Texture (.png, .jpg)</string>
+    <string>Supprimer</string>
    </property>
   </widget>
-  <widget class="QPushButton" name="enregistrerTerrain">
+  <widget class="QPushButton" name="et_enregistrer">
    <property name="enabled">
     <bool>false</bool>
    </property>
    <property name="geometry">
     <rect>
-     <x>20</x>
+     <x>280</x>
      <y>200</y>
-     <width>81</width>
-     <height>23</height>
+     <width>91</width>
+     <height>31</height>
     </rect>
    </property>
    <property name="font">
     <font>
+     <family>Verdana</family>
      <weight>75</weight>
      <bold>true</bold>
     </font>
@@ -115,149 +93,291 @@
     <string>Enregistrer</string>
    </property>
   </widget>
-  <widget class="QLineEdit" name="imgTextureTerrain">
-   <property name="geometry">
-    <rect>
-     <x>200</x>
-     <y>80</y>
-     <width>161</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="annulerTerrain">
+  <widget class="QPushButton" name="et_annuler">
    <property name="geometry">
     <rect>
-     <x>290</x>
+     <x>190</x>
      <y>200</y>
      <width>81</width>
-     <height>23</height>
+     <height>31</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <family>Verdana</family>
+    </font>
+   </property>
    <property name="text">
     <string>Annuler</string>
    </property>
   </widget>
-  <widget class="QDoubleSpinBox" name="modDeplacementTerrain">
+  <widget class="QPushButton" name="et_selectionCouleur">
    <property name="geometry">
     <rect>
-     <x>170</x>
-     <y>110</y>
-     <width>62</width>
-     <height>22</height>
+     <x>20</x>
+     <y>80</y>
+     <width>31</width>
+     <height>31</height>
     </rect>
    </property>
-   <property name="prefix">
-    <string>x</string>
-   </property>
-   <property name="singleStep">
-    <double>0.100000000000000</double>
+   <property name="text">
+    <string/>
    </property>
-   <property name="value">
-    <double>1.000000000000000</double>
+   <property name="icon">
+    <iconset>
+     <normaloff>img/btnCouleurs.png</normaloff>img/btnCouleurs.png</iconset>
    </property>
   </widget>
-  <widget class="QPushButton" name="couleurTerrain">
+  <widget class="QLabel" name="label_4">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>40</y>
-     <width>75</width>
-     <height>23</height>
+     <x>100</x>
+     <y>5</y>
+     <width>131</width>
+     <height>21</height>
     </rect>
    </property>
-   <property name="text">
-    <string>Couleur</string>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="idTerrain">
-   <property name="enabled">
-    <bool>false</bool>
+   <property name="font">
+    <font>
+     <family>Verdana</family>
+     <pointsize>8</pointsize>
+    </font>
    </property>
-   <property name="geometry">
-    <rect>
-     <x>60</x>
-     <y>10</y>
-     <width>101</width>
-     <height>20</height>
-    </rect>
+   <property name="text">
+    <string>Nom du terrain : </string>
    </property>
   </widget>
-  <widget class="QLabel" name="label_6">
+  <widget class="QLineEdit" name="et_nom">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>110</y>
-     <width>151</width>
-     <height>21</height>
+     <x>100</x>
+     <y>30</y>
+     <width>271</width>
+     <height>31</height>
     </rect>
    </property>
-   <property name="text">
-    <string>Coût de déplacement : </string>
+   <property name="palette">
+    <palette>
+     <active>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>248</red>
+         <green>248</green>
+         <blue>248</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </active>
+     <inactive>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>248</red>
+         <green>248</green>
+         <blue>248</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </inactive>
+     <disabled>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>240</red>
+         <green>240</green>
+         <blue>240</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </disabled>
+    </palette>
    </property>
   </widget>
-  <widget class="QCheckBox" name="visibiliteTerrain">
+  <widget class="QToolButton" name="et_selectionFichier">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>140</y>
-     <width>70</width>
-     <height>17</height>
+     <x>60</x>
+     <y>80</y>
+     <width>31</width>
+     <height>31</height>
     </rect>
    </property>
    <property name="text">
-    <string>Visibilité</string>
+    <string>...</string>
    </property>
-   <property name="checked">
-    <bool>true</bool>
+   <property name="icon">
+    <iconset>
+     <normaloff>img/loupe.png</normaloff>img/loupe.png</iconset>
    </property>
   </widget>
-  <widget class="QLabel" name="label_4">
+  <widget class="QLineEdit" name="et_tags">
    <property name="geometry">
     <rect>
      <x>170</x>
-     <y>10</y>
-     <width>46</width>
-     <height>16</height>
+     <y>70</y>
+     <width>201</width>
+     <height>21</height>
     </rect>
    </property>
-   <property name="text">
-    <string>Nom : </string>
+   <property name="palette">
+    <palette>
+     <active>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>248</red>
+         <green>248</green>
+         <blue>248</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </active>
+     <inactive>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>248</red>
+         <green>248</green>
+         <blue>248</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </inactive>
+     <disabled>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>240</red>
+         <green>240</green>
+         <blue>240</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </disabled>
+    </palette>
    </property>
   </widget>
-  <widget class="QLabel" name="label_3">
+  <widget class="QLabel" name="label">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>10</y>
-     <width>46</width>
-     <height>16</height>
+     <x>110</x>
+     <y>70</y>
+     <width>51</width>
+     <height>21</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <family>Verdana</family>
+    </font>
+   </property>
    <property name="text">
-    <string>Id : </string>
+    <string>Tags : </string>
    </property>
   </widget>
-  <widget class="QLineEdit" name="nomTerrain">
+  <widget class="QGroupBox" name="et_groupeDep">
    <property name="geometry">
     <rect>
-     <x>210</x>
-     <y>10</y>
-     <width>161</width>
-     <height>20</height>
+     <x>20</x>
+     <y>120</y>
+     <width>351</width>
+     <height>61</height>
     </rect>
    </property>
-  </widget>
-  <widget class="QComboBox" name="listeCategories">
-   <property name="geometry">
-    <rect>
-     <x>240</x>
-     <y>40</y>
-     <width>131</width>
-     <height>22</height>
-    </rect>
+   <property name="font">
+    <font>
+     <family>Verdana</family>
+    </font>
    </property>
+   <property name="title">
+    <string>Déplacement</string>
+   </property>
+   <widget class="QRadioButton" name="et_depMarche">
+    <property name="geometry">
+     <rect>
+      <x>50</x>
+      <y>20</y>
+      <width>51</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset>
+      <normaloff>img/btnZonePlacement.png</normaloff>img/btnZonePlacement.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>19</width>
+      <height>19</height>
+     </size>
+    </property>
+    <property name="checked">
+     <bool>true</bool>
+    </property>
+   </widget>
+   <widget class="QRadioButton" name="et_depNage">
+    <property name="geometry">
+     <rect>
+      <x>160</x>
+      <y>20</y>
+      <width>71</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset>
+      <normaloff>img/nage.png</normaloff>img/nage.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>19</width>
+      <height>19</height>
+     </size>
+    </property>
+   </widget>
+   <widget class="QRadioButton" name="et_depAucun">
+    <property name="geometry">
+     <rect>
+      <x>270</x>
+      <y>20</y>
+      <width>61</width>
+      <height>31</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset>
+      <normaloff>img/interdit.png</normaloff>img/interdit.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>19</width>
+      <height>19</height>
+     </size>
+    </property>
+   </widget>
   </widget>
+  <zorder>et_apercu</zorder>
+  <zorder>et_supprimer</zorder>
+  <zorder>et_enregistrer</zorder>
+  <zorder>et_annuler</zorder>
+  <zorder>et_selectionCouleur</zorder>
+  <zorder>label_4</zorder>
+  <zorder>et_nom</zorder>
+  <zorder>et_selectionFichier</zorder>
+  <zorder>et_tags</zorder>
+  <zorder>label</zorder>
+  <zorder>et_groupeDep</zorder>
+  <zorder>et_groupeDep_2</zorder>
  </widget>
  <resources/>
  <connections/>

lib/ui/mainwindow.ui

@@ -1852,7 +1852,7 @@
                   </size>
                  </property>
                  <property name="currentIndex">
-                  <number>2</number>
+                  <number>1</number>
                  </property>
                  <widget class="QWidget" name="cp_afficherTerrains">
                   <attribute name="icon">