pb d affichage

diff --git a/InterfaceQT4/gereIcones.py b/InterfaceQT4/gereIcones.py
index 26ba38f4d2493f5c77176b207d461ee0f40c6c13..62f2d0c248c9e7adff1b2fe6f3850f5ec0742f4c 100644 (file)
--- a/InterfaceQT4/gereIcones.py
+++ b/InterfaceQT4/gereIcones.py
@@ -268,7 +268,7 @@ class ContientIcones(object):
           filters = ""
       if len(mctype) > 2 and mctype[2] == "Sauvegarde":
           fichier = QFileDialog.getSaveFileName(self.appliEficas,
-                              tr('Sauvegarder Fichier'),
+                              tr('Use File'),
                               self.appliEficas.maConfiguration.savedir,
                               filters)
       else:

diff --git a/InterfaceQT4/groupe.py b/InterfaceQT4/groupe.py
index e7d20873495a100cced161f43994dea91a9ab5d2..5a541edb40904c26985f019083f5df658bb94d56 100644 (file)
--- a/InterfaceQT4/groupe.py
+++ b/InterfaceQT4/groupe.py
@@ -206,6 +206,6 @@ class Groupe(QWidget,FacultatifOuOptionnel):
       if self.editor.code != "CARMELCND" : self.afficheOptionnel()
 
 
-  def propageChange(self,leType):
-      self.parentQt.propageChange(leType)
+  def propageChange(self,leType,donneLefocus):
+      self.parentQt.propageChange(leType,donneLefocus)
 

diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py
index 54ab0e555788e1616311ef4e929c679a6172b6c5..99faa62897d73f7ae0a1d17ba04eaaed3961eab1 100644 (file)
--- a/InterfaceQT4/monWidgetCommande.py
+++ b/InterfaceQT4/monWidgetCommande.py
@@ -289,9 +289,13 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       self.RBValide.setIcon(icon)
 
 
-  def propageChange(self,typeChange):
+  def propageChange(self,typeChange,donneLeFocus):
       aReecrire=self.propageChangeEnfant(self.node.item.object,typeChange)
       if aReecrire : self.node.affichePanneau()
+      if hasattr(donneLeFocus.node.fenetre, 'selectionneDernier') :
+         QApplication.processEvents()
+         self.editor.fenetreCentraleAffichee.scrollAreaCommandes.ensureWidgetVisible(donneLeFocus.node.fenetre)
+         donneLeFocus.node.fenetre.selectionneDernier()
 
   def propageChangeEnfant(self,mc, typeChange):
       for enfant in mc.mcListe:

diff --git a/InterfaceQT4/monWidgetCreeUserAssd.py b/InterfaceQT4/monWidgetCreeUserAssd.py
index 789f941fa890d7c4b8b1580d667e9bf65db798b2..3e2ab8f68980d41528baf6bce444c092d57fc849 100644 (file)
--- a/InterfaceQT4/monWidgetCreeUserAssd.py
+++ b/InterfaceQT4/monWidgetCreeUserAssd.py
@@ -56,7 +56,7 @@ class MonWidgetCreeUserAssd ( MonWidgetSimpTxt):
             self.editor.afficheInfos(commentaire,Qt.red)
             self.lineEditVal.setText("")
             self.oldValeurTexte=""
-      self.parentQt.propageChange(self.objSimp.definition.type[0])
+      self.parentQt.propageChange(self.objSimp.definition.type[0],self)
       
        
 

diff --git a/InterfaceQT4/monWidgetPlusieursCreeUserAssd.py b/InterfaceQT4/monWidgetPlusieursCreeUserAssd.py
index 04ca30da467cdec57fd22deade2c4ec2de0447be..bee52b5c1f49ee01a0a50a19f97444a429b88592 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursCreeUserAssd.py
+++ b/InterfaceQT4/monWidgetPlusieursCreeUserAssd.py
@@ -57,6 +57,9 @@ class MonWidgetPlusieursCreeUserAssd ( MonWidgetPlusieursBase):
       elif oldValeurUserAssd.nom == valeur : self.selectionneNext();return
       else :  
          validite, commentaire=self.node.item.renommeSdCreeDsListe(oldValeurUserAssd,valeur)
+         if commentaire != "" and not validite:
+            self.editor.afficheInfos(commentaire,Qt.red)
+            self.lineEditEnCours.setText(oldValeurUserAssd.nom)
          nomDernierLineEdit="lineEditVal"+str(self.numLineEditEnCours+1)
          dernier=getattr(self,nomDernierLineEdit)
          dernier.setFocus()
@@ -88,11 +91,11 @@ class MonWidgetPlusieursCreeUserAssd ( MonWidgetPlusieursBase):
          self.editor.afficheInfos('ajout impossible' ,Qt.red)
          if objASSD : objASSD.supprime()
          self.lineEditEnCours.setText("")
-      self.parentQt.propageChange(self.objSimp.definition.type[0])
-      self.selectionneNext()
+      self.parentQt.propageChange(self.objSimp.definition.type[0],self)
 
-  def selectionneNext(self):
-      print ('selectionne Next a programmer')
+  def selectionneDernier(self):
+      index=len(self.listeValeursCourantes)
+      self.listeAffichageWidget[index].setFocus()
 
   def leaveEventScrollArea(self,event):
       pass