X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FmonViewTexte.py;h=ee796eb72db2c83f55e606bdc93934f6c2875b10;hb=4aec96ddfcd8ae0e817b0aaf827f008015a4bf5b;hp=8aeddc7ceec5e6d440f4fbc4015b8245ff2fb50a;hpb=283128d5842f911861917b3f15288479061afd64;p=tools%2Feficas.git
diff --git a/InterfaceQT4/monViewTexte.py b/InterfaceQT4/monViewTexte.py
index 8aeddc7c..ee796eb7 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, QFileDialog
+ from PyQt5.QtCore import QSize
+else :
+ from PyQt4.QtGui import *
+ from PyQt4.QtCore import *
from desViewTexte import Ui_dView
# ------------------------------- #
@@ -38,8 +44,12 @@ class ViewText(Ui_dView,QDialog):
self.setupUi(self)
self.resize( QSize(largeur,hauteur).expandedTo(self.minimumSizeHint()) )
- self.connect( self.bclose,SIGNAL("clicked()"), self, SLOT("close()") )
- self.connect( self.bsave,SIGNAL("clicked()"), self.saveFile )
+ 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,17 +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
-class ViewText2(ViewText):
- def __init__(self,parent,cmd,editor=None,entete=None,texte=None,largeur=600,hauteur=600):
- ViewText.__init__(self,parent,editor,entete,texte,largeur,hauteur)
- import subprocess
- p = subprocess.Popen(cmd,stdout=subprocess.PIPE)
- (output, err) = p.communicate()
- if output != None : self.view.append(QString.fromUtf8(output,len(output))) ;
- if err != None : self.view.append(QString.fromUtf8(err,len(err))) ;
-