Salome HOME
projects
/
tools
/
eficas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CloseEntete
[tools/eficas.git]
/
InterfaceQT4
/
monViewRegles.py
diff --git
a/InterfaceQT4/monViewRegles.py
b/InterfaceQT4/monViewRegles.py
index d180e671d497668732cefea23b6c34adcb8a3a3f..b2a74597db26b2fe10b954741b35d4a4a0a66d00 100644
(file)
--- a/
InterfaceQT4/monViewRegles.py
+++ b/
InterfaceQT4/monViewRegles.py
@@
-22,8
+22,13
@@
import string,types,os
import traceback
from Extensions.i18n import tr
import traceback
from Extensions.i18n import tr
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from determine import monEnvQT5
+if monEnvQT5:
+ from PyQt5.QtCore import Qt
+ from PyQt5.QtWidgets import QDialog, QListWidgetItem
+else :
+ from PyQt4.QtGui import *
+ from PyQt4.QtCore import *
from desViewRegles import Ui_viewRegles
# ------------------------------------ #
from desViewRegles import Ui_viewRegles
# ------------------------------------ #
@@
-35,6
+40,10
@@
class ViewRegles(Ui_viewRegles,QDialog):
def __init__(self,parent,liste,entete=None):
QDialog.__init__(self,parent)
self.setupUi(self)
def __init__(self,parent,liste,entete=None):
QDialog.__init__(self,parent)
self.setupUi(self)
+ self.setModal(False)
+ if monEnvQT5 : self.bclose.clicked.connect(self.close)
+ else : self.connect( self.bclose,SIGNAL("clicked()"), self, SLOT("close()") )
+
if entete != None : self.setWindowTitle (entete)
for ligne in liste :
texte=ligne[0]
if entete != None : self.setWindowTitle (entete)
for ligne in liste :
texte=ligne[0]