13695 et autres soucis

diff --git a/InterfaceQT4/gereIcones.py b/InterfaceQT4/gereIcones.py
index 4b4e30b1f9631cb1b40516b2b012128640a5c018..6c6852f463fbc914a9c65f221f235042a5853245 100644 (file)
--- a/InterfaceQT4/gereIcones.py
+++ b/InterfaceQT4/gereIcones.py
@@ -172,6 +172,8 @@ class FacultatifOuOptionnel:
             self.dict_commandes_mesScripts=self.appliEficas.mesScripts[self.editor.code].dict_commandes
             if self.obj.nom in self.dict_commandes_mesScripts.keys() :
                self.ajoutScript()
+               icon=QIcon(self.repIcon+"/roue.png")
+               self.RBRun.setIcon(icon)
                return
       if hasattr(self,"RBRun"): self.RBRun.close()
       if hasattr(self,"CBScripts"): self.CBScripts.close()

diff --git a/InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py b/InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py
index 6b9a6a227ea3a6d16c91a2eac77e52c5aa067138..e8f8d51f7755f572572f010c18edb3a8f05aeda3 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py
+++ b/InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py
@@ -25,6 +25,13 @@ from Extensions.i18n import tr
 from monWidgetPlusieursIntoOrdonne import MonWidgetPlusieursIntoOrdonne 
 from politiquesValidation          import PolitiquePlusieurs
 
+from determine import monEnvQT5
+if monEnvQT5:
+    from PyQt5.QtWidgets  import  QScrollBar
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
+
 
 
 class MonWidgetPlusieursASSDIntoOrdonne (MonWidgetPlusieursIntoOrdonne):

diff --git a/InterfaceQT4/monWidgetPlusieursBase.py b/InterfaceQT4/monWidgetPlusieursBase.py
index 26a3f42adb0a36e3df0da3c07f45b2cff80bcc33..42d6022c1a2d4deffa301e31c8c714b588a38860 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursBase.py
+++ b/InterfaceQT4/monWidgetPlusieursBase.py
@@ -216,9 +216,8 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
           valeur=courant.text()
           lval=valeur.split(',')
           if len (lval) > 1 : 
-             QMessageBox.warning(self,tr('saisie invalide'),tr('Entrer 1 valeur par ligne'))
              courant.setText(lval[0])
-             break
+             self.ajoutNValeur(lval[1:])
 
       for i in range (1, self.indexDernierLabel+1):
           nomLineEdit="lineEditVal"+str(i)
@@ -257,5 +256,7 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
       self.reaffiche()
 
           
+  def entreListe(self,listeDeValeur,index):
+             self.entreListe(lval, i)
 
 # Avertissement quand on quitte le widget

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 9d7bf2720c586fdaf7f19554dd99695a2b85e97a..080d8e8388452dcf882166cf5342937263705c44 100755 (executable)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -48,7 +48,6 @@ class Appli(Ui_Eficas,QMainWindow):
         """
         QMainWindow.__init__(self,parent)
         Ui_Eficas.__init__(self)
-        self.setupUi(self)
 
 
         version=getEficasVersion()
@@ -94,7 +93,9 @@ class Appli(Ui_Eficas,QMainWindow):
 
         from Extensions import localisation
         app=QApplication
-        localisation.localise(app,langue)
+        localisation.localise(None,langue)
+        self.setupUi(self)
+
 
         if self.code in ['MAP',] : self.resize(1440,self.height())
         else : self.resize(1800,self.height())
@@ -239,7 +240,7 @@ class Appli(Ui_Eficas,QMainWindow):
         else         : self.connect(self.actionN1,SIGNAL("triggered()"),self.newN1)
 
     def ajoutExecution(self):
-        self.menuExecution = self.menubar.addMenu(tr("Execution"))
+        self.menuExecution = self.menubar.addMenu(tr("Run"))
         self.actionExecution = QAction(self)
         if sys.platform[0:5]=="linux":
           icon6 = QIcon(self.repIcon+"/roue.png")
@@ -250,7 +251,7 @@ class Appli(Ui_Eficas,QMainWindow):
         self.menuExecution.addAction(self.actionExecution)
         if not(self.actionExecution in self.toolBar.actions()):
            self.toolBar.addAction(self.actionExecution)
-        self.actionExecution.setText(tr("Execution"))
+        self.actionExecution.setText(tr("Run"))
         if monEnvQT5 : self.actionExecution.triggered.connect(self.run)
         else         : self.connect(self.actionExecution,SIGNAL("triggered()"),self.run)