PyQt4/PyQt5 support.

[modules/smesh.git] / src / Tools / YamsPlug / monYamsPlugDialog.py

diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py
index 9a4a658412c452d7fb1b3430eb8045ba9a3777a1..27953a1b8968fe15e4007df1d617fe3845393d70 100644 (file)
--- a/src/Tools/YamsPlug/monYamsPlugDialog.py
+++ b/src/Tools/YamsPlug/monYamsPlugDialog.py
@@ -24,9 +24,7 @@
 import os, subprocess
 from YamsPlugDialog_ui import Ui_YamsPlugDialog
 from monViewText import MonViewText
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
-
+from qtsalome import *
 
 class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
   """
@@ -84,22 +82,22 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
     self.clean()
 
   def connecterSignaux(self) :
-    self.connect(self.PB_Cancel,SIGNAL("clicked()"),self.PBCancelPressed)
-    self.connect(self.PB_Default,SIGNAL("clicked()"),self.clean)
-    self.connect(self.PB_Help,SIGNAL("clicked()"),self.PBHelpPressed)
-    self.connect(self.PB_OK,SIGNAL("clicked()"),self.PBOKPressed)
+    self.PB_Cancel.clicked.connect(self.PBCancelPressed)
+    self.PB_Default.clicked.connect(self.clean)
+    self.PB_Help.clicked.connect(self.PBHelpPressed)
+    self.PB_OK.clicked.connect(self.PBOKPressed)
     
-    self.connect(self.PB_Load,SIGNAL("clicked()"),self.PBLoadPressed)
-    self.connect(self.PB_Save,SIGNAL("clicked()"),self.PBSavePressed)
-    self.connect(self.PB_LoadHyp,SIGNAL("clicked()"),self.PBLoadHypPressed)
-    self.connect(self.PB_SaveHyp,SIGNAL("clicked()"),self.PBSaveHypPressed)
+    self.PB_Load.clicked.connect(self.PBLoadPressed)
+    self.PB_Save.clicked.connect(self.PBSavePressed)
+    self.PB_LoadHyp.clicked.connect(self.PBLoadHypPressed)
+    self.PB_SaveHyp.clicked.connect(self.PBSaveHypPressed)
     
-    self.connect(self.PB_MeshFile,SIGNAL("clicked()"),self.PBMeshFilePressed)
-    self.connect(self.PB_MeshSmesh,SIGNAL("clicked()"),self.PBMeshSmeshPressed)
-    self.connect(self.LE_MeshSmesh,SIGNAL("returnPressed()"),self.meshSmeshNameChanged)
-    self.connect(self.PB_ParamsFileExplorer,SIGNAL("clicked()"),self.setParamsFileName)
-    self.connect(self.LE_MeshFile,SIGNAL("returnPressed()"),self.meshFileNameChanged)
-    self.connect(self.LE_ParamsFile,SIGNAL("returnPressed()"),self.paramsFileNameChanged)
+    self.PB_MeshFile.clicked.connect(self.PBMeshFilePressed)
+    self.PB_MeshSmesh.clicked.connect(self.PBMeshSmeshPressed)
+    self.LE_MeshSmesh.returnPressed.connect(self.meshSmeshNameChanged)
+    self.PB_ParamsFileExplorer.clicked.connect(self.setParamsFileName)
+    self.LE_MeshFile.returnPressed.connect(self.meshFileNameChanged)
+    self.LE_ParamsFile.returnPressed.connect(self.paramsFileNameChanged)
 
   def PBHelpPressed(self):
     import SalomePyQt
@@ -364,7 +362,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
     if fd.exec_():
       infile = fd.selectedFiles()[0]
       self.LE_MeshFile.setText(infile)
-      self.fichierIn=infile.toLatin1()
+      self.fichierIn=unicode(infile).encode("latin-1")
       self.MeshIn=""
       self.LE_MeshSmesh.setText("")
 
@@ -373,7 +371,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
     if fd.exec_():
       infile = fd.selectedFiles()[0]
       self.LE_ParamsFile.setText(infile)
-      self.paramsFile=infile.toLatin1()
+      self.paramsFile=unicode(infile).encode("latin-1")
 
   def meshFileNameChanged(self):
     self.fichierIn=str(self.LE_MeshFile.text())
@@ -453,7 +451,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
       except:
         pass
       
-    style = self.style.toLatin1()
+    style = unicode(self.style).encode("latin-1")
     # Translation of old Yams options to new MG-SurfOpt options
     if   style == "0" :
       self.commande+= " --optimisation only"
@@ -540,10 +538,9 @@ def getDialog():
 #
 def TEST_MonYamsPlugDialog():
   import sys
-  from PyQt4.QtGui import QApplication
-  from PyQt4.QtCore import QObject, SIGNAL, SLOT
+  from qtsalome import QApplication
   app = QApplication(sys.argv)
-  QObject.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()"))
+  app.lastWindowClosed.connect(app.quit)
 
   dlg=MonYamsPlugDialog()
   dlg.show()