Salome HOME
projects
/
tools
/
eficas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
synchronisation avec Yoann
[tools/eficas.git]
/
InterfaceQT4
/
qtEficas.py
diff --git
a/InterfaceQT4/qtEficas.py
b/InterfaceQT4/qtEficas.py
index 3dd0dd38d420a231469e1cb312839edaa991628a..ced79316317932dcd097893a1a85079cd659349b 100755
(executable)
--- a/
InterfaceQT4/qtEficas.py
+++ b/
InterfaceQT4/qtEficas.py
@@
-48,7
+48,7
@@
class Appli(Ui_Eficas,QMainWindow):
"""
Class implementing the main user interface.
"""
"""
Class implementing the main user interface.
"""
- def __init__(self,code=None,salome=0,parent=None,ssCode=None,multi=False,langue='
fr
',ssIhm=False):
+ def __init__(self,code=None,salome=0,parent=None,ssCode=None,multi=False,langue='
ang
',ssIhm=False):
"""
Constructor
"""
"""
Constructor
"""
@@
-210,7
+210,7
@@
class Appli(Ui_Eficas,QMainWindow):
menu.setAttribute(Qt.WA_DeleteOnClose)
menu.close()
delattr(self,intituleMenu)
menu.setAttribute(Qt.WA_DeleteOnClose)
menu.close()
delattr(self,intituleMenu)
- for intituleAction in ("actionExecution","actionSaveRun"
,
):
+ for intituleAction in ("actionExecution","actionSaveRun"):
if hasattr(self,intituleAction):
action=getattr(self,intituleAction)
self.toolBar.removeAction(action)
if hasattr(self,intituleAction):
action=getattr(self,intituleAction)
self.toolBar.removeAction(action)
@@
-331,6
+331,8
@@
class Appli(Ui_Eficas,QMainWindow):
self.actionRechercherDsCatalogue.setVisible(False)
def connectRechercherDsCatalogue(self):
self.actionRechercherDsCatalogue.setVisible(False)
def connectRechercherDsCatalogue(self):
+ if hasattr(self,'rechercherDejaLa') : return
+ self.rechercherDejaLa=True
self.actionRechercherDsCatalogue.triggered.connect(self.handleRechercherDsCatalogue)
def ajoutSortieLegere(self):
self.actionRechercherDsCatalogue.triggered.connect(self.handleRechercherDsCatalogue)
def ajoutSortieLegere(self):
@@
-393,8
+395,12
@@
class Appli(Ui_Eficas,QMainWindow):
self.menuOptions.setTitle(tr("Options"))
def PSEN(self):
self.menuOptions.setTitle(tr("Options"))
def PSEN(self):
- if self.first: self.first=0
- self.action_Nouveau.triggered.disconnect(self.fileNew)
+ if self.first: self.first=0
+ try : self.action_Nouveau.triggered.disconnect(self.fileNew)
+ except : pass
+ try : self.action_Nouveau.triggered.disconnect(self.newPSEN)
+ except : pass
+
self.action_Nouveau.triggered.connect(self.newPSEN)
self.enleverActionsStructures()
self.enleverParametres()
self.action_Nouveau.triggered.connect(self.newPSEN)
self.enleverActionsStructures()
self.enleverParametres()