# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+from __future__ import absolute_import
+from __future__ import print_function
+try :
+ from builtins import str
+except : pass
+
import os, sys
-from determine import monEnvQT5
-if monEnvQT5 :
- from PyQt5.QtWidgets import QApplication, QMainWindow, QBoxLayout, QMenu, QAction, QMessageBox
- from PyQt5.QtGui import QIcon
- from PyQt5.QtCore import Qt
-else:
- from PyQt4.QtGui import *
- from PyQt4.QtCore import *
+import six
+
+
+from PyQt5.QtWidgets import QApplication, QMainWindow, QBoxLayout, QMenu, QAction, QMessageBox
+from PyQt5.QtGui import QIcon
+from PyQt5.QtCore import Qt
from Extensions.i18n import tr
from Extensions.eficas_exception import EficasException
from myMain import Ui_Eficas
-from viewManager import MyTabview
-from getVersion import getEficasVersion
+from .viewManager import MyTabview
+from .getVersion import getEficasVersion
from Editeur import session
version=getEficasVersion()
- self.VERSION_EFICAS="Eficas QT4 Salome "+version
- if monEnvQT5 : self.VERSION_EFICAS="Eficas QT5 Salome "
+ self.VERSION_EFICAS="Eficas QT5 Salome " + version
self.salome=salome
self.parentMainWindow=parent
self.ihm="QT"
self.indice=0
self.first=1
self.dict_reels={}
- if monEnvQT5 : self.recent = []
- else : self.recent = QStringList()
+ self.recent = []
self.ficRecents={}
self.mesScripts={}
self.listeAEnlever=[]
self.suiteTelemac=False
if hasattr (self, 'CONFIGURATION') :
if self.CONFIGURATION.force_langue :
- from monChoixLangue import MonChoixLangue
+ from .monChoixLangue import MonChoixLangue
widgetLangue = MonChoixLangue(self)
ret=widgetLangue.exec_()
self.suiteTelemac=self.CONFIGURATION.suiteTelemac
from Extensions import localisation
app=QApplication
- localisation.localise(None,self.langue)
+ localisation.localise(None,self.langue,translatorFichier=self.CONFIGURATION.translatorFichier)
+
+
self.setupUi(self)
#if parent != None : self.parentCentralWidget = parent.centralWidget()
# actionARemplacer ne sert que pour l insert Menu
self.menuFichier.insertMenu(self.actionARemplacer ,self.recentMenu)
self.menuFichier.removeAction(self.actionARemplacer)
- if monEnvQT5 : self.connecterSignaux()
- else : self.connecterSignauxQT4()
+ self.connecterSignaux()
self.toolBar.addSeparator()
if self.code != None : self.construitMenu()
self.ssCode=ssCode
if self.code==None :
self.cleanPath()
- from monChoixCode import MonChoixCode
+ from .monChoixCode import MonChoixCode
widgetChoix = MonChoixCode(self)
ret=widgetChoix.exec_()
import sys
if hasattr(self,intituleAction):
action=getattr(self,intituleAction)
self.toolBar.removeAction(action)
- if self.code.upper() in Appli.__dict__.keys():
- listeTexte=apply(Appli.__dict__[self.code.upper()],(self,))
+ if self.code.upper() in Appli.__dict__:
+ Appli.__dict__[self.code.upper()](self,)
if self.suiteTelemac : self.lookSuiteTelemac()
def initAides(self):
self.actionN1 = QAction(self)
self.actionN1.setText(tr("Process Output"))
self.menuN1.addAction(self.actionN1)
- if monEnvQT5 : self.actionN1.triggered.connect(self.newN1)
- else : self.connect(self.actionN1,SIGNAL("triggered()"),self.newN1)
-
+ self.actionN1.triggered.connect(self.newN1)
if hasattr(self,'actionOpenProcess'):return
self.actionOpenProcess = QAction(self)
self.actionOpenProcess.setText(tr("Open Process_Output File"))
self.menuN1.addAction(self.actionOpenProcess)
- if monEnvQT5 : self.actionOpenProcess.triggered.connect(self.openProcess)
- else : self.connect(self.actionOpenProcess,SIGNAL("triggered()"),self.openProcess)
+ self.actionOpenProcess.triggered.connect(self.openProcess)
def ajoutExecution(self):
self.menuExecution = self.menubar.addMenu(tr("&Run"))
if not(self.actionExecution in self.toolBar.actions()):
self.toolBar.addAction(self.actionExecution)
self.actionExecution.setText(tr("Run"))
- if monEnvQT5 : self.actionExecution.triggered.connect(self.run)
- else : self.connect(self.actionExecution,SIGNAL("triggered()"),self.run)
+ self.actionExecution.triggered.connect(self.run)
def ajoutSauveExecution(self):
self.actionSaveRun = QAction(self)
if not(self.actionSaveRun in self.toolBar.actions()):
self.toolBar.addAction(self.actionSaveRun)
self.actionSaveRun.setText(tr("Save Run"))
- if monEnvQT5 : self.actionSaveRun.triggered.connect(self.saveRun)
- else : self.connect(self.actionSaveRun,SIGNAL("triggered()"),self.saveRun)
+ self.actionSaveRun.triggered.connect(self.saveRun)
def griserActionsStructures(self):
self.actionCouper.setEnabled(False)
self.actionRechercherDsCatalogue.setVisible(False)
def connectRechercherDsCatalogue(self):
- if monEnvQT5:
- self.actionRechercherDsCatalogue.triggered.connect(self.handleRechercherDsCatalogue)
- else :
- self.connect(self.actionRechercherDsCatalogue,SIGNAL("triggered()"),self.handleRechercherDsCatalogue)
+ self.actionRechercherDsCatalogue.triggered.connect(self.handleRechercherDsCatalogue)
def ajoutSortieLegere(self):
if hasattr(self,'actionSortieLegere') : return
self.actionSortieLegere = QAction(self)
self.actionSortieLegere.setText(tr("Sortie Legere"))
self.menuFichier.insertAction(self.actionEnregistrer_sous,self.actionSortieLegere)
- if monEnvQT5:
- self.actionSortieLegere.triggered.connect(self.handleSortieLegere)
- else :
- self.connect(self.actionSortieLegere,SIGNAL("triggered()"),self.handleSortieLegere)
+ self.actionSortieLegere.triggered.connect(self.handleSortieLegere)
def ZCRACKS(self):
self.menuOptions.setTitle(tr("Options"))
def PSEN(self):
- if self.first:
- self.first=0
- if monEnvQT5:
- self.action_Nouveau.triggered.disconnect(self.fileNew)
- self.action_Nouveau.triggered.connect(self.newPSEN)
- self
- else :
- self.disconnect(self.action_Nouveau,SIGNAL("triggered()"),self.fileNew)
- self.connect(self.action_Nouveau,SIGNAL("triggered()"),self.newPSEN)
+ if self.first: self.first=0
+ self.action_Nouveau.triggered.disconnect(self.fileNew)
+ self.action_Nouveau.triggered.connect(self.newPSEN)
self.enleverActionsStructures()
self.enleverParametres()
self.enleverRechercherDsCatalogue()
def ajoutHelpPSEN(self):
self.actionParametres_Eficas.setText('Help PSEN')
- if monEnvQT5 : self.actionParametres_Eficas.triggered.connect(self.aidePSEN)
- else : self.connect(self.actionParametres_Eficas,SIGNAL("triggered()"),self.aidePSEN)
+ self.actionParametres_Eficas.triggered.connect(self.aidePSEN)
if Msg == None :
self.viewmanager.handleAjoutGroup(listeGroup)
else :
- print "(il faut gerer les erreurs")
+ print ("il faut gerer les erreurs")
def ChercheGrp(self):
+
# Pour Aster
self.actionTraduitV9V10 = QAction(self)
self.actionTraduitV9V10.setObjectName("actionTraduitV9V10")
self.actionEficas.triggered.connect(self.aidePPal)
self.actionVersion.triggered.connect(self.version)
self.actionParametres.triggered.connect(self.gestionParam)
+ self.actionCommentaire.triggered.connect(self.ajoutCommentaire)
self.actionCouper.triggered.connect(self.editCut)
self.actionCopier.triggered.connect(self.editCopy)
self.actionRegles_du_JdC.triggered.connect(self.jdcRegles)
self.actionFichier_Source.triggered.connect(self.jdcFichierSource)
self.actionFichier_Resultat.triggered.connect(self.visuJdcPy)
+ self.actionAfficher_l_Arbre.triggered.connect(self.ouvreArbre)
+ self.actionCacher_l_Arbre.triggered.connect(self.fermeArbre)
# Pour Aster
def Deplier(self):
self.viewmanager.handleDeplier()
+ def ajoutCommentaire(self):
+ self.viewmanager.ajoutCommentaire()
+
def ouvreFichiers(self) :
# Ouverture des fichiers de commandes donnes sur la ligne de commande
cwd=os.getcwd()
def initPatrons(self) :
# Mise a jour du menu des fichiers recemment ouverts
from Editeur import listePatrons
- if not(self.code in listePatrons.sous_menus.keys()) :
+ if not(self.code in listePatrons.sous_menus) :
if hasattr(self,"menuPatrons"):
self.menuPatrons.setAttribute(Qt.WA_DeleteOnClose)
self.menuPatrons.close()
self.menuPatrons.clear()
self.listePatrons = listePatrons.listePatrons(self.code)
idx = 0
- for nomSsMenu in self.listePatrons.liste.keys():
+ for nomSsMenu in self.listePatrons.liste:
ssmenu=self.menuPatrons.addMenu(nomSsMenu)
for fichier in self.listePatrons.liste[nomSsMenu]:
id = ssmenu.addAction(fichier)
self.ficPatrons[id]=fichier
- if monEnvQT5 : self.id.triggered.connect(self.handleOpenPatrons)
- else : self.connect(id, SIGNAL('triggered()'),self.handleOpenPatrons)
+ self.id.triggered.connect(self.handleOpenPatrons)
# self.Patrons.setItemParameter(id,idx)
idx=idx+1
def initRecents(self):
- if monEnvQT5 : self.recent = []
- else : self.recent = QStringList()
+ self.recent = []
try :
if sys.platform[0:5]=="linux" :
rep=os.path.join(os.environ['HOME'],'.config/Eficas',self.code)
except : pass
def addToRecentList(self, fn):
- if not monEnvQT5 : self.addToRecentListQT4(fn); return
while fn in self.recent: self.recent.remove(fn)
self.recent.insert(0,fn)
if len(self.recent) > 9:
def traductionV11V12(self):
- from gereTraduction import traduction
+ from .gereTraduction import traduction
traduction(self.CONFIGURATION.repIni,self.viewmanager,"V11V12")
def traductionV10V11(self):
- from gereTraduction import traduction
+ from .gereTraduction import traduction
traduction(self.CONFIGURATION.repIni,self.viewmanager,"V10V11")
def traductionV9V10(self):
- from gereTraduction import traduction
+ from .gereTraduction import traduction
traduction(self.CONFIGURATION.repIni,self.viewmanager,"V9V10")
def version(self) :
- from monVisu import DVisu
+ from .monVisu import DVisu
titre = tr("version ")
monVisuDialg=DVisu(parent=self,fl=0)
monVisuDialg.setWindowTitle(titre)
for rp in self.recent:
id = self.recentMenu.addAction(rp)
self.ficRecents[id]=rp
- if monEnvQT5 : id.triggered.connect(self.handleOpenRecent)
- else : self.connect(id, SIGNAL('triggered()'),self.handleOpenRecent)
+ id.triggered.connect(self.handleOpenRecent)
self.recentMenu.addSeparator()
self.recentMenu.addAction(tr('&Effacer'), self.handleClearRecent)
try:
self.viewmanager.newEditor()
except EficasException as exc:
- msg = unicode(exc)
+ msg = six.text_type(exc)
if msg != "": QMessageBox.warning(self, tr(u"Erreur"), msg)
def openProcess(self):
try:
self.viewmanager.handleOpen()
except EficasException as exc:
- msg = unicode(exc)
+ msg = six.text_type(exc)
if msg != "":
QMessageBox.warning(self, tr(u"Erreur"), msg)
def visuJdcPy(self):
self.viewmanager.handleViewJdcPy()
+ def ouvreArbre(self):
+ self.viewmanager.ouvreArbre()
+
+ def fermeArbre(self):
+ self.viewmanager.fermeArbre()
def NewInclude(self):
self.viewmanager.newIncludeEditor()
