X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FgereListe.py;h=5faaf5d9d342976cfa6fa497accfcccccdce3a0d;hb=9bf98fc1cb51814c31679120598dc309e0802e31;hp=c7b87989dce89340a5491fabcacee7ab77826a25;hpb=bf00944dffe13d0a9a098a1c1934b664df8f1bd7;p=tools%2Feficas.git diff --git a/InterfaceQT4/gereListe.py b/InterfaceQT4/gereListe.py index c7b87989..5faaf5d9 100644 --- a/InterfaceQT4/gereListe.py +++ b/InterfaceQT4/gereListe.py @@ -18,20 +18,26 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # Modules Python -import string,types,os + +from __future__ import absolute_import +try : + from builtins import str + from builtins import range + from builtins import object +except : pass + +import types,os import traceback -from determine import monEnvQT5 -if monEnvQT5: - from PyQt5.QtWidgets import QLineEdit, QLabel - from PyQt5.QtCore import QEvent, Qt - from PyQt5.QtGui import QIcon, QPalette -else : - from PyQt4.QtGui import * - from PyQt4.QtCore import * + +import six +from six.moves import range +from PyQt5.QtWidgets import QLineEdit, QLabel, QFileDialog +from PyQt5.QtCore import QEvent, Qt +from PyQt5.QtGui import QIcon, QPalette from Extensions.i18n import tr -from monViewTexte import ViewText +from InterfaceQT4.monViewTexte import ViewText # ---------------------- # @@ -42,24 +48,41 @@ class LECustom(QLineEdit): Constructor """ QLineEdit.__init__(self,parent) + self.parentQt=parentQt self.num=i self.dansUnTuple=False + self.numDsLaListe=-1 def focusInEvent(self,event): #print "dans focusInEvent de LECustom" self.parentQt.LineEditEnCours=self self.parentQt.NumLineEditEnCours=self.num + self.parentQt.textSelected=self.text() self.setStyleSheet("border: 2px solid gray") QLineEdit.focusInEvent(self,event) def focusOutEvent(self,event): - #print "dans focusOutEvent de LECustom" self.setStyleSheet("border: 0px") if self.dansUnTuple : self.setStyleSheet("background:rgb(235,235,235); border: 0px;") elif self.num % 2 == 1 : self.setStyleSheet("background:rgb(210,210,210)") else : self.setStyleSheet("background:rgb(235,235,235)") - QLineEdit.focusOutEvent(self,event) + + + + from InterfaceQT4.monWidgetPlusieursBase import MonWidgetPlusieursBase + try : + #if isinstance (self.parentQt, MonWidgetPlusieursBase) and not self.parentQt.inFocusOutEvent : + # self.parentQt.inFocusOutEvent=True + # self.parentQt.changeValeur(changeDePlace=True,oblige=False) + # self.parentQt.inFocusOutEvent=False + + #if isinstance(self,LECustomTuple) and not self.tupleCustomParent.inFocusOutEvent: + # self.tupleCustomParent.inFocusOutEvent=True + # self.tupleCustomParent.valueChange() + # self.tupleCustomParent.inFocusOutEvent=False + QLineEdit.focusOutEvent(self,event) + except : pass def clean(self): self.setText("") @@ -70,6 +93,8 @@ class LECustom(QLineEdit): def setValeur(self,valeur): self.setText(valeur) + + # --------------------------- # class LECustomTuple(LECustom): # --------------------------- # @@ -77,6 +102,7 @@ class LECustomTuple(LECustom): # index sera mis a jour par TupleCustom parentQt=parent.parent().parent().parent() LECustom. __init__(self,parent,parentQt,0) + #print (dir(self)) # ---------------------------- # class MonLabelListeClic(QLabel): @@ -95,12 +121,11 @@ class MonLabelListeClic(QLabel): # ------------- # -class GereListe: +class GereListe(object): # ------------- # def __init__(self): - if monEnvQT5 :self.connecterSignaux() - else : self.connecterSignauxQT4() + self.connecterSignaux() def connecterSignauxQT4(self): if hasattr(self,'RBHaut'): @@ -145,7 +170,7 @@ class GereListe: self.prepareListeResultatFiltre() def alphaPushed(self): - print "alphaPushed" ,self.alpha + #print "alphaPushed" ,self.alpha if self.alpha == 1 : return self.alpha=1 self.prepareListeResultat() @@ -189,6 +214,8 @@ class GereListe: def moinsPushed(self): # on supprime le dernier + if self.NumLineEditEnCours == 0 : return + if self.indexDernierLabel == 0 : return if self.NumLineEditEnCours==self.indexDernierLabel : nomLineEdit=self.nomLine+str(self.indexDernierLabel) courant=getattr(self,nomLineEdit) @@ -239,7 +266,7 @@ class GereListe: courant.setValeur(valeurADescendre) valeurADescendre=valeurAGarder self.changeValeur(changeDePlace=False) - self.scrollArea.ensureWidgetVisible(self.LineEditEnCours) + if hasattr (self, 'LineEditEnCours') :self.scrollArea.ensureWidgetVisible(self.LineEditEnCours) def voisListePushed(self): texteValeurs="" @@ -251,17 +278,18 @@ class GereListe: def selectInFile(self): - init=QString( self.editor.CONFIGURATION.savedir) + init=str( self.editor.CONFIGURATION.savedir) fn = QFileDialog.getOpenFileName(self.node.appliEficas, tr("Fichier de donnees"), init, tr('Tous les Fichiers (*)',)) + fn=fn[0] if fn == None : return if fn == "" : return - ulfile = os.path.abspath(unicode(fn)) + ulfile = os.path.abspath(six.text_type(fn)) self.editor.CONFIGURATION.savedir=os.path.split(ulfile)[0] - from monSelectVal import MonSelectVal + from .monSelectVal import MonSelectVal MonSelectVal(file=fn,parent=self).show() def noircirResultatFiltre(self): @@ -277,7 +305,7 @@ class GereListe: # ----------- # -class GerePlie: +class GerePlie(object): # ----------- # def gereIconePlier(self): @@ -292,8 +320,7 @@ class GerePlie: fichier=os.path.join(repIcon, 'minusnode.png') icon = QIcon(fichier) self.BFermeListe.setIcon(icon) - if monEnvQT5 : self.BFermeListe.clicked.connect( self.selectWidgetPlie) - else : self.connect(self.BFermeListe,SIGNAL("clicked()"), self.selectWidgetPlie) + self.BFermeListe.clicked.connect( self.selectWidgetPlie) def selectWidgetPlie(self): self.editor.listeDesListesOuvertes.remove(self.node.item)