From: Pascale Noyret Date: Thu, 24 Jul 2008 13:48:20 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V1_14QT4v1~14 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=097bbc17828cf64336f16f8de813fb8aa71e122d;p=tools%2Feficas.git *** empty log message *** --- diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py index e149adc5..559caaa2 100644 --- a/InterfaceQT4/browser.py +++ b/InterfaceQT4/browser.py @@ -1,164 +1,178 @@ # -*- 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) +# +# diff --git a/InterfaceQT4/compocomm.py b/InterfaceQT4/compocomm.py index 0656c95a..bad7623d 100644 --- a/InterfaceQT4/compocomm.py +++ b/InterfaceQT4/compocomm.py @@ -20,7 +20,6 @@ # ====================================================================== import string -from qt import * from Editeur import Objecttreeitem import browser diff --git a/InterfaceQT4/compofact.py b/InterfaceQT4/compofact.py index 7739e04a..76b81c63 100644 --- a/InterfaceQT4/compofact.py +++ b/InterfaceQT4/compofact.py @@ -19,10 +19,13 @@ # # ====================================================================== -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): diff --git a/InterfaceQT4/compoformule.py b/InterfaceQT4/compoformule.py index 02dcdc0d..43ae257a 100644 --- a/InterfaceQT4/compoformule.py +++ b/InterfaceQT4/compoformule.py @@ -7,7 +7,6 @@ d'EFICAS """ import string -from qt import * import compooper import browser import typeNode diff --git a/InterfaceQT4/compojdc.py b/InterfaceQT4/compojdc.py index 1cd49081..58265149 100644 --- a/InterfaceQT4/compojdc.py +++ b/InterfaceQT4/compojdc.py @@ -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): diff --git a/InterfaceQT4/compomacro.py b/InterfaceQT4/compomacro.py index 74e2f59a..c9f36ad6 100644 --- a/InterfaceQT4/compomacro.py +++ b/InterfaceQT4/compomacro.py @@ -4,7 +4,6 @@ import os,sys,string import types import traceback -from qt import * # Modules Eficas from Editeur import Objecttreeitem diff --git a/InterfaceQT4/compomclist.py b/InterfaceQT4/compomclist.py index 65bdad03..04a79132 100644 --- a/InterfaceQT4/compomclist.py +++ b/InterfaceQT4/compomclist.py @@ -3,8 +3,6 @@ import types import traceback -from qt import * - import compofact import browser from Editeur import Objecttreeitem diff --git a/InterfaceQT4/componiveau.py b/InterfaceQT4/componiveau.py index 866d585e..02743c71 100644 --- a/InterfaceQT4/componiveau.py +++ b/InterfaceQT4/componiveau.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from qt import * from Editeur import Objecttreeitem from Extensions import commentaire import browser diff --git a/InterfaceQT4/componuplet.py b/InterfaceQT4/componuplet.py index 649ce0e2..d9c610c1 100644 --- a/InterfaceQT4/componuplet.py +++ b/InterfaceQT4/componuplet.py @@ -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): diff --git a/InterfaceQT4/compooper.py b/InterfaceQT4/compooper.py index dd89378e..add78867 100644 --- a/InterfaceQT4/compooper.py +++ b/InterfaceQT4/compooper.py @@ -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 diff --git a/InterfaceQT4/compoparam.py b/InterfaceQT4/compoparam.py index 4c3fb26b..b21ae803 100644 --- a/InterfaceQT4/compoparam.py +++ b/InterfaceQT4/compoparam.py @@ -7,7 +7,6 @@ # import modules Python import string -from qt import * # import modules EFICAS from Editeur import Objecttreeitem diff --git a/InterfaceQT4/compoproc.py b/InterfaceQT4/compoproc.py index ffbfdf03..0a1adcaf 100644 --- a/InterfaceQT4/compoproc.py +++ b/InterfaceQT4/compoproc.py @@ -4,7 +4,6 @@ import compooper import browser import typeNode -from qt import * class Node(browser.JDCNode,typeNode.PopUpMenuNode): def getPanel(self): diff --git a/InterfaceQT4/composimp.py b/InterfaceQT4/composimp.py index 19db6b5f..2d7364fd 100644 --- a/InterfaceQT4/composimp.py +++ b/InterfaceQT4/composimp.py @@ -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 diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py index c0a94035..73ccf78d 100644 --- a/InterfaceQT4/editor.py +++ b/InterfaceQT4/editor.py @@ -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) # diff --git a/InterfaceQT4/monChoixCata.py b/InterfaceQT4/monChoixCata.py index b5756ef4..714563b7 100644 --- a/InterfaceQT4/monChoixCata.py +++ b/InterfaceQT4/monChoixCata.py @@ -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) diff --git a/InterfaceQT4/monCommandePanel.py b/InterfaceQT4/monCommandePanel.py index 80c3aaf8..2ca34e65 100644 --- a/InterfaceQT4/monCommandePanel.py +++ b/InterfaceQT4/monCommandePanel.py @@ -21,13 +21,20 @@ # 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) + + diff --git a/InterfaceQT4/monCommentairePanel.py b/InterfaceQT4/monCommentairePanel.py index a4440245..b10e14db 100644 --- a/InterfaceQT4/monCommentairePanel.py +++ b/InterfaceQT4/monCommentairePanel.py @@ -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() diff --git a/InterfaceQT4/monFormulePanel.py b/InterfaceQT4/monFormulePanel.py index e691082e..4d86c187 100644 --- a/InterfaceQT4/monFormulePanel.py +++ b/InterfaceQT4/monFormulePanel.py @@ -21,10 +21,19 @@ # 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) diff --git a/InterfaceQT4/monListeParamPanel.py b/InterfaceQT4/monListeParamPanel.py index e7c84da3..a3a581d8 100644 --- a/InterfaceQT4/monListeParamPanel.py +++ b/InterfaceQT4/monListeParamPanel.py @@ -21,11 +21,16 @@ # 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]) diff --git a/InterfaceQT4/monMCFactPanel.py b/InterfaceQT4/monMCFactPanel.py index 9f2b5037..0fb9bea2 100644 --- a/InterfaceQT4/monMCFactPanel.py +++ b/InterfaceQT4/monMCFactPanel.py @@ -21,11 +21,17 @@ # 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) diff --git a/InterfaceQT4/monMCListAjoutPanel.py b/InterfaceQT4/monMCListAjoutPanel.py index d3da3569..5e0868b2 100644 --- a/InterfaceQT4/monMCListAjoutPanel.py +++ b/InterfaceQT4/monMCListAjoutPanel.py @@ -21,12 +21,18 @@ # 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) diff --git a/InterfaceQT4/monMacroPanel.py b/InterfaceQT4/monMacroPanel.py index 8c4b0068..4897377b 100644 --- a/InterfaceQT4/monMacroPanel.py +++ b/InterfaceQT4/monMacroPanel.py @@ -21,14 +21,20 @@ # 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) diff --git a/InterfaceQT4/monParamPanel.py b/InterfaceQT4/monParamPanel.py index f70abf7c..a15e7e1b 100644 --- a/InterfaceQT4/monParamPanel.py +++ b/InterfaceQT4/monParamPanel.py @@ -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() diff --git a/InterfaceQT4/monRacinePanel.py b/InterfaceQT4/monRacinePanel.py index f125340c..8ebc8e5f 100644 --- a/InterfaceQT4/monRacinePanel.py +++ b/InterfaceQT4/monRacinePanel.py @@ -21,12 +21,19 @@ # 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') diff --git a/InterfaceQT4/monUniqueASSDPanel.py b/InterfaceQT4/monUniqueASSDPanel.py index bfdee9ee..79245bb3 100644 --- a/InterfaceQT4/monUniqueASSDPanel.py +++ b/InterfaceQT4/monUniqueASSDPanel.py @@ -22,16 +22,21 @@ 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() diff --git a/InterfaceQT4/monUniqueBasePanel.py b/InterfaceQT4/monUniqueBasePanel.py index d10a1204..ecf9b57f 100644 --- a/InterfaceQT4/monUniqueBasePanel.py +++ b/InterfaceQT4/monUniqueBasePanel.py @@ -22,16 +22,20 @@ 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) diff --git a/InterfaceQT4/politiquesValidation.py b/InterfaceQT4/politiquesValidation.py index 539f6113..a976f971 100644 --- a/InterfaceQT4/politiquesValidation.py +++ b/InterfaceQT4/politiquesValidation.py @@ -21,8 +21,6 @@ # Modules Python import types -from qt import * - #------------------ class Validation : diff --git a/InterfaceQT4/qtCommun.py b/InterfaceQT4/qtCommun.py index e1a7010b..e904810c 100644 --- a/InterfaceQT4/qtCommun.py +++ b/InterfaceQT4/qtCommun.py @@ -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 %1 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 %1 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: diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py index e94f3ebb..49863cac 100644 --- a/InterfaceQT4/qtEficas.py +++ b/InterfaceQT4/qtEficas.py @@ -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() diff --git a/InterfaceQT4/qtSaisie.py b/InterfaceQT4/qtSaisie.py index e7ea9c4d..b1b45acb 100644 --- a/InterfaceQT4/qtSaisie.py +++ b/InterfaceQT4/qtSaisie.py @@ -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) diff --git a/InterfaceQT4/viewManager.py b/InterfaceQT4/viewManager.py index f7b59750..6ee892f0 100644 --- a/InterfaceQT4/viewManager.py +++ b/InterfaceQT4/viewManager.py @@ -19,12 +19,10 @@ # # ====================================================================== -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 %1 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 %1 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 "" diff --git a/UiQT4/desChoixCata.py b/UiQT4/desChoixCata.py index 42dc6c62..d35f39ff 100644 --- a/UiQT4/desChoixCata.py +++ b/UiQT4/desChoixCata.py @@ -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", "\n" +"\n" +"

Veuillez choisir celle avec laquelle

\n" +"

vous souhaitez travailler

", 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", "Veuillez choisir celle avec laquelle vous souhaitez travailler", None, QtGui.QApplication.UnicodeUTF8)) + self.buttonCancel.setText(QtGui.QApplication.translate("DChoixCata", "&Cancel", None, QtGui.QApplication.UnicodeUTF8)) if __name__ == "__main__": diff --git a/UiQT4/desChoixCata.ui b/UiQT4/desChoixCata.ui index 54172825..a59643f7 100644 --- a/UiQT4/desChoixCata.ui +++ b/UiQT4/desChoixCata.ui @@ -1,116 +1,139 @@ - - - - - DChoixCata - - - - 0 - 0 - 547 - 172 - - - - Choix d'une version du code Aster - - + + DChoixCata + + + + 0 + 0 + 547 + 192 + + + + Choix d'une version du code Aster + + + true + + + + + + + 30 + 0 + + + + 2 versions sont disponibles + + + false + + + + + + true - - - - - - StyledPanel - - - Raised - - - - - 380 - 6 - 90 - 30 - - - - &Cancel - - - - - - true - - - - - - 40 - 6 - 90 - 30 - - - - &OK - - - - - - true - - - true - - - + + + + 125 + 41 + + + + + 150 + 16777215 + + + + + + + + + 60 + 60 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<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> +<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> + + + false + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + &OK + + + + + + true + + + true + + - - - - - 30 - 0 - - - - 2 - - - false - - + + + + Qt::Horizontal + + + + 334 + 20 + + + - - - - true - - + + + + &Cancel + + + + + + true + + - - - - - 380 - 60 - - - - <font size="+1">Veuillez choisir celle avec laquelle vous souhaitez travailler</font> - - - false - - - - - - - qPixmapFromMimeSource + + + + + frame3 + TLNb + textLabel1_2 + CBChoixCata + + + qPixmapFromMimeSource + + diff --git a/UiQT4/desCommande.py b/UiQT4/desCommande.py index 3ef3d724..bbdf4704 100644 --- a/UiQT4/desCommande.py +++ b/UiQT4/desCommande.py @@ -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", "

Mots Clefs Permis

", None, QtGui.QApplication.UnicodeUTF8)) self.textLabel1_2.setText(QtGui.QApplication.translate("DComm", "

Règles

", 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", "Nom du concept :", None, QtGui.QApplication.UnicodeUTF8)) self.textLabel1_3_2.setText(QtGui.QApplication.translate("DComm", "Type du concept :", 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", "Commandes :", 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__": diff --git a/UiQT4/desCommande.ui b/UiQT4/desCommande.ui index eb82bfab..ef5fd5c9 100644 --- a/UiQT4/desCommande.ui +++ b/UiQT4/desCommande.ui @@ -105,7 +105,7 @@ - + 0 @@ -169,7 +169,7 @@ - + 250 @@ -288,163 +288,110 @@ Nouvelle Commande - - - - 11 - 11 - 291 - 44 - - - - <b><u>Commandes :</u></b> - - - false - - - - - - 11 - 341 - 457 - 17 - - - - La commande choisie sera ajoutée APRES la commande courante - - - false - - - - - - 60 - 60 - 169 - 30 - - - - - 160 - 30 - - - - - - - 11 - 61 - 50 - 30 - - - - - 50 - 30 - - - - Filtre - - - false - - - - - - 330 - 60 - 101 - 20 - - - - par groupe - - - - - - 330 - 30 - 120 - 20 - - - - alphabétique - - - true - - - - - - 310 - 10 - 141 - 80 - - - - Affichage - - - - - - 5 - 101 - 471 - 231 - - - - - - - 233 - 60 - 71 - 27 - - - - Suivant - - + + + + + <b><u>Commandes :</u></b> + + + false + + + + + + + + + + 50 + 30 + + + + Filtre + + + false + + + + + + + + 160 + 30 + + + + + + + + Suivant + + + + + + + + + Affichage + + + + + + alphabétique + + + true + + + + + + + par groupe + + + + + + + + + + + + + La commande choisie sera ajoutée APRES la commande courante + + + false + + + + - Commentaire - bOk - bSup - bHelp - listWidget - LBRegles qPixmapFromMimeSource LEFiltre LENomConcept - LBRegles - RBalpha + TWChoix LBNouvCommande bOk bSup bHelp + diff --git a/UiQT4/desCommentaire.py b/UiQT4/desCommentaire.py index d2876c59..d4b7a5e4 100644 --- a/UiQT4/desCommentaire.py +++ b/UiQT4/desCommentaire.py @@ -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", "Commandes :", 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)) diff --git a/UiQT4/desCommentaire.ui b/UiQT4/desCommentaire.ui index 2ce08576..1202e7b5 100644 --- a/UiQT4/desCommentaire.ui +++ b/UiQT4/desCommentaire.ui @@ -107,7 +107,7 @@ - 1 + 0 @@ -139,141 +139,90 @@ Nouvelle Commande - - - - 11 - 11 - 291 - 44 - - - - <b><u>Commandes :</u></b> - - - false - - - - - - 11 - 341 - 457 - 17 - - - - La commande choisie sera ajoutée APRES la commande courante - - - false - - - - - - 60 - 60 - 169 - 30 - - - - - 160 - 30 - - - - - - - 11 - 61 - 50 - 30 - - - - - 50 - 30 - - - - Filtre - - - false - - - - - - 330 - 60 - 101 - 20 - - - - par groupe - - - - - - 330 - 30 - 120 - 20 - - - - alphabétique - - - true - - - - - - 310 - 10 - 141 - 80 - - - - Affichage - - - - - - 5 - 101 - 471 - 231 - - - - - - - 233 - 60 - 71 - 27 - - - - Suivant - - + + + + + <b><u>Commandes :</u></b> + + + false + + + + + + + Affichage + + + + + + alphabétique + + + true + + + + + + + par groupe + + + + + + + + + + + 50 + 30 + + + + Filtre + + + false + + + + + + + + 160 + 30 + + + + + + + + Suivant + + + + + + + + + + La commande choisie sera ajoutée APRES la commande courante + + + false + + + + @@ -282,12 +231,11 @@ qPixmapFromMimeSource - LEFiltre TWChoix - RBalpha bOk bSup bHelp + diff --git a/UiQT4/desFormule.py b/UiQT4/desFormule.py index 6f29672d..2ac2323d 100644 --- a/UiQT4/desFormule.py +++ b/UiQT4/desFormule.py @@ -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", "

Arguments

", 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", "Commandes :", 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)) diff --git a/UiQT4/desFormule.ui b/UiQT4/desFormule.ui index 922d95ed..e0d4f44a 100644 --- a/UiQT4/desFormule.ui +++ b/UiQT4/desFormule.ui @@ -276,141 +276,94 @@ valeurs seront effectivement prises en compte Nouvelle Commande - - - - 11 - 11 - 291 - 44 - - - - <b><u>Commandes :</u></b> - - - false - - - - - - 11 - 341 - 457 - 17 - - - - La commande choisie sera ajoutée APRES la commande courante - - - false - - - - - - 60 - 60 - 169 - 30 - - - - - 160 - 30 - - - - - - - 11 - 61 - 50 - 30 - - - - - 50 - 30 - - - - Filtre - - - false - - - - - - 330 - 60 - 101 - 20 - - - - par groupe - - - - - - 330 - 30 - 120 - 20 - - - - alphabétique - - - true - - - - - - 310 - 10 - 141 - 80 - - - - Affichage - - - - - - 5 - 101 - 471 - 231 - - - - - - - 233 - 60 - 71 - 27 - - - - Suivant - - + + + + + <b><u>Commandes :</u></b> + + + false + + + + + + + Affichage + + + + + + alphabétique + + + true + + + + + + + par groupe + + + + + + + + + + + + + 50 + 30 + + + + Filtre + + + false + + + + + + + + 160 + 30 + + + + + + + + Suivant + + + + + + + + + + + + La commande choisie sera ajoutée APRES la commande courante + + + false + + + + diff --git a/UiQT4/desInclude.py b/UiQT4/desInclude.py index 3eb4c70d..aeadffda 100644 --- a/UiQT4/desInclude.py +++ b/UiQT4/desInclude.py @@ -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", "

Régles

", 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", "Commandes :", 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", "La commande INCLUDE requiert un nom de Fichier :", None, QtGui.QApplication.UnicodeUTF8)) self.BBrowse.setText(QtGui.QApplication.translate("DInc1", "Edit", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/UiQT4/desInclude.ui b/UiQT4/desInclude.ui index 79f9df38..e0ac6469 100644 --- a/UiQT4/desInclude.ui +++ b/UiQT4/desInclude.ui @@ -101,7 +101,7 @@ - 0 + 2 @@ -117,7 +117,7 @@ - + 0 @@ -143,7 +143,7 @@ - + @@ -169,141 +169,90 @@ Nouvelle Commande - - - - 11 - 11 - 291 - 44 - - - - <b><u>Commandes :</u></b> - - - false - - - - - - 11 - 341 - 457 - 17 - - - - La commande choisie sera ajoutée APRES la commande courante - - - false - - - - - - 60 - 60 - 169 - 30 - - - - - 160 - 30 - - - - - - - 11 - 61 - 50 - 30 - - - - - 50 - 30 - - - - Filtre - - - false - - - - - - 330 - 60 - 101 - 20 - - - - par groupe - - - - - - 330 - 30 - 120 - 20 - - - - alphabétique - - - true - - - - - - 310 - 10 - 141 - 80 - - - - Affichage - - - - - - 5 - 101 - 471 - 231 - - - - - - - 233 - 60 - 71 - 27 - - - - Suivant - - + + + + + <b><u>Commandes :</u></b> + + + false + + + + + + + Affichage + + + + + + alphabétique + + + true + + + + + + + par groupe + + + + + + + + + + + 50 + 30 + + + + Filtre + + + false + + + + + + + + 160 + 30 + + + + + + + + Suivant + + + + + + + + + + La commande choisie sera ajoutée APRES la commande courante + + + false + + + + diff --git a/UiQT4/desListeParam.py b/UiQT4/desListeParam.py index e4c65e49..ade7e63b 100644 --- a/UiQT4/desListeParam.py +++ b/UiQT4/desListeParam.py @@ -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) diff --git a/UiQT4/desListeParam.ui b/UiQT4/desListeParam.ui index 2c3b36c1..0e3a9fe3 100644 --- a/UiQT4/desListeParam.ui +++ b/UiQT4/desListeParam.ui @@ -17,7 +17,7 @@ - + diff --git a/UiQT4/desMCFact.py b/UiQT4/desMCFact.py index 9b82a730..ede80549 100644 --- a/UiQT4/desMCFact.py +++ b/UiQT4/desMCFact.py @@ -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) diff --git a/UiQT4/desMCFact.ui b/UiQT4/desMCFact.ui index 12819de4..8eb9080d 100644 --- a/UiQT4/desMCFact.ui +++ b/UiQT4/desMCFact.ui @@ -46,7 +46,7 @@ - + 0 @@ -56,7 +56,7 @@ - + diff --git a/UiQT4/desParam.py b/UiQT4/desParam.py index cdda2438..398bdb1a 100644 --- a/UiQT4/desParam.py +++ b/UiQT4/desParam.py @@ -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", "Commandes :", 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)) diff --git a/UiQT4/desParam.ui b/UiQT4/desParam.ui index 55ec3277..a15789c0 100644 --- a/UiQT4/desParam.ui +++ b/UiQT4/desParam.ui @@ -1,270 +1,212 @@ - - - - - DParam - - - + + DParam + + + + 0 + 0 + 505 + 483 + + + + + 505 + 0 + + + + DComm + + + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + false + + + + + + + 0 + + + + 0 0 - 505 - 483 - - - - - 505 - 0 - - - - DComm - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - false - - - - - - - - Valeur Parametre - - - - - 80 - 11 - 231 - 89 - - - - <u><b><p align="center">Parametre</p></b></u> - - - false - - - - - - 11 - 275 - 459 - 89 - - - - - - - false - - - - - - 80 - 106 - 231 - 31 - - - - - 231 - 31 - - - - - - - 11 - 106 - 63 - 31 - - - - <b> Nom: </b> - - - false - - - - - - 11 - 143 - 63 - 31 - - - - <b> Valeur: </b> - - - false - - - - - - 11 - 180 - 459 - 89 - - - - Retour Chariot dans une sone de saisie permet de vérifier la + 483 + 372 + + + + Valeur Parametre + + + + + 80 + 11 + 231 + 89 + + + + <u><b><p align="center">Parametre</p></b></u> + + + false + + + + + + 11 + 275 + 459 + 89 + + + + + + + false + + + + + + 80 + 106 + 231 + 31 + + + + + 231 + 31 + + + + + + + 11 + 106 + 63 + 31 + + + + <b> Nom: </b> + + + false + + + + + + 11 + 143 + 63 + 31 + + + + <b> Valeur: </b> + + + false + + + + + + 11 + 180 + 459 + 89 + + + + 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. - - - false - - - - - - 80 - 143 - 231 - 31 - - - - - 231 - 31 - - - - - - - - 0 - 0 - 483 - 371 - - - - Nouvelle Commande - - - - - 11 - 11 - 291 - 44 - - - - <b><u>Commandes :</u></b> - - - false - - - - - - 11 - 341 - 457 - 17 - - - - La commande choisie sera ajoutée APRES la commande courante - - - false - - - - - - 60 - 60 - 169 - 30 - - - - - 160 - 30 - - - - - - - 11 - 61 - 50 - 30 - - - - - 50 - 30 - - - - Filtre - - - false - - + + + false + + + + + + 80 + 143 + 231 + 31 + + + + + 231 + 31 + + + + + + + + 0 + 0 + 483 + 372 + + + + Nouvelle Commande + + + + + + <b><u>Commandes :</u></b> + + + false + + + + + + + Affichage + + + - - - 330 - 60 - 101 - 20 - - par groupe + + - - - 330 - 30 - 120 - 20 - - alphabétique @@ -272,127 +214,146 @@ appuyé sur le bouton Valider. true - - - - 310 - 10 - 141 - 80 - - - - Affichage - - - - - - 5 - 101 - 471 - 231 - - - - - - - 233 - 60 - 71 - 27 - - - - Suivant - - - + + + RBGroupe + RBalpha - - - - - - 0 - 30 - - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - true - - - validation de la saisie - + + + + + + 50 + 30 + + + + Filtre + + + false + - - - - - - 0 - 30 - - - - &Supprimer - - - Alt+S - - - true - - - suppression du mot clef - + + + + + + 160 + 30 + + - - - - - - 0 - 30 - - - - &Documentation - - - Alt+D - - - true - - - affichage documentation aster - + + + + + Suivant + - - - - - qPixmapFromMimeSource - - LEFiltre - TWChoix - lineEditNom - lineEditVal - LBNouvCommande - RBalpha - bOk - bSup - bHelp - + + + + + + + + La commande choisie sera ajoutée APRES la commande courante + + + false + + + + + + + + + + + + 0 + 30 + + + + validation de la saisie + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + + + + + + 0 + 30 + + + + suppression du mot clef + + + &Supprimer + + + Alt+S + + + true + + + + + + + + 0 + 30 + + + + affichage documentation aster + + + &Documentation + + + Alt+D + + + true + + + + + + + qPixmapFromMimeSource + + LEFiltre + TWChoix + lineEditNom + lineEditVal + LBNouvCommande + RBalpha + bOk + bSup + bHelp + + + diff --git a/UiQT4/desPlusieursBase.py b/UiQT4/desPlusieursBase.py index 09682a66..54c612b3 100644 --- a/UiQT4/desPlusieursBase.py +++ b/UiQT4/desPlusieursBase.py @@ -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) diff --git a/UiQT4/desPlusieursBase.ui b/UiQT4/desPlusieursBase.ui index 14022e1f..6ad53129 100644 --- a/UiQT4/desPlusieursBase.ui +++ b/UiQT4/desPlusieursBase.ui @@ -45,7 +45,7 @@ - + 200 diff --git a/UiQT4/desPlusieursInto.py b/UiQT4/desPlusieursInto.py index 922f323d..f00206c6 100644 --- a/UiQT4/desPlusieursInto.py +++ b/UiQT4/desPlusieursInto.py @@ -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) diff --git a/UiQT4/desPlusieursInto.ui b/UiQT4/desPlusieursInto.ui index 2e43106e..140ddc10 100644 --- a/UiQT4/desPlusieursInto.ui +++ b/UiQT4/desPlusieursInto.ui @@ -138,7 +138,7 @@ - + @@ -233,7 +233,7 @@ - + diff --git a/UiQT4/desPoursuite.py b/UiQT4/desPoursuite.py index 7b6d2318..cf9c48da 100644 --- a/UiQT4/desPoursuite.py +++ b/UiQT4/desPoursuite.py @@ -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", "

Mots Clefs Permis

", 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", "Commandes :", 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", "La commande POURSUITE requiert un nom de Fichier :", None, QtGui.QApplication.UnicodeUTF8)) self.BBrowse.setText(QtGui.QApplication.translate("DPour", "Edit", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/UiQT4/desPoursuite.ui b/UiQT4/desPoursuite.ui index c83d83c8..65b43e0e 100644 --- a/UiQT4/desPoursuite.ui +++ b/UiQT4/desPoursuite.ui @@ -58,7 +58,7 @@ - + 0 @@ -68,7 +68,7 @@ - + @@ -100,141 +100,90 @@ Nouvelle Commande - - - - 11 - 11 - 291 - 44 - - - - <b><u>Commandes :</u></b> - - - false - - - - - - 11 - 341 - 457 - 17 - - - - La commande choisie sera ajoutée APRES la commande courante - - - false - - - - - - 60 - 60 - 169 - 30 - - - - - 160 - 30 - - - - - - - 11 - 61 - 50 - 30 - - - - - 50 - 30 - - - - Filtre - - - false - - - - - - 330 - 60 - 101 - 20 - - - - par groupe - - - - - - 330 - 30 - 120 - 20 - - - - alphabétique - - - true - - - - - - 310 - 10 - 141 - 80 - - - - Affichage - - - - - - 5 - 101 - 471 - 231 - - - - - - - 233 - 60 - 71 - 27 - - - - Suivant - - + + + + + <b><u>Commandes :</u></b> + + + false + + + + + + + Affichage + + + + + + alphabétique + + + true + + + + + + + par groupe + + + + + + + + + + + 50 + 30 + + + + Filtre + + + false + + + + + + + + 160 + 30 + + + + + + + + Suivant + + + + + + + + + + La commande choisie sera ajoutée APRES la commande courante + + + false + + + + diff --git a/UiQT4/desRacine.py b/UiQT4/desRacine.py index 092dddd9..eb368a12 100644 --- a/UiQT4/desRacine.py +++ b/UiQT4/desRacine.py @@ -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)) diff --git a/UiQT4/desRacine.ui b/UiQT4/desRacine.ui index 43819118..99fab0d2 100644 --- a/UiQT4/desRacine.ui +++ b/UiQT4/desRacine.ui @@ -89,14 +89,14 @@ - + Suivant - + 240 @@ -106,7 +106,7 @@ - + @@ -190,4 +190,5 @@ LBRegles + diff --git a/UiQT4/desUniqueASSD.py b/UiQT4/desUniqueASSD.py index a4ebbdb7..39863fbc 100644 --- a/UiQT4/desUniqueASSD.py +++ b/UiQT4/desUniqueASSD.py @@ -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) diff --git a/UiQT4/desUniqueASSD.ui b/UiQT4/desUniqueASSD.ui index 0184a8ef..fd6ee2ab 100644 --- a/UiQT4/desUniqueASSD.ui +++ b/UiQT4/desUniqueASSD.ui @@ -47,7 +47,7 @@ requis par l'objet courant :</p></font> - + diff --git a/UiQT4/desUniqueBase.py b/UiQT4/desUniqueBase.py index 1e922254..26520797 100644 --- a/UiQT4/desUniqueBase.py +++ b/UiQT4/desUniqueBase.py @@ -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)) diff --git a/UiQT4/desUniqueBase.ui b/UiQT4/desUniqueBase.ui index 5c271f2b..c089a5ff 100644 --- a/UiQT4/desUniqueBase.ui +++ b/UiQT4/desUniqueBase.ui @@ -249,13 +249,14 @@ lineEditVal - tabuniqueinto - bParametres - bSup bOk + bSup + BSalome bHelp BView2D - BSalome + bParametres + tabuniqueinto + diff --git a/UiQT4/desUniqueInto.py b/UiQT4/desUniqueInto.py index 671bf3b6..5d9270f5 100644 --- a/UiQT4/desUniqueInto.py +++ b/UiQT4/desUniqueInto.py @@ -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) diff --git a/UiQT4/desUniqueInto.ui b/UiQT4/desUniqueInto.ui index 57c3f8b6..7ab92b49 100644 --- a/UiQT4/desUniqueInto.ui +++ b/UiQT4/desUniqueInto.ui @@ -119,7 +119,7 @@ - + diff --git a/UiQT4/desUniqueSDCOInto.py b/UiQT4/desUniqueSDCOInto.py index c91fc84a..718c787b 100644 --- a/UiQT4/desUniqueSDCOInto.py +++ b/UiQT4/desUniqueSDCOInto.py @@ -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) diff --git a/UiQT4/desUniqueSDCOInto.ui b/UiQT4/desUniqueSDCOInto.ui index 05618099..c42947b9 100644 --- a/UiQT4/desUniqueSDCOInto.ui +++ b/UiQT4/desUniqueSDCOInto.ui @@ -40,7 +40,7 @@ - + diff --git a/UiQT4/makefile b/UiQT4/makefile index 5cf6a04f..8327014d 100644 --- a/UiQT4/makefile +++ b/UiQT4/makefile @@ -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 $@ $<