pour Rechercher

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 9ee7c1e1d2a72f172d9c05949a99b777a168caf8..06223904944da330c6d02081e68b8b7532c4b5eb 100644 (file)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -405,6 +405,13 @@ class JDCEditor(QSplitter):
       else : self.node_selected[0].deleteMultiple(self.node_selected)
      
     
+    #---------------------#
+    def handleRechercher(self):
+    #---------------------#
+      print "hhhhhhhhh"
+      from monRecherche import DRecherche
+      monRechercheDialg=DRecherche(parent=self,fl=0)
+    
     #---------------------#
     def handleEditCut(self):
     #---------------------#

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 448c4d5245dd3014683e1e8f097f8efa4f36945c..338b17904afd231da63728e7c3d9d0f837485e43 100644 (file)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -238,6 +238,7 @@ class Appli(Ui_Eficas,QMainWindow):
         self.connect(self.actionCopier,SIGNAL("activated()"),self.editCopy)
         self.connect(self.actionColler,SIGNAL("activated()"),self.editPaste)
         self.connect(self.actionSupprimer,SIGNAL("activated()"),self.supprimer)
+        self.connect(self.actionRechercher,SIGNAL("activated()"),self.rechercher)
 
         self.connect(self.actionRapport_de_Validation,SIGNAL("activated()"),self.jdcRapport)
         self.connect(self.actionFichier_Source,SIGNAL("activated()"),self.jdcFichierSource)
@@ -454,6 +455,9 @@ class Appli(Ui_Eficas,QMainWindow):
     def editPaste(self):
         self.viewmanager.handleEditPaste()
         
+    def rechercher(self):
+        self.viewmanager.handleRechercher()
+        
     def run(self):
         self.viewmanager.run()
         

diff --git a/InterfaceQT4/viewManager.py b/InterfaceQT4/viewManager.py
index bfba5444e8436bcb7f94da1e0589c05a5987782e..2d82ca3075df6a69e27d87c4e2cd12cfef567285 100644 (file)
--- a/InterfaceQT4/viewManager.py
+++ b/InterfaceQT4/viewManager.py
@@ -122,6 +122,13 @@ class MyTabview:
              if res==2 : return res   # l utilsateur a annule
        return res
         
+   def handleRechercher(self):
+       #print "passage dans handleRechercher"
+       index=self.myQtab.currentIndex()
+       editor=self.dict_editors[index]
+       editor.handleRechercher()
+
+   
    def handleEditCopy(self):
        #print "passage dans handleEditCopy"
        index=self.myQtab.currentIndex()

diff --git a/UiQT4/desRecherche.ui b/UiQT4/desRecherche.ui
new file mode 100644 (file)
index 0000000..e6470ac
--- /dev/null
+++ b/UiQT4/desRecherche.ui
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>desRecherche</class>
+ <widget class="QWidget" name="desRecherche">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>525</width>
+    <height>55</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Rechercher dans le JDC</string>
+  </property>
+  <widget class="QLineEdit" name="LERecherche">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>10</y>
+     <width>411</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="PBSuivant">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>420</x>
+     <y>10</y>
+     <width>101</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text">
+    <string>Suivant</string>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/UiQT4/makefile b/UiQT4/makefile
index 03c68280ff765852d936afad56dc69f77bf1f386..05f276cc1f75a3c57f2fb2c42084c0d05aae78a0 100644 (file)
--- a/UiQT4/makefile
+++ b/UiQT4/makefile
@@ -9,7 +9,7 @@ PY_FILES = desChoixCata.py desCommande.py desCommentaire.py desError.py desFormu
        desUniqueASSD.py desUniqueBase.py desUniqueComp.py desUniqueInto.py desUniqueSDCOInto.py \
        desUniqueSDCO.py desVisu.py  aideQT.py OptionsEditeur.py OptionsPdf.py myMain.py \
        desViewTexte.py desPixmap.py desMatrice.py OptionsOT.py OptionsCuve.py desChoixMap.py \
-        OptionsMAP.py desImage.py desChoixCode.py
+        OptionsMAP.py desImage.py desChoixCode.py desRecherche.py
 
 %.py:%.ui
        ${PYUIC} -x -o $@ $<

diff --git a/UiQT4/myMain.ui b/UiQT4/myMain.ui
index 2859279de7b60c7737b14566e1260439f150eac8..6bd695653982fda1dd064a11d9f1fb14793c1b5b 100644 (file)
--- a/UiQT4/myMain.ui
+++ b/UiQT4/myMain.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Eficas</class>
- <widget class="QMainWindow" name="Eficas" >
-  <property name="geometry" >
+ <widget class="QMainWindow" name="Eficas">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,250 +10,266 @@
     <height>811</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>MainWindow</string>
   </property>
-  <widget class="QWidget" name="centralwidget" />
-  <widget class="QMenuBar" name="menubar" >
-   <property name="geometry" >
+  <widget class="QWidget" name="centralwidget"/>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>1383</width>
-     <height>32</height>
+     <height>28</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuFichier" >
-    <property name="title" >
+   <widget class="QMenu" name="menuFichier">
+    <property name="title">
      <string>&amp;Fichier</string>
     </property>
-    <addaction name="action_Nouveau" />
-    <addaction name="actionNouvel_Include" />
-    <addaction name="action_Ouvrir" />
-    <addaction name="separator" />
-    <addaction name="actionEnregistrer" />
-    <addaction name="actionEnregistrer_sous" />
-    <addaction name="actionFermer" />
-    <addaction name="actionFermer_tout" />
-    <addaction name="separator" />
-    <addaction name="actionQuitter" />
+    <addaction name="action_Nouveau"/>
+    <addaction name="actionNouvel_Include"/>
+    <addaction name="action_Ouvrir"/>
+    <addaction name="separator"/>
+    <addaction name="actionEnregistrer"/>
+    <addaction name="actionEnregistrer_sous"/>
+    <addaction name="actionFermer"/>
+    <addaction name="actionFermer_tout"/>
+    <addaction name="separator"/>
+    <addaction name="actionQuitter"/>
    </widget>
-   <widget class="QMenu" name="menuEdition" >
-    <property name="title" >
+   <widget class="QMenu" name="menuEdition">
+    <property name="title">
      <string>Edition</string>
     </property>
-    <addaction name="actionCouper" />
-    <addaction name="actionCopier" />
-    <addaction name="actionColler" />
-    <addaction name="actionSupprimer" />
+    <addaction name="actionCouper"/>
+    <addaction name="actionCopier"/>
+    <addaction name="actionColler"/>
+    <addaction name="actionSupprimer"/>
+    <addaction name="separator"/>
+    <addaction name="actionRechercher"/>
    </widget>
-   <widget class="QMenu" name="menuJdC" >
-    <property name="title" >
+   <widget class="QMenu" name="menuJdC">
+    <property name="title">
      <string>JdC</string>
     </property>
-    <addaction name="actionRapport_de_Validation" />
-    <addaction name="actionFichier_Source" />
-    <addaction name="actionFichier_Resultat" />
+    <addaction name="actionRapport_de_Validation"/>
+    <addaction name="actionFichier_Source"/>
+    <addaction name="actionFichier_Resultat"/>
    </widget>
-   <widget class="QMenu" name="menu_Aide" >
-    <property name="title" >
+   <widget class="QMenu" name="menu_Aide">
+    <property name="title">
      <string>&amp;Aide</string>
     </property>
-    <addaction name="actionEficas" />
-    <addaction name="actionVersion" />
+    <addaction name="actionEficas"/>
+    <addaction name="actionVersion"/>
    </widget>
-   <widget class="QMenu" name="menuOptions" >
-    <property name="title" >
+   <widget class="QMenu" name="menuOptions">
+    <property name="title">
      <string>Options</string>
     </property>
-    <addaction name="actionParametres_Eficas" />
-    <addaction name="actionLecteur_Pdf" />
+    <addaction name="actionParametres_Eficas"/>
+    <addaction name="actionLecteur_Pdf"/>
    </widget>
-   <addaction name="menuFichier" />
-   <addaction name="menuEdition" />
-   <addaction name="menuJdC" />
-   <addaction name="menu_Aide" />
-   <addaction name="menuOptions" />
+   <addaction name="menuFichier"/>
+   <addaction name="menuEdition"/>
+   <addaction name="menuJdC"/>
+   <addaction name="menu_Aide"/>
+   <addaction name="menuOptions"/>
   </widget>
-  <widget class="QStatusBar" name="statusbar" />
-  <widget class="QToolBar" name="toolBar" >
-   <property name="windowTitle" >
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
     <string>toolBar</string>
    </property>
-   <attribute name="toolBarArea" >
+   <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
-   <attribute name="toolBarBreak" >
+   <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="action_Nouveau" />
-   <addaction name="action_Ouvrir" />
-   <addaction name="actionEnregistrer" />
-   <addaction name="separator" />
-   <addaction name="actionCopier" />
-   <addaction name="actionColler" />
-   <addaction name="actionSupprimer" />
-   <addaction name="actionCouper" />
+   <addaction name="action_Nouveau"/>
+   <addaction name="action_Ouvrir"/>
+   <addaction name="actionEnregistrer"/>
+   <addaction name="separator"/>
+   <addaction name="actionCopier"/>
+   <addaction name="actionColler"/>
+   <addaction name="actionSupprimer"/>
+   <addaction name="actionCouper"/>
   </widget>
-  <action name="action_Nouveau" >
-   <property name="icon" >
+  <action name="action_Nouveau">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/New24.png</normaloff>../Editeur/icons/New24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Nouveau</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+N</string>
    </property>
   </action>
-  <action name="actionNouvel_Include" >
-   <property name="text" >
+  <action name="actionNouvel_Include">
+   <property name="text">
     <string>Nouvel Include</string>
    </property>
   </action>
-  <action name="action_Ouvrir" >
-   <property name="icon" >
+  <action name="action_Ouvrir">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Open24.png</normaloff>../Editeur/icons/Open24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Ouvrir</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+O</string>
    </property>
   </action>
-  <action name="actionEnregistrer" >
-   <property name="icon" >
+  <action name="actionEnregistrer">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Save24.png</normaloff>../Editeur/icons/Save24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Enregistrer</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+E</string>
    </property>
   </action>
-  <action name="actionEnregistrer_sous" >
-   <property name="text" >
+  <action name="actionEnregistrer_sous">
+   <property name="text">
     <string>Enregistrer sous</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Shift+E</string>
    </property>
   </action>
-  <action name="actionFermer" >
-   <property name="text" >
+  <action name="actionFermer">
+   <property name="text">
     <string>Fermer </string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+W</string>
    </property>
   </action>
-  <action name="actionFermer_tout" >
-   <property name="text" >
+  <action name="actionFermer_tout">
+   <property name="text">
     <string>Fermer tout</string>
    </property>
   </action>
-  <action name="actionCouper" >
-   <property name="icon" >
+  <action name="actionCouper">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Cut24.png</normaloff>../Editeur/icons/Cut24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Couper</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+X</string>
    </property>
-   <property name="shortcutContext" >
+   <property name="shortcutContext">
     <enum>Qt::ApplicationShortcut</enum>
    </property>
   </action>
-  <action name="actionCopier" >
-   <property name="icon" >
+  <action name="actionCopier">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Copy24.png</normaloff>../Editeur/icons/Copy24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Copier</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+C</string>
    </property>
-   <property name="shortcutContext" >
+   <property name="shortcutContext">
     <enum>Qt::ApplicationShortcut</enum>
    </property>
   </action>
-  <action name="actionColler" >
-   <property name="icon" >
+  <action name="actionColler">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Paste24.png</normaloff>../Editeur/icons/Paste24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Coller</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+V</string>
    </property>
-   <property name="shortcutContext" >
+   <property name="shortcutContext">
     <enum>Qt::ApplicationShortcut</enum>
    </property>
   </action>
-  <action name="actionQuitter" >
-   <property name="text" >
+  <action name="actionQuitter">
+   <property name="text">
     <string>Quitter</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Q</string>
    </property>
   </action>
-  <action name="actionRapport_de_Validation" >
-   <property name="text" >
+  <action name="actionRapport_de_Validation">
+   <property name="text">
     <string>Rapport de Validation</string>
    </property>
   </action>
-  <action name="actionFichier_Source" >
-   <property name="text" >
+  <action name="actionFichier_Source">
+   <property name="text">
     <string>Fichier Source</string>
    </property>
   </action>
-  <action name="actionFichier_Resultat" >
-   <property name="text" >
+  <action name="actionFichier_Resultat">
+   <property name="text">
     <string>Fichier Résultat</string>
    </property>
   </action>
-  <action name="actionParametres_Eficas" >
-   <property name="text" >
+  <action name="actionParametres_Eficas">
+   <property name="text">
     <string>Parametres Eficas</string>
    </property>
   </action>
-  <action name="actionLecteur_Pdf" >
-   <property name="text" >
+  <action name="actionLecteur_Pdf">
+   <property name="text">
     <string>Lecteur documentation</string>
    </property>
   </action>
-  <action name="actionEficas" >
-   <property name="text" >
+  <action name="actionEficas">
+   <property name="text">
     <string>Eficas</string>
    </property>
   </action>
-  <action name="actionVersion" >
-   <property name="text" >
+  <action name="actionVersion">
+   <property name="text">
     <string>Version</string>
    </property>
   </action>
-  <action name="actionSupprimer" >
-   <property name="icon" >
+  <action name="actionSupprimer">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/delete.png</normaloff>../Editeur/icons/delete.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Supprimer</string>
    </property>
   </action>
+  <action name="actionRechercher">
+   <property name="text">
+    <string>Rechercher</string>
+   </property>
+   <property name="toolTip">
+    <string> Rechercher dans l'arbre d'etude</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+F</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::ApplicationShortcut</enum>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>