浏览代码

Poursuite de la refonte de l'ecran de creation de pion

unknown 10 年之前
父节点
当前提交
f15ea5aa70
共有 4 个文件被更改,包括 1412 次插入131 次删除
  1. 36 0
      lib/ui/dm.py
  2. 355 29
      lib/ui/dmOngletsH.py
  3. 1021 90
      lib/ui/dmOngletsH.ui
  4. 0 12
      lib/ui/editionTerrain.ui

+ 36 - 0
lib/ui/dm.py

@@ -26,6 +26,42 @@ class DmLabel(QLabel):
     def texte(self):
         return str(self.text())
 
+class DmLabelChoixImage(QLabel):
+    """surcharge de DmLabel,
+        affiche une fenetre de selection de fichier, recupere une image,
+        et l'affiche."""
+    def __init__(self, parent = None):
+        super(DmLabelChoixImage, self).__init__(parent)
+        self.setStyleSheet("QLabel { padding: 3px; }")
+        self._sourceImage = ""
+
+    def mousePressEvent(self, event):
+        if event.button() == 1:
+            self.selectionImage()
+            
+    def selectionImage(self):
+        fichier = QFileDialog.getOpenFileName(self, 
+                                              "Selectionnez une image", 
+                                              "\\img", 
+                                              "Images (*.png *.jpg)")
+        pix = QPixmap(fichier)
+        if not pix.isNull():
+            self._sourceImage = fichier
+            self.clear()
+            pix = pix.scaled(self.width(), self.height(), Qt.KeepAspectRatio, Qt.SmoothTransformation)
+            self.setPixmap(pix)
+        else:    
+            dial = QMessageBox(self)
+            dial.setText("Format non reconnu")
+            dial.setWindowTitle("Erreur")
+            dial.setStandardButtons(QMessageBox.Ok)
+            dial.exec_()
+
+    def image(self):
+        """retourne le chemin de l'image chargee"""
+        return self._sourceImage
+
+
 class DmTextEdit(QTextEdit):
     def __init__(self, parent = None):
         super(DmTextEdit, self).__init__(parent)    

+ 355 - 29
lib/ui/dmOngletsH.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'dmOngletsH.ui'
 #
-# Created: Thu Jun 04 14:47:48 2015
+# Created: Thu Jun 04 15:32:12 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -27,9 +27,10 @@ class Ui_ecran_creationPion(object):
     def setupUi(self, ecran_creationPion):
         ecran_creationPion.setObjectName(_fromUtf8("ecran_creationPion"))
         ecran_creationPion.setWindowModality(QtCore.Qt.ApplicationModal)
-        ecran_creationPion.resize(598, 470)
-        ecran_creationPion.setMaximumSize(QtCore.QSize(16777215, 470))
+        ecran_creationPion.resize(766, 452)
+        ecran_creationPion.setMaximumSize(QtCore.QSize(16777215, 10000))
         self.horizontalLayout_2 = QtGui.QHBoxLayout(ecran_creationPion)
+        self.horizontalLayout_2.setContentsMargins(0, 0, -1, 0)
         self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
         self.horizontalLayout = QtGui.QHBoxLayout()
         self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
@@ -205,45 +206,336 @@ class Ui_ecran_creationPion(object):
         self.menu.verticalHeader().setDefaultSectionSize(75)
         self.menu.verticalHeader().setHighlightSections(False)
         self.horizontalLayout.addWidget(self.menu)
+        self.verticalLayout = QtGui.QVBoxLayout()
+        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
         self.pages = QtGui.QStackedWidget(ecran_creationPion)
+        self.pages.setMinimumSize(QtCore.QSize(392, 0))
         self.pages.setObjectName(_fromUtf8("pages"))
         self.page = QtGui.QWidget()
         self.page.setObjectName(_fromUtf8("page"))
-        self.label = QtGui.QLabel(self.page)
-        self.label.setGeometry(QtCore.QRect(80, 30, 46, 13))
-        self.label.setObjectName(_fromUtf8("label"))
+        self.label_6 = QtGui.QLabel(self.page)
+        self.label_6.setGeometry(QtCore.QRect(120, 90, 81, 21))
+        self.label_6.setObjectName(_fromUtf8("label_6"))
+        self.deplacementCombattant = QtGui.QDoubleSpinBox(self.page)
+        self.deplacementCombattant.setGeometry(QtCore.QRect(200, 90, 41, 22))
+        self.deplacementCombattant.setPrefix(_fromUtf8(""))
+        self.deplacementCombattant.setDecimals(0)
+        self.deplacementCombattant.setSingleStep(1.0)
+        self.deplacementCombattant.setProperty("value", 1.0)
+        self.deplacementCombattant.setObjectName(_fromUtf8("deplacementCombattant"))
         self.pages.addWidget(self.page)
         self.page_2 = QtGui.QWidget()
         self.page_2.setObjectName(_fromUtf8("page_2"))
-        self.label_2 = QtGui.QLabel(self.page_2)
-        self.label_2.setGeometry(QtCore.QRect(160, 80, 46, 13))
-        self.label_2.setObjectName(_fromUtf8("label_2"))
+        self.listeAttributs = QtGui.QTableWidget(self.page_2)
+        self.listeAttributs.setGeometry(QtCore.QRect(250, 68, 191, 261))
+        palette = QtGui.QPalette()
+        brush = QtGui.QBrush(QtGui.QColor(255, 255, 255, 150))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(255, 255, 255, 150))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(240, 240, 240))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
+        self.listeAttributs.setPalette(palette)
+        self.listeAttributs.setFrameShape(QtGui.QFrame.WinPanel)
+        self.listeAttributs.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.listeAttributs.setEditTriggers(QtGui.QAbstractItemView.AllEditTriggers)
+        self.listeAttributs.setAlternatingRowColors(True)
+        self.listeAttributs.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
+        self.listeAttributs.setShowGrid(True)
+        self.listeAttributs.setObjectName(_fromUtf8("listeAttributs"))
+        self.listeAttributs.setColumnCount(2)
+        self.listeAttributs.setRowCount(0)
+        item = QtGui.QTableWidgetItem()
+        self.listeAttributs.setHorizontalHeaderItem(0, item)
+        item = QtGui.QTableWidgetItem()
+        self.listeAttributs.setHorizontalHeaderItem(1, item)
+        self.listeAttributs.horizontalHeader().setVisible(False)
+        self.listeAttributs.horizontalHeader().setDefaultSectionSize(50)
+        self.listeAttributs.verticalHeader().setVisible(False)
+        self.label_18 = QtGui.QLabel(self.page_2)
+        self.label_18.setGeometry(QtCore.QRect(250, 40, 221, 16))
+        self.label_18.setObjectName(_fromUtf8("label_18"))
         self.pages.addWidget(self.page_2)
         self.page_3 = QtGui.QWidget()
         self.page_3.setObjectName(_fromUtf8("page_3"))
-        self.label_3 = QtGui.QLabel(self.page_3)
-        self.label_3.setGeometry(QtCore.QRect(230, 80, 46, 13))
-        self.label_3.setObjectName(_fromUtf8("label_3"))
+        self.ajouterInventaireCombattant = QtGui.QToolButton(self.page_3)
+        self.ajouterInventaireCombattant.setGeometry(QtCore.QRect(270, 30, 21, 20))
+        icon6 = QtGui.QIcon()
+        icon6.addPixmap(QtGui.QPixmap(_fromUtf8("img/plus.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.ajouterInventaireCombattant.setIcon(icon6)
+        self.ajouterInventaireCombattant.setObjectName(_fromUtf8("ajouterInventaireCombattant"))
+        self.listeInventaireCombattant = QtGui.QTableWidget(self.page_3)
+        self.listeInventaireCombattant.setGeometry(QtCore.QRect(30, 50, 291, 131))
+        palette = QtGui.QPalette()
+        brush = QtGui.QBrush(QtGui.QColor(255, 255, 255, 150))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(255, 255, 255, 150))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Base, brush)
+        brush = QtGui.QBrush(QtGui.QColor(240, 240, 240))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Base, brush)
+        self.listeInventaireCombattant.setPalette(palette)
+        self.listeInventaireCombattant.setFrameShape(QtGui.QFrame.WinPanel)
+        self.listeInventaireCombattant.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+        self.listeInventaireCombattant.setEditTriggers(QtGui.QAbstractItemView.AllEditTriggers)
+        self.listeInventaireCombattant.setAlternatingRowColors(True)
+        self.listeInventaireCombattant.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
+        self.listeInventaireCombattant.setShowGrid(True)
+        self.listeInventaireCombattant.setObjectName(_fromUtf8("listeInventaireCombattant"))
+        self.listeInventaireCombattant.setColumnCount(2)
+        self.listeInventaireCombattant.setRowCount(0)
+        item = QtGui.QTableWidgetItem()
+        self.listeInventaireCombattant.setHorizontalHeaderItem(0, item)
+        item = QtGui.QTableWidgetItem()
+        self.listeInventaireCombattant.setHorizontalHeaderItem(1, item)
+        self.listeInventaireCombattant.horizontalHeader().setVisible(False)
+        self.listeInventaireCombattant.horizontalHeader().setDefaultSectionSize(50)
+        self.listeInventaireCombattant.verticalHeader().setVisible(False)
+        self.supprimerInventaireCombattant = QtGui.QToolButton(self.page_3)
+        self.supprimerInventaireCombattant.setGeometry(QtCore.QRect(300, 30, 21, 20))
+        icon7 = QtGui.QIcon()
+        icon7.addPixmap(QtGui.QPixmap(_fromUtf8("img/gomme.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.supprimerInventaireCombattant.setIcon(icon7)
+        self.supprimerInventaireCombattant.setObjectName(_fromUtf8("supprimerInventaireCombattant"))
+        self.label_22 = QtGui.QLabel(self.page_3)
+        self.label_22.setGeometry(QtCore.QRect(30, 30, 221, 16))
+        self.label_22.setObjectName(_fromUtf8("label_22"))
         self.pages.addWidget(self.page_3)
         self.page_4 = QtGui.QWidget()
         self.page_4.setObjectName(_fromUtf8("page_4"))
-        self.label_4 = QtGui.QLabel(self.page_4)
-        self.label_4.setGeometry(QtCore.QRect(200, 190, 46, 13))
-        self.label_4.setObjectName(_fromUtf8("label_4"))
+        self.label = QtGui.QLabel(self.page_4)
+        self.label.setGeometry(QtCore.QRect(110, 70, 71, 41))
+        self.label.setObjectName(_fromUtf8("label"))
         self.pages.addWidget(self.page_4)
         self.page_5 = QtGui.QWidget()
         self.page_5.setObjectName(_fromUtf8("page_5"))
-        self.label_5 = QtGui.QLabel(self.page_5)
-        self.label_5.setGeometry(QtCore.QRect(160, 190, 46, 13))
-        self.label_5.setObjectName(_fromUtf8("label_5"))
+        self.notesCombattant = QtGui.QTextEdit(self.page_5)
+        self.notesCombattant.setGeometry(QtCore.QRect(90, 70, 291, 91))
+        self.notesCombattant.setObjectName(_fromUtf8("notesCombattant"))
+        self.label_23 = QtGui.QLabel(self.page_5)
+        self.label_23.setGeometry(QtCore.QRect(90, 50, 46, 13))
+        self.label_23.setObjectName(_fromUtf8("label_23"))
         self.pages.addWidget(self.page_5)
         self.page_6 = QtGui.QWidget()
         self.page_6.setObjectName(_fromUtf8("page_6"))
-        self.label_6 = QtGui.QLabel(self.page_6)
-        self.label_6.setGeometry(QtCore.QRect(170, 210, 46, 13))
-        self.label_6.setObjectName(_fromUtf8("label_6"))
+        self.et_tags = QtGui.QLineEdit(self.page_6)
+        self.et_tags.setGeometry(QtCore.QRect(170, 80, 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.et_nom = QtGui.QLineEdit(self.page_6)
+        self.et_nom.setGeometry(QtCore.QRect(100, 40, 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.label_7 = QtGui.QLabel(self.page_6)
+        self.label_7.setGeometry(QtCore.QRect(110, 80, 51, 21))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.label_7.setFont(font)
+        self.label_7.setObjectName(_fromUtf8("label_7"))
+        self.et_apercu = DmLabelChoixImage(self.page_6)
+        self.et_apercu.setGeometry(QtCore.QRect(20, 20, 71, 71))
+        font = QtGui.QFont()
+        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.label_8 = QtGui.QLabel(self.page_6)
+        self.label_8.setGeometry(QtCore.QRect(100, 15, 131, 21))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        font.setPointSize(8)
+        self.label_8.setFont(font)
+        self.label_8.setObjectName(_fromUtf8("label_8"))
+        self.vueForme = QtGui.QGraphicsView(self.page_6)
+        self.vueForme.setGeometry(QtCore.QRect(10, 131, 281, 291))
+        self.vueForme.setRenderHints(QtGui.QPainter.Antialiasing|QtGui.QPainter.HighQualityAntialiasing|QtGui.QPainter.TextAntialiasing)
+        self.vueForme.setObjectName(_fromUtf8("vueForme"))
+        self.groupBox_2 = QtGui.QGroupBox(self.page_6)
+        self.groupBox_2.setGeometry(QtCore.QRect(440, 110, 131, 291))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.groupBox_2.setFont(font)
+        self.groupBox_2.setObjectName(_fromUtf8("groupBox_2"))
+        self.txtAfficherCombattant = QtGui.QCheckBox(self.groupBox_2)
+        self.txtAfficherCombattant.setGeometry(QtCore.QRect(100, 10, 21, 21))
+        self.txtAfficherCombattant.setText(_fromUtf8(""))
+        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.setMinimum(-1000)
+        self.txtPosYCombattant.setMaximum(1000)
+        self.txtPosYCombattant.setOrientation(QtCore.Qt.Horizontal)
+        self.txtPosYCombattant.setObjectName(_fromUtf8("txtPosYCombattant"))
+        self.label_17 = QtGui.QLabel(self.groupBox_2)
+        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.setObjectName(_fromUtf8("label_19"))
+        self.txtTaillePoliceCombattant = QtGui.QSlider(self.groupBox_2)
+        self.txtTaillePoliceCombattant.setGeometry(QtCore.QRect(10, 90, 111, 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.setMinimum(-180)
+        self.txtRotationCombattant.setMaximum(180)
+        self.txtRotationCombattant.setOrientation(QtCore.Qt.Horizontal)
+        self.txtRotationCombattant.setObjectName(_fromUtf8("txtRotationCombattant"))
+        self.label_20 = QtGui.QLabel(self.groupBox_2)
+        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.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.setObjectName(_fromUtf8("label_21"))
+        self.txtReinitCombattant = QtGui.QPushButton(self.groupBox_2)
+        self.txtReinitCombattant.setGeometry(QtCore.QRect(10, 240, 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.setObjectName(_fromUtf8("txtGrasCombattant"))
+        self.label_9 = QtGui.QLabel(self.page_6)
+        self.label_9.setGeometry(QtCore.QRect(10, 110, 251, 21))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.label_9.setFont(font)
+        self.label_9.setObjectName(_fromUtf8("label_9"))
+        self.groupBox = QtGui.QGroupBox(self.page_6)
+        self.groupBox.setGeometry(QtCore.QRect(290, 110, 131, 291))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.groupBox.setFont(font)
+        self.groupBox.setObjectName(_fromUtf8("groupBox"))
+        self.imgAfficherCombattant = QtGui.QCheckBox(self.groupBox)
+        self.imgAfficherCombattant.setGeometry(QtCore.QRect(100, 10, 21, 21))
+        self.imgAfficherCombattant.setText(_fromUtf8(""))
+        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.setMinimum(-400)
+        self.imgPosYCombattant.setMaximum(400)
+        self.imgPosYCombattant.setOrientation(QtCore.Qt.Horizontal)
+        self.imgPosYCombattant.setObjectName(_fromUtf8("imgPosYCombattant"))
+        self.label_12 = QtGui.QLabel(self.groupBox)
+        self.label_12.setGeometry(QtCore.QRect(10, 60, 111, 20))
+        self.label_12.setObjectName(_fromUtf8("label_12"))
+        self.label_13 = QtGui.QLabel(self.groupBox)
+        self.label_13.setGeometry(QtCore.QRect(10, 100, 111, 20))
+        self.label_13.setObjectName(_fromUtf8("label_13"))
+        self.label_14 = QtGui.QLabel(self.groupBox)
+        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.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.setMinimum(-180)
+        self.imgRotationCombattant.setMaximum(180)
+        self.imgRotationCombattant.setOrientation(QtCore.Qt.Horizontal)
+        self.imgRotationCombattant.setObjectName(_fromUtf8("imgRotationCombattant"))
+        self.label_16 = QtGui.QLabel(self.groupBox)
+        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.setMinimum(-400)
+        self.imgPosXCombattant.setMaximum(400)
+        self.imgPosXCombattant.setOrientation(QtCore.Qt.Horizontal)
+        self.imgPosXCombattant.setObjectName(_fromUtf8("imgPosXCombattant"))
+        self.label_15 = QtGui.QLabel(self.groupBox)
+        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.setMinimum(0)
+        self.imgTailleYCombattant.setProperty("value", 10)
+        self.imgTailleYCombattant.setOrientation(QtCore.Qt.Horizontal)
+        self.imgTailleYCombattant.setObjectName(_fromUtf8("imgTailleYCombattant"))
+        self.imgReinitCombattant = QtGui.QPushButton(self.groupBox)
+        self.imgReinitCombattant.setGeometry(QtCore.QRect(10, 260, 111, 20))
+        self.imgReinitCombattant.setObjectName(_fromUtf8("imgReinitCombattant"))
+        self.imgPivoteCombattant = QtGui.QCheckBox(self.groupBox)
+        self.imgPivoteCombattant.setGeometry(QtCore.QRect(10, 220, 101, 17))
+        self.imgPivoteCombattant.setObjectName(_fromUtf8("imgPivoteCombattant"))
+        self.imgMasqueCombattant = QtGui.QCheckBox(self.groupBox)
+        self.imgMasqueCombattant.setGeometry(QtCore.QRect(10, 240, 101, 17))
+        self.imgMasqueCombattant.setObjectName(_fromUtf8("imgMasqueCombattant"))
         self.pages.addWidget(self.page_6)
-        self.horizontalLayout.addWidget(self.pages)
+        self.verticalLayout.addWidget(self.pages)
+        self.frame = QtGui.QFrame(ecran_creationPion)
+        self.frame.setMinimumSize(QtCore.QSize(392, 50))
+        self.frame.setMaximumSize(QtCore.QSize(16777215, 50))
+        self.frame.setFrameShape(QtGui.QFrame.StyledPanel)
+        self.frame.setFrameShadow(QtGui.QFrame.Raised)
+        self.frame.setObjectName(_fromUtf8("frame"))
+        self.et_enregistrer = QtGui.QPushButton(self.frame)
+        self.et_enregistrer.setEnabled(False)
+        self.et_enregistrer.setGeometry(QtCore.QRect(290, 10, 91, 31))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        font.setBold(True)
+        font.setWeight(75)
+        self.et_enregistrer.setFont(font)
+        self.et_enregistrer.setObjectName(_fromUtf8("et_enregistrer"))
+        self.et_annuler = QtGui.QPushButton(self.frame)
+        self.et_annuler.setGeometry(QtCore.QRect(200, 10, 81, 31))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.et_annuler.setFont(font)
+        self.et_annuler.setObjectName(_fromUtf8("et_annuler"))
+        self.et_supprimer = QtGui.QPushButton(self.frame)
+        self.et_supprimer.setEnabled(False)
+        self.et_supprimer.setGeometry(QtCore.QRect(10, 10, 75, 31))
+        font = QtGui.QFont()
+        font.setFamily(_fromUtf8("Verdana"))
+        self.et_supprimer.setFont(font)
+        self.et_supprimer.setObjectName(_fromUtf8("et_supprimer"))
+        self.verticalLayout.addWidget(self.frame)
+        self.horizontalLayout.addLayout(self.verticalLayout)
+        self.horizontalLayout.setStretch(1, 1)
         self.horizontalLayout_2.addLayout(self.horizontalLayout)
 
         self.retranslateUi(ecran_creationPion)
@@ -284,14 +576,48 @@ class Ui_ecran_creationPion(object):
         item = self.menu.item(5, 1)
         item.setText(_translate("ecran_creationPion", " NOTES ", None))
         self.menu.setSortingEnabled(__sortingEnabled)
-        self.label.setText(_translate("ecran_creationPion", "Page 1", None))
-        self.label_2.setText(_translate("ecran_creationPion", "Page 2", None))
-        self.label_3.setText(_translate("ecran_creationPion", "Page 3", None))
-        self.label_4.setText(_translate("ecran_creationPion", "Page 4", None))
-        self.label_5.setText(_translate("ecran_creationPion", "Page 5", None))
-        self.label_6.setText(_translate("ecran_creationPion", "Page 6", None))
+        self.label_6.setText(_translate("ecran_creationPion", "Déplacement : ", None))
+        item = self.listeAttributs.horizontalHeaderItem(0)
+        item.setText(_translate("ecran_creationPion", "Nouvelle colonne", None))
+        item = self.listeAttributs.horizontalHeaderItem(1)
+        item.setText(_translate("ecran_creationPion", "Valeur", None))
+        self.label_18.setText(_translate("ecran_creationPion", "Attributs / caractéristiques :  ", None))
+        self.ajouterInventaireCombattant.setText(_translate("ecran_creationPion", "...", None))
+        item = self.listeInventaireCombattant.horizontalHeaderItem(0)
+        item.setText(_translate("ecran_creationPion", "nombre", None))
+        item = self.listeInventaireCombattant.horizontalHeaderItem(1)
+        item.setText(_translate("ecran_creationPion", "objet", None))
+        self.supprimerInventaireCombattant.setText(_translate("ecran_creationPion", "...", None))
+        self.label_22.setText(_translate("ecran_creationPion", "Inventaire de base :", None))
+        self.label.setText(_translate("ecran_creationPion", "Attaques", None))
+        self.label_23.setText(_translate("ecran_creationPion", "Notes :", None))
+        self.label_7.setText(_translate("ecran_creationPion", "Tags : ", None))
+        self.et_apercu.setText(_translate("ecran_creationPion", "Choisissez \n"
+"un fichier\n"
+"image", None))
+        self.label_8.setText(_translate("ecran_creationPion", "Nom de la créature : ", None))
+        self.groupBox_2.setTitle(_translate("ecran_creationPion", "Texte", None))
+        self.label_17.setText(_translate("ecran_creationPion", "Taille de la police", None))
+        self.label_19.setText(_translate("ecran_creationPion", "Position (X)", None))
+        self.label_20.setText(_translate("ecran_creationPion", "Rotation", None))
+        self.label_21.setText(_translate("ecran_creationPion", "Position (Y)", None))
+        self.txtReinitCombattant.setText(_translate("ecran_creationPion", "Ré-initialiser", None))
+        self.txtGrasCombattant.setText(_translate("ecran_creationPion", "Gras", None))
+        self.label_9.setText(_translate("ecran_creationPion", "Créer la forme du pion : ", None))
+        self.groupBox.setTitle(_translate("ecran_creationPion", "Image", None))
+        self.label_12.setText(_translate("ecran_creationPion", "Taille (X)", None))
+        self.label_13.setText(_translate("ecran_creationPion", "Taille (Y)", None))
+        self.label_14.setText(_translate("ecran_creationPion", "Position (X)", None))
+        self.label_16.setText(_translate("ecran_creationPion", "Rotation", None))
+        self.label_15.setText(_translate("ecran_creationPion", "Position (Y)", None))
+        self.imgReinitCombattant.setText(_translate("ecran_creationPion", "Ré-initialiser", None))
+        self.imgPivoteCombattant.setText(_translate("ecran_creationPion", "Image pivote", None))
+        self.imgMasqueCombattant.setText(_translate("ecran_creationPion", "Masque auto.", None))
+        self.et_enregistrer.setText(_translate("ecran_creationPion", "Enregistrer", None))
+        self.et_annuler.setText(_translate("ecran_creationPion", "Annuler", None))
+        self.et_supprimer.setText(_translate("ecran_creationPion", "Supprimer", None))
 
-from dm import DmTableMenu
+from dm import DmLabelChoixImage, DmTableMenu
 
 if __name__ == "__main__":
     import sys

文件差异内容过多而无法显示
+ 1021 - 90
lib/ui/dmOngletsH.ui


+ 0 - 12
lib/ui/editionTerrain.ui

@@ -366,18 +366,6 @@ texture</string>
     </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/>

部分文件因为文件数量过多而无法显示