From ad0564e131defb9b01fc420ea6f78918b8a7fb27 Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Wed, 2 Nov 2016 11:12:10 +0100 Subject: [PATCH] 13695 et autres soucis --- InterfaceQT4/gereIcones.py | 2 ++ InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py | 7 +++++++ InterfaceQT4/monWidgetPlusieursBase.py | 5 +++-- InterfaceQT4/qtEficas.py | 9 +++++---- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/InterfaceQT4/gereIcones.py b/InterfaceQT4/gereIcones.py index 4b4e30b1..6c6852f4 100644 --- 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 6b9a6a22..e8f8d51f 100644 --- 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 26a3f42a..42d6022c 100644 --- 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 9d7bf272..080d8e83 100755 --- 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) -- 2.39.2