X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FmonViewTexte.py;h=02af852de729040ba4aa9b4501ed46cf67ee79b6;hb=39b7b166eb606b80c9ac427811651b20db79bde2;hp=564a9660ac52406dcbec3e24642653a31eaa8a3a;hpb=2c5a8689b9c6cc46804fd268d416d1de2777059e;p=tools%2Feficas.git
diff --git a/InterfaceQT4/monViewTexte.py b/InterfaceQT4/monViewTexte.py
index 564a9660..02af852d 100644
--- a/InterfaceQT4/monViewTexte.py
+++ b/InterfaceQT4/monViewTexte.py
@@ -22,8 +22,14 @@ import string,types,os
import traceback
from Extensions.i18n import tr
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+
+from determine import monEnvQT5
+if monEnvQT5 :
+ from PyQt5.QtWidgets import QDialog, QMessageBox
+ from PyQt5.QtCore import QSize
+else :
+ from PyQt4.QtGui import *
+ from PyQt4.QtCore import *
from desViewTexte import Ui_dView
# ------------------------------- #
@@ -32,14 +38,18 @@ class ViewText(Ui_dView,QDialog):
"""
Classe permettant la visualisation de texte
"""
- def __init__(self,parent,editor=None,entete=None,texte=None):
+ def __init__(self,parent,editor=None,entete=None,texte=None,largeur=600,hauteur=600):
QDialog.__init__(self,parent)
self.editor=editor
self.setupUi(self)
- self.resize( QSize(600,600).expandedTo(self.minimumSizeHint()) )
- self.connect( self.bclose,SIGNAL("clicked()"), self, SLOT("close()") )
- self.connect( self.bsave,SIGNAL("clicked()"), self.saveFile )
+ self.resize( QSize(largeur,hauteur).expandedTo(self.minimumSizeHint()) )
+ if monEnvQT5 :
+ self.bclose.clicked.connect(self.close)
+ self.bsave.clicked.connect(self.saveFile )
+ else :
+ self.connect( self.bclose,SIGNAL("clicked()"), self, SLOT("close()") )
+ self.connect( self.bsave,SIGNAL("clicked()"), self.saveFile )
if entete != None : self.setWindowTitle (entete)
if entete != None : self.setText (texte)
@@ -56,7 +66,10 @@ class ViewText(Ui_dView,QDialog):
fn = QFileDialog.getSaveFileName(None,
tr("Sauvegarder le fichier"),
dir)
- if fn.isNull() : return
+ if monEnvQT5 : fn=fn[0]
+ if fn == "" : return
+ if fn == None : return (0, None)
+
ulfile = os.path.abspath(unicode(fn))
if self.editor != None :
self.editor.appliEficas.CONFIGURATION.savedir=os.path.split(ulfile)[0]
@@ -67,6 +80,8 @@ class ViewText(Ui_dView,QDialog):
return 1
except IOError, why:
QMessageBox.critical(self, tr("Sauvegarder le fichier"),
- tr("Le fichier %(v_1)s n'a pu etre sauvegarde.
Raison : %(v_2)s", {'v_1': unicode(fn), 'v_2': unicode(why)}))
+ tr('Le fichier')+str(fn) + tr('n a pas pu etre sauvegarde : ') + str(why))
return
+
+