closeEntete et autre

diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py
index 0bd9a26d868c34b903b168b8619cf0794446ebc3..3631c8298cb370d5f0348796c942b7bd78e14cc9 100644 (file)
--- a/InterfaceQT4/browser.py
+++ b/InterfaceQT4/browser.py
@@ -316,7 +316,7 @@ class JDCNode(QTreeWidgetItem,GereRegles):
             nouvelItem=item.itemNode(self,item,itemExpand,ancien)
             self.children.append(nouvelItem)
 
-        #print "fin *********** build_children ",self,self.item, self.item.nom
+        #print "fin *********** build_children ",self,self.item, self.item.nom, self.children
 
         
     def chercheNoeudCorrespondant(self,objSimp):

diff --git a/InterfaceQT4/configuration.py b/InterfaceQT4/configuration.py
index 4f92bf84317baafad9cdb427493b2fd98c08a55d..af63f5d0e08e1d324004525831e6971917b9dc91 100644 (file)
--- a/InterfaceQT4/configuration.py
+++ b/InterfaceQT4/configuration.py
@@ -98,6 +98,7 @@ class CONFIG_BASE:
       self.affiche="alpha"\r
       self.closeAutreCommande = False\r
       self.closeFrameRechercheCommande = False\r
+      self.closeEntete = False\r
 \r
  \r
   #--------------------------------------\r

diff --git a/InterfaceQT4/monRechercheCatalogue.py b/InterfaceQT4/monRechercheCatalogue.py
index ac115eb3d9a4d183fb9af2c0a79a9dc6abd8f1f8..e0c22c641186908497c3b97faa3e9af72cb3ec10 100644 (file)
--- a/InterfaceQT4/monRechercheCatalogue.py
+++ b/InterfaceQT4/monRechercheCatalogue.py
@@ -46,11 +46,9 @@ class DRechercheCatalogue (Ui_desRechercheCatalogue ,QDialog):
       self.editor=editor
       self.CBRecherche.setEditable(True)
       if monEnvQT5 :
-         self.LERecherche.returnPressed.connect(self.rechercheLE)
          self.CBRecherche.lineEdit().returnPressed.connect(self.rechercheCB)
          self.CBRecherche.currentIndexChanged.connect(self.rechercheCB)
       else :
-         self.connect(self.LERecherche,SIGNAL("returnPressed()"),self.rechercheLE)
          self.connect(self.CBRecherche.lineEdit(),SIGNAL("returnPressed()"),self.rechercheCB)
          self.connect(self.CBRecherche,SIGNAL("currentIndexChanged(int)"),self.rechercheCB)
 
@@ -70,9 +68,6 @@ class DRechercheCatalogue (Ui_desRechercheCatalogue ,QDialog):
       motAChercher=self.CBRecherche.lineEdit().text()
       self.recherche(motAChercher)
 
-  def rechercheLE(self):
-      motAChercher=self.LERecherche.text()
-      self.recherche(motAChercher)
 
   def recherche(self,motAChercher):
       if str(motAChercher)=="" or str(motAChercher) == None : return

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index e3cf63b5ea3fcb88b3cf027667df00dba0f8fb0e..27eafbd1f8567bf92de2f67db1c899b842de5958 100755 (executable)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -74,6 +74,7 @@ class Appli(Ui_Eficas,QMainWindow):
           import eficasSalome
           Accas.SalomeEntry = eficasSalome.SalomeEntry
 
+        #self.salome=1
         self.multi=multi
         self.demande=multi # specifique PSEN
         if self.multi == False :
@@ -101,6 +102,7 @@ class Appli(Ui_Eficas,QMainWindow):
         self.blEntete.insertWidget(0,self.toolBar)
         self.blEntete.insertWidget(0,self.menubar)
 
+        if self.CONFIGURATION.closeEntete==True : self.closeEntete()
 
         eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -279,6 +281,12 @@ class Appli(Ui_Eficas,QMainWindow):
     def enleverRechercherDsCatalogue(self):
         self.actionRechercherDsCatalogue.setVisible(False)
 
+    def connectRechercherDsCatalogue(self):
+        if monEnvQT5:
+          self.actionRechercherDsCatalogue.triggered.connect(self.handleRechercherDsCatalogue)
+        else :
+          self.connect(self.actionRechercherDsCatalogue,SIGNAL("triggered()"),self.handleRechercherDsCatalogue)
+
     def ZCRACKS(self):
         self.enleverNewInclude()
         self.toolBar.addSeparator()
@@ -291,7 +299,6 @@ class Appli(Ui_Eficas,QMainWindow):
     def ADAO(self):
         self.enleverActionsStructures()
         self.enleverNewInclude()
-        self.enleverRechercherDsCatalogue()
 
     def ASTER(self) :
         self.menuTraduction = self.menubar.addMenu("menuTraduction")
@@ -356,6 +363,7 @@ class Appli(Ui_Eficas,QMainWindow):
     def TELEMAC(self):
         self.enleverActionsStructures()
         self.enleverNewInclude()
+        self.connectRechercherDsCatalogue()
 
     def ajoutHelpPSEN(self):
         self.actionParametres_Eficas.setText('Help PSEN')
@@ -760,6 +768,10 @@ class Appli(Ui_Eficas,QMainWindow):
         self.recent = QStringList()
         self.sauveRecents()
 
+    def handleRechercherDsCatalogue(self):
+        if not self.viewmanager : return
+        self.viewmanager.handleRechercherDsCatalogue()
+
     def fileNew(self):
         try:
             self.viewmanager.newEditor()

diff --git a/UiQT4/CMakeLists.txt b/UiQT4/CMakeLists.txt
index 48ed0f90411d36739e16c715b0db178d2f27acf5..a9a7e414813fb2b5df221844eb6966fa435257b3 100644 (file)
--- a/UiQT4/CMakeLists.txt
+++ b/UiQT4/CMakeLists.txt
@@ -37,6 +37,7 @@ eficas_compile_ui ( desChoixCata.ui )
 eficas_compile_ui ( desChoixCode.ui )
 eficas_compile_ui ( desChoixCommandes.ui )
 eficas_compile_ui ( desRecherche.ui )
+eficas_compile_ui ( desRechercheCatalogue.ui )
 eficas_compile_ui ( desSelectVal.ui )
 eficas_compile_ui ( desViewTexte.ui )
 eficas_compile_ui ( desViewRegles.ui )

diff --git a/UiQT4/desRechercheCatalogue.ui b/UiQT4/desRechercheCatalogue.ui
index 895138346100e3db6edd87bcb1065222b84f71ed..ef529e25c252cb6f3458bacbaa42c346ff51a3c5 100644 (file)
--- a/UiQT4/desRechercheCatalogue.ui
+++ b/UiQT4/desRechercheCatalogue.ui
@@ -38,25 +38,6 @@
      <item>
       <widget class="QComboBox" name="CBRecherche"/>
      </item>
-     <item>
-      <widget class="QLineEdit" name="LERecherche">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>411</width>
-         <height>41</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">background:rgb(240,240,240)</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>