Browse Source

Correction de bugs mineurs
Modif de l'interface de combat (1ere partie)

olinox 10 years ago
parent
commit
700a4b4985
4 changed files with 877 additions and 1305 deletions
  1. 1 1
      lib/EcranCreationPlateau.py
  2. 3 2
      lib/Plateau.py
  3. 4 1
      lib/ui/creationPlateau.ui
  4. 869 1301
      lib/ui/mainwindow.ui

+ 1 - 1
lib/EcranCreationPlateau.py

@@ -36,7 +36,7 @@ class EcranCreationPlateau(QDialog):
         self.ui.couleurCasesPlateau.setStyleSheet("QLabel {backGround:%s}" %(self.couleur))
         self.majListeChargement()
         self.connect(self.ui.creerPlateau, SIGNAL("clicked()"), self.creerPlateau)
-        self.connect(self.ui.nomPlateau, SIGNAL("textEdited(QString)"), self.focusBoutonCreer)
+##        self.connect(self.ui.nomPlateau, SIGNAL("textEdited(QString)"), self.focusBoutonCreer)
         self.connect(self.ui.nomPlateau, SIGNAL("textEdited(QString)"), self.majAffichage)
         self.connect(self.ui.listPlateau, SIGNAL("cellPressed(int, int)"), self.majAffichage) 
         self.connect(self.ui.listPlateau, SIGNAL("cellPressed(int, int)"), self.focusBoutonCharger) 

+ 3 - 2
lib/Plateau.py

@@ -25,6 +25,7 @@ from EcranEditionDecors import EcranEditionDecors
 from EcranEditionTerrain import EcranEditionTerrain
 from EcranAffichageTexte import EcranAffichageTexte
 from EcranGestionCombat import EcranGestionCombat
+from EcranEditionAttaques import EcranEditionAttaques
 
 import regles as regles
 from outilsSvg import *
@@ -2067,8 +2068,8 @@ class Plateau(QGraphicsScene):
             self.majProjectionAttaqueCaC(pion)
             pass
         if numPion in self.pions:
-            case = self.cases[self.pions[numPion].position]
-            self.caseSurvol(case)
+##            case = self.cases[self.pions[numPion].position]
+            self.caseSurvol(self.pions[numPion].position[0], self.pions[numPion].position[1])
 
     def pionDoubleClic(self, numPion):
         """on a double-clique sur le pion"""

+ 4 - 1
lib/ui/creationPlateau.ui

@@ -382,7 +382,7 @@
     </palette>
    </property>
    <property name="currentIndex">
-    <number>2</number>
+    <number>1</number>
    </property>
    <widget class="QWidget" name="page">
     <widget class="QLabel" name="label">
@@ -698,6 +698,9 @@
      <property name="text">
       <string>Ok</string>
      </property>
+     <property name="default">
+      <bool>true</bool>
+     </property>
     </widget>
     <widget class="QLabel" name="label_10">
      <property name="geometry">

File diff suppressed because it is too large
+ 869 - 1301
lib/ui/mainwindow.ui


Some files were not shown because too many files changed in this diff