]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
*** empty log message ***
authorPascale Noyret <pascale.noyret@edf.fr>
Thu, 24 Jul 2008 13:48:20 +0000 (13:48 +0000)
committerPascale Noyret <pascale.noyret@edf.fr>
Thu, 24 Jul 2008 13:48:20 +0000 (13:48 +0000)
64 files changed:
InterfaceQT4/browser.py
InterfaceQT4/compocomm.py
InterfaceQT4/compofact.py
InterfaceQT4/compoformule.py
InterfaceQT4/compojdc.py
InterfaceQT4/compomacro.py
InterfaceQT4/compomclist.py
InterfaceQT4/componiveau.py
InterfaceQT4/componuplet.py
InterfaceQT4/compooper.py
InterfaceQT4/compoparam.py
InterfaceQT4/compoproc.py
InterfaceQT4/composimp.py
InterfaceQT4/editor.py
InterfaceQT4/monChoixCata.py
InterfaceQT4/monCommandePanel.py
InterfaceQT4/monCommentairePanel.py
InterfaceQT4/monFormulePanel.py
InterfaceQT4/monListeParamPanel.py
InterfaceQT4/monMCFactPanel.py
InterfaceQT4/monMCListAjoutPanel.py
InterfaceQT4/monMacroPanel.py
InterfaceQT4/monParamPanel.py
InterfaceQT4/monRacinePanel.py
InterfaceQT4/monUniqueASSDPanel.py
InterfaceQT4/monUniqueBasePanel.py
InterfaceQT4/politiquesValidation.py
InterfaceQT4/qtCommun.py
InterfaceQT4/qtEficas.py
InterfaceQT4/qtSaisie.py
InterfaceQT4/viewManager.py
UiQT4/desChoixCata.py
UiQT4/desChoixCata.ui
UiQT4/desCommande.py
UiQT4/desCommande.ui
UiQT4/desCommentaire.py
UiQT4/desCommentaire.ui
UiQT4/desFormule.py
UiQT4/desFormule.ui
UiQT4/desInclude.py
UiQT4/desInclude.ui
UiQT4/desListeParam.py
UiQT4/desListeParam.ui
UiQT4/desMCFact.py
UiQT4/desMCFact.ui
UiQT4/desParam.py
UiQT4/desParam.ui
UiQT4/desPlusieursBase.py
UiQT4/desPlusieursBase.ui
UiQT4/desPlusieursInto.py
UiQT4/desPlusieursInto.ui
UiQT4/desPoursuite.py
UiQT4/desPoursuite.ui
UiQT4/desRacine.py
UiQT4/desRacine.ui
UiQT4/desUniqueASSD.py
UiQT4/desUniqueASSD.ui
UiQT4/desUniqueBase.py
UiQT4/desUniqueBase.ui
UiQT4/desUniqueInto.py
UiQT4/desUniqueInto.ui
UiQT4/desUniqueSDCOInto.py
UiQT4/desUniqueSDCOInto.ui
UiQT4/makefile

index e149adc59415c735fef7ed691f25d7d89cf50bfb..559caaa2305fd56c48109183f10b0618d258241f 100644 (file)
 # -*- coding: utf-8 -*-
-import os,sys,string,re,types,traceback
 
-from qt import *
-import utilIcons
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
 
+import string,re
+import types,sys,os
+import traceback
+from PyQt4 import *
+from PyQt4.QtGui  import *
+from PyQt4.QtCore import *
 
-class JDCTree( QListView ):
-    def __init__( self, jdc_item, parent = None ):        
-        QListView.__init__( self, parent )
+class JDCTree( QTreeWidget ):
+    def __init__( self, jdc_item, QWParent):        
+        QListView.__init__( self, QWParent )
         
-        self.item     = jdc_item
-        self.tree     = self        
-        self.editor   = parent
-        self.racine   = self
-        self.node_selected = None
-        self.children      = self.build_children()        
+        self.item          = jdc_item
+        self.tree          = self        
+        self.QWParent      = QWParent
+        self.editor       = QWParent
+        self.appliEficas   = self.editor.appliEficas
         
-        self.setCaption(self.trUtf8('Browser'))
-        self.setRootIsDecorated(1)
-        self.setSorting(-1)
-        self.addColumn(self.trUtf8('Commande'))
-        self.addColumn(self.trUtf8('Concept/Valeur'))
+        #self.setRootIsDecorated(1)
+        self.setColumnCount(2)
+        mesLabels=QStringList()
+        mesLabels << self.trUtf8('Commande') << self.trUtf8('Concept/Valeur')
+        self.setHeaderLabels(mesLabels)
                 
         self.setMinimumSize(QSize(400,500))
-        self.connect(self,SIGNAL('contextMenuRequested(QListViewItem *, const QPoint &, int)'),
-                     self.handleContextMenu)
+        #self.connect(self,SIGNAL('contextMenuRequested(QListWidgetItem *, const QPoint &, int)'),
+        #             self.handleContextMenu)
 
-        #self.connect(self, SIGNAL("onItem ( QListViewItem * ) "), self.handleOnItem)
-        self.connect(self, SIGNAL("clicked ( QListViewItem * ) "), self.handleOnItem)
-        self.connect(self, SIGNAL('mouseButtonPressed(int, QListViewItem*, const QPoint&, int)'),
-                     self.handleNommeItem)
-        
-        
-    def handleContextMenu(self,itm,coord,col):
-        """
-        Private slot to show the context menu of the listview.
-        
-        @param itm the selected listview item (QListViewItem)
-        @param coord the position of the mouse pointer (QPoint)
-        @param col the column of the mouse pointer (int)
-        """
-        try:
-            if itm.menu:
-                itm.menu.popup(coord)            
-        except:
-            pass
-            
-    def handleNommeItem(self,bouton,itm,coord,col):
-        """
-        PN --> a finir eventuellement pour nommer
-        le concept dans l arbre
-        """
-        try :
-            if itm :
-               panel=itm.getPanel()
-               if panel.node.item.object.get_type_produit() != None :
-                  pass
-        except:
-            pass
+        #self.connect(self, SIGNAL("onItem ( QListWidgetItem * ) "), self.handleOnItem)
+        self.connect(self, SIGNAL("itemClicked ( QTreeWidgetItem * ,int) "), self.handleOnItem)
+        self.racine=self.item.itemNode(self,self.item)
+        self.expandItem(self.racine)
+        self.node_selected = self.racine 
 
-    def handleOnItem(self,  item ):
+#     def handleContextMenu(self,itm,coord,col):
+#        """
+#        Private slot to show the context menu of the listview.
+#        
+#        @param itm the selected listview item (QListWidgetItem)
+#        @param coord the position of the mouse pointer (QPoint)
+#        @param col the column of the mouse pointer (int)
+#        """
+#        try:
+#            if itm.menu:
+#                itm.menu.popup(coord)            
+#        except:
+#            pass
+#            
+    def handleOnItem(self,item,int):
+        item.affichePanneau()
         try :
            fr = item.item.get_fr()
-           if self.editor:
-              self.editor.affiche_infos(fr)
+           if self.QWParent:
+              self.QWParent.affiche_infos(fr)
         except:
             pass
-        
+#        
+#        
+#    def supprime(self):
+#        """ supprime tous les elements de l'arbre """
+#        raise RuntimeError, 'Not implemented'
+#        self.tree = None
+#        self.racine = None
+#        self.node_selected = None
+#        self.item = None
+#        self.scrolledcanvas = None
+#        for child in self.children:
+#            child.supprime()
+#        self.children=[]
+#                
+#    def showEvent(self, event):
+#        """ QT : pour afficher le 1er niveau d'arborescence de l''arbre"""        
+#        self.children[0].select()
+#        
+#    def update(self):
+#        """ Update tous les elements de l'arbre """
+#        for child in self.children:
+#            child.update()
+#            
+## type de noeud
+#COMMENT     = "COMMENTAIRE"
+#PARAMETERS  = "PARAMETRE"
+#
+#        
+class JDCNode(QTreeWidgetItem):
+    def __init__( self, treeParent, item):
+        self.item        = item
+        self.treeParent  = treeParent
+        self.tree        = self.treeParent.tree
+        self.editor     = self.treeParent.editor
+        self.appliEficas = treeParent.appliEficas
+                        
+        name  = self.appliEficas.trUtf8(  str( item.GetLabelText()[0] ) )
+        value = self.appliEficas.trUtf8(  str( item.GetText() ) )
+        mesColonnes=QStringList()
+        mesColonnes <<  name << value
+        QTreeWidgetItem.__init__(self,treeParent,mesColonnes)
+
+        monIcone = QIcon("icons/" +item.GetIconName() + ".gif")
+        self.setIcon(0,monIcone)
+        self.build_children()
+        self.connect()    
+
     def build_children(self):
         """ Construit la liste des enfants de self """
-        children = []
-        child = self.item.itemNode(self,self.item)
-        children.append(child)
-        child.state='expanded'
-        return children
-        
-    def supprime(self):
-        """ supprime tous les elements de l'arbre """
-        raise RuntimeError, 'Not implemented'
-        self.tree = None
-        self.racine = None
-        self.node_selected = None
-        self.item = None
-        self.scrolledcanvas = None
-        for child in self.children:
-            child.supprime()
-        self.children=[]
-                
-    def showEvent(self, event):
-        """ QT : pour afficher le 1er niveau d'arborescence de l''arbre"""        
-        self.children[0].select()
-        
-    def update(self):
-        """ Update tous les elements de l'arbre """
-        for child in self.children:
-            child.update()
-            
-# type de noeud
-COMMENT     = "COMMENTAIRE"
-PARAMETERS  = "PARAMETRE"
+        self.children = []
+        sublist = self.item._GetSubList()
+        for item in sublist :
+            nouvelItem=item.itemNode(self,item)
+            self.children.append(nouvelItem)
 
-        
-class JDCNode(QListViewItem):
-    def __init__( self, parent, item, after=None, bold=0):
-        """
-        Constructor
-        
-        @param parent parent Browser or BrowserNode
-        @param text text to be displayed by this node (string or QString)
-        @param after sibling this node is positioned after
-        @param bold flag indicating a highlighted font
-        """        
-        self.item   = item
-        self.parent = parent
-        self.tree   = self.parent.tree
-        self.editor = self.parent.tree.editor
-        self.bold   = bold
-                        
-        name  = self.tree.trUtf8(  str( item.GetLabelText()[0] ) )
-        value = self.tree.trUtf8(  str( item.GetText() ) )
-        
-        if after is None:        
-            QListViewItem.__init__(self,parent)            
-            self.setText(0, name )
-            self.setText(1, value )            
-        else:
-            QListViewItem.__init__(self,parent, after)
-            self.setText(0, name )
-            self.setText(1, value)
-            
-        p = utilIcons.getPixmap(item.GetIconName() + ".gif")
-        self.setPixmap(0,p)
-        self.setExpandable(item.IsExpandable())
-                
-        self.connect()    
-        self.init()        
-        self.createPopUpMenu()
-        
-        
-    def paintCell(self, p, cg, column, width, alignment):
-        """
-        Overwritten class to set a different text color, if bold is true.
-        
-        @param p the painter (QPainter)
-        @param cg the color group (QColorGroup)
-        @param column the column (int)
-        @param width width of the cell (int)
-        @param alignment alignment of the cell (int)
-        """
-        _cg = QColorGroup(cg)
-        c = _cg.text()
-        
-        if self.bold and column == 0:
-            _cg.setColor(QColorGroup.Text, Qt.red)
-            
-        QListViewItem.paintCell(self, p, _cg, column, width, alignment)
-        
-        _cg.setColor(QColorGroup.Text, c)
-        
-        
+    def affichePanneau(self) :
+       panel=self.getPanel()
+        panel.show()
+
+
+
+#        if after is None:        
+#            QListWidgetItem. _init__(self,QWParent)            
+#            self.setText(0, name )
+#            self.setText(1, value )            
+#        else:
+#            QListWidgetItem.__init__(self,QWParent, after)
+#            self.setText(0, name )
+#            self.setText(1, value)
+#            
+#        p = utilIcons.getPixmap(item.GetIconName() + ".gif")
+#        self.setPixmap(0,p)
+#        self.setExpandable(item.IsExpandable())
+#                
+#        self.init()        
+#        self.createPopUpMenu()
+#        
+#        
+#    def paintCell(self, p, cg, column, width, alignment):
+#        """
+#        Overwritten class to set a different text color, if bold is true.
+#        
+#        @param p the painter (QPainter)
+#        @param cg the color group (QColorGroup)
+#        @param column the column (int)
+#        @param width width of the cell (int)
+#        @param alignment alignment of the cell (int)
+#        """
+#        _cg = QColorGroup(cg)
+#        c = _cg.text()
+#        
+#        if self.bold and column == 0:
+#            _cg.setColor(QColorGroup.Text, Qt.red)
+#            
+#        QListWidgetItem.paintCell(self, p, _cg, column, width, alignment)
+#        
+#        _cg.setColor(QColorGroup.Text, c)
+#        
+#        
     def setOpen(self, o):
         """
         Public slot to set/reset the open state.
@@ -176,126 +190,127 @@ class JDCNode(QListViewItem):
                 self.takeItem(child)
                 del child
             self.children = []
-        QListViewItem.setOpen(self,o)
-       self.tree.setSelected(self,o)
-    
-     
-    #----------------------------------------------------------
-    #   interface a implementer par les noeuds derives (debut)
-    #----------------------------------------------------------
-    def getPanel(self):
-        print self.__class__
-        return None
-        
-    def createPopUpMenu(self):
-        pass 
-        
-    #----------------------------------------------------
-    #   interface a implementer par les noeuds derives (fin)
-    #----------------------------------------------------
+        #QListWidgetItem.setOpen(self,o)
+        print self.tree.__class__
+       self.tree.setCurrentItem(self)
     
-    def init(self): #CS_pbruno toclean
-        self.state='collapsed'
-        self.displayed = 0
-        self.selected = 0
-        self.x = self.y  =None
-        self.lasty = 0
-        self.children = []
-        self.id = []
-        if self.parent is self.tree:
-           self.racine=self
-        else:
-           self.racine = self.parent.racine
-                      
+#     
+#    #----------------------------------------------------------
+#    #   interface a implementer par les noeuds derives (debut)
+#    #----------------------------------------------------------
+#    def getPanel(self):
+#        print self.__class__
+#        return None
+#        
+#    def createPopUpMenu(self):
+#        pass 
+#        
+#    #----------------------------------------------------
+#    #   interface a implementer par les noeuds derives (fin)
+#    #----------------------------------------------------
+#    
+#    def init(self): #CS_pbruno toclean
+#        self.state='collapsed'
+#        self.displayed = 0
+#        self.selected = 0
+#        self.x = self.y  =None
+#        self.lasty = 0
+#        self.children = []
+#        self.id = []
+#        if self.QWParent is self.tree:
+#           self.racine=self
+#        else:
+#           self.racine = self.QWParent.racine
+#                      
     def connect(self):
         self.item.connect("add",self.onAdd,())
         self.item.connect("supp",self.onSupp,())
         self.item.connect("valid",self.onValid,())
 
-           
-    def commentIt(self):
-        """
-        Cette methode a pour but de commentariser la commande pointee par self
-        """
-        # On traite par une exception le cas ou l'utilisateur final cherche a désactiver
-        # (commentariser) un commentaire.
-        try :
-            pos=self.parent.children.index(self)
-            commande_comment = self.item.get_objet_commentarise()
-            # On signale au parent du panel (le JDCDisplay) une modification
-            self.editor.init_modif()
-            self.parent.children[pos].select()
-        except Exception,e:
-            traceback.print_exc()
-            QMessageBox.critical( self.parent, "TOO BAD",str(e))
-        return
-        
-    def unCommentIt(self):
-        """
-        Realise la decommentarisation de self
-        """
-        try :
-            pos=self.parent.children.index(self)
-            commande,nom = self.item.uncomment()
-            self.editor.init_modif()
-            self.parent.children[pos].select()
-        except Exception,e:
-            QMessageBox.critical( self.editor, "Erreur !",str(e))
-            return        
-        
-    def addComment( self, after=True ):
-        """
-        Ajoute un commentaire a l'interieur du JDC :
-        """
-        self.editor.init_modif()        
-        if after:
-            pos = 'after'
-        else:
-            pos = 'before'
-        return self.append_brother( COMMENT, pos )
-                
-    def addParameters( self, after=True ):
-        """
-        Ajoute un parametre a l'interieur du JDC :
-        """
-        self.editor.init_modif()
-        if after:
-            pos = 'after'
-        else:
-            pos = 'before'
-        return self.append_brother( PARAMETERS, pos )
-    
-    
-    
+#           
+#    def commentIt(self):
+#        """
+#        Cette methode a pour but de commentariser la commande pointee par self
+#        """
+#        # On traite par une exception le cas ou l'utilisateur final cherche a désactiver
+#        # (commentariser) un commentaire.
+#        try :
+#            pos=self.QWParent.children.index(self)
+#            commande_comment = self.item.get_objet_commentarise()
+#            # On signale au QWParent du panel (le JDCDisplay) une modification
+#            self.QWParent.init_modif()
+#            self.QWParent.children[pos].select()
+#        except Exception,e:
+#            traceback.print_exc()
+#            QMessageBox.critical( self.QWParent, "TOO BAD",str(e))
+#        return
+#        
+#    def unCommentIt(self):
+#        """
+#        Realise la decommentarisation de self
+#        """
+#        try :
+#            pos=self.QWParent.children.index(self)
+#            commande,nom = self.item.uncomment()
+#            self.QWParent.init_modif()
+#            self.QWParent.children[pos].select()
+#        except Exception,e:
+#            QMessageBox.critical( self.QWParent, "Erreur !",str(e))
+#            return        
+#        
+#    def addComment( self, after=True ):
+#        """
+#        Ajoute un commentaire a l'interieur du JDC :
+#        """
+#        self.QWParent.init_modif()        
+#        if after:
+#            pos = 'after'
+#        else:
+#            pos = 'before'
+#        return self.append_brother( COMMENT, pos )
+#                
+#    def addParameters( self, after=True ):
+#        """
+#        Ajoute un parametre a l'interieur du JDC :
+#        """
+#        self.QWParent.init_modif()
+#        if after:
+#            pos = 'after'
+#        else:
+#            pos = 'before'
+#        return self.append_brother( PARAMETERS, pos )
+#    
+#    
+#    
     def select( self ):
         """
         Rend le noeud courant (self) selectionne et deselectionne
         tous les autres
         """        
         self.setOpen( True )    
-                               
-    #------------------------------------------------------------------
-    # Methodes de creation et destruction de noeuds
-    # Certaines de ces methodes peuvent etre appelees depuis l'externe
-    #------------------------------------------------------------------
-    def append_brother(self,name,pos='after',retour='non'):
-        """
-        Permet d'ajouter un objet frere a l'objet associe au noeud self
-        par defaut on l'ajoute immediatement apres 
-        Methode externe
-        """
-        # on veut ajouter le frere de nom name directement avant ou apres self
-##       print "*********** append_brother ", self.item.GetLabelText()
-        index = self.parent.children.index(self)
-        if pos == 'before':
-            index = index
-        elif pos == 'after':
-            index = index +1
-        else:
-            print str(pos)," n'est pas un index valide pour append_brother"
-            return 0
-        return self.parent.append_child(name,pos=index)
-
+#                               
+#    #------------------------------------------------------------------
+#    # Methodes de creation et destruction de noeuds
+#    # Certaines de ces methodes peuvent etre appelees depuis l'externe
+#    #------------------------------------------------------------------
+#    def append_brother(self,name,pos='after',retour='non'):
+#        """
+#        Permet d'ajouter un objet frere a l'objet associe au noeud self
+#        par defaut on l'ajoute immediatement apres 
+#        Methode externe
+#        """
+#        # on veut ajouter le frere de nom name directement avant ou apres self
+###       print "*********** append_brother ", self.item.GetLabelText()
+#        index = self.QWParent.children.index(self)
+#        if pos == 'before':
+#            index = index
+#        elif pos == 'after':
+#            index = index +1
+#        else:
+#            print str(pos)," n'est pas un index valide pour append_brother"
+#            return 0
+#        return self.QWParent.append_child(name,pos=index)
+#
     def append_child(self,name,pos=None,verif='oui',retour='non'):
         """
            Methode pour ajouter un objet fils a l'objet associe au noeud self.
@@ -303,7 +318,7 @@ class JDCNode(QListViewItem):
            ou en position intermediaire.
            Si pos vaut None, on le place a la position du catalogue.
         """
-##        print "************** append_child ",self.item.GetLabelText()
+###        print "************** append_child ",self.item.GetLabelText()
         if pos == 'first':
             index = 0
         elif pos == 'last':
@@ -327,27 +342,27 @@ class JDCNode(QListViewItem):
         child.select()
         return child
 
-    def delete(self):
-        """ 
-            Methode externe pour la destruction de l'objet associe au noeud
-            La mise a jour des noeuds est faite par onSupp sur notification
-        """
-        self.editor.init_modif()
-        index = self.parent.children.index(self) - 1 
-        if index < 0 : index =0
-
-        parent=self.parent
-        ret=parent.item.suppitem(self.item)
-        if ret == 0:return
-
-        brothers=parent.children
-        if brothers:
-           toselect=brothers[index]
-        else:
-           toselect=parent
-        toselect.select()
-        
-    #------------------------------------------------------------------
+#    def delete(self):
+#        """ 
+#            Methode externe pour la destruction de l'objet associe au noeud
+#            La mise a jour des noeuds est faite par onSupp sur notification
+#        """
+#        self.QWParent.init_modif()
+#        index = self.QWParent.children.index(self) - 1 
+#        if index < 0 : index =0
+#
+#        QWParent=self.QWParent
+#        ret=QWParent.item.suppitem(self.item)
+#        if ret == 0:return
+#
+#        brothers=QWParent.children
+#        if brothers:
+#           toselect=brothers[index]
+#        else:
+#           toselect=QWParent
+#        toselect.select()
+#        
+#    #------------------------------------------------------------------
     def onValid(self):        
         self.update_node_valid()
         self.update_node_label()
@@ -371,10 +386,10 @@ class JDCNode(QListViewItem):
            Elle appelle isvalid
         """
         #print 'NODE update_node_valid', self.item.GetLabelText()
-        p = utilIcons.getPixmap(self.item.GetIconName() + ".gif")
-        self.setPixmap(0,p)
+        monIcone = QIcon("icons/" +self.item.GetIconName() + ".gif")
+        self.setIcon(0,monIcone)
 
-    def update_node_label(self): #CS_pbruno todo
+    def update_node_label(self):
         """ Met a jour le label du noeud """
         #print "NODE update_node_label", self.item.GetLabelText()
         labeltext,fonte,couleur = self.item.GetLabelText()
@@ -386,125 +401,124 @@ class JDCNode(QListViewItem):
         value = self.item.GetText()
         self.setText(1, value)
 
-    def update_nodes(self):
-        #print "NODE update_nodes ", self.item.GetLabelText()
-        self.setOpen( False )
-        self.setOpen( True )
-        #self.select()
-            
+#    def update_nodes(self):
+#        #print "NODE update_nodes ", self.item.GetLabelText()
+#        self.setOpen( False )
+#        self.setOpen( True )
+#        #self.select()
+#            
     def update_texte(self):
         """ Met a jour les noms des SD et valeurs des mots-cles """
         #print "NODE update_texte", self.item.GetLabelText()
         self.update_node_texte()
-        if self.state == 'expanded' :
+        if self.isExpanded() :
             for child in self.children:
-                if child.displayed != 0 : child.update_texte()
+                if child.isHidden() == false : child.update_texte()
         
     def update_valid(self) :
         """Cette methode a pour but de mettre a jour la validite du noeud
-           et de propager la demande de mise a jour a son parent
+           et de propager la demande de mise a jour a son Parent
         """
-        #print "NODE update_valid", self.item.GetLabelText()
-        #PN a reverifier SVP parent
+        print "NODE update_valid", self.item.GetLabelText()
         self.update_node_valid()
         try :
-          self.parent.update_valid()            
+          self.treeParent.update_valid()            
         except:
           pass
-
-    def supprime(self):
-        #print "NODE supprime",self.item.GetLabelText()
-        self.efface_node()
-        self.racine = None        
-        if not self.children : return
-        for child in self.children:
-            child.supprime()
-        self.children=None    
-
-    def build_children(self):
-        """ Construit la liste des enfants de self """        
-        #print "NODE : Construit la liste des enfants de", self.item.GetLabelText()
-        self.children = []
-        sublist = self.item._GetSubList()
-        if sublist :            
-            last = None
-            for item in sublist :                
-                child = item.itemNode(self, item, last)
-                last = child
-                self.children.append(child)
-            
-            
-    def doPasteCommande(self,objet_a_copier):
-        """
-          Réalise la copie de l'objet passé en argument qui est nécessairement
-          une commande
-        """
-        parent=self.parent
-        #child = parent.item.append_child(objet_a_copier,self.item.getObject())
-        child = self.append_brother(objet_a_copier,retour='oui')
-        #if child is None:return 0
-        return child
-
-    def doPasteMCF(self,objet_a_copier):
-        """
-           Réalise la copie de l'objet passé en argument (objet_a_copier)
-           Il s'agit forcément d'un mot clé facteur
-        """
-        child = self.append_child(objet_a_copier,pos='first',retour='oui')
-        return child
-
-
-        
-    
-if __name__=='__main__':
-    from qt import *
-    
-
-    sys.path[:0]=['..','../Aster','../Aster/Cata' ]
-
-    app = QApplication(sys.argv)
-        
-    fn      = 'azAster.comm'
-    jdcName =  os.path.basename(fn)
-    f=open(fn,'r')
-    text=f.read()
-    f.close()
-    print 'text',text
-
-    from autre_analyse_cata import analyse_catalogue
-    from Cata import cataSTA8
-    cata=cataSTA8
-    fic_cata="../../Aster/Cata/cataSTA8/cata.py"
-    cata_ordonne ,list_simp_reel = analyse_catalogue(cata)
-    
-    
-    
-    j=cata.JdC( procedure=text, cata=cata, nom=jdcName,
-                            cata_ord_dico=cata_ordonne )
-                            
-    j.compile()
-    if not j.cr.estvide():
-        print j.cr
-        sys.exit()
-    
-    j.exec_compile()
-    if not j.cr.estvide():
-        print j.cr
-        sys.exit()
-                            
-    from Editeur import comploader
-    comploader.charger_composants(QT)    
-    from Editeur import Objecttreeitem
-    jdc_item=Objecttreeitem.make_objecttreeitem( app, "nom", j)
-                
-    if jdc_item:                        
-        tree = JDCTree( jdc_item, None )                
-    
-    app.setMainWidget(tree)    
-    app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()"))
-    tree.show()
-            
-    res = app.exec_loop()
-    sys.exit(res)
-    
-    
+#    def supprime(self):
+#        #print "NODE supprime",self.item.GetLabelText()
+#        self.efface_node()
+#        self.racine = None        
+#        if not self.children : return
+#        for child in self.children:
+#            child.supprime()
+#        self.children=None    
+#
+#    def build_children(self):
+#        """ Construit la liste des enfants de self """        
+#        #print "NODE : Construit la liste des enfants de", self.item.GetLabelText()
+#        self.children = []
+#        sublist = self.item._GetSubList()
+#        if sublist :            
+#            last = None
+#            for item in sublist :                
+#                child = item.itemNode(self, item, last)
+#                last = child
+#                self.children.append(child)
+#            
+#            
+#    def doPasteCommande(self,objet_a_copier):
+#        """
+#          Réalise la copie de l'objet passé en argument qui est nécessairement
+#          une commande
+#        """
+#        QWParent=self.QWParent
+#        #child = QWParent.item.append_child(objet_a_copier,self.item.getObject())
+#        child = self.append_brother(objet_a_copier,retour='oui')
+#        #if child is None:return 0
+#        return child
+#
+#    def doPasteMCF(self,objet_a_copier):
+#        """
+#           Réalise la copie de l'objet passé en argument (objet_a_copier)
+#           Il s'agit forcément d'un mot clé facteur
+#        """
+#        child = self.append_child(objet_a_copier,pos='first',retour='oui')
+#        return child
+#
+#
+#        
+#    
+#if __name__=='__main__':
+#    from qt import *
+#    
+#
+#    sys.path[:0]=['..','../Aster','../Aster/Cata' ]
+#
+#    app = QApplication(sys.argv)
+#        
+#    fn      = 'azAster.comm'
+#    jdcName =  os.path.basename(fn)
+#    f=open(fn,'r')
+#    text=f.read()
+#    f.close()
+#    print 'text',text
+#
+#    from autre_analyse_cata import analyse_catalogue
+#    from Cata import cataSTA8
+#    cata=cataSTA8
+#    fic_cata="../../Aster/Cata/cataSTA8/cata.py"
+#    cata_ordonne ,list_simp_reel = analyse_catalogue(cata)
+#    
+#    
+#    
+#    j=cata.JdC( procedure=text, cata=cata, nom=jdcName,
+#                            cata_ord_dico=cata_ordonne )
+#                            
+#    j.compile()
+#    if not j.cr.estvide():
+#        print j.cr
+#        sys.exit()
+#    
+#    j.exec_compile()
+#    if not j.cr.estvide():
+#        print j.cr
+#        sys.exit()
+#                            
+#    from Editeur import comploader
+#    comploader.charger_composants(QT)    
+#    from Editeur import Objecttreeitem
+#    jdc_item=Objecttreeitem.make_objecttreeitem( app, "nom", j)
+#                
+#    if jdc_item:                        
+#        tree = JDCTree( jdc_item, None )                
+#    
+#    app.setMainWidget(tree)    
+#    app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()"))
+#    tree.show()
+#            
+#    res = app.exec_loop()
+#    sys.exit(res)
+#    
+#    
index 0656c95a9f9a36cb3c014e42f9c769883c6f363b..bad7623d65c2faa504bbda7e8c344db415d6c1f5 100644 (file)
@@ -20,7 +20,6 @@
 # ======================================================================
 
 import string
-from qt import *
 
 from Editeur     import Objecttreeitem
 import browser
index 7739e04ac877eac94227932e0f3c574c0991904a..76b81c63d5e0cc76229751c23322155c509b0a85 100644 (file)
 #
 # ======================================================================
 
-from qt import *
-from Editeur     import Objecttreeitem
+from PyQt4 import *
+from PyQt4.QtGui  import *
+from PyQt4.QtCore import *
 import browser
 
+from Editeur import Objecttreeitem
+
 
 class Node(browser.JDCNode):
     def getPanel(self):
index 02dcdc0da18961720558accc08caff1f172ea615..43ae257a0e238733a4d8ea5ff41326e3cb017c9c 100644 (file)
@@ -7,7 +7,6 @@ d'EFICAS
 """
 
 import string
-from qt import *
 import compooper
 import browser
 import typeNode
index 1cd49081b68990e9021fd17fe145f7cb0d411c3d..582651490d84ab7700cbc5e7efa841d861c29863 100644 (file)
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from qt import *
 from Editeur import Objecttreeitem
 import browser
 
@@ -10,6 +9,10 @@ class Node(browser.JDCNode):
         """
         """
         from monRacinePanel import MonRacinePanel
+        #return MonRacinePanel(self,parent=self.appliEficas.centralWidget())
+        #print self.treeParent.editor
+        print dir(self)
+       
         return MonRacinePanel(self,parent=self.editor)
 
     def doPasteCommande(self,objet_a_copier):
index 74e2f59a10c5b3981d27e945050c3bdee3f68072..c9f36ad65bbf78d0b8e49a9e03311ae3eee3d1df 100644 (file)
@@ -4,7 +4,6 @@
 import os,sys,string
 import types
 import traceback
-from qt import *
 
 # Modules Eficas
 from Editeur import Objecttreeitem
index 65bdad035e9fde9e4ed0d3bd09183cb1061bf95c..04a79132cb8354db4233c5dc804caa09b9e21007 100644 (file)
@@ -3,8 +3,6 @@
 import types
 import traceback
 
-from qt import *
-
 import compofact
 import browser
 from Editeur     import Objecttreeitem
index 866d585ec594b5192b90ea32c20aab5158b90609..02743c711551e13b3064ee277066abeedac66855 100644 (file)
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from qt import *
 from Editeur     import Objecttreeitem
 from Extensions  import commentaire 
 import browser
index 649ce0e2d032f53717d5f5e7fd8edbf015e95860..d9c610c1b6ca5616b2d2d2f1c1a415a5e9ca74a0 100644 (file)
@@ -36,17 +36,11 @@ Expandable=1
 
 
 import browser
-from qt import *
 
 class Node(browser.JDCNode): pass
-##    def getPanel(self):
-##        """        
-##        """    
-##        return NUPLETPanel( self, self.editor )
     
 
 class NUPLETTreeItem(Objecttreeitem.ObjectTreeItem):
-##  panel=NUPLETPanel
   itemNode=Node
 
   def IsExpandable(self):
index dd89378e502047f0fcdde65bfc87f6da2b67fb19..add788672a7e75efd1c84a281ef95b85be67bdd5 100644 (file)
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-
 import traceback
 import string
+from PyQt4 import *
+from PyQt4.QtGui  import *
+from PyQt4.QtCore import *
 
-from qt import *
 
 from Editeur     import Objecttreeitem
 import browser
index 4c3fb26b6ff6a4d07669471f17dce81cce3f6c22..b21ae80345a23cd7b9b230b78ea69cdb45630f45 100644 (file)
@@ -7,7 +7,6 @@
 
 # import modules Python
 import string
-from qt import *
 
 # import modules EFICAS
 from Editeur     import Objecttreeitem
index ffbfdf03bd52681ef43623ae7e178329b3f8c31c..0a1adcaf5bc0597a65dafea224ffa9b03b4ac5b0 100644 (file)
@@ -4,7 +4,6 @@ import compooper
 import browser
 import typeNode
 
-from qt import *
 
 class Node(browser.JDCNode,typeNode.PopUpMenuNode):
     def getPanel(self):
index 19db6b5f81119c8d11586a9d404773a9a52d5115..2d7364fdde2347cfdcbd81421ee532f2ef7b7b55 100644 (file)
@@ -4,11 +4,9 @@ import string,types,os
 
 from copy import copy,deepcopy
 import traceback
-from qt import *
 
 # Modules Eficas
-#from Editeur import Objecttreeitem
-import Objecttreeitem
+from Editeur import Objecttreeitem
 import browser
 from Noyau.N_CR   import justify_text
     
index c0a940355e098d098a1a26516eb578895d3936a4..73ccf78d71d5a2ec9fbab24cfcf9270bf80f6a0c 100644 (file)
@@ -31,11 +31,11 @@ from Editeur     import session
 from Editeur     import comploader
 from Editeur     import Objecttreeitem
 #import panelsQT
-#import browser
+import browser
 import readercata
+import qtCommun
 
 import prefs
-#import qtCommun
 
 VERSION_EFICAS  = "EFICAS v1.14"
 
@@ -46,15 +46,15 @@ class JDCEditor(QWidget):
        Editeur de jdc
     """        
 
-    def __init__ (self,fileName = None, jdc = None, QWParent=None, units = None, include=0 ,appli=None):          
+    def __init__ (self,fichier = None, jdc = None, QWParent=None, units = None, include=0 ,appli=None):          
     #----------------------------------------------------------------------------------------------#
 
         print "debut JDCEditor __init__"
         QWidget.__init__(self, QWParent)
        self.appliEficas = appli
-        self.fileName       = fileName
-        self.jdc            = jdc
-        self.QWParent         = QWParent
+        self.fichier     = fichier
+        self.jdc         = jdc
+        self.QWParent    = QWParent
 
         self.test=0
         VERSION_CODE    = session.d_env.cata
@@ -78,14 +78,13 @@ class JDCEditor(QWidget):
         self.CONFIGURATION = self.appliEficas.CONFIGURATION
         self.CONFIGStyle =   self.appliEficas.CONFIGStyle
 
-        #self.sb = None
-        #if hasattr(self.appliEficas,"statusBar"):
-        #   self.sb = self.appliEficas.statusBar()
+        self.sb = None
+        if hasattr(self.appliEficas,"statusBar"):
+           self.sb = self.appliEficas.statusBar()
       
         self.fileInfo       = None
         self.lastModified   = 0
         
-        self.fichier=None
         self.panel_courant=None    
         self.node_selected = None
         self.modified   = False
@@ -100,11 +99,12 @@ class JDCEditor(QWidget):
         jdc_item = None
                         
         nouveau=0
-        if self.fileName is not None:        #  fichier jdc fourni
-            self.fileInfo = QFileInfo(self.fileName)
+        if self.fichier is not None:        #  fichier jdc fourni
+            self.fileInfo = QFileInfo(self.fichier)
             self.fileInfo.setCaching(0)
             #if editor is None:
-            self.jdc = self.readFile(self.fileName)
+            self.jdc = self.readFile(self.fichier)
+            print self.jdc
             if units is not None:
                self.jdc.recorded_units=units
                self.jdc.old_recorded_units=units
@@ -142,7 +142,7 @@ class JDCEditor(QWidget):
                 self.affiche_infos("Erreur fatale au chargement de %s" %fn)                
                 QMessageBox.critical( self, "Erreur fatale au chargement d'un fichier", txt_exception)                
             else:
-#                comploader.charger_composants("QT")
+                comploader.charger_composants("QT")
                 jdc_item=Objecttreeitem.make_objecttreeitem( self, "nom", self.jdc )
 
                 if (not self.jdc.isvalid()) and (not nouveau) :
@@ -150,8 +150,8 @@ class JDCEditor(QWidget):
 #
 #        #------- config widget --------------
 #                
-#        if jdc_item:                        
-#            self.tree = browser.JDCTree( jdc_item, self )
+        if jdc_item:                        
+            self.tree = browser.JDCTree( jdc_item,  self )
 #            self.connect(self.tree,SIGNAL('selectionChanged(QListViewItem *)'),self.updatePanel)
 #      
 #        sh = self.sizeHint()
@@ -192,12 +192,12 @@ class JDCEditor(QWidget):
 #                signal if there was an attribute change.
 #        """
 #
-#        if self.fileName is None:
+#        if self.fichier is None:
 #            return
-#        readOnly = not QFileInfo(self.fileName).isWritable() and 1 or 0
+#        readOnly = not QFileInfo(self.fichier).isWritable() and 1 or 0
 #        if not bForce and (readOnly == self.isReadOnly):
 #            return
-#        cap = self.fileName
+#        cap = self.fichier
 #        if readOnly:
 #            cap = "%s (ro)" % unicode(cap)
 #        self.isReadOnly = readOnly
@@ -312,84 +312,84 @@ class JDCEditor(QWidget):
 #        return ulfile, jdcText
 #        
 #        
-#    #-----------------------#
-#    def readFile(self, fn):
-#    #-----------------------#
-#        """
-#        Public slot to read the text from a file.
-#        
-#        @param fn filename to read from (string or QString)
-#        """        
-#        fn = unicode(fn)        
-#            
+    #-----------------------#
+    def readFile(self, fn):
+    #-----------------------#
+        """
+        Public slot to read the text from a file.
+        
+        @param fn filename to read from (string or QString)
+        """        
+        fn = unicode(fn)        
 #        qApp.setOverrideCursor(Qt.WaitCursor)
-#                        
-#        # ------------------------------------------------------------------------------------
-#        #                         charge le JDC
-#        # ------------------------------------------------------------------------------------      
-#        
-#        jdcName=os.path.basename(fn)
-#        # Il faut convertir le contenu du fichier en fonction du format
-#        if convert.plugins.has_key( self.format_fichier ):
-#             # Le convertisseur existe on l'utilise
-#             appli = self # CS_pbruno compatiblity parseur_python: self.appli.liste_simp_reel, self.appli.dict_reels
-#             p=convert.plugins[self.format_fichier]()
-#             p.readfile(fn)         
-#             text=p.convert('exec',appli)
-#             if not p.cr.estvide():                 
-#                self.affiche_infos("Erreur à la conversion")
-#        
-#        CONTEXT.unset_current_step()
-#        ##   os.chdir(self.initialdir)
-#        jdc=self.readercata.cata[0].JdC(procedure=text,
-#                                    appli=self,
-#                                    cata=self.readercata.cata,
-#                                    cata_ord_dico=self.readercata.cata_ordonne_dico,
-#                                    nom=jdcName,
-#                                    rep_mat=self.CONFIGURATION.rep_mat
-#                                   )
-#        # ----------------------------------------------------
-#        #      charge le JDC fin
-#        # ----------------------------------------------------
-#        self.modified = False
-#                        
+                        
+        # ------------------------------------------------------------------------------------
+        #                         charge le JDC
+        # ------------------------------------------------------------------------------------      
+        
+        jdcName=os.path.basename(fn)
+        # Il faut convertir le contenu du fichier en fonction du format
+        if convert.plugins.has_key( self.format_fichier ):
+             # Le convertisseur existe on l'utilise
+             appli = self 
+# CS_pbruno compatiblity parseur_python: self.appli.liste_simp_reel, self.appli.dict_reels
+             p=convert.plugins[self.format_fichier]()
+             p.readfile(fn)         
+             text=p.convert('exec',appli)
+             if not p.cr.estvide():                 
+                self.affiche_infos("Erreur à la conversion")
+        
+        CONTEXT.unset_current_step()
+        ##   os.chdir(self.initialdir)
+        jdc=self.readercata.cata[0].JdC(procedure=text,
+                                    appli=self,
+                                    cata=self.readercata.cata,
+                                    cata_ord_dico=self.readercata.cata_ordonne_dico,
+                                    nom=jdcName,
+                                    rep_mat=self.CONFIGURATION.rep_mat
+                                   )
+        # ----------------------------------------------------
+        #      charge le JDC fin
+        # ----------------------------------------------------
+        self.modified = False
+                        
 #        qApp.restoreOverrideCursor()        
-#        if self.fileInfo!= None : 
-#           self.lastModified = self.fileInfo.lastModified()
-#        else :
-#           self.lastModified = 1
-#        return jdc
-#        
-#    #----------------------------------------------#
-#    def _viewText(self, txt, caption = "FILE_VIEWER"):    
-#    #----------------------------------------------#
-#        w = qtCommun.ViewText( self.QWParent )
-#        w.setCaption( caption )
-#        w.setText(txt)
-#        w.show()
-#        
-#    #-----------------------#
-#    def viewJdcSource(self):        
-#    #-----------------------#
-#        format = self.format_fichier
-#        f=open(self.fileName,'r')
-#        texteSource=f.read()
-#        f.close()
-#        self._viewText(texteSource, "JDC_SOURCE")
-#                
-#    #-----------------------#
-#    def viewJdcPy(self):        
-#    #-----------------------#
-#        format = self.format_fichier
-#        strSource = str( self.get_text_JDC(format) )       
-#        self._viewText(strSource, "JDC_RESULTAT")
-#                
-#    #-----------------------#
-#    def viewJdcRapport(self):
-#    #-----------------------#
-#        strRapport = str( self.jdc.report() )
-#        self._viewText(strRapport, "JDC_RAPPORT")        
-#        
+        if self.fileInfo!= None : 
+           self.lastModified = self.fileInfo.lastModified()
+        else :
+           self.lastModified = 1
+        return jdc
+        
+    #----------------------------------------------#
+    def _viewText(self, txt, caption = "FILE_VIEWER"):    
+    #----------------------------------------------#
+        w = qtCommun.ViewText( self.QWParent )
+        w.setWindowTitle( caption )
+        w.setText(txt)
+        w.show()
+        
+    #-----------------------#
+    def viewJdcSource(self):        
+    #-----------------------#
+        format = self.format_fichier
+        f=open(self.fichier,'r')
+        texteSource=f.read()
+        f.close()
+        self._viewText(texteSource, "JDC_SOURCE")
+                
+    #-----------------------#
+    def viewJdcPy(self):        
+    #-----------------------#
+        format = self.format_fichier
+        strSource = str( self.get_text_JDC(format) )       
+        self._viewText(strSource, "JDC_RESULTAT")
+                 
+    #-----------------------#
+    def viewJdcRapport(self):
+    #-----------------------#
+        strRapport = str( self.jdc.report() )
+        self._viewText(strRapport, "JDC_RAPPORT")        
+        
 #    #-----------------------#
 #    def handleRenamed(self, fn):
 #    #-----------------------#
@@ -398,15 +398,15 @@ class JDCEditor(QWidget):
 #        
 #        @param fn filename to be set for the editor (QString or string).
 #        """
-#        self.fileName = unicode(fn)
-#        self.setCaption(self.fileName)
+#        self.fichier = unicode(fn)
+#        self.setCaption(self.fichier)
 #        
 #        if self.fileInfo is None:
-#            self.fileInfo = QFileInfo(self.fileName)
+#            self.fileInfo = QFileInfo(self.fichier)
 #            self.fileInfo.setCaching(0)
 #        
 #        self.lastModified = self.fileInfo.lastModified()
-#        self.vm.setEditorName(self, self.fileName)
+#        self.vm.setEditorName(self, self.fichier)
 #        self._updateReadOnly(1)        
 #
 #    #-----------------------#
@@ -415,7 +415,7 @@ class JDCEditor(QWidget):
 #        """
 #        Private slot to create a new view to an open document.
 #        """
-#        self.vm.newEditorView(self.fileName, self)#, self.isPythonFile)
+#        self.vm.newEditorView(self.fichier, self)#, self.isPythonFile)
 #
 #    #------------------------------------#
 #    def handleModificationChanged(self, m):
@@ -449,12 +449,12 @@ class JDCEditor(QWidget):
         self.close()
 #    
 #
-#    #------------------------------#
-#    def affiche_infos(self,message):
-#    #------------------------------#
-#        if self.sb:
-#            self.sb.showMessage(message)#,2000)
-#
+    #------------------------------#
+    def affiche_infos(self,message):
+    #------------------------------#
+        if self.sb:
+            self.sb.showMessage(message)#,2000)
+
 #    #------------------------------#
 #    def updatePanel(self, jdcNode):
 #    #------------------------------#
@@ -478,15 +478,16 @@ class JDCEditor(QWidget):
 #        self.panel.show()
 #        
 #    
-#    #-------------------#
-#    def init_modif(self):
-#    #-------------------#
-#      """
-#          Met l'attribut modified a 'o' : utilise par Eficas pour savoir 
-#          si un JDC doit etre sauvegarde avant destruction ou non
-#      """
-#      self.modified = True
-#      self.emit(PYSIGNAL('modificationStatusChanged'), (True, self))
+    #-------------------#
+    def init_modif(self):
+    #-------------------#
+      """
+          Met l'attribut modified a 'o' : utilise par Eficas pour savoir 
+          si un JDC doit etre sauvegarde avant destruction ou non
+      """
+      self.modified = True
+      #self.emit(PYSIGNAL('modificationStatusChanged'), (True, self))
+      self.emit(SIGNAL('modificationStatusChanged'), (True, self))
 #    
 #    #-------------------#
 #    def stop_modif(self):
@@ -566,7 +567,7 @@ class JDCEditor(QWidget):
     #---------------------#
     def getFileName(self):
     #---------------------#
-      return self.fileName
+      return self.fichier
 #      
 #    #---------------------------#
 #    def writeFile(self, fn, txt = None):
@@ -610,27 +611,27 @@ class JDCEditor(QWidget):
 #        self.writeFile(fileSTD,self.jdc_openturn_std)
 #
 #
-#    #-----------------------------#
-#    def get_text_JDC(self,format):
-#    #-----------------------------#
-#      if generator.plugins.has_key(format):
-#         # Le generateur existe on l'utilise
-#         g=generator.plugins[format]()
-#         jdc_formate=g.gener(self.jdc,format='beautifie')
-#       if format == "openturns" :
-#          self.jdc_openturn_xml=g.getOpenturnsXML()
-#          self.jdc_openturn_std=g.getOpenturnsSTD()
-#         if not g.cr.estvide():            
-#            self.affiche_infos("Erreur à la generation")
-#            QMessageBox.critical( self, "Erreur a la generation","EFICAS ne sait pas convertir ce JDC")
-#            return
-#         else:
-#            return jdc_formate
-#      else:         
-#         # Il n'existe pas c'est une erreur
-#         self.affiche_infos("Format %s non reconnu" % format)
-#         QMessageBox.critical( self, "Format %s non reconnu" % format,"EFICAS ne sait pas convertir le JDC en format %s "% format)
-#         return
+    #-----------------------------#
+    def get_text_JDC(self,format):
+    #-----------------------------#
+      if generator.plugins.has_key(format):
+         # Le generateur existe on l'utilise
+         g=generator.plugins[format]()
+         jdc_formate=g.gener(self.jdc,format='beautifie')
+        if format == "openturns" :
+           self.jdc_openturn_xml=g.getOpenturnsXML()
+           self.jdc_openturn_std=g.getOpenturnsSTD()
+         if not g.cr.estvide():            
+            self.affiche_infos("Erreur à la generation")
+            QMessageBox.critical( self, "Erreur a la generation","EFICAS ne sait pas convertir ce JDC")
+            return
+         else:
+            return jdc_formate
+      else:         
+         # Il n'existe pas c'est une erreur
+         self.affiche_infos("Format %s non reconnu" % format)
+         QMessageBox.critical( self, "Format %s non reconnu" % format,"EFICAS ne sait pas convertir le JDC en format %s "% format)
+         return
 #      
 #      
 #    #-------------------------------------------#
@@ -650,9 +651,9 @@ class JDCEditor(QWidget):
 #            return (0, None)      # do nothing if text wasn't changed
 #            
 #        newName = None
-#        if saveas or self.fileName is None:
-#            if path is None and self.fileName is not None:
-#                path = os.path.dirname(unicode(self.fileName))
+#        if saveas or self.fichier is None:
+#            if path is None and self.fichier is not None:
+#                path = os.path.dirname(unicode(self.fichier))
 #            selectedFilter = QString('')
 #            fn = QFileDialog.getSaveFileName(path,
 #                self.trUtf8("JDC (*.comm);;"
@@ -679,31 +680,31 @@ class JDCEditor(QWidget):
 #            else:
 #                return (0, None)
 #        else:
-#            fn = self.fileName
+#            fn = self.fichier
 #        
 #        if self.writeFile(fn):
-#            self.fileName = fn
+#            self.fichier = fn
 #            self.modified  = False                        
-#            self.setCaption(self.fileName)                
+#            self.setCaption(self.fichier)                
 #            if self.fileInfo is None or saveas:
-#                self.fileInfo = QFileInfo(self.fileName)
+#                self.fileInfo = QFileInfo(self.fichier)
 #                self.fileInfo.setCaching(0)
-#                self.emit(PYSIGNAL('editorRenamed'), (self.fileName,))
+#                self.emit(PYSIGNAL('editorRenamed'), (self.fichier,))
 #            self.lastModified = self.fileInfo.lastModified()
 #            if newName is not None:
 #                self.vm.addToRecentList(newName)
-#            self.emit(PYSIGNAL('editorSaved'), (self.fileName,))
+#            self.emit(PYSIGNAL('editorSaved'), (self.fichier,))
 #            self.stop_modif()            
 #          if self.code == "OPENTURNS" :
 #             self.writeFilesOpenturns(fn)
 #            if self.salome : 
-#               self.QWParent.appli.addJdcInSalome( self.fileName)
+#               self.QWParent.appli.addJdcInSalome( self.fichier)
 #               if self.code == 'ASTER':
 #                  self.QWParent.appli.createOrUpdateMesh(self)
 #               #PN ; TODO
 #
 #
-#            return (1, self.fileName)
+#            return (1, self.fichier)
 #        else:
 #            return (0, None)
 #
index b5756ef419852e897a90a5fda922d8f8a09025d6..714563b7f4c6dae57567410d260c80e48a0d4a89 100644 (file)
@@ -42,14 +42,15 @@ class MonChoixCata(Ui_DChoixCata,QtGui.QDialog):
       self.listeCata=listeCata
       self.readercata=readercata
       for cata in self.listeCata :
-               self.CBChoixCata.addItem(cata)
+               self.CBChoixCata.insertItem(0,cata)
       lab  = QString(repr(len(listeCata)))
       lab += QString(" versions du catalogue sont disponibles")
       self.TLNb.setText(lab)
+      self.CBChoixCata.setCurrentIndex(0)
       self.readercata.version_cata=self.CBChoixCata.currentText()
 
-  def on_buttonCancel(self):
-      QTPanel.BSupPressed(self)
+  def on_buttonCancel_clicked(self):
+      QDialog.reject(self)
 
   def on_CBChoixCata_activated(self):
       self.readercata.version_cata=self.CBChoixCata.currentText()
@@ -57,5 +58,3 @@ class MonChoixCata(Ui_DChoixCata,QtGui.QDialog):
   def on_buttonOk_clicked(self):
       QDialog.accept(self)
 
-  def BCancelPressed(self):
-      QDialog.reject(self)
index 80c3aaf85176a98ab3a7bcc4fd45c9ec6714212b..2ca34e65400e6ae7f815e566801b6c64b876e3bd 100644 (file)
 # Modules Python
 # Modules Eficas
 
-from desCommande import DComm
+from desCommande import Ui_DComm
 from qtCommun    import QTPanel
 from qtCommun    import QTPanelTBW1
 from qtCommun    import QTPanelTBW2
 from qtCommun    import QTPanelTBW3
 from PyQt4       import *
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
+
+class DComm(Ui_DComm,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
 
 
 # Import des panels
@@ -39,38 +46,51 @@ class MonCommandePanel(DComm,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
   discrètes
   """
   def __init__(self,node, parent = None,name = None,fl = 0):
-        DComm.__init__(self,parent,name,fl)
+        DComm.__init__(self,parent,fl)
         QTPanel.__init__(self,node,parent)
         QTPanelTBW1.__init__(self,node,parent)
         QTPanelTBW2.__init__(self,node,parent)
         QTPanelTBW3.__init__(self,node,parent)
+        self.connecterSignaux()
 
-  def on_BSup_pressed(self):
-      QTPanel.BSupPressed(self)
+  def connecterSignaux(self):
+        self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
+        self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
+        self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
+        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.LENomConcept,SIGNAL("returnPressed()"),self.LENomConceptReturnPressed)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
 
-  def on_BOk_clicked(self):
-      QTPanel.BOkPressed(self)
 
-  def on_bHelp_clicked(self):
+  def ViewDoc(self):
       QTPanel.ViewDoc(self)
 
-  def on_BNext_pressed(self):
-      QTPanelTBW2.BNextPressed(self)
+  def BSupPressed(self):
+      QTPanel.BSupPressed(self)
 
-  def on_RBGroupe_clicked(self):
-      QTPanelTBW2.BuildLBNouvCommande(self)
+  def BOkPressed(self):
+      QTPanel.BOkPressed(self)
+
+  def BNextPressed(self):
+      QTPanelTBW2.BNextPressed(self)
 
-  def on_RBalpha_clicked(self):
+  def BuildTabCommand(self):
       QTPanelTBW2.BuildLBNouvCommande(self)
 
-  def on_LEFiltre_textChanged(self,string):
+  def LEFiltreTextChanged(self):
       QTPanelTBW2.LEFiltreTextChanged(self)
 
-  def on_LEfiltre_returnPressed(self):
+  def LEfiltreReturnPressed(self):
       QTPanelTBW2.LEfiltreReturnPressed(self)
 
-  def on_LBNouvCommande_doubleClicked(self,QLBoxItem):
+  def LBNouvCommandeClicked(self):
       QTPanelTBW2.LBNouvCommandeClicked(self)
 
-  def on_LENomConcept_returnPressed(self):
+  def LENomConceptReturnPressed(self):
       QTPanelTBW3.LENomConceptReturnPressed(self)
+
+
index a4440245442d2f68c9a33420bf26167326acf7ed..b10e14db22a8b47db131344cabc4d8f98de9aad1 100644 (file)
@@ -24,13 +24,19 @@ import string,types,os
 # Modules Eficas
 
 from PyQt4 import *
-from PyQt4.QtGui import *
+from PyQt4.QtGui  import *
+from PyQt4.QtCore import *
 
-from desCommentaire import DComment
+from desCommentaire import Ui_DComment
 from qtCommun      import QTPanel
 from qtCommun      import QTPanelTBW2
 
-import prefs
+class DComment(Ui_DComment,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
+
 
 # Import des panels
 
@@ -41,17 +47,30 @@ class MonCommentairePanel(DComment,QTPanelTBW2,QTPanel):
   discrètes
   """
   def __init__(self,node, parent = None,name = None,fl = 0):
-        DComment.__init__(self,parent,name,fl)
+        DComment.__init__(self,parent,fl)
         QTPanel.__init__(self,node,parent)
         QTPanelTBW2.__init__(self,node,parent)
         self.RemplitPanel()
+        self.connecterSignaux()
+
+  def connecterSignaux(self) :
+        self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
+        self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
+        self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
+        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
+        self.connect(self.textCommentaire,SIGNAL("textChanged()"),self.TexteCommentaireEntre)
 
   def RemplitPanel(self):
         texte=self.node.item.get_valeur()
         self.textCommentaire.setText(texte)
 
   def TexteCommentaireEntre(self):
-        texte=self.textCommentaire.text().latin1()
+        texte=str(self.textCommentaire.toPlainText())
         self.editor.init_modif()
         self.node.item.set_valeur(texte)
         self.node.onValid()
index e691082eacf674264b069911f62cd70a20689a5b..4d86c187325cbae0de81fe8a3540b5872e7c51a7 100644 (file)
 # Modules Python
 # Modules Eficas
 
-from desFormule import DFormule
+from desFormule import Ui_DFormule
 from qtCommun import QTPanel
 from qtCommun import QTPanelTBW2
-from qt import *
+
+from PyQt4.QtGui  import *
+from PyQt4.QtCore import *
+
+
+class DFormule(Ui_DFormule,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
 
 
 # Import des panels
@@ -36,9 +45,10 @@ class MonFormulePanel(DFormule,QTPanelTBW2):
   discrètes
   """
   def __init__(self,node, parent = None,name = None,fl = 0):
-        DFormule.__init__(self,parent,name,fl)
+        DFormule.__init__(self,parent,fl)
         QTPanel.__init__(self,node,parent)
         QTPanelTBW2.__init__(self,node,parent)
+        self.connecterSignaux()
         self.LENomFormule.setText(node.item.get_nom())
         self.LECorpsFormule.setText(node.item.get_corps())
         texte_args=""
@@ -49,9 +59,22 @@ class MonFormulePanel(DFormule,QTPanelTBW2):
                 texte_args=texte_args + i
         self.LENomsArgs.setText(texte_args)
 
-        
         self.parent=parent
 
+  def connecterSignaux(self):
+        self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
+        self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
+        self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
+        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed)
+        self.connect(self.LENomFormule,SIGNAL("returnPressed()"),self.NomFormuleSaisi)
+        self.connect(self.LENomsArgs,SIGNAL("returnPressed()"),self.argsSaisis)
+        self.connect(self.LECorpsFormule,SIGNAL("returnPressed()"),self.FormuleSaisie)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+
   def BSupPressed(self):
       QTPanel.BSupPressed(self)
 
@@ -77,7 +100,7 @@ class MonFormulePanel(DFormule,QTPanelTBW2):
       QTPanelTBW2.LBNouvCommandeClicked(self)
 
   def NomFormuleSaisi(self):
-      nomFormule = self.LENomFormule.text().latin1()
+      nomFormule = str(self.LENomFormule.text())
       if nomFormule == '' : return
       test,erreur = self.node.item.verif_nom(nomFormule)
       if test :
@@ -87,7 +110,7 @@ class MonFormulePanel(DFormule,QTPanelTBW2):
       self.editor.affiche_infos(commentaire) 
 
   def argsSaisis(self):
-      arguments = self.LENomsArgs.text().latin1()
+      arguments = str(self.LENomsArgs.text())
       if arguments == '' : return
 
       test,erreur = self.node.item.verif_arguments(arguments)
@@ -98,9 +121,9 @@ class MonFormulePanel(DFormule,QTPanelTBW2):
       self.editor.affiche_infos(commentaire) 
 
   def FormuleSaisie(self):
-      nomFormule = self.LENomFormule.text().latin1()
-      arguments  = self.LENomsArgs.text().latin1()
-      expression = self.LECorpsFormule.text().latin1()
+      nomFormule = str(self.LENomFormule.text())
+      arguments  = str(self.LENomsArgs.text())
+      expression = str(self.LECorpsFormule.text())
       if expression == '' : return
       test,erreur = self.node.item.verif_formule_python((nomFormule,"REEL",arguments,expression))
 
@@ -114,19 +137,19 @@ class MonFormulePanel(DFormule,QTPanelTBW2):
   def BOkPressedFormule(self):
       if self.parent.modified == 'n' : self.parent.init_modif()
 
-      nomFormule = self.LENomFormule.text().latin1()
+      nomFormule = str(self.LENomFormule.text())
       test,erreur = self.node.item.verif_nom(nomFormule)
       if not test :
          self.editor.affiche_infos(erreur)
          return
 
-      arguments  = self.LENomsArgs.text().latin1()
+      arguments  = str(self.LENomsArgs.text())
       test,erreur = self.node.item.verif_arguments(arguments)
       if not test :
          self.editor.affiche_infos(erreur)
          return
 
-      expression = self.LECorpsFormule.text().latin1()
+      expression = str(self.LECorpsFormule.text())
       test,erreur = self.node.item.verif_formule_python((nomFormule,"REEL",arguments,expression))
       if not test :
          self.editor.affiche_infos(erreur)
index e7c84da3cd9d3124a59cf2a0220a1b75ef193cba..a3a581d8ff8f92b21a71c56a11546525b8de7a21 100644 (file)
 # Modules Python
 # Modules Eficas
 
-from desListeParam import DLisParam
-from PyQt4 import *
+from desListeParam import Ui_DLisParam
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
 
 # Import des panels
+class DLisParam(Ui_DLisParam,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
 
 class MonListeParamPanel(DLisParam):
   """
@@ -35,15 +40,21 @@ class MonListeParamPanel(DLisParam):
   """
   def __init__(self,liste,parent,name = None,fl = 0):
         self.panel=parent
-        DLisParam.__init__(self,parent,name,Qt.WType_Dialog)
+        DLisParam.__init__(self,parent,fl)
         self.liste=liste
+        self.dictListe={}
         self.initVal()
+        self.connecterSignaux()
+
+  def connecterSignaux(self) :
+        self.connect(self.LBParam,SIGNAL("itemPressed(QListWidgetItem*)"),self.LBParamItemPressed)
 
   def initVal(self):
         self.LBParam.clear()
         for param in self.liste :
-            self.LBParam.insertItem(QString(repr(param)))
+            self.LBParam.addItem(QString(repr(param)))
+            self.dictListe[QString(repr(param))] = param
 
   def LBParamItemPressed(self):
-        i=self.LBParam.index(self.LBParam.selectedItem())
-        self.panel.Ajout1Valeur(self.liste[i])
+        i=self.LBParam.selectedItems()[0].text()
+        self.panel.Ajout1Valeur(self.dictListe[i])
index 9f2b50373295a145e0c13c339b3c2540f74211b8..0fb9bea219c456a3d070f46de8a4da01e667af4a 100644 (file)
 # Modules Python
 # Modules Eficas
 
-from desMCFact import DMCFact
+from desMCFact import Ui_DMCFact
 from qtCommun import QTPanel
 from qtCommun import QTPanelTBW1
-from PyQt4 import *
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
+
+class DMCFact(Ui_DMCFact,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
 
 
 # Import des panels
@@ -40,6 +46,12 @@ class MonMCFactPanel(DMCFact,QTPanelTBW1):
         DMCFact.__init__(self,parent,name,fl)
         QTPanel.__init__(self,node,parent)
         QTPanelTBW1.__init__(self,node,parent)
+        self.connecterSignaux()
+
+  def connecterSignaux(self):
+        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
 
   def BSupPressed(self):
       QTPanel.BSupPressed(self)
index d3da3569c0e98985229d029f61645bb3ace998f3..5e0868b2941f0cdd1c0d743fc41e1812a0b837b1 100644 (file)
 # Modules Python
 # Modules Eficas
 
-from desMCListAjout import DMCListAjout
-from qtCommun import QTPanel
-from PyQt4 import *
+from desMCListAjout import Ui_DMCListAjout
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
+from qtCommun import QTPanel
 
 
+class DMCListAjout(Ui_DMCListAjout,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
+
 # Import des panels
 
 class MonMCListAjoutPanel(DMCListAjout,QTPanel):
@@ -36,17 +42,24 @@ class MonMCListAjoutPanel(DMCListAjout,QTPanel):
   discrètes
   """
   def __init__(self,node,parent = None,name = None,fl = 0):
-        DMCListAjout.__init__(self,parent,name,fl)
+        DMCListAjout.__init__(self,parent,fl)
         QTPanel.__init__(self,node,parent)
         monMCFact=self.node.item.get_nom()
         self.MCFacteur.setText(QString(monMCFact))
         self.MCFacteur.setAlignment(Qt.AlignHCenter)
+        self.connecterSignaux()
+
+  def connecterSignaux(self):
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BAjoutClicked)
+        self.connect(self.bAjout,SIGNAL("clicked()"),self.BAjoutClicked)
+        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
 
   def BSupPressed(self):
       QTPanel.BSupPressed(self)
 
   def BAjoutClicked(self):
-        self.node.parent.append_child(self.node.item.get_nom())
+        self.node.treeParent.append_child(self.node.item.get_nom())
 
   def ViewDoc(self):
       QTPanel.ViewDoc(self)
index 8c4b0068f9b864590fe4e77b35c749672eccde2b..4897377ba62e7d7530dd00dfdc3dbe8dd4fd27a1 100644 (file)
 # Modules Python
 # Modules Eficas
 
-from desMacro import DMacro
+from desCommande import Ui_DComm
 from qtCommun import QTPanel
 from qtCommun import QTPanelTBW1
 from qtCommun import QTPanelTBW2
 from qtCommun import QTPanelTBW3
 from PyQt4 import *
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
 
+class DMacro(Ui_DComm,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
 
 # Import des panels
 
@@ -39,15 +45,28 @@ class MonMacroPanel(DMacro,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
   discrètes
   """
   def __init__(self,node, parent = None,name = None,fl = 0):
-        DMacro.__init__(self,parent,name,fl)
+        DMacro.__init__(self,parent,fl)
         QTPanel.__init__(self,node,parent)
         QTPanelTBW2.__init__(self,node,parent)
         QTPanelTBW1.__init__(self,node,parent)
+        self.connecterSignaux()
         if self.node.item.object.get_type_produit() != None :
            QTPanelTBW3.__init__(self,node,parent)
         else :
-           self.TWChoix.removePage(self.TWChoix.page(2))
+           self.TWChoix.removeTab(1)
            
+  def connecterSignaux(self):
+        self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
+        self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
+        self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
+        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.LENomConcept,SIGNAL("returnPressed()"),self.LENomConceptReturnPressed)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
+
   def ViewDoc(self):
       QTPanel.ViewDoc(self)
 
index f70abf7cf7c9312519f91d3d67666289aaf121d6..a15e7e1bd63c4fad6312c56141cf487c4d7ec5e4 100644 (file)
@@ -26,12 +26,18 @@ import prefs
 
 from PyQt4 import *
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
 
-
-from desParam import DParam
+from desParam import Ui_DParam
 from qtCommun import QTPanel
 from qtCommun import QTPanelTBW2
 
+class DParam(Ui_DParam,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
+
 # Import des panels
 
 class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
@@ -41,10 +47,23 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
   discrètes
   """
   def __init__(self,node, parent = None,name = None,fl = 0):
-        DParam.__init__(self,parent,name,fl)
+        DParam.__init__(self,parent,fl)
         QTPanel.__init__(self,node,parent)
         QTPanelTBW2.__init__(self,node,parent)
         self.InitLEs()
+        self.connecterSignaux()
+
+  def connecterSignaux(self) :
+        self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
+        self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
+        self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
+        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
+        self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.BOkPressed)
 
   def InitLEs(self):
         nom=self.node.item.get_nom()
index f125340c319da8bba9c8f5e909db69a32a375143..8ebc8e5f186808125209c1f8bc47b331bb79217e 100644 (file)
 # Modules Python
 # Modules Eficas
 
-from desRacine import DRac
+from desRacine import Ui_DRac
 from qtCommun  import QTPanel
 from qtCommun  import QTPanelTBW2
-from qtCommun  import itemColore
+#from qtCommun  import itemColore
 from PyQt4 import *
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
+
+class DRac(Ui_DRac,QDialog):
+   def __init__(self,parent ,modal = 0 ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
 
 
 # Import des panels
@@ -38,10 +45,25 @@ class MonRacinePanel(DRac,QTPanelTBW2):
   discrètes
   """
   def __init__(self,node, parent = None,name = None,fl = 0):
-        DRac.__init__(self,parent,name,fl)
+        print "hhhhhhhhhhhhhhhhhhhhhhhhhhhhh"
+        print parent
+        print "hhhhhhhhhhhhhhhhhhhhhhhhhhhhh"
+        DRac.__init__(self,parent,0)
+        self.connecterSignaux()
         QTPanel.__init__(self,node,parent)
         QTPanelTBW2.__init__(self,node,parent,racine=1)
 
+  def connecterSignaux(self):
+        self.connect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
+        self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
+        self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
+        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+
   def BSupPressed(self):
       QTPanel.BSupPressed(self)
 
@@ -72,9 +94,12 @@ class MonRacinePanel(DRac,QTPanelTBW2):
       self.BuildLBRegles(listeRegles,listeNomsEtapes)
 
   def DefCmd(self):
-      if self.LBNouvCommande.selectedItem()== None : return
-      name=str(self.LBNouvCommande.selectedItem().text())
+      if self.LBNouvCommande.currentItem()== None : return
+      name=str(self.LBNouvCommande.currentItem().text())
       if name==QString(" "): return
       if name.find("GROUPE :")==0 : return
+      print self.editor
+      print self.editor.__class__
       self.editor.init_modif()
+      print self.node.__class__
       new_node = self.node.append_child(name,'first')
index bfdee9ee0f04391e129a0bbf9780592b100463f3..79245bb38443f5c513c33eb6893acc81b9669ad8 100644 (file)
 import string,types,os
 
 # Modules Eficas
-import prefs 
 
-from PyQt4 import *
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
 
-from desUniqueASSD import DUnASSD
+from desUniqueASSD import Ui_DUnASSD
 from qtCommun      import QTPanel
 from qtSaisie      import SaisieValeur
 from politiquesValidation import PolitiqueUnique
 
+class DUnASSD(Ui_DUnASSD,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
+
 # Import des panels
 
 class MonUniqueASSDPanel(DUnASSD,QTPanel,SaisieValeur):
@@ -43,10 +48,17 @@ class MonUniqueASSDPanel(DUnASSD,QTPanel,SaisieValeur):
   def __init__(self,node, parent = None,name = None,fl = 0):
         self.editor=parent
         QTPanel.__init__(self,node,parent)
-        DUnASSD.__init__(self,parent,name,fl)
+        DUnASSD.__init__(self,parent,fl)
         self.politique=PolitiqueUnique(node,parent)
         self.InitListBoxASSD()
         self.InitCommentaire()
+        self.connecterSignaux()
+
+  def connecterSignaux(self) :
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
+
 
   def BOkPressed(self):
         self.ClicASSD()
index d10a1204d0b1b39d59281c9d7243e88ba84ee510..ecf9b57f55640818af38e01c9cd6b20da884716e 100644 (file)
 import string,types,os
 
 # Modules Eficas
-import prefs 
-
-from PyQt4 import *
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
 
-from desUniqueBase import DUnBase
+from desUniqueBase import Ui_DUnBase
 from qtCommun      import QTPanel
 from qtSaisie      import SaisieValeur
 from politiquesValidation import PolitiqueUnique
 
+class DUnBase(Ui_DUnBase,QDialog):
+   def __init__(self,parent ,modal ) :
+       QDialog.__init__(self,parent)
+       self.setupUi(self)
+       self.setModal(modal)
+
 # Import des panels
 
 class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
@@ -43,11 +47,21 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
   def __init__(self,node, parent = None,name = None,fl = 0):
         self.editor=parent
         QTPanel.__init__(self,node,parent)
-        DUnBase.__init__(self,parent,name,fl)
+        DUnBase.__init__(self,parent,fl)
         self.politique=PolitiqueUnique(node,parent)
         self.InitLineEditVal()
         self.InitCommentaire()
         self.detruitBouton()
+        self.connecterSignaux()
+
+  def connecterSignaux(self) :
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOk2Pressed)
+        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
+        self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
+        self.connect(self.bParametres,SIGNAL("pressed()"),self.BParametresPressed)
+        self.connect(self.BSalome,SIGNAL("pressed()"),self.BSalomePressed)
+        self.connect(self.BView2D,SIGNAL("clicked()"),self.BView2DPressed)
 
   def ViewDoc(self):
       QTPanel.ViewDoc(self)
@@ -63,11 +77,14 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
   def InitLineEditVal(self):
         valeur=self.node.item.get_valeur()
         valeurTexte=self.politique.GetValeurTexte(valeur)
-        if valeurTexte != None:
-           try :
-               str=QString("").setNum(valeurTexte)
-           except :
-               str=QString(valeurTexte)
+        if valeurTexte != None :
+           if repr(valeurTexte.__class__).find("PARAMETRE") > 0:
+               str = QString(repr(valeur)) 
+           else :
+               try :
+                   str=QString("").setNum(valeurTexte)
+               except :
+                   str=QString(valeurTexte)
            self.lineEditVal.setText(str)
 
 
index 539f61134439c21f66d96f92bf45509cc53a4660..a976f9717be6a707f34d5723d8da1b989f225c05 100644 (file)
@@ -21,8 +21,6 @@
 # Modules Python
 import types
 
-from qt import *
-
 
 #------------------
 class Validation  :
index e1a7010b8049be38f946b0747cb2a994895b984c..e904810cc2eefa0b5c21f53d2cdb50c955c23537 100644 (file)
@@ -24,6 +24,7 @@ import traceback
 
 from PyQt4 import *
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
 import prefsQT
 
 # Import des panels
@@ -79,7 +80,8 @@ class QTPanel:
 
   def BOkPressed(self):
         """ Impossible d utiliser les vrais labels avec designer ?? """
-        label=self.TWChoix.tabLabel(self.TWChoix.currentPage())
+        label=self.TWChoix.tabText(self.TWChoix.currentIndex())
+        #print label
         if label==QString("Nouvelle Commande"):
            self.DefCmd()
         if label==QString("Nommer Concept"):
@@ -111,14 +113,14 @@ class QTPanel:
               texteMauvais,test = regle.verif(listeNomsEtapes)
               for ligne in texteRegle.split("\n") :
                  if ligne == "" :
-                    self.LBRegles.insertItem(ligne)
+                    self.LBRegles.insertItem(0,ligne)
                     continue
                  if ligne[0]=="\t" :
                     ligne="     "+ligne[1:]
                  if test :
-                    self.LBRegles.insertItem(ligne)
+                    self.LBRegles.insertItem(0,ligne)
                  else :
-                    self.LBRegles.insertItem(ligne)
+                    self.LBRegles.insertItem(0,ligne)
                     #self.LBRegles.insertItem(itemColore(ligne))
 
 
@@ -138,19 +140,12 @@ class QTPanelTBW1(QTPanel):
 
   def BuildLBMCPermis(self):
         self.LBMCPermis.clear()
-        try :
-           QObject.disconnect(self.LBMCPermis,SIGNAL("doubleClicked(QListBoxItem*)"),self.DefMC)
-        except :
-           # normal pour la première fois qu on passe
-           # peut-etre inutile selon le connect ??
-           pass
-        QObject.connect(self.LBMCPermis,SIGNAL("doubleClicked(QListBoxItem*)"),self.DefMC)
-
+        QObject.connect(self.LBMCPermis,SIGNAL("itemDoubleClicked(QListWidegetItem*)"),self.DefMC)
         jdc = self.node.item.get_jdc()
         genea =self.node.item.get_genealogie()
         liste_mc=self.node.item.get_liste_mc_ordonnee(genea,jdc.cata_ordonne_dico)
         for aMc in liste_mc:
-           self.LBMCPermis.insertItem( aMc)
+           self.LBMCPermis.addItem( aMc)
 
 
   def DefMC(self):
@@ -173,58 +168,54 @@ class QTPanelTBW2(QTPanel):
         self.editor    = parent
         self.node      = node
         self.BuildLBNouvCommande()
+        self.NbRecherches = 0
         if racine == 1 : self.AppelleBuildLBRegles()
 
       
   def BuildLBNouvCommande(self):
         self.LBNouvCommande.clear()
-        try :
-           QObject.disconnect(self.LBNouvCommande,SIGNAL("doubleClicked(QListBoxItem*)"),self.DefCmd)
-        except :
-           # normal pour la première fois qu on passe
-           # peut-etre inutile selon le connect ??
-           pass
 
         jdc=self.node.item.object.get_jdc_root()
-        if self.RBalpha.isOn():
+        if self.RBalpha.isChecked():
            listeCmd = jdc.get_liste_cmd()
            for aCmd in listeCmd:
-              self.LBNouvCommande.insertItem( aCmd )
+              self.LBNouvCommande.addItem( aCmd )
         else :
            listeGroupes,dictGroupes=jdc.get_groups()
            for grp in listeGroupes:
               if grp == "CACHE":continue
               listeCmd=dictGroupes[grp]
               texte="GROUPE : "+grp
-              self.LBNouvCommande.insertItem( texte )
-              self.LBNouvCommande.insertItem( " " )
+              self.LBNouvCommande.addItem( texte )
+              self.LBNouvCommande.addItem( " " )
               for aCmd in listeCmd:
-                 self.LBNouvCommande.insertItem( aCmd)
-              self.LBNouvCommande.insertItem( " " )
-        QObject.connect( self.LBNouvCommande, SIGNAL("doubleClicked(QListBoxItem*)"),self.DefCmd )
-        QObject.connect( self.LBNouvCommande, SIGNAL("returnPressed(QListBoxItem*)"),self.DefCmd )
+                 self.LBNouvCommande.addItem( aCmd)
+              self.LBNouvCommande.addItem( " " )
+        QObject.connect( self.LBNouvCommande, SIGNAL("itemClicked(QListWidgetItem*)"),self.DefCmd )
+        QObject.connect( self.LBNouvCommande, SIGNAL("itemDoubleClicked(QListWidgetItem*)"),self.DefCmd )
 
   def DefCmd(self):
+        print "iiiiiii"
         if (self.editor.focusWidget())!=self.LBNouvCommande :
             return 
-        if self.LBNouvCommande.selectedItem()== 0 : return
-        if self.LBNouvCommande.selectedItem()== None : return
-        name=str(self.LBNouvCommande.selectedItem().text())
+        if self.LBNouvCommande.currentItem()== 0 : return
+        if self.LBNouvCommande.currentItem()== None : return
+        name=str(self.LBNouvCommande.currentItem().text())
         if name==QString(" "):
           return
         if name.find("GROUPE :")==0 :
           return
         self.editor.init_modif()
+        print self.node
+        print name
         new_node = self.node.append_brother(name,'after')
 
 
   def LEFiltreTextChanged(self):
-        MonItem=self.LBNouvCommande.findItem(self.LEFiltre.text().upper(),Qt.Contains)
-       if MonItem != None :
-          self.LBNouvCommande.setCurrentItem(MonItem)
-          self.LBNouvCommande.setSelected(MonItem,1)
+        self.NbRecherches = 0
         try :
-           QObject.disconnect(self.LBNouvCommande,SIGNAL("returnPressed(QListBoxItem*)"),self.DefCmd)
+           MonItem=self.LBNouvCommande.findItems(self.LEFiltre.text().toUpper(),Qt.MatchContains)[0]
+          self.LBNouvCommande.setCurrentItem(MonItem)
         except :
            pass
 
@@ -232,10 +223,17 @@ class QTPanelTBW2(QTPanel):
         self.DefCmd()
 
   def BNextPressed(self):
-        MonItem=self.LBNouvCommande.findItem(self.LEFiltre.text().upper(),Qt.Contains)
-        if MonItem != None :
-           self.LBNouvCommande.setCurrentItem(self.LBNouvCommande.currentItem()+1)
-           self.LEFiltreTextChanged()
+        self.NbRecherches = self.NbRecherches + 1
+        monItem = None
+        try :
+            MonItem=self.LBNouvCommande.findItems(self.LEFiltre.text().toUpper(),Qt.MatchContains)[self.NbRecherches]
+        except :
+            try : # ce try sert si la liste est vide
+               MonItem=self.LBNouvCommande.findItems(self.LEFiltre.text().toUpper(),Qt.MatchContains)[0]
+               self.NbRecherches = 0
+            except :
+               return
+       self.LBNouvCommande.setCurrentItem(MonItem)
 
   def LBNouvCommandeClicked(self):
         name=str(self.LBNouvCommande.currentText())
@@ -261,50 +259,31 @@ class QTPanelTBW3(QTPanel):
         self.LENomConcept.setText("")
         self.LENomConcept.setText(nomConcept)
         
-
-
   def LENomConceptReturnPressed(self):
         """
         Nomme le concept SD retourne par l'etape
         """
         nom = str(self.LENomConcept.text())
         nom = string.strip(nom)
-
         if nom == '' : return                  # si pas de nom, on ressort sans rien faire
-
         self.editor.init_modif()
         test,mess = self.node.item.nomme_sd(nom)
         self.editor.affiche_infos(mess)
 
-# ----------------------- #
-class ViewText(QDialog):
-# ----------------------- #
+# ------------------------------- #
+from desViewTexte import Ui_dView
+class ViewText(Ui_dView,QDialog):
+# ------------------------------- #
     """
     Classe permettant la visualisation de texte
     """
-    def __init__(self,parent = None,name = None,modal = 0,fl = 0):
-        QDialog.__init__(self,parent,name,modal,fl)
-        
-        l1 = QVBoxLayout(self,11,6,)
-        self.view = QTextEdit(self)
-        self.view.setReadOnly(True)
-
-        l2 = QHBoxLayout(None,0,6)
-        Horizontal_Spacing2 = QSpacerItem(220,20,QSizePolicy.Expanding,QSizePolicy.Minimum)                
-        bclose= QPushButton(self)
-        bclose.setText(self.trUtf8( "Fermer"))
-        bsave= QPushButton(self)
-        bsave.setText(self.trUtf8( "Sauver"))
-        l2.addItem(Horizontal_Spacing2)
-        l2.addWidget(bsave)
-        l2.addWidget(bclose)
-                
-        l1.addWidget(self.view)        
-        l1.addLayout(l2)
+    def __init__(self,parent):
+        QDialog.__init__(self,parent)
+        self.setupUi(self)
 
         self.resize( QSize(600,507).expandedTo(self.minimumSizeHint()) )
-        self.connect( bclose,SIGNAL("clicked()"), self, SLOT("close()") )
-        self.connect( bsave,SIGNAL("clicked()"), self.saveFile )
+        self.connect( self.bclose,SIGNAL("clicked()"), self, SLOT("close()") )
+        self.connect( self.bsave,SIGNAL("clicked()"), self.saveFile )
         
     def setText(self, txt ):    
         self.view.setText(txt)
@@ -312,26 +291,28 @@ class ViewText(QDialog):
     def saveFile(self):
         #recuperation du nom du fichier
         fn = QFileDialog.getSaveFileName(None,
-                self.trUtf8("All Files (*)"), self, None,
-                self.trUtf8("Save File"), '', 0)                
-        if not fn.isNull():                
-           if QFileInfo(fn).exists():
-              abort = QMessageBox.warning(self,
-                        self.trUtf8("Save File"),
-                        self.trUtf8("The file <b>%1</b> already exists.")
-                            .arg(fn),
-                        self.trUtf8("&Overwrite"),
-                        self.trUtf8("&Abort"), None, 1)
-              if abort:
-                 return
-           fn = unicode(QDir.convertSeparators(fn))                
-        else:
-           return
+                self.trUtf8("Save File"),
+                self.trUtf8("/tmp"))
+        #if not fn.isNull():                
+        #   print "hhhhhhhhhhhhhhjjjjjjjjjjjjjjjjjjjjkkkkkkkkkkkkk"
+        #   if QFileInfo(fn).exists():
+        #      abort = QMessageBox.warning(self,
+        #                self.trUtf8("Save File"),
+        #                self.trUtf8("The file <b>%1</b> already exists.")
+        #                    .arg(fn),
+        #                self.trUtf8("&Overwrite"),
+        #                self.trUtf8("&Abort"))
+        #      if abort:
+        #         return
+        #   fn = unicode(QDir.convertSeparators(fn))                
+        #else:
+        #   return
 
         #ecriture du fichier
+        if fn.isNull() : return
         try:
            f = open(fn, 'wb')
-           f.write(str(self.view.text()))
+           f.write(str(self.view.toPlainText()))
            f.close()
            return 1
         except IOError, why:
index e94f3ebb698a05fb5f1d07bd3d6aefe353d64555..49863cacb04177671b850bd816ece6810c39a8a7 100644 (file)
@@ -45,9 +45,11 @@ class Appli(Ui_Eficas,QMainWindow):
 
         #self.monAssistant=QAssistantClient(QString(""), self.viewmanager)
         
-        if self.salome :
-           from Editeur import session
-           self.ouvreFichiers()
+        #if self.salome :
+        #   from Editeur import session
+        #   self.ouvreFichiers()
+        from Editeur import session
+        self.ouvreFichiers()
 
         self.ficPatrons={}
         self.initPatrons()
index e7ea9c4d67c3f301c2a263de5814633d499b4f5e..b1b45acb37a2db782c0a035a9a8bb4314cd322d7 100644 (file)
@@ -22,6 +22,7 @@
 import string,types,os
 from PyQt4 import *
 from PyQt4.QtGui import *
+from PyQt4.QtCore import *
 
 # Import des panels
 
@@ -36,7 +37,7 @@ class SaisieValeur:
   def InitListBoxASSD(self):
        listeNomsSD = self.node.item.get_sd_avant_du_bon_type()
        for aSD in listeNomsSD:
-            self.listBoxASSD.insertItem( aSD)
+            self.listBoxASSD.addItem( aSD)
             QObject.connect(self.listBoxASSD, SIGNAL("doubleClicked(QListBoxItem*)" ), self.ClicASSD )
        min,max =  self.node.item.GetMinMax()
        l= self.node.item.GetListeValeurs()
@@ -50,16 +51,16 @@ class SaisieValeur:
         self.LBValeurs.clear()
         listeValeurs=self.node.item.GetListeValeurs()
         for valeur in listeValeurs:
-            self.LBValeurs.insertItem(str(valeur))
+            self.LBValeurs.addItem(str(valeur))
         if listeValeurs != None and listeValeurs != [] :
-            self.LBValeurs.setCurrentItem(len(listeValeurs) - 1)
+            self.LBValeurs.setCurrentRow(len(listeValeurs) - 1)
        
 
   def RemplitPanel(self,listeDejaLa=[]):
         self.listBoxVal.clear()
         lChoix=self.node.item.get_liste_possible(listeDejaLa)
         for valeur in lChoix :
-            self.listBoxVal.insertItem( str(valeur) ) 
+            self.listBoxVal.addItem( str(valeur) ) 
         if len(lChoix) == 1 :
             self.listBoxVal.setSelected(0,1)
 
index f7b59750e0d96e18ea3ab7d0d0e6b42fe0b420fe..6ee892f034dae22a66e1cb52f4f607a959ab02f2 100644 (file)
 #
 # ======================================================================
 
-import os
+import os, string
 from PyQt4.QtGui  import *
 from PyQt4.QtCore import *
 
-from utils import *
-
 class MyTabview:
 
    def __init__(self,appliEficas):
@@ -33,14 +31,25 @@ class MyTabview:
        self.mesIndexes = {}
        self.appliEficas=appliEficas
        self.editors = []
-       self.currentEditor = None
+       self.dict_editors={}
+       self.untitledCount = 0
 
        self.myQtab = QTabWidget(self.appliEficas.centralWidget())
        #self.connect(tw, SIGNAL('currentChanged(QWidget*)'), self.handleCurrentChanged)
         
 
-   def handleOpen(self,fn=None,patron=0,units=None):
+   def handleOpen(self,fichier=None,patron=0,units=None):
        print "passage dans handleOpen"
+       if fichier is None:
+            fichier = QFileDialog.getOpenFileName(self.appliEficas,
+                        self.appliEficas.trUtf8('Ouvrir Fichier'),
+                        self.getOpenStartDir(),
+                        self.appliEficas.trUtf8('JDC Files (*.comm);;''All Files (*)'))
+            if fichier.isNull(): return
+
+       from utilitaires import normabspath
+       fichier = normabspath(unicode(fichier))
+       maPage=self.getEditor( fichier)
 
    def handleClose(self):
        print "passage dans Close"
@@ -68,13 +77,19 @@ class MyTabview:
        print "passage dans newIncludeEditor"
 
    def handleViewJdcFichierSource(self):
-       print "passage dans handleViewJdcFichierSource"
+       index=self.myQtab.currentIndex()
+       if index < 0 : return
+       self.dict_editors[index].viewJdcSource()
 
    def handleViewJdcRapport(self):
-       print "passage dans handleViewRapport"
+       index=self.myQtab.currentIndex()
+       if index < 0 : return
+       self.dict_editors[index].viewJdcRapport()
 
    def handleViewJdcPy(self):
-       print "passage dans handleViewPy"
+       index=self.myQtab.currentIndex()
+       if index < 0 : return
+       self.dict_editors[index].viewJdcPy()
 
    def saveCurrentEditor(self):
        print "passage dans CurrentEditor"
@@ -83,20 +98,24 @@ class MyTabview:
        print "passage dans AsCurrentEditor"
 
 
-   def getEditor(self, fileName = None, jdc = None, units = None):
+   def getEditor(self,fichier = None,jdc = None, units = None):
        newWin = 0
        double = None
-       for editor in self.editors:
-           if samepath(fileName, editor.getFileName()):
-              abort = QMessageBox.warning(self,
-                        self.trUtf8("Fichier"),
-                        self.trUtf8("Le fichier <b>%1</b> est deja ouvert.").arg(fileName),
-                        self.trUtf8("&Duplication"),
-                        self.trUtf8("&Abort"), None, 1)
+       indexEditor=0
+       #for editor in self.editors:
+       for indexEditor in self.dict_editors.keys():
+           editor=self.dict_editors[indexEditor]
+           from utilitaires import samepath
+           if samepath(fichier, editor.getFileName()):
+              abort = QMessageBox.warning(self.appliEficas,
+                        self.appliEficas.trUtf8("Fichier"),
+                        self.appliEficas.trUtf8("Le fichier <b>%1</b> est deja ouvert.").arg(fichier),
+                        self.appliEficas.trUtf8("&Duplication"),
+                        self.appliEficas.trUtf8("&Abort"))
               if abort: break
        else :
             from editor import JDCEditor
-            editor = JDCEditor(fileName, jdc, self.myQtab,units=units,appli=self.appliEficas)
+            editor = JDCEditor(fichier, jdc, self.myQtab,units=units,appli=self.appliEficas)
             if editor.jdc: # le fichier est bien un jdc
                 self.editors.append(editor)
                 #self.connect(editor, SIGNAL('modificationStatusChanged'), self.handleModificationStatusChanged)
@@ -106,46 +125,41 @@ class MyTabview:
                 #self.connect(editor, SIGNAL('bookmarkToggled'), self.handleBookmarkToggled)
                 #self.connect(editor, SIGNAL('syntaxerrorToggled'), self.handleSyntaxErrorToggled)
                 #self.handleEditorOpened()
-                #self.emit(SIGNAL('editorOpened'), (fn,))
+                #self.emit(SIGNAL('editorOpened'), (fichier,))
                 newWin = 1
             else:
                 editor.closeIt()
 
+       hauteur=self.appliEficas.centralWidget().height()
+       largeur=self.appliEficas.centralWidget().width()
+       self.myQtab.setGeometry(0,0,hauteur,largeur)
        if newWin:
-            self.addView(editor, fn , title)
+            self.addView(editor, fichier)
        elif editor.jdc:
-            self.showView(editor, fn)
+            self.myQtab.setCurrentIndex(indexEditor)
 
+       index=self.myQtab.currentIndex()
+       self.dict_editors[index]=editor
        return editor
 
-   def addView(self, win, fn=None, title=None):
-        #win.show()
-        if fn is None:
-            if title== None :
-               self.untitledCount += 1
-               self.currentTabWidget.addTab(win, self.trUtf8("Untitled %1").arg(self.untitledCount))
-            else :
-               self.currentTabWidget.addTab(win, title)
+   def addView(self, win, fichier=None):
+        if fichier is None:
+            self.untitledCount += 1
+            self.myQtab.addTab(win, self.appliEficas.trUtf8("Untitled %1").arg(self.untitledCount))
         else:
-            txt = os.path.basename(fn)
-            if not QFileInfo(fn).isWritable():
+            liste=fichier.split('/')
+            txt =  liste[-1]
+            if not QFileInfo(fichier).isWritable():
                 txt = '%s (ro)' % txt
-            self.currentTabWidget.addTab(win, txt)
-            self.currentTabWidget.setTabToolTip(win, os.path.dirname(fn))
-        self.currentTabWidget.showPage(win)
-        win.setFocus()
-
-   def showView(self, win, fn=None):
-        """
-        Private method to show a view (i.e. window)
-        @param win editor window to be shown
-        @param fn filename of this editor
-        """
-        win.show()
-        for tw in self.tabWidgets:
-            if tw.hasEditor(win):
-                tw.showPage(win)
-                self.currentTabWidget = tw
-                break
+            self.myQtab.addTab(win, txt)
+        self.myQtab.setCurrentWidget(win)
+        self.cuurentEditor=win
         win.setFocus()
 
+   def getOpenStartDir(self) :
+       #PN --> Les Preferences
+        try :
+            userDir=os.path.expanduser("~/Eficas_install/")
+            return userDir
+        except :
+            return ""
index 42dc6c6272bf952222264e5f7df4f7e6e955a1f8..d35f39ff16f4826de07033e4ed35707a7e3db7ae 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desChoixCata.ui'
 #
-# Created: Wed Jul  9 10:11:20 2008
+# Created: Wed Jul 16 16:27:33 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -12,47 +12,59 @@ from PyQt4 import QtCore, QtGui
 class Ui_DChoixCata(object):
     def setupUi(self, DChoixCata):
         DChoixCata.setObjectName("DChoixCata")
-        DChoixCata.resize(547,172)
+        DChoixCata.resize(547,192)
         DChoixCata.setSizeGripEnabled(True)
-        self.gridlayout = QtGui.QGridLayout(DChoixCata)
-        self.gridlayout.setObjectName("gridlayout")
-        self.frame3 = QtGui.QFrame(DChoixCata)
-        self.frame3.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.frame3.setFrameShadow(QtGui.QFrame.Raised)
-        self.frame3.setObjectName("frame3")
-        self.buttonCancel = QtGui.QPushButton(self.frame3)
-        self.buttonCancel.setGeometry(QtCore.QRect(380,6,90,30))
-        self.buttonCancel.setAutoDefault(True)
-        self.buttonCancel.setObjectName("buttonCancel")
-        self.buttonOk = QtGui.QPushButton(self.frame3)
-        self.buttonOk.setGeometry(QtCore.QRect(40,6,90,30))
-        self.buttonOk.setAutoDefault(True)
-        self.buttonOk.setDefault(True)
-        self.buttonOk.setObjectName("buttonOk")
-        self.gridlayout.addWidget(self.frame3,2,0,1,2)
+        self.gridLayout = QtGui.QGridLayout(DChoixCata)
+        self.gridLayout.setObjectName("gridLayout")
         self.TLNb = QtGui.QLabel(DChoixCata)
         self.TLNb.setMinimumSize(QtCore.QSize(30,0))
         self.TLNb.setWordWrap(False)
         self.TLNb.setObjectName("TLNb")
-        self.gridlayout.addWidget(self.TLNb,0,0,1,1)
+        self.gridLayout.addWidget(self.TLNb,0,0,1,1)
         self.CBChoixCata = QtGui.QComboBox(DChoixCata)
         self.CBChoixCata.setEnabled(True)
+        self.CBChoixCata.setMinimumSize(QtCore.QSize(125,41))
+        self.CBChoixCata.setMaximumSize(QtCore.QSize(150,16777215))
         self.CBChoixCata.setObjectName("CBChoixCata")
-        self.gridlayout.addWidget(self.CBChoixCata,1,1,1,1)
+        self.gridLayout.addWidget(self.CBChoixCata,0,1,2,1)
         self.textLabel1_2 = QtGui.QLabel(DChoixCata)
-        self.textLabel1_2.setMinimumSize(QtCore.QSize(380,60))
+        self.textLabel1_2.setMinimumSize(QtCore.QSize(60,60))
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
-        self.gridlayout.addWidget(self.textLabel1_2,1,0,1,1)
+        self.gridLayout.addWidget(self.textLabel1_2,1,0,1,1)
+        self.frame3 = QtGui.QFrame(DChoixCata)
+        self.frame3.setFrameShape(QtGui.QFrame.StyledPanel)
+        self.frame3.setFrameShadow(QtGui.QFrame.Raised)
+        self.frame3.setObjectName("frame3")
+        self.horizontalLayout = QtGui.QHBoxLayout(self.frame3)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.buttonOk = QtGui.QPushButton(self.frame3)
+        self.buttonOk.setAutoDefault(True)
+        self.buttonOk.setDefault(True)
+        self.buttonOk.setObjectName("buttonOk")
+        self.horizontalLayout.addWidget(self.buttonOk)
+        spacerItem = QtGui.QSpacerItem(334,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
+        self.buttonCancel = QtGui.QPushButton(self.frame3)
+        self.buttonCancel.setAutoDefault(True)
+        self.buttonCancel.setObjectName("buttonCancel")
+        self.horizontalLayout.addWidget(self.buttonCancel)
+        self.gridLayout.addWidget(self.frame3,2,0,1,2)
 
         self.retranslateUi(DChoixCata)
+        QtCore.QMetaObject.connectSlotsByName(DChoixCata)
 
     def retranslateUi(self, DChoixCata):
         DChoixCata.setWindowTitle(QtGui.QApplication.translate("DChoixCata", "Choix d\'une version du code Aster", None, QtGui.QApplication.UnicodeUTF8))
-        self.buttonCancel.setText(QtGui.QApplication.translate("DChoixCata", "&Cancel", None, QtGui.QApplication.UnicodeUTF8))
+        self.TLNb.setText(QtGui.QApplication.translate("DChoixCata", "2 versions sont disponibles", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel1_2.setText(QtGui.QApplication.translate("DChoixCata", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:\'Sans Serif\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:large;\">Veuillez choisir celle avec laquelle</span></p>\n"
+"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large;\"><span style=\" font-size:large;\"> vous souhaitez travailler</span></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
         self.buttonOk.setText(QtGui.QApplication.translate("DChoixCata", "&OK", None, QtGui.QApplication.UnicodeUTF8))
-        self.TLNb.setText(QtGui.QApplication.translate("DChoixCata", "2", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel1_2.setText(QtGui.QApplication.translate("DChoixCata", "<font size=\"+1\">Veuillez choisir celle avec laquelle vous souhaitez travailler</font>", None, QtGui.QApplication.UnicodeUTF8))
+        self.buttonCancel.setText(QtGui.QApplication.translate("DChoixCata", "&Cancel", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":
index 54172825416b4d4b0ee0d48b4d0040648a4eb625..a59643f77e5d797e0c3dcbe12146cbad38265b45 100644 (file)
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DChoixCata</class>
-  <widget class="QDialog" name="DChoixCata" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>547</width>
-        <height>172</height>
-      </rect>
-    </property>
-    <property name="windowTitle" >
-      <string>Choix d'une version du code Aster</string>
-    </property>
-    <property name="sizeGripEnabled" >
+<ui version="4.0" >
+ <class>DChoixCata</class>
+ <widget class="QDialog" name="DChoixCata" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>547</width>
+    <height>192</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Choix d'une version du code Aster</string>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="TLNb" >
+     <property name="minimumSize" >
+      <size>
+       <width>30</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="text" >
+      <string>2 versions sont disponibles</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item rowspan="2" row="0" column="1" >
+    <widget class="QComboBox" name="CBChoixCata" >
+     <property name="enabled" >
       <bool>true</bool>
-    </property>
-    <layout class="QGridLayout" >
-      <item rowspan="1" row="2" column="0" colspan="2" >
-        <widget class="QFrame" name="frame3" >
-          <property name="frameShape" >
-            <enum>StyledPanel</enum>
-          </property>
-          <property name="frameShadow" >
-            <enum>Raised</enum>
-          </property>
-          <widget class="QPushButton" name="buttonCancel" >
-            <property name="geometry" >
-              <rect>
-                <x>380</x>
-                <y>6</y>
-                <width>90</width>
-                <height>30</height>
-              </rect>
-            </property>
-            <property name="text" >
-              <string>&amp;Cancel</string>
-            </property>
-            <property name="shortcut" >
-              <string/>
-            </property>
-            <property name="autoDefault" >
-              <bool>true</bool>
-            </property>
-          </widget>
-          <widget class="QPushButton" name="buttonOk" >
-            <property name="geometry" >
-              <rect>
-                <x>40</x>
-                <y>6</y>
-                <width>90</width>
-                <height>30</height>
-              </rect>
-            </property>
-            <property name="text" >
-              <string>&amp;OK</string>
-            </property>
-            <property name="shortcut" >
-              <string/>
-            </property>
-            <property name="autoDefault" >
-              <bool>true</bool>
-            </property>
-            <property name="default" >
-              <bool>true</bool>
-            </property>
-          </widget>
-        </widget>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>125</width>
+       <height>41</height>
+      </size>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>150</width>
+       <height>16777215</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="textLabel1_2" >
+     <property name="minimumSize" >
+      <size>
+       <width>60</width>
+       <height>60</height>
+      </size>
+     </property>
+     <property name="text" >
+      <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:large;">Veuillez choisir celle avec laquelle&lt;/span>&lt;/p>
+&lt;p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large;">&lt;span style=" font-size:large;"> vous souhaitez travailler&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <widget class="QFrame" name="frame3" >
+     <property name="frameShape" >
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout" >
+      <item>
+       <widget class="QPushButton" name="buttonOk" >
+        <property name="text" >
+         <string>&amp;OK</string>
+        </property>
+        <property name="shortcut" >
+         <string/>
+        </property>
+        <property name="autoDefault" >
+         <bool>true</bool>
+        </property>
+        <property name="default" >
+         <bool>true</bool>
+        </property>
+       </widget>
       </item>
-      <item row="0" column="0" >
-        <widget class="QLabel" name="TLNb" >
-          <property name="minimumSize" >
-            <size>
-              <width>30</width>
-              <height>0</height>
-            </size>
-          </property>
-          <property name="text" >
-            <string>2</string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
+      <item>
+       <spacer name="horizontalSpacer" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>334</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
-      <item row="1" column="1" >
-        <widget class="QComboBox" name="CBChoixCata" >
-          <property name="enabled" >
-            <bool>true</bool>
-          </property>
-        </widget>
+      <item>
+       <widget class="QPushButton" name="buttonCancel" >
+        <property name="text" >
+         <string>&amp;Cancel</string>
+        </property>
+        <property name="shortcut" >
+         <string/>
+        </property>
+        <property name="autoDefault" >
+         <bool>true</bool>
+        </property>
+       </widget>
       </item>
-      <item row="1" column="0" >
-        <widget class="QLabel" name="textLabel1_2" >
-          <property name="minimumSize" >
-            <size>
-              <width>380</width>
-              <height>60</height>
-            </size>
-          </property>
-          <property name="text" >
-            <string>&lt;font size="+1">Veuillez choisir celle avec laquelle vous souhaitez travailler&lt;/font></string>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-    </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+  <zorder>frame3</zorder>
+  <zorder>TLNb</zorder>
+  <zorder>textLabel1_2</zorder>
+  <zorder>CBChoixCata</zorder>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources/>
+ <connections/>
 </ui>
index 3ef3d724a0a06e6005df48cb5dc8b169f2f4535b..bbdf4704b123da2148257184df6812d8887545c4 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desCommande.ui'
 #
-# Created: Wed Jul  9 10:11:20 2008
+# Created: Wed Jul 23 12:04:11 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -38,8 +38,8 @@ class Ui_DComm(object):
         self.bHelp.setAutoDefault(True)
         self.bHelp.setObjectName("bHelp")
         self.gridlayout.addWidget(self.bHelp,2,2,1,1)
-        self.LBRegles = QtGui.QTabWidget(DComm)
-        self.LBRegles.setObjectName("LBRegles")
+        self.TWChoix = QtGui.QTabWidget(DComm)
+        self.TWChoix.setObjectName("TWChoix")
         self.MotClef = QtGui.QWidget()
         self.MotClef.setGeometry(QtCore.QRect(0,0,483,372))
         self.MotClef.setObjectName("MotClef")
@@ -55,10 +55,10 @@ class Ui_DComm(object):
         self.LBMCPermis = QtGui.QListWidget(self.MotClef)
         self.LBMCPermis.setGeometry(QtCore.QRect(10,40,211,321))
         self.LBMCPermis.setObjectName("LBMCPermis")
-        self.LB = QtGui.QListWidget(self.MotClef)
-        self.LB.setGeometry(QtCore.QRect(250,40,211,321))
-        self.LB.setObjectName("LB")
-        self.LBRegles.addTab(self.MotClef,"")
+        self.LBRegles = QtGui.QListWidget(self.MotClef)
+        self.LBRegles.setGeometry(QtCore.QRect(250,40,211,321))
+        self.LBRegles.setObjectName("LBRegles")
+        self.TWChoix.addTab(self.MotClef,"")
         self.Concept = QtGui.QWidget()
         self.Concept.setGeometry(QtCore.QRect(0,0,483,372))
         self.Concept.setObjectName("Concept")
@@ -86,52 +86,59 @@ class Ui_DComm(object):
         self.typeConcept.setWordWrap(False)
         self.typeConcept.setObjectName("typeConcept")
         self.gridlayout1.addWidget(self.groupBox1,0,0,1,1)
-        self.LBRegles.addTab(self.Concept,"")
+        self.TWChoix.addTab(self.Concept,"")
         self.Commande = QtGui.QWidget()
         self.Commande.setGeometry(QtCore.QRect(0,0,483,372))
         self.Commande.setObjectName("Commande")
+        self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
-        self.textLabel1_4.setGeometry(QtCore.QRect(11,11,291,44))
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.textLabel4 = QtGui.QLabel(self.Commande)
-        self.textLabel4.setGeometry(QtCore.QRect(11,341,457,17))
-        self.textLabel4.setWordWrap(False)
-        self.textLabel4.setObjectName("textLabel4")
-        self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setGeometry(QtCore.QRect(60,60,169,30))
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
-        self.LEFiltre.setObjectName("LEFiltre")
+        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
         self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setGeometry(QtCore.QRect(11,61,50,30))
         self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.RBGroupe = QtGui.QRadioButton(self.Commande)
-        self.RBGroupe.setGeometry(QtCore.QRect(330,60,101,20))
-        self.RBGroupe.setObjectName("RBGroupe")
-        self.RBalpha = QtGui.QRadioButton(self.Commande)
-        self.RBalpha.setGeometry(QtCore.QRect(330,30,120,20))
-        self.RBalpha.setChecked(True)
-        self.RBalpha.setObjectName("RBalpha")
+        self.horizontalLayout.addWidget(self.textLabel6)
+        self.LEFiltre = QtGui.QLineEdit(self.Commande)
+        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setObjectName("LEFiltre")
+        self.horizontalLayout.addWidget(self.LEFiltre)
+        self.BNext = QtGui.QPushButton(self.Commande)
+        self.BNext.setObjectName("BNext")
+        self.horizontalLayout.addWidget(self.BNext)
+        self.gridLayout_2.addLayout(self.horizontalLayout,1,0,1,1)
         self.groupBox = QtGui.QGroupBox(self.Commande)
-        self.groupBox.setGeometry(QtCore.QRect(310,10,141,80))
         self.groupBox.setObjectName("groupBox")
+        self.gridLayout = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout.setObjectName("gridLayout")
+        self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setChecked(True)
+        self.RBalpha.setObjectName("RBalpha")
+        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
+        self.RBGroupe = QtGui.QRadioButton(self.groupBox)
+        self.RBGroupe.setObjectName("RBGroupe")
+        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
+        self.gridLayout_2.addWidget(self.groupBox,0,1,2,1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
-        self.LBNouvCommande.setGeometry(QtCore.QRect(5,101,471,231))
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.pushButton = QtGui.QPushButton(self.Commande)
-        self.pushButton.setGeometry(QtCore.QRect(233,60,71,27))
-        self.pushButton.setObjectName("pushButton")
-        self.LBRegles.addTab(self.Commande,"")
-        self.gridlayout.addWidget(self.LBRegles,0,0,1,3)
+        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,2)
+        self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setWordWrap(False)
+        self.textLabel4.setObjectName("textLabel4")
+        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,2)
+        self.TWChoix.addTab(self.Commande,"")
+        self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
 
         self.retranslateUi(DComm)
-        self.LBRegles.setCurrentIndex(0)
+        self.TWChoix.setCurrentIndex(0)
+        QtCore.QMetaObject.connectSlotsByName(DComm)
         DComm.setTabOrder(self.LEFiltre,self.LENomConcept)
-        DComm.setTabOrder(self.LENomConcept,self.LBRegles)
-        DComm.setTabOrder(self.LBRegles,self.RBalpha)
-        DComm.setTabOrder(self.RBalpha,self.LBNouvCommande)
+        DComm.setTabOrder(self.LENomConcept,self.TWChoix)
+        DComm.setTabOrder(self.TWChoix,self.LBNouvCommande)
         DComm.setTabOrder(self.LBNouvCommande,self.bOk)
         DComm.setTabOrder(self.bOk,self.bSup)
         DComm.setTabOrder(self.bSup,self.bHelp)
@@ -149,21 +156,21 @@ class Ui_DComm(object):
         self.bHelp.setShortcut(QtGui.QApplication.translate("DComm", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1.setText(QtGui.QApplication.translate("DComm", "<h3><p align=\"center\"><u><b>Mots Clefs Permis</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_2.setText(QtGui.QApplication.translate("DComm", "<h3><p align=\"center\"><u><b>Règles</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
-        self.LBRegles.setTabText(self.LBRegles.indexOf(self.MotClef), QtGui.QApplication.translate("DComm", "Ajouter Mot-Clef", None, QtGui.QApplication.UnicodeUTF8))
+        self.TWChoix.setTabText(self.TWChoix.indexOf(self.MotClef), QtGui.QApplication.translate("DComm", "Ajouter Mot-Clef", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox1.setTitle(QtGui.QApplication.translate("DComm", "Concept", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_3.setText(QtGui.QApplication.translate("DComm", "<u>Nom du concept :</u>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_3_2.setText(QtGui.QApplication.translate("DComm", "<u>Type du concept :</u>", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel3.setText(QtGui.QApplication.translate("DComm", "L\'opérateur retourne un concept de type :", None, QtGui.QApplication.UnicodeUTF8))
         self.typeConcept.setText(QtGui.QApplication.translate("DComm", "TypeDuConcept", None, QtGui.QApplication.UnicodeUTF8))
-        self.LBRegles.setTabText(self.LBRegles.indexOf(self.Concept), QtGui.QApplication.translate("DComm", "Nommer Concept", None, QtGui.QApplication.UnicodeUTF8))
+        self.TWChoix.setTabText(self.TWChoix.indexOf(self.Concept), QtGui.QApplication.translate("DComm", "Nommer Concept", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DComm", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel4.setText(QtGui.QApplication.translate("DComm", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel6.setText(QtGui.QApplication.translate("DComm", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBGroupe.setText(QtGui.QApplication.translate("DComm", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBalpha.setText(QtGui.QApplication.translate("DComm", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
+        self.BNext.setText(QtGui.QApplication.translate("DComm", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("DComm", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButton.setText(QtGui.QApplication.translate("DComm", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
-        self.LBRegles.setTabText(self.LBRegles.indexOf(self.Commande), QtGui.QApplication.translate("DComm", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBalpha.setText(QtGui.QApplication.translate("DComm", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBGroupe.setText(QtGui.QApplication.translate("DComm", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel4.setText(QtGui.QApplication.translate("DComm", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
+        self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DComm", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
 
 
 if __name__ == "__main__":
index eb82bfab134cc030f2db67bbced48eeba28e8034..ef5fd5c995832d9152cb1a7889e38da3c34d00bd 100644 (file)
     </widget>
    </item>
    <item row="0" column="0" colspan="3" >
-    <widget class="QTabWidget" name="LBRegles" >
+    <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
       <number>0</number>
      </property>
         </rect>
        </property>
       </widget>
-      <widget class="QListWidget" name="LB" >
+      <widget class="QListWidget" name="LBRegles" >
        <property name="geometry" >
         <rect>
          <x>250</x>
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
-      <widget class="QLabel" name="textLabel1_4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>11</y>
-         <width>291</width>
-         <height>44</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>341</y>
-         <width>457</width>
-         <height>17</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>La commande choisie sera ajoutée APRES la commande courante</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="LEFiltre" >
-       <property name="geometry" >
-        <rect>
-         <x>60</x>
-         <y>60</y>
-         <width>169</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>160</width>
-         <height>30</height>
-        </size>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel6" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>61</y>
-         <width>50</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>50</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="text" >
-        <string>Filtre</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBGroupe" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>60</y>
-         <width>101</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>par groupe</string>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBalpha" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>30</y>
-         <width>120</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>alphabétique</string>
-       </property>
-       <property name="checked" >
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QGroupBox" name="groupBox" >
-       <property name="geometry" >
-        <rect>
-         <x>310</x>
-         <y>10</y>
-         <width>141</width>
-         <height>80</height>
-        </rect>
-       </property>
-       <property name="title" >
-        <string>Affichage</string>
-       </property>
-      </widget>
-      <widget class="QListWidget" name="LBNouvCommande" >
-       <property name="geometry" >
-        <rect>
-         <x>5</x>
-         <y>101</y>
-         <width>471</width>
-         <height>231</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QPushButton" name="pushButton" >
-       <property name="geometry" >
-        <rect>
-         <x>233</x>
-         <y>60</y>
-         <width>71</width>
-         <height>27</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>Suivant</string>
-       </property>
-      </widget>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textLabel1_4" >
+         <property name="text" >
+          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <layout class="QHBoxLayout" name="horizontalLayout" >
+         <item>
+          <widget class="QLabel" name="textLabel6" >
+           <property name="minimumSize" >
+            <size>
+             <width>50</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="text" >
+            <string>Filtre</string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="LEFiltre" >
+           <property name="minimumSize" >
+            <size>
+             <width>160</width>
+             <height>30</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="BNext" >
+           <property name="text" >
+            <string>Suivant</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item rowspan="2" row="0" column="1" >
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Affichage</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout" >
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="RBalpha" >
+            <property name="text" >
+             <string>alphabétique</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QRadioButton" name="RBGroupe" >
+            <property name="text" >
+             <string>par groupe</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2" >
+        <widget class="QListWidget" name="LBNouvCommande" />
+       </item>
+       <item row="3" column="0" colspan="2" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="text" >
+          <string>La commande choisie sera ajoutée APRES la commande courante</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
   </layout>
-  <zorder>Commentaire</zorder>
-  <zorder>bOk</zorder>
-  <zorder>bSup</zorder>
-  <zorder>bHelp</zorder>
-  <zorder>listWidget</zorder>
-  <zorder>LBRegles</zorder>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>LEFiltre</tabstop>
   <tabstop>LENomConcept</tabstop>
-  <tabstop>LBRegles</tabstop>
-  <tabstop>RBalpha</tabstop>
+  <tabstop>TWChoix</tabstop>
   <tabstop>LBNouvCommande</tabstop>
   <tabstop>bOk</tabstop>
   <tabstop>bSup</tabstop>
   <tabstop>bHelp</tabstop>
  </tabstops>
  <resources/>
+ <connections/>
 </ui>
index d2876c59edc618083a11eff200b811fea3bf46ff..d4b7a5e4005adc60b636444473be5f38e30c9e3b 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desCommentaire.ui'
 #
-# Created: Wed Jul  9 10:11:20 2008
+# Created: Wed Jul 23 12:00:45 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -52,47 +52,50 @@ class Ui_DComment(object):
         self.Commande = QtGui.QWidget()
         self.Commande.setGeometry(QtCore.QRect(0,0,483,371))
         self.Commande.setObjectName("Commande")
+        self.gridLayout_4 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_4.setObjectName("gridLayout_4")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
-        self.textLabel1_4.setGeometry(QtCore.QRect(11,11,291,44))
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.textLabel4 = QtGui.QLabel(self.Commande)
-        self.textLabel4.setGeometry(QtCore.QRect(11,341,457,17))
-        self.textLabel4.setWordWrap(False)
-        self.textLabel4.setObjectName("textLabel4")
+        self.gridLayout_4.addWidget(self.textLabel1_4,0,0,1,3)
+        self.groupBox = QtGui.QGroupBox(self.Commande)
+        self.groupBox.setObjectName("groupBox")
+        self.gridLayout_3 = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout_3.setObjectName("gridLayout_3")
+        self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setChecked(True)
+        self.RBalpha.setObjectName("RBalpha")
+        self.gridLayout_3.addWidget(self.RBalpha,0,0,1,1)
+        self.RBGroupe = QtGui.QRadioButton(self.groupBox)
+        self.RBGroupe.setObjectName("RBGroupe")
+        self.gridLayout_3.addWidget(self.RBGroupe,1,0,1,1)
+        self.gridLayout_4.addWidget(self.groupBox,0,3,2,1)
+        self.textLabel6_2 = QtGui.QLabel(self.Commande)
+        self.textLabel6_2.setMinimumSize(QtCore.QSize(50,30))
+        self.textLabel6_2.setWordWrap(False)
+        self.textLabel6_2.setObjectName("textLabel6_2")
+        self.gridLayout_4.addWidget(self.textLabel6_2,1,0,1,1)
         self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setGeometry(QtCore.QRect(60,60,169,30))
         self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
         self.LEFiltre.setObjectName("LEFiltre")
-        self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setGeometry(QtCore.QRect(11,61,50,30))
-        self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
-        self.textLabel6.setWordWrap(False)
-        self.textLabel6.setObjectName("textLabel6")
-        self.RBGroupe = QtGui.QRadioButton(self.Commande)
-        self.RBGroupe.setGeometry(QtCore.QRect(330,60,101,20))
-        self.RBGroupe.setObjectName("RBGroupe")
-        self.RBalpha = QtGui.QRadioButton(self.Commande)
-        self.RBalpha.setGeometry(QtCore.QRect(330,30,120,20))
-        self.RBalpha.setChecked(True)
-        self.RBalpha.setObjectName("RBalpha")
-        self.groupBox = QtGui.QGroupBox(self.Commande)
-        self.groupBox.setGeometry(QtCore.QRect(310,10,141,80))
-        self.groupBox.setObjectName("groupBox")
+        self.gridLayout_4.addWidget(self.LEFiltre,1,1,1,1)
+        self.BNext = QtGui.QPushButton(self.Commande)
+        self.BNext.setObjectName("BNext")
+        self.gridLayout_4.addWidget(self.BNext,1,2,1,1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
-        self.LBNouvCommande.setGeometry(QtCore.QRect(5,101,471,231))
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.pushButton = QtGui.QPushButton(self.Commande)
-        self.pushButton.setGeometry(QtCore.QRect(233,60,71,27))
-        self.pushButton.setObjectName("pushButton")
+        self.gridLayout_4.addWidget(self.LBNouvCommande,2,0,1,4)
+        self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setWordWrap(False)
+        self.textLabel4.setObjectName("textLabel4")
+        self.gridLayout_4.addWidget(self.textLabel4,3,0,1,4)
         self.TWChoix.addTab(self.Commande,"")
         self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
 
         self.retranslateUi(DComment)
-        self.TWChoix.setCurrentIndex(1)
-        DComment.setTabOrder(self.LEFiltre,self.TWChoix)
-        DComment.setTabOrder(self.TWChoix,self.RBalpha)
-        DComment.setTabOrder(self.RBalpha,self.bOk)
+        self.TWChoix.setCurrentIndex(0)
+        QtCore.QMetaObject.connectSlotsByName(DComment)
+        DComment.setTabOrder(self.TWChoix,self.bOk)
         DComment.setTabOrder(self.bOk,self.bSup)
         DComment.setTabOrder(self.bSup,self.bHelp)
 
@@ -109,12 +112,12 @@ class Ui_DComment(object):
         self.bHelp.setShortcut(QtGui.QApplication.translate("DComment", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Valeur_Parametre), QtGui.QApplication.translate("DComment", "Commentaire", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DComment", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel4.setText(QtGui.QApplication.translate("DComment", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel6.setText(QtGui.QApplication.translate("DComment", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBGroupe.setText(QtGui.QApplication.translate("DComment", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBalpha.setText(QtGui.QApplication.translate("DComment", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("DComment", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButton.setText(QtGui.QApplication.translate("DComment", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBalpha.setText(QtGui.QApplication.translate("DComment", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBGroupe.setText(QtGui.QApplication.translate("DComment", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel6_2.setText(QtGui.QApplication.translate("DComment", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
+        self.BNext.setText(QtGui.QApplication.translate("DComment", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel4.setText(QtGui.QApplication.translate("DComment", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DComment", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
 
 
index 2ce0857608e35bb2318694fbebf305b5335fa403..1202e7b5d1da37eb25de8e1da45900dbe70c9618 100644 (file)
    <item row="0" column="0" colspan="3" >
     <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="Valeur_Parametre" >
       <property name="geometry" >
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
-      <widget class="QLabel" name="textLabel1_4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>11</y>
-         <width>291</width>
-         <height>44</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>341</y>
-         <width>457</width>
-         <height>17</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>La commande choisie sera ajoutée APRES la commande courante</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="LEFiltre" >
-       <property name="geometry" >
-        <rect>
-         <x>60</x>
-         <y>60</y>
-         <width>169</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>160</width>
-         <height>30</height>
-        </size>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel6" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>61</y>
-         <width>50</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>50</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="text" >
-        <string>Filtre</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBGroupe" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>60</y>
-         <width>101</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>par groupe</string>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBalpha" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>30</y>
-         <width>120</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>alphabétique</string>
-       </property>
-       <property name="checked" >
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QGroupBox" name="groupBox" >
-       <property name="geometry" >
-        <rect>
-         <x>310</x>
-         <y>10</y>
-         <width>141</width>
-         <height>80</height>
-        </rect>
-       </property>
-       <property name="title" >
-        <string>Affichage</string>
-       </property>
-      </widget>
-      <widget class="QListWidget" name="LBNouvCommande" >
-       <property name="geometry" >
-        <rect>
-         <x>5</x>
-         <y>101</y>
-         <width>471</width>
-         <height>231</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QPushButton" name="pushButton" >
-       <property name="geometry" >
-        <rect>
-         <x>233</x>
-         <y>60</y>
-         <width>71</width>
-         <height>27</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>Suivant</string>
-       </property>
-      </widget>
+      <layout class="QGridLayout" name="gridLayout_4" >
+       <item row="0" column="0" colspan="3" >
+        <widget class="QLabel" name="textLabel1_4" >
+         <property name="text" >
+          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item rowspan="2" row="0" column="3" >
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Affichage</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3" >
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="RBalpha" >
+            <property name="text" >
+             <string>alphabétique</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QRadioButton" name="RBGroupe" >
+            <property name="text" >
+             <string>par groupe</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="textLabel6_2" >
+         <property name="minimumSize" >
+          <size>
+           <width>50</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>Filtre</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QLineEdit" name="LEFiltre" >
+         <property name="minimumSize" >
+          <size>
+           <width>160</width>
+           <height>30</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2" >
+        <widget class="QPushButton" name="BNext" >
+         <property name="text" >
+          <string>Suivant</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="4" >
+        <widget class="QListWidget" name="LBNouvCommande" />
+       </item>
+       <item row="3" column="0" colspan="4" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="text" >
+          <string>La commande choisie sera ajoutée APRES la commande courante</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
-  <tabstop>LEFiltre</tabstop>
   <tabstop>TWChoix</tabstop>
-  <tabstop>RBalpha</tabstop>
   <tabstop>bOk</tabstop>
   <tabstop>bSup</tabstop>
   <tabstop>bHelp</tabstop>
  </tabstops>
  <resources/>
+ <connections/>
 </ui>
index 6f29672df4f25ef013c6de157b9d72eb947b5dea..2ac2323d2563104608054e37a702bad872a2093f 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desFormule.ui'
 #
-# Created: Wed Jul  9 10:11:21 2008
+# Created: Wed Jul 23 11:43:53 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -106,39 +106,46 @@ class Ui_DFormule(object):
         self.Commande = QtGui.QWidget()
         self.Commande.setGeometry(QtCore.QRect(0,0,507,384))
         self.Commande.setObjectName("Commande")
+        self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
-        self.textLabel1_4.setGeometry(QtCore.QRect(11,11,291,44))
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.textLabel4 = QtGui.QLabel(self.Commande)
-        self.textLabel4.setGeometry(QtCore.QRect(11,341,457,17))
-        self.textLabel4.setWordWrap(False)
-        self.textLabel4.setObjectName("textLabel4")
-        self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setGeometry(QtCore.QRect(60,60,169,30))
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
-        self.LEFiltre.setObjectName("LEFiltre")
+        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,1)
+        self.groupBox = QtGui.QGroupBox(self.Commande)
+        self.groupBox.setObjectName("groupBox")
+        self.gridLayout = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout.setObjectName("gridLayout")
+        self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setChecked(True)
+        self.RBalpha.setObjectName("RBalpha")
+        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
+        self.RBGroupe = QtGui.QRadioButton(self.groupBox)
+        self.RBGroupe.setObjectName("RBGroupe")
+        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
+        self.gridLayout_2.addWidget(self.groupBox,0,1,2,1)
+        self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
         self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setGeometry(QtCore.QRect(11,61,50,30))
         self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.RBGroupe = QtGui.QRadioButton(self.Commande)
-        self.RBGroupe.setGeometry(QtCore.QRect(330,60,101,20))
-        self.RBGroupe.setObjectName("RBGroupe")
-        self.RBalpha = QtGui.QRadioButton(self.Commande)
-        self.RBalpha.setGeometry(QtCore.QRect(330,30,120,20))
-        self.RBalpha.setChecked(True)
-        self.RBalpha.setObjectName("RBalpha")
-        self.groupBox = QtGui.QGroupBox(self.Commande)
-        self.groupBox.setGeometry(QtCore.QRect(310,10,141,80))
-        self.groupBox.setObjectName("groupBox")
+        self.horizontalLayout.addWidget(self.textLabel6)
+        self.LEFiltre = QtGui.QLineEdit(self.Commande)
+        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setObjectName("LEFiltre")
+        self.horizontalLayout.addWidget(self.LEFiltre)
+        self.BNext = QtGui.QPushButton(self.Commande)
+        self.BNext.setObjectName("BNext")
+        self.horizontalLayout.addWidget(self.BNext)
+        self.gridLayout_2.addLayout(self.horizontalLayout,1,0,1,1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
-        self.LBNouvCommande.setGeometry(QtCore.QRect(5,101,471,231))
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.pushButton = QtGui.QPushButton(self.Commande)
-        self.pushButton.setGeometry(QtCore.QRect(233,60,71,27))
-        self.pushButton.setObjectName("pushButton")
+        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,2)
+        self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setWordWrap(False)
+        self.textLabel4.setObjectName("textLabel4")
+        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,2)
         self.TWChoix.addTab(self.Commande,"")
         self.gridlayout.addWidget(self.TWChoix,0,0,1,1)
 
@@ -180,12 +187,12 @@ class Ui_DFormule(object):
         self.textLabel1_2.setText(QtGui.QApplication.translate("DFormule", "<h3><p align=\"center\"><u><b>Arguments</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Formule), QtGui.QApplication.translate("DFormule", "Définition Formule", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DFormule", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel4.setText(QtGui.QApplication.translate("DFormule", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel6.setText(QtGui.QApplication.translate("DFormule", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBGroupe.setText(QtGui.QApplication.translate("DFormule", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBalpha.setText(QtGui.QApplication.translate("DFormule", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("DFormule", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButton.setText(QtGui.QApplication.translate("DFormule", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBalpha.setText(QtGui.QApplication.translate("DFormule", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBGroupe.setText(QtGui.QApplication.translate("DFormule", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel6.setText(QtGui.QApplication.translate("DFormule", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
+        self.BNext.setText(QtGui.QApplication.translate("DFormule", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel4.setText(QtGui.QApplication.translate("DFormule", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DFormule", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
 
 
index 922d95edf90263dc2dd158dd9d0f5ec0054f7ea7..e0d4f44a3dd86269794498dd1844491921d9c096 100644 (file)
@@ -276,141 +276,94 @@ valeurs seront effectivement prises en compte</string>
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
-      <widget class="QLabel" name="textLabel1_4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>11</y>
-         <width>291</width>
-         <height>44</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>341</y>
-         <width>457</width>
-         <height>17</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>La commande choisie sera ajoutée APRES la commande courante</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="LEFiltre" >
-       <property name="geometry" >
-        <rect>
-         <x>60</x>
-         <y>60</y>
-         <width>169</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>160</width>
-         <height>30</height>
-        </size>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel6" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>61</y>
-         <width>50</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>50</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="text" >
-        <string>Filtre</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBGroupe" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>60</y>
-         <width>101</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>par groupe</string>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBalpha" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>30</y>
-         <width>120</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>alphabétique</string>
-       </property>
-       <property name="checked" >
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QGroupBox" name="groupBox" >
-       <property name="geometry" >
-        <rect>
-         <x>310</x>
-         <y>10</y>
-         <width>141</width>
-         <height>80</height>
-        </rect>
-       </property>
-       <property name="title" >
-        <string>Affichage</string>
-       </property>
-      </widget>
-      <widget class="QListWidget" name="LBNouvCommande" >
-       <property name="geometry" >
-        <rect>
-         <x>5</x>
-         <y>101</y>
-         <width>471</width>
-         <height>231</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QPushButton" name="pushButton" >
-       <property name="geometry" >
-        <rect>
-         <x>233</x>
-         <y>60</y>
-         <width>71</width>
-         <height>27</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>Suivant</string>
-       </property>
-      </widget>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="textLabel1_4" >
+         <property name="text" >
+          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item rowspan="2" row="0" column="1" >
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Affichage</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout" >
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="RBalpha" >
+            <property name="text" >
+             <string>alphabétique</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QRadioButton" name="RBGroupe" >
+            <property name="text" >
+             <string>par groupe</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <layout class="QHBoxLayout" name="horizontalLayout" >
+         <item>
+          <widget class="QLabel" name="textLabel6" >
+           <property name="minimumSize" >
+            <size>
+             <width>50</width>
+             <height>30</height>
+            </size>
+           </property>
+           <property name="text" >
+            <string>Filtre</string>
+           </property>
+           <property name="wordWrap" >
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="LEFiltre" >
+           <property name="minimumSize" >
+            <size>
+             <width>160</width>
+             <height>30</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="BNext" >
+           <property name="text" >
+            <string>Suivant</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="0" colspan="2" >
+        <widget class="QListWidget" name="LBNouvCommande" />
+       </item>
+       <item row="3" column="0" colspan="2" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="text" >
+          <string>La commande choisie sera ajoutée APRES la commande courante</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
index 3eb4c70dc4ad0dae27ccf8ff0f8086cd44a9d89e..aeadffda1f844ddd9458eff84ca52eacc616c70b 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desInclude.ui'
 #
-# Created: Wed Jul  9 10:11:21 2008
+# Created: Wed Jul 23 11:48:02 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -43,7 +43,7 @@ class Ui_DInc1(object):
         self.MotClef.setObjectName("MotClef")
         self.gridlayout1 = QtGui.QGridLayout(self.MotClef)
         self.gridlayout1.setObjectName("gridlayout1")
-        self.LBMCPermis = QtGui.QListView(self.MotClef)
+        self.LBMCPermis = QtGui.QListWidget(self.MotClef)
         self.LBMCPermis.setMinimumSize(QtCore.QSize(0,0))
         self.LBMCPermis.setObjectName("LBMCPermis")
         self.gridlayout1.addWidget(self.LBMCPermis,1,0,1,1)
@@ -52,7 +52,7 @@ class Ui_DInc1(object):
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
         self.gridlayout1.addWidget(self.textLabel1,0,0,1,1)
-        self.LBRegles = QtGui.QListView(self.MotClef)
+        self.LBRegles = QtGui.QListWidget(self.MotClef)
         self.LBRegles.setObjectName("LBRegles")
         self.gridlayout1.addWidget(self.LBRegles,1,1,1,1)
         self.textLabel1_2 = QtGui.QLabel(self.MotClef)
@@ -63,39 +63,43 @@ class Ui_DInc1(object):
         self.Commande = QtGui.QWidget()
         self.Commande.setGeometry(QtCore.QRect(0,0,499,400))
         self.Commande.setObjectName("Commande")
+        self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
-        self.textLabel1_4.setGeometry(QtCore.QRect(11,11,291,44))
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.textLabel4 = QtGui.QLabel(self.Commande)
-        self.textLabel4.setGeometry(QtCore.QRect(11,341,457,17))
-        self.textLabel4.setWordWrap(False)
-        self.textLabel4.setObjectName("textLabel4")
-        self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setGeometry(QtCore.QRect(60,60,169,30))
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
-        self.LEFiltre.setObjectName("LEFiltre")
+        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,3)
+        self.groupBox = QtGui.QGroupBox(self.Commande)
+        self.groupBox.setObjectName("groupBox")
+        self.gridLayout = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout.setObjectName("gridLayout")
+        self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setChecked(True)
+        self.RBalpha.setObjectName("RBalpha")
+        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
+        self.RBGroupe = QtGui.QRadioButton(self.groupBox)
+        self.RBGroupe.setObjectName("RBGroupe")
+        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
+        self.gridLayout_2.addWidget(self.groupBox,0,3,2,1)
         self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setGeometry(QtCore.QRect(11,61,50,30))
         self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.RBGroupe = QtGui.QRadioButton(self.Commande)
-        self.RBGroupe.setGeometry(QtCore.QRect(330,60,101,20))
-        self.RBGroupe.setObjectName("RBGroupe")
-        self.RBalpha = QtGui.QRadioButton(self.Commande)
-        self.RBalpha.setGeometry(QtCore.QRect(330,30,120,20))
-        self.RBalpha.setChecked(True)
-        self.RBalpha.setObjectName("RBalpha")
-        self.groupBox = QtGui.QGroupBox(self.Commande)
-        self.groupBox.setGeometry(QtCore.QRect(310,10,141,80))
-        self.groupBox.setObjectName("groupBox")
+        self.gridLayout_2.addWidget(self.textLabel6,1,0,1,1)
+        self.LEFiltre = QtGui.QLineEdit(self.Commande)
+        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setObjectName("LEFiltre")
+        self.gridLayout_2.addWidget(self.LEFiltre,1,1,1,1)
+        self.BNext = QtGui.QPushButton(self.Commande)
+        self.BNext.setObjectName("BNext")
+        self.gridLayout_2.addWidget(self.BNext,1,2,1,1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
-        self.LBNouvCommande.setGeometry(QtCore.QRect(5,101,471,231))
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.pushButton = QtGui.QPushButton(self.Commande)
-        self.pushButton.setGeometry(QtCore.QRect(233,60,71,27))
-        self.pushButton.setObjectName("pushButton")
+        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,4)
+        self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setWordWrap(False)
+        self.textLabel4.setObjectName("textLabel4")
+        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,4)
         self.TWChoix.addTab(self.Commande,"")
         self.TabPage = QtGui.QWidget()
         self.TabPage.setGeometry(QtCore.QRect(0,0,499,400))
@@ -143,7 +147,7 @@ class Ui_DInc1(object):
         self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
 
         self.retranslateUi(DInc1)
-        self.TWChoix.setCurrentIndex(0)
+        self.TWChoix.setCurrentIndex(2)
         QtCore.QMetaObject.connectSlotsByName(DInc1)
         DInc1.setTabOrder(self.LEFiltre,self.LENomFichier)
         DInc1.setTabOrder(self.LENomFichier,self.bHelp)
@@ -172,12 +176,12 @@ class Ui_DInc1(object):
         self.textLabel1_2.setText(QtGui.QApplication.translate("DInc1", "<h3><p align=\"center\"><u><b>Régles</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.MotClef), QtGui.QApplication.translate("DInc1", "Ajouter Mot-Clef", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DInc1", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel4.setText(QtGui.QApplication.translate("DInc1", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel6.setText(QtGui.QApplication.translate("DInc1", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBGroupe.setText(QtGui.QApplication.translate("DInc1", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBalpha.setText(QtGui.QApplication.translate("DInc1", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("DInc1", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButton.setText(QtGui.QApplication.translate("DInc1", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBalpha.setText(QtGui.QApplication.translate("DInc1", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBGroupe.setText(QtGui.QApplication.translate("DInc1", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel6.setText(QtGui.QApplication.translate("DInc1", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
+        self.BNext.setText(QtGui.QApplication.translate("DInc1", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel4.setText(QtGui.QApplication.translate("DInc1", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DInc1", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_3.setText(QtGui.QApplication.translate("DInc1", "<font size=\"+1\">La commande INCLUDE requiert un nom de Fichier :</font>", None, QtGui.QApplication.UnicodeUTF8))
         self.BBrowse.setText(QtGui.QApplication.translate("DInc1", "Edit", None, QtGui.QApplication.UnicodeUTF8))
index 79f9df38865a50a8980c30fb5599ac78584fd783..e0ac6469d9beb6fe75c6115d25d38a9f960ace62 100644 (file)
    <item row="0" column="0" colspan="3" >
     <widget class="QTabWidget" name="TWChoix" >
      <property name="currentIndex" >
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="MotClef" >
       <property name="geometry" >
       </attribute>
       <layout class="QGridLayout" >
        <item row="1" column="0" >
-        <widget class="QListView" name="LBMCPermis" >
+        <widget class="QListWidget" name="LBMCPermis" >
          <property name="minimumSize" >
           <size>
            <width>0</width>
         </widget>
        </item>
        <item row="1" column="1" >
-        <widget class="QListView" name="LBRegles" />
+        <widget class="QListWidget" name="LBRegles" />
        </item>
        <item row="0" column="1" >
         <widget class="QLabel" name="textLabel1_2" >
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
-      <widget class="QLabel" name="textLabel1_4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>11</y>
-         <width>291</width>
-         <height>44</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>341</y>
-         <width>457</width>
-         <height>17</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>La commande choisie sera ajoutée APRES la commande courante</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="LEFiltre" >
-       <property name="geometry" >
-        <rect>
-         <x>60</x>
-         <y>60</y>
-         <width>169</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>160</width>
-         <height>30</height>
-        </size>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel6" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>61</y>
-         <width>50</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>50</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="text" >
-        <string>Filtre</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBGroupe" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>60</y>
-         <width>101</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>par groupe</string>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBalpha" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>30</y>
-         <width>120</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>alphabétique</string>
-       </property>
-       <property name="checked" >
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QGroupBox" name="groupBox" >
-       <property name="geometry" >
-        <rect>
-         <x>310</x>
-         <y>10</y>
-         <width>141</width>
-         <height>80</height>
-        </rect>
-       </property>
-       <property name="title" >
-        <string>Affichage</string>
-       </property>
-      </widget>
-      <widget class="QListWidget" name="LBNouvCommande" >
-       <property name="geometry" >
-        <rect>
-         <x>5</x>
-         <y>101</y>
-         <width>471</width>
-         <height>231</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QPushButton" name="pushButton" >
-       <property name="geometry" >
-        <rect>
-         <x>233</x>
-         <y>60</y>
-         <width>71</width>
-         <height>27</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>Suivant</string>
-       </property>
-      </widget>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" colspan="3" >
+        <widget class="QLabel" name="textLabel1_4" >
+         <property name="text" >
+          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item rowspan="2" row="0" column="3" >
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Affichage</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout" >
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="RBalpha" >
+            <property name="text" >
+             <string>alphabétique</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QRadioButton" name="RBGroupe" >
+            <property name="text" >
+             <string>par groupe</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="textLabel6" >
+         <property name="minimumSize" >
+          <size>
+           <width>50</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>Filtre</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QLineEdit" name="LEFiltre" >
+         <property name="minimumSize" >
+          <size>
+           <width>160</width>
+           <height>30</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2" >
+        <widget class="QPushButton" name="BNext" >
+         <property name="text" >
+          <string>Suivant</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="4" >
+        <widget class="QListWidget" name="LBNouvCommande" />
+       </item>
+       <item row="3" column="0" colspan="4" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="text" >
+          <string>La commande choisie sera ajoutée APRES la commande courante</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
      <widget class="QWidget" name="TabPage" >
       <property name="geometry" >
index e4c65e499c216f8415f5eaae43a6d36ac55e1921..ade7e63ba3135d0af15c3616d4c8d8130ba41722 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desListeParam.ui'
 #
-# Created: Wed Jul  9 10:11:21 2008
+# Created: Fri Jul 18 16:24:34 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -15,7 +15,7 @@ class Ui_DLisParam(object):
         DLisParam.resize(413,394)
         self.gridlayout = QtGui.QGridLayout(DLisParam)
         self.gridlayout.setObjectName("gridlayout")
-        self.LBParam = QtGui.QListView(DLisParam)
+        self.LBParam = QtGui.QListWidget(DLisParam)
         self.LBParam.setObjectName("LBParam")
         self.gridlayout.addWidget(self.LBParam,0,0,1,1)
 
index 2c3b36c1a35eb847a4d34019e3dba5a0e0829090..0e3a9fe3c65fe243ca7e754270316f184061fd10 100644 (file)
@@ -17,7 +17,7 @@
     </property>
     <layout class="QGridLayout" >
       <item row="0" column="0" >
-        <widget class="QListView" name="LBParam" />
+        <widget class="QListWidget" name="LBParam" />
       </item>
     </layout>
   </widget>
index 9b82a7306f18fdce25615c414d8e3fdcc9a8c9e2..ede8054900aa6180ce80f88872d02ee0e548e360 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desMCFact.ui'
 #
-# Created: Wed Jul  9 10:11:21 2008
+# Created: Fri Jul 18 16:24:34 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -27,11 +27,11 @@ class Ui_DMCFact(object):
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
         self.gridlayout1.addWidget(self.textLabel1,0,0,1,1)
-        self.LBMCPermis = QtGui.QListView(self.MotClef)
+        self.LBMCPermis = QtGui.QListWidget(self.MotClef)
         self.LBMCPermis.setMinimumSize(QtCore.QSize(0,0))
         self.LBMCPermis.setObjectName("LBMCPermis")
         self.gridlayout1.addWidget(self.LBMCPermis,1,0,1,1)
-        self.LBRegles = QtGui.QListView(self.MotClef)
+        self.LBRegles = QtGui.QListWidget(self.MotClef)
         self.LBRegles.setObjectName("LBRegles")
         self.gridlayout1.addWidget(self.LBRegles,1,1,1,1)
         self.textLabel1_2 = QtGui.QLabel(self.MotClef)
index 12819de4a0d28e3ee296c94be1f967ae875b6193..8eb9080d2587f9dd765b1436742daa930a715b33 100644 (file)
@@ -46,7 +46,7 @@
                 </widget>
               </item>
               <item row="1" column="0" >
-                <widget class="QListView" name="LBMCPermis" >
+                <widget class="QListWidget" name="LBMCPermis" >
                   <property name="minimumSize" >
                     <size>
                       <width>0</width>
@@ -56,7 +56,7 @@
                 </widget>
               </item>
               <item row="1" column="1" >
-                <widget class="QListView" name="LBRegles" />
+                <widget class="QListWidget" name="LBRegles" />
               </item>
               <item row="0" column="1" >
                 <widget class="QLabel" name="textLabel1_2" >
index cdda24382f8c8f9ff2b3fac807b4962bf2d14ebc..398bdb1a0b64b26b3209ecda5395c8ccd500630e 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desParam.ui'
 #
-# Created: Wed Jul  9 10:11:21 2008
+# Created: Wed Jul 23 11:49:56 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -25,6 +25,7 @@ class Ui_DParam(object):
         self.TWChoix = QtGui.QTabWidget(DParam)
         self.TWChoix.setObjectName("TWChoix")
         self.Valeur_Parametre = QtGui.QWidget()
+        self.Valeur_Parametre.setGeometry(QtCore.QRect(0,0,483,372))
         self.Valeur_Parametre.setObjectName("Valeur_Parametre")
         self.textLabel2_2_2 = QtGui.QLabel(self.Valeur_Parametre)
         self.textLabel2_2_2.setGeometry(QtCore.QRect(80,11,231,89))
@@ -56,64 +57,67 @@ class Ui_DParam(object):
         self.lineEditVal.setObjectName("lineEditVal")
         self.TWChoix.addTab(self.Valeur_Parametre,"")
         self.Commande = QtGui.QWidget()
-        self.Commande.setGeometry(QtCore.QRect(0,0,483,371))
+        self.Commande.setGeometry(QtCore.QRect(0,0,483,372))
         self.Commande.setObjectName("Commande")
+        self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
-        self.textLabel1_4.setGeometry(QtCore.QRect(11,11,291,44))
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.textLabel4 = QtGui.QLabel(self.Commande)
-        self.textLabel4.setGeometry(QtCore.QRect(11,341,457,17))
-        self.textLabel4.setWordWrap(False)
-        self.textLabel4.setObjectName("textLabel4")
-        self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setGeometry(QtCore.QRect(60,60,169,30))
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
-        self.LEFiltre.setObjectName("LEFiltre")
+        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,3)
+        self.groupBox = QtGui.QGroupBox(self.Commande)
+        self.groupBox.setObjectName("groupBox")
+        self.gridLayout = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout.setObjectName("gridLayout")
+        self.RBGroupe = QtGui.QRadioButton(self.groupBox)
+        self.RBGroupe.setObjectName("RBGroupe")
+        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
+        self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setChecked(True)
+        self.RBalpha.setObjectName("RBalpha")
+        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
+        self.gridLayout_2.addWidget(self.groupBox,0,3,2,1)
         self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setGeometry(QtCore.QRect(11,61,50,30))
         self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.RBGroupe = QtGui.QRadioButton(self.Commande)
-        self.RBGroupe.setGeometry(QtCore.QRect(330,60,101,20))
-        self.RBGroupe.setObjectName("RBGroupe")
-        self.RBalpha = QtGui.QRadioButton(self.Commande)
-        self.RBalpha.setGeometry(QtCore.QRect(330,30,120,20))
-        self.RBalpha.setChecked(True)
-        self.RBalpha.setObjectName("RBalpha")
-        self.groupBox = QtGui.QGroupBox(self.Commande)
-        self.groupBox.setGeometry(QtCore.QRect(310,10,141,80))
-        self.groupBox.setObjectName("groupBox")
+        self.gridLayout_2.addWidget(self.textLabel6,1,0,1,1)
+        self.LEFiltre = QtGui.QLineEdit(self.Commande)
+        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setObjectName("LEFiltre")
+        self.gridLayout_2.addWidget(self.LEFiltre,1,1,1,1)
+        self.BNext = QtGui.QPushButton(self.Commande)
+        self.BNext.setObjectName("BNext")
+        self.gridLayout_2.addWidget(self.BNext,1,2,1,1)
         self.LBNouvCommande = QtGui.QListWidget(self.Commande)
-        self.LBNouvCommande.setGeometry(QtCore.QRect(5,101,471,231))
         self.LBNouvCommande.setObjectName("LBNouvCommande")
-        self.pushButton = QtGui.QPushButton(self.Commande)
-        self.pushButton.setGeometry(QtCore.QRect(233,60,71,27))
-        self.pushButton.setObjectName("pushButton")
+        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,4)
+        self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setWordWrap(False)
+        self.textLabel4.setObjectName("textLabel4")
+        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,4)
         self.TWChoix.addTab(self.Commande,"")
         self.gridlayout.addWidget(self.TWChoix,0,0,1,3)
         self.bOk = QtGui.QPushButton(DParam)
         self.bOk.setMinimumSize(QtCore.QSize(0,30))
         self.bOk.setAutoDefault(True)
         self.bOk.setDefault(True)
-        self.bOk.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DParam", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8)))
         self.bOk.setObjectName("bOk")
         self.gridlayout.addWidget(self.bOk,2,1,1,1)
         self.bSup = QtGui.QPushButton(DParam)
         self.bSup.setMinimumSize(QtCore.QSize(0,30))
         self.bSup.setAutoDefault(True)
-        self.bSup.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DParam", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8)))
         self.bSup.setObjectName("bSup")
         self.gridlayout.addWidget(self.bSup,2,0,1,1)
         self.bHelp = QtGui.QPushButton(DParam)
         self.bHelp.setMinimumSize(QtCore.QSize(0,30))
         self.bHelp.setAutoDefault(True)
-        self.bHelp.setProperty("toolTip",QtCore.QVariant(QtGui.QApplication.translate("DParam", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8)))
         self.bHelp.setObjectName("bHelp")
         self.gridlayout.addWidget(self.bHelp,2,2,1,1)
 
         self.retranslateUi(DParam)
+        self.TWChoix.setCurrentIndex(0)
+        QtCore.QMetaObject.connectSlotsByName(DParam)
         DParam.setTabOrder(self.LEFiltre,self.TWChoix)
         DParam.setTabOrder(self.TWChoix,self.lineEditNom)
         DParam.setTabOrder(self.lineEditNom,self.lineEditVal)
@@ -135,17 +139,20 @@ class Ui_DParam(object):
 "appuyé sur  le bouton Valider.", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Valeur_Parametre), QtGui.QApplication.translate("DParam", "Valeur Parametre", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DParam", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel4.setText(QtGui.QApplication.translate("DParam", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel6.setText(QtGui.QApplication.translate("DParam", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
+        self.groupBox.setTitle(QtGui.QApplication.translate("DParam", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
         self.RBGroupe.setText(QtGui.QApplication.translate("DParam", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
         self.RBalpha.setText(QtGui.QApplication.translate("DParam", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox.setTitle(QtGui.QApplication.translate("DParam", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButton.setText(QtGui.QApplication.translate("DParam", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel6.setText(QtGui.QApplication.translate("DParam", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
+        self.BNext.setText(QtGui.QApplication.translate("DParam", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel4.setText(QtGui.QApplication.translate("DParam", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DParam", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
+        self.bOk.setToolTip(QtGui.QApplication.translate("DParam", "validation de la saisie", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setText(QtGui.QApplication.translate("DParam", "&Valider", None, QtGui.QApplication.UnicodeUTF8))
         self.bOk.setShortcut(QtGui.QApplication.translate("DParam", "Shift+A, Alt+A, Alt+A, Alt+A", None, QtGui.QApplication.UnicodeUTF8))
+        self.bSup.setToolTip(QtGui.QApplication.translate("DParam", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
         self.bSup.setText(QtGui.QApplication.translate("DParam", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
         self.bSup.setShortcut(QtGui.QApplication.translate("DParam", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
+        self.bHelp.setToolTip(QtGui.QApplication.translate("DParam", "affichage documentation aster", None, QtGui.QApplication.UnicodeUTF8))
         self.bHelp.setText(QtGui.QApplication.translate("DParam", "&Documentation", None, QtGui.QApplication.UnicodeUTF8))
         self.bHelp.setShortcut(QtGui.QApplication.translate("DParam", "Alt+D", None, QtGui.QApplication.UnicodeUTF8))
 
index 55ec32779b3f375cff624be52e6ad900546add77..a15789c073b09fd3b6c5f3ac5fc0adf05e32cc80 100644 (file)
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>DParam</class>
-  <widget class="QWidget" name="DParam" >
-    <property name="geometry" >
-      <rect>
+<ui version="4.0" >
+ <class>DParam</class>
+ <widget class="QWidget" name="DParam" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>505</width>
+    <height>483</height>
+   </rect>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>505</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle" >
+   <string>DComm</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="1" column="0" colspan="3" >
+    <widget class="QLabel" name="Commentaire" >
+     <property name="frameShape" >
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Plain</enum>
+     </property>
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="3" >
+    <widget class="QTabWidget" name="TWChoix" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="Valeur_Parametre" >
+      <property name="geometry" >
+       <rect>
         <x>0</x>
         <y>0</y>
-        <width>505</width>
-        <height>483</height>
-      </rect>
-    </property>
-    <property name="minimumSize" >
-      <size>
-        <width>505</width>
-        <height>0</height>
-      </size>
-    </property>
-    <property name="windowTitle" >
-      <string>DComm</string>
-    </property>
-    <layout class="QGridLayout" >
-      <item rowspan="1" row="1" column="0" colspan="3" >
-        <widget class="QLabel" name="Commentaire" >
-          <property name="frameShape" >
-            <enum>QFrame::NoFrame</enum>
-          </property>
-          <property name="frameShadow" >
-            <enum>QFrame::Plain</enum>
-          </property>
-          <property name="text" >
-            <string/>
-          </property>
-          <property name="wordWrap" >
-            <bool>false</bool>
-          </property>
-        </widget>
-      </item>
-      <item rowspan="1" row="0" column="0" colspan="3" >
-        <widget class="QTabWidget" name="TWChoix" >
-          <widget class="QWidget" name="Valeur_Parametre" >
-            <attribute name="title" >
-              <string>Valeur Parametre</string>
-            </attribute>
-            <widget class="QLabel" name="textLabel2_2_2" >
-              <property name="geometry" >
-                <rect>
-                  <x>80</x>
-                  <y>11</y>
-                  <width>231</width>
-                  <height>89</height>
-                </rect>
-              </property>
-              <property name="text" >
-                <string>&lt;u>&lt;b>&lt;p align="center">Parametre&lt;/p>&lt;/b>&lt;/u></string>
-              </property>
-              <property name="wordWrap" >
-                <bool>false</bool>
-              </property>
-            </widget>
-            <widget class="QLabel" name="Commentaire_2" >
-              <property name="geometry" >
-                <rect>
-                  <x>11</x>
-                  <y>275</y>
-                  <width>459</width>
-                  <height>89</height>
-                </rect>
-              </property>
-              <property name="text" >
-                <string/>
-              </property>
-              <property name="wordWrap" >
-                <bool>false</bool>
-              </property>
-            </widget>
-            <widget class="QLineEdit" name="lineEditNom" >
-              <property name="geometry" >
-                <rect>
-                  <x>80</x>
-                  <y>106</y>
-                  <width>231</width>
-                  <height>31</height>
-                </rect>
-              </property>
-              <property name="minimumSize" >
-                <size>
-                  <width>231</width>
-                  <height>31</height>
-                </size>
-              </property>
-            </widget>
-            <widget class="QLabel" name="textLabel2_2" >
-              <property name="geometry" >
-                <rect>
-                  <x>11</x>
-                  <y>106</y>
-                  <width>63</width>
-                  <height>31</height>
-                </rect>
-              </property>
-              <property name="text" >
-                <string>&lt;b> Nom: &lt;/b></string>
-              </property>
-              <property name="wordWrap" >
-                <bool>false</bool>
-              </property>
-            </widget>
-            <widget class="QLabel" name="textLabel2" >
-              <property name="geometry" >
-                <rect>
-                  <x>11</x>
-                  <y>143</y>
-                  <width>63</width>
-                  <height>31</height>
-                </rect>
-              </property>
-              <property name="text" >
-                <string>&lt;b> Valeur: &lt;/b></string>
-              </property>
-              <property name="wordWrap" >
-                <bool>false</bool>
-              </property>
-            </widget>
-            <widget class="QLabel" name="Commentaire2" >
-              <property name="geometry" >
-                <rect>
-                  <x>11</x>
-                  <y>180</y>
-                  <width>459</width>
-                  <height>89</height>
-                </rect>
-              </property>
-              <property name="text" >
-                <string>Retour Chariot dans une sone de saisie permet de vérifier la 
+        <width>483</width>
+        <height>372</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Valeur Parametre</string>
+      </attribute>
+      <widget class="QLabel" name="textLabel2_2_2" >
+       <property name="geometry" >
+        <rect>
+         <x>80</x>
+         <y>11</y>
+         <width>231</width>
+         <height>89</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>&lt;u>&lt;b>&lt;p align="center">Parametre&lt;/p>&lt;/b>&lt;/u></string>
+       </property>
+       <property name="wordWrap" >
+        <bool>false</bool>
+       </property>
+      </widget>
+      <widget class="QLabel" name="Commentaire_2" >
+       <property name="geometry" >
+        <rect>
+         <x>11</x>
+         <y>275</y>
+         <width>459</width>
+         <height>89</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="wordWrap" >
+        <bool>false</bool>
+       </property>
+      </widget>
+      <widget class="QLineEdit" name="lineEditNom" >
+       <property name="geometry" >
+        <rect>
+         <x>80</x>
+         <y>106</y>
+         <width>231</width>
+         <height>31</height>
+        </rect>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>231</width>
+         <height>31</height>
+        </size>
+       </property>
+      </widget>
+      <widget class="QLabel" name="textLabel2_2" >
+       <property name="geometry" >
+        <rect>
+         <x>11</x>
+         <y>106</y>
+         <width>63</width>
+         <height>31</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>&lt;b> Nom: &lt;/b></string>
+       </property>
+       <property name="wordWrap" >
+        <bool>false</bool>
+       </property>
+      </widget>
+      <widget class="QLabel" name="textLabel2" >
+       <property name="geometry" >
+        <rect>
+         <x>11</x>
+         <y>143</y>
+         <width>63</width>
+         <height>31</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>&lt;b> Valeur: &lt;/b></string>
+       </property>
+       <property name="wordWrap" >
+        <bool>false</bool>
+       </property>
+      </widget>
+      <widget class="QLabel" name="Commentaire2" >
+       <property name="geometry" >
+        <rect>
+         <x>11</x>
+         <y>180</y>
+         <width>459</width>
+         <height>89</height>
+        </rect>
+       </property>
+       <property name="text" >
+        <string>Retour Chariot dans une sone de saisie permet de vérifier la 
 validité de la valeur saisie.
 
 Les nouvelles valeurs ne seront prises  en compte qu'après avoir 
 appuyé sur  le bouton Valider.</string>
-              </property>
-              <property name="wordWrap" >
-                <bool>false</bool>
-              </property>
-            </widget>
-            <widget class="QLineEdit" name="lineEditVal" >
-              <property name="geometry" >
-                <rect>
-                  <x>80</x>
-                  <y>143</y>
-                  <width>231</width>
-                  <height>31</height>
-                </rect>
-              </property>
-              <property name="minimumSize" >
-                <size>
-                  <width>231</width>
-                  <height>31</height>
-                </size>
-              </property>
-            </widget>
-          </widget>
-          <widget class="QWidget" name="Commande" >
-           <property name="geometry" >
-            <rect>
-             <x>0</x>
-             <y>0</y>
-             <width>483</width>
-             <height>371</height>
-            </rect>
-           </property>
-           <attribute name="title" >
-            <string>Nouvelle Commande</string>
-           </attribute>
-           <widget class="QLabel" name="textLabel1_4" >
-            <property name="geometry" >
-             <rect>
-              <x>11</x>
-              <y>11</y>
-              <width>291</width>
-              <height>44</height>
-             </rect>
-            </property>
-            <property name="text" >
-             <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-            </property>
-            <property name="wordWrap" >
-             <bool>false</bool>
-            </property>
-           </widget>
-           <widget class="QLabel" name="textLabel4" >
-            <property name="geometry" >
-             <rect>
-              <x>11</x>
-              <y>341</y>
-              <width>457</width>
-              <height>17</height>
-             </rect>
-            </property>
-            <property name="text" >
-             <string>La commande choisie sera ajoutée APRES la commande courante</string>
-            </property>
-            <property name="wordWrap" >
-             <bool>false</bool>
-            </property>
-           </widget>
-           <widget class="QLineEdit" name="LEFiltre" >
-            <property name="geometry" >
-             <rect>
-              <x>60</x>
-              <y>60</y>
-              <width>169</width>
-              <height>30</height>
-             </rect>
-            </property>
-            <property name="minimumSize" >
-             <size>
-              <width>160</width>
-              <height>30</height>
-             </size>
-            </property>
-           </widget>
-           <widget class="QLabel" name="textLabel6" >
-            <property name="geometry" >
-             <rect>
-              <x>11</x>
-              <y>61</y>
-              <width>50</width>
-              <height>30</height>
-             </rect>
-            </property>
-            <property name="minimumSize" >
-             <size>
-              <width>50</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="text" >
-             <string>Filtre</string>
-            </property>
-            <property name="wordWrap" >
-             <bool>false</bool>
-            </property>
-           </widget>
+       </property>
+       <property name="wordWrap" >
+        <bool>false</bool>
+       </property>
+      </widget>
+      <widget class="QLineEdit" name="lineEditVal" >
+       <property name="geometry" >
+        <rect>
+         <x>80</x>
+         <y>143</y>
+         <width>231</width>
+         <height>31</height>
+        </rect>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>231</width>
+         <height>31</height>
+        </size>
+       </property>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="Commande" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>483</width>
+        <height>372</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Nouvelle Commande</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" colspan="3" >
+        <widget class="QLabel" name="textLabel1_4" >
+         <property name="text" >
+          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item rowspan="2" row="0" column="3" >
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Affichage</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout" >
+          <item row="1" column="0" >
            <widget class="QRadioButton" name="RBGroupe" >
-            <property name="geometry" >
-             <rect>
-              <x>330</x>
-              <y>60</y>
-              <width>101</width>
-              <height>20</height>
-             </rect>
-            </property>
             <property name="text" >
              <string>par groupe</string>
             </property>
            </widget>
+          </item>
+          <item row="0" column="0" >
            <widget class="QRadioButton" name="RBalpha" >
-            <property name="geometry" >
-             <rect>
-              <x>330</x>
-              <y>30</y>
-              <width>120</width>
-              <height>20</height>
-             </rect>
-            </property>
             <property name="text" >
              <string>alphabétique</string>
             </property>
@@ -272,127 +214,146 @@ appuyé sur  le bouton Valider.</string>
              <bool>true</bool>
             </property>
            </widget>
-           <widget class="QGroupBox" name="groupBox" >
-            <property name="geometry" >
-             <rect>
-              <x>310</x>
-              <y>10</y>
-              <width>141</width>
-              <height>80</height>
-             </rect>
-            </property>
-            <property name="title" >
-             <string>Affichage</string>
-            </property>
-           </widget>
-           <widget class="QListWidget" name="LBNouvCommande" >
-            <property name="geometry" >
-             <rect>
-              <x>5</x>
-              <y>101</y>
-              <width>471</width>
-              <height>231</height>
-             </rect>
-            </property>
-           </widget>
-           <widget class="QPushButton" name="pushButton" >
-            <property name="geometry" >
-             <rect>
-              <x>233</x>
-              <y>60</y>
-              <width>71</width>
-              <height>27</height>
-             </rect>
-            </property>
-            <property name="text" >
-             <string>Suivant</string>
-            </property>
-           </widget>
-          </widget>
+          </item>
+         </layout>
+         <zorder>RBGroupe</zorder>
+         <zorder>RBalpha</zorder>
         </widget>
-      </item>
-      <item row="2" column="1" >
-        <widget class="QPushButton" name="bOk" >
-          <property name="minimumSize" >
-            <size>
-              <width>0</width>
-              <height>30</height>
-            </size>
-          </property>
-          <property name="text" >
-            <string>&amp;Valider</string>
-          </property>
-          <property name="shortcut" >
-            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
-          </property>
-          <property name="autoDefault" >
-            <bool>true</bool>
-          </property>
-          <property name="default" >
-            <bool>true</bool>
-          </property>
-          <property name="toolTip" stdset="0" >
-            <string>validation de la saisie</string>
-          </property>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="textLabel6" >
+         <property name="minimumSize" >
+          <size>
+           <width>50</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>Filtre</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
         </widget>
-      </item>
-      <item row="2" column="0" >
-        <widget class="QPushButton" name="bSup" >
-          <property name="minimumSize" >
-            <size>
-              <width>0</width>
-              <height>30</height>
-            </size>
-          </property>
-          <property name="text" >
-            <string>&amp;Supprimer</string>
-          </property>
-          <property name="shortcut" >
-            <string>Alt+S</string>
-          </property>
-          <property name="autoDefault" >
-            <bool>true</bool>
-          </property>
-          <property name="toolTip" stdset="0" >
-            <string>suppression du mot clef</string>
-          </property>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QLineEdit" name="LEFiltre" >
+         <property name="minimumSize" >
+          <size>
+           <width>160</width>
+           <height>30</height>
+          </size>
+         </property>
         </widget>
-      </item>
-      <item row="2" column="2" >
-        <widget class="QPushButton" name="bHelp" >
-          <property name="minimumSize" >
-            <size>
-              <width>0</width>
-              <height>30</height>
-            </size>
-          </property>
-          <property name="text" >
-            <string>&amp;Documentation</string>
-          </property>
-          <property name="shortcut" >
-            <string>Alt+D</string>
-          </property>
-          <property name="autoDefault" >
-            <bool>true</bool>
-          </property>
-          <property name="toolTip" stdset="0" >
-            <string>affichage documentation aster</string>
-          </property>
+       </item>
+       <item row="1" column="2" >
+        <widget class="QPushButton" name="BNext" >
+         <property name="text" >
+          <string>Suivant</string>
+         </property>
         </widget>
-      </item>
-    </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
-  <tabstops>
-    <tabstop>LEFiltre</tabstop>
-    <tabstop>TWChoix</tabstop>
-    <tabstop>lineEditNom</tabstop>
-    <tabstop>lineEditVal</tabstop>
-    <tabstop>LBNouvCommande</tabstop>
-    <tabstop>RBalpha</tabstop>
-    <tabstop>bOk</tabstop>
-    <tabstop>bSup</tabstop>
-    <tabstop>bHelp</tabstop>
-  </tabstops>
+       </item>
+       <item row="2" column="0" colspan="4" >
+        <widget class="QListWidget" name="LBNouvCommande" />
+       </item>
+       <item row="3" column="0" colspan="4" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="text" >
+          <string>La commande choisie sera ajoutée APRES la commande courante</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QPushButton" name="bOk" >
+     <property name="minimumSize" >
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="toolTip" >
+      <string>validation de la saisie</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Valider</string>
+     </property>
+     <property name="shortcut" >
+      <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>true</bool>
+     </property>
+     <property name="default" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QPushButton" name="bSup" >
+     <property name="minimumSize" >
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="toolTip" >
+      <string>suppression du mot clef</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Supprimer</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+S</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QPushButton" name="bHelp" >
+     <property name="minimumSize" >
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="toolTip" >
+      <string>affichage documentation aster</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Documentation</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+D</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>LEFiltre</tabstop>
+  <tabstop>TWChoix</tabstop>
+  <tabstop>lineEditNom</tabstop>
+  <tabstop>lineEditVal</tabstop>
+  <tabstop>LBNouvCommande</tabstop>
+  <tabstop>RBalpha</tabstop>
+  <tabstop>bOk</tabstop>
+  <tabstop>bSup</tabstop>
+  <tabstop>bHelp</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
 </ui>
index 09682a66c021a519a6f68faa0f14483f89cc18b8..54c612b3ffa773027a61768189622fa8057f19d8 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursBase.ui'
 #
-# Created: Wed Jul  9 10:32:21 2008
+# Created: Fri Jul 18 16:24:35 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -27,7 +27,7 @@ class Ui_DPlusBase(object):
         self.textLabel1.setWordWrap(False)
         self.textLabel1.setObjectName("textLabel1")
         self.gridlayout1.addWidget(self.textLabel1,0,0,1,1)
-        self.LBValeurs = QtGui.QListView(self.Widget8)
+        self.LBValeurs = QtGui.QListWidget(self.Widget8)
         self.LBValeurs.setMinimumSize(QtCore.QSize(200,0))
         self.LBValeurs.setObjectName("LBValeurs")
         self.gridlayout1.addWidget(self.LBValeurs,1,0,9,1)
index 14022e1fd9393e994b6d3d9b4ef5051e4f04cbdd..6ad5312903f31d26a91ce7a4a267d3ad047c22d2 100644 (file)
@@ -45,7 +45,7 @@
         </widget>
        </item>
        <item rowspan="9" row="1" column="0" >
-        <widget class="QListView" name="LBValeurs" >
+        <widget class="QListWidget" name="LBValeurs" >
          <property name="minimumSize" >
           <size>
            <width>200</width>
index 922f323d947f94029900fa658c6f63bf396d6e77..f00206c6d2c0d63157c6df6fa2bfcf91c894a28d 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursInto.ui'
 #
-# Created: Wed Jul  9 10:11:21 2008
+# Created: Fri Jul 18 16:24:35 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -55,7 +55,7 @@ class Ui_DPlusInto(object):
         self.gridlayout1.addWidget(self.Commentaire,2,0,1,4)
         self.hboxlayout = QtGui.QHBoxLayout()
         self.hboxlayout.setObjectName("hboxlayout")
-        self.LBValeurs = QtGui.QListView(self.Widget8)
+        self.LBValeurs = QtGui.QListWidget(self.Widget8)
         self.LBValeurs.setObjectName("LBValeurs")
         self.hboxlayout.addWidget(self.LBValeurs)
         self.vboxlayout = QtGui.QVBoxLayout()
@@ -84,7 +84,7 @@ class Ui_DPlusInto(object):
         self.vboxlayout1.addItem(spacerItem1)
         self.vboxlayout.addLayout(self.vboxlayout1)
         self.hboxlayout.addLayout(self.vboxlayout)
-        self.listBoxVal = QtGui.QListView(self.Widget8)
+        self.listBoxVal = QtGui.QListWidget(self.Widget8)
         self.listBoxVal.setObjectName("listBoxVal")
         self.hboxlayout.addWidget(self.listBoxVal)
         self.gridlayout1.addLayout(self.hboxlayout,1,0,1,4)
index 2e43106e427c65a6ff347bb1f97b5658e68d7ac3..140ddc106c759af1a144be08d9b3a77981d424a5 100644 (file)
        <item row="1" column="0" colspan="4" >
         <layout class="QHBoxLayout" >
          <item>
-          <widget class="QListView" name="LBValeurs" />
+          <widget class="QListWidget" name="LBValeurs" />
          </item>
          <item>
           <layout class="QVBoxLayout" >
           </layout>
          </item>
          <item>
-          <widget class="QListView" name="listBoxVal" />
+          <widget class="QListWidget" name="listBoxVal" />
          </item>
         </layout>
        </item>
index 7b6d2318eea11af3855160a123047883c500d1f1..cf9c48da03cc838fc1beaaf59927c380bad4dce4 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPoursuite.ui'
 #
-# Created: Wed Jul  9 10:11:21 2008
+# Created: Wed Jul 23 11:56:47 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -31,11 +31,11 @@ class Ui_DPour(object):
         self.textLabel1_2.setWordWrap(False)
         self.textLabel1_2.setObjectName("textLabel1_2")
         self.gridlayout1.addWidget(self.textLabel1_2,0,1,1,1)
-        self.LBMCPermis = QtGui.QListView(self.MotClef)
+        self.LBMCPermis = QtGui.QListWidget(self.MotClef)
         self.LBMCPermis.setMinimumSize(QtCore.QSize(0,0))
         self.LBMCPermis.setObjectName("LBMCPermis")
         self.gridlayout1.addWidget(self.LBMCPermis,1,0,1,1)
-        self.LBRegles = QtGui.QListView(self.MotClef)
+        self.LBRegles = QtGui.QListWidget(self.MotClef)
         self.LBRegles.setObjectName("LBRegles")
         self.gridlayout1.addWidget(self.LBRegles,1,1,1,1)
         self.textLabel1 = QtGui.QLabel(self.MotClef)
@@ -47,39 +47,43 @@ class Ui_DPour(object):
         self.Commande = QtGui.QWidget()
         self.Commande.setGeometry(QtCore.QRect(0,0,499,388))
         self.Commande.setObjectName("Commande")
+        self.gridLayout_2 = QtGui.QGridLayout(self.Commande)
+        self.gridLayout_2.setObjectName("gridLayout_2")
         self.textLabel1_4 = QtGui.QLabel(self.Commande)
-        self.textLabel1_4.setGeometry(QtCore.QRect(11,11,291,44))
         self.textLabel1_4.setWordWrap(False)
         self.textLabel1_4.setObjectName("textLabel1_4")
-        self.textLabel4 = QtGui.QLabel(self.Commande)
-        self.textLabel4.setGeometry(QtCore.QRect(11,341,457,17))
-        self.textLabel4.setWordWrap(False)
-        self.textLabel4.setObjectName("textLabel4")
-        self.LEFiltre = QtGui.QLineEdit(self.Commande)
-        self.LEFiltre.setGeometry(QtCore.QRect(60,60,169,30))
-        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
-        self.LEFiltre.setObjectName("LEFiltre")
+        self.gridLayout_2.addWidget(self.textLabel1_4,0,0,1,3)
+        self.groupBox = QtGui.QGroupBox(self.Commande)
+        self.groupBox.setObjectName("groupBox")
+        self.gridLayout = QtGui.QGridLayout(self.groupBox)
+        self.gridLayout.setObjectName("gridLayout")
+        self.RBalpha = QtGui.QRadioButton(self.groupBox)
+        self.RBalpha.setChecked(True)
+        self.RBalpha.setObjectName("RBalpha")
+        self.gridLayout.addWidget(self.RBalpha,0,0,1,1)
+        self.RBGroupe = QtGui.QRadioButton(self.groupBox)
+        self.RBGroupe.setObjectName("RBGroupe")
+        self.gridLayout.addWidget(self.RBGroupe,1,0,1,1)
+        self.gridLayout_2.addWidget(self.groupBox,0,3,2,1)
         self.textLabel6 = QtGui.QLabel(self.Commande)
-        self.textLabel6.setGeometry(QtCore.QRect(11,61,50,30))
         self.textLabel6.setMinimumSize(QtCore.QSize(50,30))
         self.textLabel6.setWordWrap(False)
         self.textLabel6.setObjectName("textLabel6")
-        self.RBGroupe = QtGui.QRadioButton(self.Commande)
-        self.RBGroupe.setGeometry(QtCore.QRect(330,60,101,20))
-        self.RBGroupe.setObjectName("RBGroupe")
-        self.RBalpha = QtGui.QRadioButton(self.Commande)
-        self.RBalpha.setGeometry(QtCore.QRect(330,30,120,20))
-        self.RBalpha.setChecked(True)
-        self.RBalpha.setObjectName("RBalpha")
-        self.groupBox = QtGui.QGroupBox(self.Commande)
-        self.groupBox.setGeometry(QtCore.QRect(310,10,141,80))
-        self.groupBox.setObjectName("groupBox")
-        self.LBNouvCommande = QtGui.QListWidget(self.Commande)
-        self.LBNouvCommande.setGeometry(QtCore.QRect(5,101,471,231))
-        self.LBNouvCommande.setObjectName("LBNouvCommande")
+        self.gridLayout_2.addWidget(self.textLabel6,1,0,1,1)
+        self.LEFiltre = QtGui.QLineEdit(self.Commande)
+        self.LEFiltre.setMinimumSize(QtCore.QSize(160,30))
+        self.LEFiltre.setObjectName("LEFiltre")
+        self.gridLayout_2.addWidget(self.LEFiltre,1,1,1,1)
         self.pushButton = QtGui.QPushButton(self.Commande)
-        self.pushButton.setGeometry(QtCore.QRect(233,60,71,27))
         self.pushButton.setObjectName("pushButton")
+        self.gridLayout_2.addWidget(self.pushButton,1,2,1,1)
+        self.LBNouvCommande = QtGui.QListWidget(self.Commande)
+        self.LBNouvCommande.setObjectName("LBNouvCommande")
+        self.gridLayout_2.addWidget(self.LBNouvCommande,2,0,1,4)
+        self.textLabel4 = QtGui.QLabel(self.Commande)
+        self.textLabel4.setWordWrap(False)
+        self.textLabel4.setObjectName("textLabel4")
+        self.gridLayout_2.addWidget(self.textLabel4,3,0,1,4)
         self.TWChoix.addTab(self.Commande,"")
         self.TabPage = QtGui.QWidget()
         self.TabPage.setGeometry(QtCore.QRect(0,0,499,388))
@@ -157,12 +161,12 @@ class Ui_DPour(object):
         self.textLabel1.setText(QtGui.QApplication.translate("DPour", "<h3><p align=\"center\"><u><b>Mots Clefs Permis</b></u></p></h3>", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.MotClef), QtGui.QApplication.translate("DPour", "Ajouter Mot-Clef", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_4.setText(QtGui.QApplication.translate("DPour", "<b><u>Commandes :</u></b>", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel4.setText(QtGui.QApplication.translate("DPour", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
-        self.textLabel6.setText(QtGui.QApplication.translate("DPour", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBGroupe.setText(QtGui.QApplication.translate("DPour", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
-        self.RBalpha.setText(QtGui.QApplication.translate("DPour", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("DPour", "Affichage", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBalpha.setText(QtGui.QApplication.translate("DPour", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
+        self.RBGroupe.setText(QtGui.QApplication.translate("DPour", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel6.setText(QtGui.QApplication.translate("DPour", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
         self.pushButton.setText(QtGui.QApplication.translate("DPour", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.textLabel4.setText(QtGui.QApplication.translate("DPour", "La commande choisie sera ajoutée APRES la commande courante", None, QtGui.QApplication.UnicodeUTF8))
         self.TWChoix.setTabText(self.TWChoix.indexOf(self.Commande), QtGui.QApplication.translate("DPour", "Nouvelle Commande", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel1_3.setText(QtGui.QApplication.translate("DPour", "<font size=\"+1\">La commande POURSUITE requiert un nom de Fichier :</font>", None, QtGui.QApplication.UnicodeUTF8))
         self.BBrowse.setText(QtGui.QApplication.translate("DPour", "Edit", None, QtGui.QApplication.UnicodeUTF8))
index c83d83c8cc8b98f427b3d126a3d13acc9800a6a8..65b43e0ecf82f45ed1d288e01111329d207f6d0c 100644 (file)
@@ -58,7 +58,7 @@
         </widget>
        </item>
        <item row="1" column="0" >
-        <widget class="QListView" name="LBMCPermis" >
+        <widget class="QListWidget" name="LBMCPermis" >
          <property name="minimumSize" >
           <size>
            <width>0</width>
@@ -68,7 +68,7 @@
         </widget>
        </item>
        <item row="1" column="1" >
-        <widget class="QListView" name="LBRegles" />
+        <widget class="QListWidget" name="LBRegles" />
        </item>
        <item row="0" column="0" >
         <widget class="QLabel" name="textLabel1" >
       <attribute name="title" >
        <string>Nouvelle Commande</string>
       </attribute>
-      <widget class="QLabel" name="textLabel1_4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>11</y>
-         <width>291</width>
-         <height>44</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel4" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>341</y>
-         <width>457</width>
-         <height>17</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>La commande choisie sera ajoutée APRES la commande courante</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QLineEdit" name="LEFiltre" >
-       <property name="geometry" >
-        <rect>
-         <x>60</x>
-         <y>60</y>
-         <width>169</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>160</width>
-         <height>30</height>
-        </size>
-       </property>
-      </widget>
-      <widget class="QLabel" name="textLabel6" >
-       <property name="geometry" >
-        <rect>
-         <x>11</x>
-         <y>61</y>
-         <width>50</width>
-         <height>30</height>
-        </rect>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>50</width>
-         <height>30</height>
-        </size>
-       </property>
-       <property name="text" >
-        <string>Filtre</string>
-       </property>
-       <property name="wordWrap" >
-        <bool>false</bool>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBGroupe" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>60</y>
-         <width>101</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>par groupe</string>
-       </property>
-      </widget>
-      <widget class="QRadioButton" name="RBalpha" >
-       <property name="geometry" >
-        <rect>
-         <x>330</x>
-         <y>30</y>
-         <width>120</width>
-         <height>20</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>alphabétique</string>
-       </property>
-       <property name="checked" >
-        <bool>true</bool>
-       </property>
-      </widget>
-      <widget class="QGroupBox" name="groupBox" >
-       <property name="geometry" >
-        <rect>
-         <x>310</x>
-         <y>10</y>
-         <width>141</width>
-         <height>80</height>
-        </rect>
-       </property>
-       <property name="title" >
-        <string>Affichage</string>
-       </property>
-      </widget>
-      <widget class="QListWidget" name="LBNouvCommande" >
-       <property name="geometry" >
-        <rect>
-         <x>5</x>
-         <y>101</y>
-         <width>471</width>
-         <height>231</height>
-        </rect>
-       </property>
-      </widget>
-      <widget class="QPushButton" name="pushButton" >
-       <property name="geometry" >
-        <rect>
-         <x>233</x>
-         <y>60</y>
-         <width>71</width>
-         <height>27</height>
-        </rect>
-       </property>
-       <property name="text" >
-        <string>Suivant</string>
-       </property>
-      </widget>
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" colspan="3" >
+        <widget class="QLabel" name="textLabel1_4" >
+         <property name="text" >
+          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item rowspan="2" row="0" column="3" >
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Affichage</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout" >
+          <item row="0" column="0" >
+           <widget class="QRadioButton" name="RBalpha" >
+            <property name="text" >
+             <string>alphabétique</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QRadioButton" name="RBGroupe" >
+            <property name="text" >
+             <string>par groupe</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="textLabel6" >
+         <property name="minimumSize" >
+          <size>
+           <width>50</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>Filtre</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QLineEdit" name="LEFiltre" >
+         <property name="minimumSize" >
+          <size>
+           <width>160</width>
+           <height>30</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2" >
+        <widget class="QPushButton" name="pushButton" >
+         <property name="text" >
+          <string>Suivant</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="4" >
+        <widget class="QListWidget" name="LBNouvCommande" />
+       </item>
+       <item row="3" column="0" colspan="4" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="text" >
+          <string>La commande choisie sera ajoutée APRES la commande courante</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
      <widget class="QWidget" name="TabPage" >
       <property name="geometry" >
index 092dddd91dbac0bff44a8d54c12855dac24109e6..eb368a12fbc86f300756907779ec01c87fd5bb08 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desRacine.ui'
 #
-# Created: Wed Jul  9 10:11:22 2008
+# Created: Fri Jul 18 16:24:35 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -41,14 +41,14 @@ class Ui_DRac(object):
         self.LEFiltre.setMinimumSize(QtCore.QSize(0,30))
         self.LEFiltre.setObjectName("LEFiltre")
         self.gridLayout.addWidget(self.LEFiltre,3,1,1,1)
-        self.pushButton = QtGui.QPushButton(DRac)
-        self.pushButton.setObjectName("pushButton")
-        self.gridLayout.addWidget(self.pushButton,3,2,1,1)
-        self.LBRegles = QtGui.QListView(DRac)
+        self.BNext = QtGui.QPushButton(DRac)
+        self.BNext.setObjectName("BNext")
+        self.gridLayout.addWidget(self.BNext,3,2,1,1)
+        self.LBRegles = QtGui.QListWidget(DRac)
         self.LBRegles.setMinimumSize(QtCore.QSize(240,350))
         self.LBRegles.setObjectName("LBRegles")
         self.gridLayout.addWidget(self.LBRegles,3,3,2,3)
-        self.LBNouvCommande = QtGui.QListView(DRac)
+        self.LBNouvCommande = QtGui.QListWidget(DRac)
         self.LBNouvCommande.setObjectName("LBNouvCommande")
         self.gridLayout.addWidget(self.LBNouvCommande,4,0,1,3)
         self.bSup = QtGui.QPushButton(DRac)
@@ -69,6 +69,7 @@ class Ui_DRac(object):
         self.gridLayout.addWidget(self.bHelp,5,5,1,1)
 
         self.retranslateUi(DRac)
+        QtCore.QMetaObject.connectSlotsByName(DRac)
         DRac.setTabOrder(self.LEFiltre,self.LBNouvCommande)
         DRac.setTabOrder(self.LBNouvCommande,self.bSup)
         DRac.setTabOrder(self.bSup,self.bOk)
@@ -82,7 +83,7 @@ class Ui_DRac(object):
         self.RBalpha.setText(QtGui.QApplication.translate("DRac", "alphabétique", None, QtGui.QApplication.UnicodeUTF8))
         self.RBGroupe.setText(QtGui.QApplication.translate("DRac", "par groupe", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel6.setText(QtGui.QApplication.translate("DRac", "Filtre", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButton.setText(QtGui.QApplication.translate("DRac", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
+        self.BNext.setText(QtGui.QApplication.translate("DRac", "Suivant", None, QtGui.QApplication.UnicodeUTF8))
         self.bSup.setToolTip(QtGui.QApplication.translate("DRac", "suppression du mot clef", None, QtGui.QApplication.UnicodeUTF8))
         self.bSup.setText(QtGui.QApplication.translate("DRac", "&Supprimer", None, QtGui.QApplication.UnicodeUTF8))
         self.bSup.setShortcut(QtGui.QApplication.translate("DRac", "Alt+S", None, QtGui.QApplication.UnicodeUTF8))
index 438191180c4bbab33bcbc6c05d71412e8647ed61..99fab0d2e2618a0f510f3e15b5e8a1ba3e839560 100644 (file)
     </widget>
    </item>
    <item row="3" column="2" >
-    <widget class="QPushButton" name="pushButton" >
+    <widget class="QPushButton" name="BNext" >
      <property name="text" >
       <string>Suivant</string>
      </property>
     </widget>
    </item>
    <item rowspan="2" row="3" column="3" colspan="3" >
-    <widget class="QListView" name="LBRegles" >
+    <widget class="QListWidget" name="LBRegles" >
      <property name="minimumSize" >
       <size>
        <width>240</width>
     </widget>
    </item>
    <item row="4" column="0" colspan="3" >
-    <widget class="QListView" name="LBNouvCommande" />
+    <widget class="QListWidget" name="LBNouvCommande" />
    </item>
    <item row="5" column="0" colspan="2" >
     <widget class="QPushButton" name="bSup" >
   <tabstop>LBRegles</tabstop>
  </tabstops>
  <resources/>
+ <connections/>
 </ui>
index a4ebbdb7ffd37856c9490922b72c99cb961a0e3f..39863fbc0ad523b63e58b6b16864bc614bc930da 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueASSD.ui'
 #
-# Created: Wed Jul  9 10:11:22 2008
+# Created: Fri Jul 18 16:24:35 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -27,7 +27,7 @@ class Ui_DUnASSD(object):
         self.textLabel2.setWordWrap(False)
         self.textLabel2.setObjectName("textLabel2")
         self.gridlayout1.addWidget(self.textLabel2,0,0,1,1)
-        self.listBoxASSD = QtGui.QListView(self.Widget8)
+        self.listBoxASSD = QtGui.QListWidget(self.Widget8)
         self.listBoxASSD.setObjectName("listBoxASSD")
         self.gridlayout1.addWidget(self.listBoxASSD,1,0,1,1)
         self.Commentaire = QtGui.QLabel(self.Widget8)
index 0184a8efc4ea935d8e5e7b22269f5ac0d62a1ff5..fd6ee2ab9f90520df18b95496680ae6810ebbefb 100644 (file)
@@ -47,7 +47,7 @@ requis par l'objet courant :&lt;/p>&lt;/font></string>
                 </widget>
               </item>
               <item row="1" column="0" >
-                <widget class="QListView" name="listBoxASSD" />
+                <widget class="QListWidget" name="listBoxASSD" />
               </item>
               <item row="2" column="0" >
                 <widget class="QLabel" name="Commentaire" >
index 1e9222541b356e1dc0ab06db818f23e27c970e90..265207970a1909d7629edae36e25289c2ade6ffe 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueBase.ui'
 #
-# Created: Wed Jul  9 10:11:22 2008
+# Created: Thu Jul 24 10:46:31 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -85,13 +85,14 @@ class Ui_DUnBase(object):
         self.gridlayout.addWidget(self.tabuniqueinto,0,0,1,1)
 
         self.retranslateUi(DUnBase)
-        DUnBase.setTabOrder(self.lineEditVal,self.tabuniqueinto)
-        DUnBase.setTabOrder(self.tabuniqueinto,self.bParametres)
-        DUnBase.setTabOrder(self.bParametres,self.bSup)
-        DUnBase.setTabOrder(self.bSup,self.bOk)
-        DUnBase.setTabOrder(self.bOk,self.bHelp)
+        QtCore.QMetaObject.connectSlotsByName(DUnBase)
+        DUnBase.setTabOrder(self.lineEditVal,self.bOk)
+        DUnBase.setTabOrder(self.bOk,self.bSup)
+        DUnBase.setTabOrder(self.bSup,self.BSalome)
+        DUnBase.setTabOrder(self.BSalome,self.bHelp)
         DUnBase.setTabOrder(self.bHelp,self.BView2D)
-        DUnBase.setTabOrder(self.BView2D,self.BSalome)
+        DUnBase.setTabOrder(self.BView2D,self.bParametres)
+        DUnBase.setTabOrder(self.bParametres,self.tabuniqueinto)
 
     def retranslateUi(self, DUnBase):
         DUnBase.setWindowTitle(QtGui.QApplication.translate("DUnBase", "DUnIn", None, QtGui.QApplication.UnicodeUTF8))
index 5c271f2bc5045e67838c78a5e8ccf7c6b2cc7b6b..c089a5ff821c1dd4c4c683263f4b316518e28f95 100644 (file)
  <layoutdefault spacing="6" margin="11" />
  <tabstops>
   <tabstop>lineEditVal</tabstop>
-  <tabstop>tabuniqueinto</tabstop>
-  <tabstop>bParametres</tabstop>
-  <tabstop>bSup</tabstop>
   <tabstop>bOk</tabstop>
+  <tabstop>bSup</tabstop>
+  <tabstop>BSalome</tabstop>
   <tabstop>bHelp</tabstop>
   <tabstop>BView2D</tabstop>
-  <tabstop>BSalome</tabstop>
+  <tabstop>bParametres</tabstop>
+  <tabstop>tabuniqueinto</tabstop>
  </tabstops>
  <resources/>
+ <connections/>
 </ui>
index 671bf3b68f2ee6c50e339deef152c9a4f1b3b00d..5d9270f5095abca3fca8533ad3903080bac44873 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueInto.ui'
 #
-# Created: Wed Jul  9 10:11:22 2008
+# Created: Fri Jul 18 16:24:35 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -49,7 +49,7 @@ class Ui_DUnIn(object):
         self.bHelp.setObjectName("bHelp")
         self.hboxlayout.addWidget(self.bHelp)
         self.gridlayout1.addLayout(self.hboxlayout,3,0,1,1)
-        self.listBoxVal = QtGui.QListView(self.Widget8)
+        self.listBoxVal = QtGui.QListWidget(self.Widget8)
         self.listBoxVal.setObjectName("listBoxVal")
         self.gridlayout1.addWidget(self.listBoxVal,1,0,1,1)
         self.textLabel2 = QtGui.QLabel(self.Widget8)
index 57c3f8b6ed920ea5bc57d4bb9ef2e70f87322f99..7ab92b499665bcf03ed2247721695b9bcd79d4e8 100644 (file)
                 </layout>
               </item>
               <item row="1" column="0" >
-                <widget class="QListView" name="listBoxVal" />
+                <widget class="QListWidget" name="listBoxVal" />
               </item>
               <item row="0" column="0" >
                 <widget class="QLabel" name="textLabel2" >
index c91fc84ab9805987ac0ab4aad630d68644259dcc..718c787b884f7ee135b3c29daf326987cec8d0e3 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui'
 #
-# Created: Wed Jul  9 10:11:22 2008
+# Created: Fri Jul 18 16:24:35 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -26,7 +26,7 @@ class Ui_DUnSDCOInto(object):
         self.textLabel2.setWordWrap(False)
         self.textLabel2.setObjectName("textLabel2")
         self.gridlayout1.addWidget(self.textLabel2,0,0,1,3)
-        self.LBSDCO = QtGui.QListView(self.Widget8)
+        self.LBSDCO = QtGui.QListWidget(self.Widget8)
         self.LBSDCO.setObjectName("LBSDCO")
         self.gridlayout1.addWidget(self.LBSDCO,1,0,1,3)
         self.textLabel2_3 = QtGui.QLabel(self.Widget8)
index 05618099c9e7fe1e94795d93a0d99a147dfa0678..c42947b9e8bcfcdd0af9b92e9efba08545902f59 100644 (file)
@@ -40,7 +40,7 @@
                 </widget>
               </item>
               <item rowspan="1" row="1" column="0" colspan="3" >
-                <widget class="QListView" name="LBSDCO" />
+                <widget class="QListWidget" name="LBSDCO" />
               </item>
               <item rowspan="1" row="5" column="0" colspan="3" >
                 <widget class="QLabel" name="textLabel2_3" >
index 5cf6a04ff8c538afb88b921642b330f7220f9b2f..8327014dffd7bea727ae85c1641b2b7a856596f2 100644 (file)
@@ -4,10 +4,11 @@ PYUIC = pyuic4
 
 
 PY_FILES = desChoixCata.py desCommande.py desCommentaire.py desError.py desFormule.py desInactif.py \
-       desInclude.py desListeParam.py desMacro.py desMCFact.py desMCListAjout.py desParam.py \
+       desInclude.py desListeParam.py  desMCFact.py desMCListAjout.py desParam.py \
        desPlusieursBase.py desPlusieursInto.py desPoursuite.py desRacine.py desSelectVal.py \
        desUniqueASSD.py desUniqueBase.py desUniqueComp.py desUniqueInto.py desUniqueSDCOInto.py \
-       desUniqueSDCO.py desVisu.py  aideQT.py OptionsEditeur.py OptionsPdf.py myMain.py
+       desUniqueSDCO.py desVisu.py  aideQT.py OptionsEditeur.py OptionsPdf.py myMain.py \
+       desViewTexte.py
 
 %.py:%.ui
        ${PYUIC} -x -o $@ $<