From: Pascale Noyret Date: Mon, 12 Nov 2007 09:33:57 +0000 (+0000) Subject: PN pour la doc X-Git-Tag: V1_13b1~24 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f21d7ebb03faafc9088013fabdf09a306b769f32;p=modules%2Feficas.git PN pour la doc --- diff --git a/InterfaceQT/monCommandePanel.py b/InterfaceQT/monCommandePanel.py index a15cc8a1..16962da8 100644 --- a/InterfaceQT/monCommandePanel.py +++ b/InterfaceQT/monCommandePanel.py @@ -50,6 +50,9 @@ class MonCommandePanel(DComm,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3): def BOkPressed(self): QTPanel.BOkPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) + def BNextPressed(self): QTPanelTBW2.BNextPressed(self) diff --git a/InterfaceQT/monFormulePanel.py b/InterfaceQT/monFormulePanel.py index e3af126d..e691082e 100644 --- a/InterfaceQT/monFormulePanel.py +++ b/InterfaceQT/monFormulePanel.py @@ -58,6 +58,9 @@ class MonFormulePanel(DFormule,QTPanelTBW2): def BOkPressed(self): QTPanel.BOkPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) + def BNextPressed(self): QTPanelTBW2.BNextPressed(self) diff --git a/InterfaceQT/monMCFactPanel.py b/InterfaceQT/monMCFactPanel.py index ccd3f6e3..fc806931 100644 --- a/InterfaceQT/monMCFactPanel.py +++ b/InterfaceQT/monMCFactPanel.py @@ -46,3 +46,6 @@ class MonMCFactPanel(DMCFact,QTPanelTBW1): def BOkPressed(self): QTPanel.BOkPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) + diff --git a/InterfaceQT/monMCListAjoutPanel.py b/InterfaceQT/monMCListAjoutPanel.py index 622deab5..8cb0eb37 100644 --- a/InterfaceQT/monMCListAjoutPanel.py +++ b/InterfaceQT/monMCListAjoutPanel.py @@ -47,3 +47,6 @@ class MonMCListAjoutPanel(DMCListAjout,QTPanel): def BAjoutClicked(self): self.node.parent.append_child(self.node.item.get_nom()) + def ViewDoc(self): + QTPanel.ViewDoc(self) + diff --git a/InterfaceQT/monMacroPanel.py b/InterfaceQT/monMacroPanel.py index 10bcf416..bb2d8036 100644 --- a/InterfaceQT/monMacroPanel.py +++ b/InterfaceQT/monMacroPanel.py @@ -47,6 +47,8 @@ class MonMacroPanel(DMacro,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3): else : self.TWChoix.removePage(self.TWChoix.page(2)) + def ViewDoc(self): + QTPanel.ViewDoc(self) def BSupPressed(self): QTPanel.BSupPressed(self) diff --git a/InterfaceQT/monParamPanel.py b/InterfaceQT/monParamPanel.py index a3760ae1..70d70c48 100644 --- a/InterfaceQT/monParamPanel.py +++ b/InterfaceQT/monParamPanel.py @@ -130,4 +130,6 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel): def BOkPressed(self): QTPanel.BOkPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) diff --git a/InterfaceQT/monPlusieursBasePanel.py b/InterfaceQT/monPlusieursBasePanel.py index 2cc00e5d..ae0a176b 100644 --- a/InterfaceQT/monPlusieursBasePanel.py +++ b/InterfaceQT/monPlusieursBasePanel.py @@ -46,6 +46,9 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur): self.BuildLBValeurs() self.listeValeursCourantes=self.node.item.GetListeValeurs() + def ViewDoc(self): + QTPanel.ViewDoc(self) + def BuildLBValeurs(self): # redefinit en raison de l heritage par monFonctionPanel SaisieValeur.BuildLBValeurs(self) diff --git a/InterfaceQT/monPlusieursIntoPanel.py b/InterfaceQT/monPlusieursIntoPanel.py index 2d088067..fe9aa862 100644 --- a/InterfaceQT/monPlusieursIntoPanel.py +++ b/InterfaceQT/monPlusieursIntoPanel.py @@ -55,6 +55,9 @@ class MonPlusieursIntoPanel(DPlusInto,QTPanel,SaisieValeur): def BSupPressed(self): QTPanel.BSupPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) + def Sup1Valeur(self): index=self.LBValeurs.currentItem() self.LBValeurs.removeItem(self.LBValeurs.currentItem()) diff --git a/InterfaceQT/monRacinePanel.py b/InterfaceQT/monRacinePanel.py index f1c3a223..bf8f3a8e 100644 --- a/InterfaceQT/monRacinePanel.py +++ b/InterfaceQT/monRacinePanel.py @@ -47,6 +47,9 @@ class MonRacinePanel(DRac,QTPanelTBW2): def BOkPressed(self): self.DefCmd() + def ViewDoc(self): + QTPanel.ViewDoc(self) + def BNextPressed(self): QTPanelTBW2.BNextPressed(self) diff --git a/InterfaceQT/monUniqueASSDPanel.py b/InterfaceQT/monUniqueASSDPanel.py index 88754153..c7c96493 100644 --- a/InterfaceQT/monUniqueASSDPanel.py +++ b/InterfaceQT/monUniqueASSDPanel.py @@ -51,3 +51,6 @@ class MonUniqueASSDPanel(DUnASSD,QTPanel,SaisieValeur): def BSupPressed(self): QTPanel.BSupPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) + diff --git a/InterfaceQT/monUniqueBasePanel.py b/InterfaceQT/monUniqueBasePanel.py index a5795772..30161f97 100644 --- a/InterfaceQT/monUniqueBasePanel.py +++ b/InterfaceQT/monUniqueBasePanel.py @@ -45,6 +45,9 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur): self.politique=PolitiqueUnique(node,parent) self.InitLineEditVal() + def ViewDoc(self): + QTPanel.ViewDoc(self) + def InitLineEditVal(self): valeur=self.node.item.get_valeur() valeurTexte=self.politique.GetValeurTexte(valeur) diff --git a/InterfaceQT/monUniqueCompPanel.py b/InterfaceQT/monUniqueCompPanel.py index 03a6bba0..ccca1053 100644 --- a/InterfaceQT/monUniqueCompPanel.py +++ b/InterfaceQT/monUniqueCompPanel.py @@ -150,3 +150,6 @@ class MonUniqueCompPanel(DUnComp,QTPanel,PolitiqueUnique): def BSupPressed(self): QTPanel.BSupPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) + diff --git a/InterfaceQT/monUniqueIntoPanel.py b/InterfaceQT/monUniqueIntoPanel.py index 43319181..86a19958 100644 --- a/InterfaceQT/monUniqueIntoPanel.py +++ b/InterfaceQT/monUniqueIntoPanel.py @@ -55,3 +55,6 @@ class MonUniqueIntoPanel(DUnIn,QTPanel,SaisieValeur): def BSupPressed(self): QTPanel.BSupPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) + diff --git a/InterfaceQT/monUniqueSDCOIntoPanel.py b/InterfaceQT/monUniqueSDCOIntoPanel.py index f0368f3d..3ec103ca 100644 --- a/InterfaceQT/monUniqueSDCOIntoPanel.py +++ b/InterfaceQT/monUniqueSDCOIntoPanel.py @@ -105,3 +105,6 @@ class MonUniqueSDCOIntoPanel(DUnSDCOInto,QTPanel,SaisieSDCO): def BSupPressed(self): QTPanel.BSupPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) + diff --git a/InterfaceQT/monUniqueSDCOPanel.py b/InterfaceQT/monUniqueSDCOPanel.py index 61e5d746..f2247ed1 100644 --- a/InterfaceQT/monUniqueSDCOPanel.py +++ b/InterfaceQT/monUniqueSDCOPanel.py @@ -62,3 +62,6 @@ class MonUniqueSDCOPanel(DUnSDCO,QTPanel,SaisieSDCO): """ SaisieSDCO.LESDCOReturnPressed(self) + def ViewDoc(self): + QTPanel.ViewDoc(self) + diff --git a/InterfaceQT/qtCommun.py b/InterfaceQT/qtCommun.py index bc144f21..7c6944e9 100644 --- a/InterfaceQT/qtCommun.py +++ b/InterfaceQT/qtCommun.py @@ -46,6 +46,21 @@ class QTPanel: self.editor.init_modif() self.node.delete() + def ViewDoc(self) : + cle_doc = self.node.item.get_docu() + if cle_doc == None : return + cle_doc = string.replace(cle_doc,'.','') + cle_doc = string.replace(cle_doc,'-','') + commande = self.editor.CONFIGURATION.exec_acrobat + nom_fichier = cle_doc+".pdf" + fichier = os.path.abspath(os.path.join(self.editor.CONFIGURATION.path_doc, + nom_fichier)) + if os.name == 'nt': + os.spawnv(os.P_NOWAIT,commande,(commande,fichier,)) + elif os.name == 'posix': + script ="#!/usr/bin/sh \n%s %s&" %(commande,fichier) + pid = os.system(script) + def BOkPressed(self): """ Impossible d utiliser les vrais labels avec designer ?? """ label=self.TWChoix.tabLabel(self.TWChoix.currentPage()) diff --git a/Ui/desCommande.py b/Ui/desCommande.py index 701122b8..fc7abbc0 100644 --- a/Ui/desCommande.py +++ b/Ui/desCommande.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desCommande.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: sam nov 10 08:41:43 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -171,7 +171,7 @@ class DComm(QWidget): 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.BHelpPressed) + self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed) @@ -228,8 +228,8 @@ class DComm(QWidget): def BuildTabCommand(self): print "DComm.BuildTabCommand(): Not implemented yet" - def BHelpPressed(self): - print "DComm.BHelpPressed(): Not implemented yet" + def ViewDoc(self): + print "DComm.ViewDoc(): Not implemented yet" def BNextPressed(self): print "DComm.BNextPressed(): Not implemented yet" diff --git a/Ui/desCommande.ui b/Ui/desCommande.ui index 8f4578b0..0f2b7ab1 100644 --- a/Ui/desCommande.ui +++ b/Ui/desCommande.ui @@ -411,7 +411,7 @@ bHelp clicked() DComm - BHelpPressed() + ViewDoc() BNext @@ -428,7 +428,7 @@ LENomConceptReturnPressed() BOkPressed() BuildTabCommand() - BHelpPressed() + ViewDoc() BNextPressed() diff --git a/Ui/desError.py b/Ui/desError.py index 54ced031..25375029 100644 --- a/Ui/desError.py +++ b/Ui/desError.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desError.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: sam nov 10 08:21:36 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -57,12 +57,6 @@ class DError(QWidget): def BSupPressed(self): print "DError.BSupPressed(): Not implemented yet" - def ViewDoc(self): - print "DError.ViewDoc(): Not implemented yet" - - def BOkPressed(self): - print "DError.BOkPressed(): Not implemented yet" - def __tr(self,s,c = None): return qApp.translate("DError",s,c) diff --git a/Ui/desError.ui b/Ui/desError.ui index 9dd94bbd..8dc6260b 100644 --- a/Ui/desError.ui +++ b/Ui/desError.ui @@ -106,8 +106,6 @@ BSupPressed() - ViewDoc() - BOkPressed() diff --git a/Ui/desFormule.py b/Ui/desFormule.py index 2142a0ed..e696be93 100644 --- a/Ui/desFormule.py +++ b/Ui/desFormule.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desFormule.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: sam nov 10 08:49:35 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -192,6 +192,7 @@ class DFormule(QWidget): 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 languageChange(self): @@ -257,6 +258,9 @@ class DFormule(QWidget): def FormuleSaisie(self): print "DFormule.FormuleSaisie(): Not implemented yet" + def ViewDoc(self): + print "DFormule.ViewDoc(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DFormule",s,c) diff --git a/Ui/desFormule.ui b/Ui/desFormule.ui index 09f8ba62..5e92c7d8 100644 --- a/Ui/desFormule.ui +++ b/Ui/desFormule.ui @@ -433,6 +433,12 @@ valeurs seront effectivement prises en compte DFormule FormuleSaisie() + + bHelp + clicked() + DFormule + ViewDoc() + LBNouvCommandeClicked() @@ -445,6 +451,7 @@ valeurs seront effectivement prises en compte NomFormuleSaisi() argsSaisis() FormuleSaisie() + ViewDoc() diff --git a/Ui/desInactif.py b/Ui/desInactif.py index 1c0a6f89..a1c284ef 100644 --- a/Ui/desInactif.py +++ b/Ui/desInactif.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desInactif.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: sam nov 10 08:23:03 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -62,12 +62,6 @@ class DInactif(QWidget): def BSupPressed(self): print "DInactif.BSupPressed(): Not implemented yet" - def ViewDoc(self): - print "DInactif.ViewDoc(): Not implemented yet" - - def BOkPressed(self): - print "DInactif.BOkPressed(): Not implemented yet" - def __tr(self,s,c = None): return qApp.translate("DInactif",s,c) diff --git a/Ui/desInactif.ui b/Ui/desInactif.ui index 1b8f7f32..4f73e52b 100644 --- a/Ui/desInactif.ui +++ b/Ui/desInactif.ui @@ -120,8 +120,6 @@ sont actives BSupPressed() - ViewDoc() - BOkPressed() diff --git a/Ui/desMCFact.py b/Ui/desMCFact.py index 4afda2ab..bdd39ea0 100644 --- a/Ui/desMCFact.py +++ b/Ui/desMCFact.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMCFact.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: sam nov 10 09:00:26 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -76,6 +76,7 @@ class DMCFact(QWidget): 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 languageChange(self): @@ -95,14 +96,8 @@ class DMCFact(QWidget): self.TWChoix.changeTab(self.MotClef,self.__tr("Ajouter Mot-Clef")) - def LBNouvCommandeClicked(self): - print "DMCFact.LBNouvCommandeClicked(): Not implemented yet" - - def LEFiltreTextChanged(self): - print "DMCFact.LEFiltreTextChanged(): Not implemented yet" - - def LEfiltreReturnPressed(self): - print "DMCFact.LEfiltreReturnPressed(): Not implemented yet" + def ViewDoc(self): + print "DMCFact.ViewDoc(): Not implemented yet" def BSupPressed(self): print "DMCFact.BSupPressed(): Not implemented yet" @@ -110,12 +105,6 @@ class DMCFact(QWidget): def BOkPressed(self): print "DMCFact.BOkPressed(): Not implemented yet" - def buildTabCommand(self): - print "DMCFact.buildTabCommand(): Not implemented yet" - - def BNextPressed(self): - print "DMCFact.BNextPressed(): Not implemented yet" - def __tr(self,s,c = None): return qApp.translate("DMCFact",s,c) diff --git a/Ui/desMCFact.ui b/Ui/desMCFact.ui index 9cf1a7fe..7eebedb4 100644 --- a/Ui/desMCFact.ui +++ b/Ui/desMCFact.ui @@ -168,15 +168,17 @@ DMCFact BOkPressed() + + bHelp + clicked() + DMCFact + ViewDoc() + - LBNouvCommandeClicked() - LEFiltreTextChanged() - LEfiltreReturnPressed() + ViewDoc() BSupPressed() BOkPressed() - buildTabCommand() - BNextPressed() diff --git a/Ui/desMCListAjout.ui b/Ui/desMCListAjout.ui index 7f1fadee..7efbe415 100644 --- a/Ui/desMCListAjout.ui +++ b/Ui/desMCListAjout.ui @@ -291,10 +291,17 @@ DMCListAjout BSupPressed() + + bHelp + clicked() + DMCListAjout + ViewDoc() + BAjoutClicked() BSupPressed() + ViewDoc() diff --git a/Ui/desMacro.py b/Ui/desMacro.py index 79e74e04..44d92b7d 100644 --- a/Ui/desMacro.py +++ b/Ui/desMacro.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desMacro.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: sam nov 10 08:41:54 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -170,6 +170,7 @@ class DMacro(QWidget): self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand) self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed) self.connect(self.LENomConcept,SIGNAL("returnPressed()"),self.LENomConceptReturnPressed) + self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) def languageChange(self): @@ -228,6 +229,9 @@ class DMacro(QWidget): def LENomConceptReturnPressed(self): print "DMacro.LENomConceptReturnPressed(): Not implemented yet" + def ViewDoc(self): + print "DMacro.ViewDoc(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DMacro",s,c) diff --git a/Ui/desMacro.ui b/Ui/desMacro.ui index 8f23269c..5ebacd0e 100644 --- a/Ui/desMacro.ui +++ b/Ui/desMacro.ui @@ -426,6 +426,12 @@ DMacro LENomConceptReturnPressed() + + bHelp + clicked() + DMacro + ViewDoc() + LBNouvCommandeClicked() @@ -436,6 +442,7 @@ BuildTabCommand() BNextPressed() LENomConceptReturnPressed() + ViewDoc() diff --git a/Ui/desParam.py b/Ui/desParam.py index d4233a25..f2d07720 100644 --- a/Ui/desParam.py +++ b/Ui/desParam.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desParam.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: sam nov 10 08:53:40 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -153,7 +153,7 @@ class DParam(QWidget): 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.BHelpPressed) + self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc) self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed) @@ -207,8 +207,8 @@ class DParam(QWidget): def BuildTabCommand(self): print "DParam.BuildTabCommand(): Not implemented yet" - def BHelpPressed(self): - print "DParam.BHelpPressed(): Not implemented yet" + def ViewDoc(self): + print "DParam.ViewDoc(): Not implemented yet" def BNextPressed(self): print "DParam.BNextPressed(): Not implemented yet" diff --git a/Ui/desParam.ui b/Ui/desParam.ui index a2ba8081..ab5a7834 100644 --- a/Ui/desParam.ui +++ b/Ui/desParam.ui @@ -132,7 +132,7 @@ - 101 + 153 20 @@ -157,7 +157,7 @@ - 101 + 153 20 @@ -452,7 +452,7 @@ appuyé sur le bouton Valider. bHelp clicked() DParam - BHelpPressed() + ViewDoc() BNext @@ -469,7 +469,7 @@ appuyé sur le bouton Valider. LENomConceptReturnPressed() BOkPressed() BuildTabCommand() - BHelpPressed() + ViewDoc() BNextPressed() diff --git a/Ui/desRacine.py b/Ui/desRacine.py index 47953697..f68055f4 100644 --- a/Ui/desRacine.py +++ b/Ui/desRacine.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desRacine.ui' # -# Created: ven nov 9 14:51:34 2007 +# Created: sam nov 10 08:45:32 2007 # by: The PyQt User Interface Compiler (pyuic) 3.13 # # WARNING! All changes made in this file will be lost! @@ -118,6 +118,7 @@ class DRac(QWidget): 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 languageChange(self): @@ -162,6 +163,9 @@ class DRac(QWidget): def BNextPressed(self): print "DRac.BNextPressed(): Not implemented yet" + def ViewDoc(self): + print "DRac.ViewDoc(): Not implemented yet" + def __tr(self,s,c = None): return qApp.translate("DRac",s,c) diff --git a/Ui/desRacine.ui b/Ui/desRacine.ui index 8bfcbdb1..6d83242c 100644 --- a/Ui/desRacine.ui +++ b/Ui/desRacine.ui @@ -247,6 +247,12 @@ DRac BNextPressed() + + bHelp + clicked() + DRac + ViewDoc() + LBNouvCommandeClicked() @@ -256,6 +262,7 @@ BOkPressed() BuildTabCommand() BNextPressed() + ViewDoc()