PyQt5/PyQt4 support

[modules/gui.git] / src / GUI_PY / selectvars.py

diff --git a/src/GUI_PY/selectvars.py b/src/GUI_PY/selectvars.py
index 4cbf2f0f58398b9537e00bb4819457dacb822630..d7a1cb416b3d02d414731446dc0a576edefe3459 100644 (file)
--- a/src/GUI_PY/selectvars.py
+++ b/src/GUI_PY/selectvars.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,8 +21,8 @@
 #
 
 import os
-from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import Qt
+
+from qtsalome import *
 
 import salome
 from salome.kernel.studyedit import getStudyEditor
@@ -34,23 +34,23 @@ from salome.kernel.parametric import study_exchange_vars
 
 from SelectVarsDialog_ui import Ui_SelectVarsDialog
 
-class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog):
+class MySelectVarsDialog(Ui_SelectVarsDialog, QDialog):
 
     def __init__(self, parent = None, modal = 0):
-        QtGui.QDialog.__init__(self, parent)
+        QDialog.__init__(self, parent)
         Ui_SelectVarsDialog.__init__(self)
         self.setupUi(self)
-        self.connect(self.cancelButton, QtCore.SIGNAL("clicked()"), self.close)
-        self.connect(self.OKButton, QtCore.SIGNAL("clicked()"), self.accept)
-        self.connect(self.selectButton, QtCore.SIGNAL("clicked()"), self.initPotentialVariablesFromSelection)
-        self.connect(self.addInputVarButton, QtCore.SIGNAL("clicked()"), self.addSelectedInputVar)
-        self.connect(self.removeInputVarButton, QtCore.SIGNAL("clicked()"), self.removeSelectedInputVar)
-        self.connect(self.newInputVarButton, QtCore.SIGNAL("clicked()"), self.newInputVar)
-        self.connect(self.addOutputVarButton, QtCore.SIGNAL("clicked()"), self.addSelectedOutputVar)
-        self.connect(self.removeOutputVarButton, QtCore.SIGNAL("clicked()"), self.removeSelectedOutputVar)
-        self.connect(self.newOutputVarButton, QtCore.SIGNAL("clicked()"), self.newOutputVar)
-        self.connect(self.loadVarsButton, QtCore.SIGNAL("clicked()"), self.loadVars)
-        self.connect(self.saveVarsButton, QtCore.SIGNAL("clicked()"), self.saveVars)
+        Connect(self.cancelButton, "clicked()", self.close)
+        Connect(self.OKButton,"clicked()", self.accept)
+        Connect(self.selectButton, "clicked()", self.initPotentialVariablesFromSelection)
+        Connect(self.addInputVarButton, "clicked()", self.addSelectedInputVar)
+        Connect(self.removeInputVarButton, "clicked()", self.removeSelectedInputVar)
+        Connect(self.newInputVarButton, "clicked()", self.newInputVar)
+        Connect(self.addOutputVarButton, "clicked()", self.addSelectedOutputVar)
+        Connect(self.removeOutputVarButton, "clicked()", self.removeSelectedOutputVar)
+        Connect(self.newOutputVarButton, "clicked()", self.newOutputVar)
+        Connect(self.loadVarsButton, "clicked()", self.loadVars)
+        Connect(self.saveVarsButton, "clicked()", self.saveVars)
         self.refEntry = None
 
     def setExchangeVariables(self, exchangeVariables):
@@ -62,8 +62,8 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog):
     def initPotentialVariablesFromSelection(self):
         entries = salome.sg.getAllSelected()
         if len(entries) != 1 :
-            QtGui.QMessageBox.warning(self, self.tr("Error"),
-                                      self.tr("One item must be selected in the object browser"))
+            QMessageBox.warning(self, self.tr("Error"),
+                                self.tr("One item must be selected in the object browser"))
             return
         selectedEntry = entries[0]
         self._initPotentialVariables(selectedEntry)
@@ -71,13 +71,13 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog):
     def _initPotentialVariables(self, entry):
         sobj = getStudyEditor().study.FindObjectID(entry)
         if sobj is None:
-            QtGui.QMessageBox.warning(self, self.tr("Error"),
-                                      self.tr('No item at entry %s' % entry))
+            QMessageBox.warning(self, self.tr("Error"),
+                                self.tr('No item at entry %s' % entry))
             return
         exchangeVariables = study_exchange_vars.getExchangeVariablesFromSObject(sobj)
         if exchangeVariables is None:
-            QtGui.QMessageBox.warning(self, self.tr("Error"),
-                                      self.tr('Item at entry %s is not a valid '
+            QMessageBox.warning(self, self.tr("Error"),
+                                self.tr('Item at entry %s is not a valid '
                                               '"Variable List" object' % entry))
             return
         self.refEntry = entry
@@ -89,27 +89,27 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog):
 
     def addSelectedInputVar(self):
         for item in self.allInputVarListWidget.selectedItems():
-            self.selectedInputVarListWidget.addItem(QtGui.QListWidgetItem(item))
+            self.selectedInputVarListWidget.addItem(QListWidgetItem(item))
 
     def removeSelectedInputVar(self):
         for item in self.selectedInputVarListWidget.selectedItems():
             self.selectedInputVarListWidget.takeItem(self.selectedInputVarListWidget.row(item))
 
     def newInputVar(self):
-        newItem = QtGui.QListWidgetItem("TO EDIT!")
+        newItem = QListWidgetItem("TO EDIT!")
         newItem.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEditable|Qt.ItemIsUserCheckable|Qt.ItemIsEnabled)
         self.selectedInputVarListWidget.addItem(newItem);
 
     def addSelectedOutputVar(self):
         for item in self.allOutputVarListWidget.selectedItems():
-            self.selectedOutputVarListWidget.addItem(QtGui.QListWidgetItem(item))
+            self.selectedOutputVarListWidget.addItem(QListWidgetItem(item))
 
     def removeSelectedOutputVar(self):
         for item in self.selectedOutputVarListWidget.selectedItems():
             self.selectedOutputVarListWidget.takeItem(self.selectedOutputVarListWidget.row(item))
 
     def newOutputVar(self):
-        newItem = QtGui.QListWidgetItem("TO EDIT!")
+        newItem = QListWidgetItem("TO EDIT!")
         newItem.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEditable|Qt.ItemIsUserCheckable|Qt.ItemIsEnabled)
         self.selectedOutputVarListWidget.addItem(newItem);
 
@@ -125,7 +125,7 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog):
         return study_exchange_vars.ExchangeVariables(inputVarList, outputVarList, self.refEntry)
 
     def loadVars(self):
-        filename = QtGui.QFileDialog.getOpenFileName(self, self.tr("Import variables from file"),
+        filename = QFileDialog.getOpenFileName(self, self.tr("Import variables from file"),
                                                      os.getenv("HOME"),
                                                      self.tr("XML Files (*.xml)"))
         if not filename:
@@ -135,12 +135,12 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog):
             exchange_variables = study_exchange_vars.loadExchangeVariablesFromXmlFile(filename)
             self.setExchangeVariables(exchange_variables)
         except Exception, e:
-            QtGui.QMessageBox.critical(self, self.tr("Error"),
-                                       self.tr("Cannot load file %s:\n%s" % (filename, e)))
+            QMessageBox.critical(self, self.tr("Error"),
+                                 self.tr("Cannot load file %s:\n%s" % (filename, e)))
 
     def saveVars(self):
         default = os.path.join(os.getenv("HOME"), "vars.xml")
-        filename = QtGui.QFileDialog.getSaveFileName(self, self.tr("Export variables to file"),
+        filename = QFileDialog.getSaveFileName(self, self.tr("Export variables to file"),
                                                      default, self.tr("XML Files (*.xml)"))
         if not filename:
             return
@@ -149,5 +149,5 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog):
             exchange_variables = self.getSelectedExchangeVariables()
             exchange_variables.saveToXmlFile(filename)
         except Exception, e:
-            QtGui.QMessageBox.critical(self, self.tr("Error"),
-                                       self.tr("Cannot save file %s:\n%s" % (filename, e)))
+            QMessageBox.critical(self, self.tr("Error"),
+                                 self.tr("Cannot save file %s:\n%s" % (filename, e)))