From: Pascale Noyret Date: Mon, 6 Jul 2009 11:55:52 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V1_0OpenTurns~85 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8c3d5efa350d780486f1a1943b085ab45c9c122a;p=modules%2Feficas.git *** empty log message *** --- diff --git a/Aster/editeur.ini b/Aster/editeur.ini index b33e6d4a..f2592b2c 100644 --- a/Aster/editeur.ini +++ b/Aster/editeur.ini @@ -21,8 +21,7 @@ import os # Répertoire initial -#initialdir=os.curdir -from prefs_ASTER import REPINI +import prefs_ASTER initialdir=prefs_ASTER.REPINI rep_cata = os.path.join(initialdir,'Cata') rep_Pmw = os.path.join(initialdir,'../Pmw') diff --git a/InterfaceQT4/monPlusieursBasePanel.py b/InterfaceQT4/monPlusieursBasePanel.py index 892a731e..4ca3d3e0 100644 --- a/InterfaceQT4/monPlusieursBasePanel.py +++ b/InterfaceQT4/monPlusieursBasePanel.py @@ -45,12 +45,11 @@ class DPlusBase (Ui_DPlusBase,QDialog): parent.addWidget(parent.partieDroite) parent.leLayout.widgetActive=self self.setupUi(self) - icon = QIcon(self.RepIcon+"arrow_left.png") + self.RepIcon=parent.appliEficas.RepIcon + icon = QIcon(self.RepIcon+"/arrow_left.png") self.BAjout1Val.setIcon(icon) - icon2 = QIcon(self.RepIcon+"arrow_right.png") + icon2 = QIcon(self.RepIcon+"/arrow_right.png") self.BSup1Val.setIcon(icon2) - icon3 = QIcon(self.RepIcon+"image240.png") - self.BSalome.setIcon(icon3) # Import des panels @@ -81,6 +80,8 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur): self.connect(self.BSalome,SIGNAL("clicked()"),self.BSalomePressed) def detruitBouton(self): + icon3 = QIcon(self.RepIcon+"/image240.png") + self.BSalome.setIcon(icon3) mc = self.node.item.get_definition() type = mc.type[0] if not(('grma' in repr(type)) or ('grno' in repr(type))) or not(self.editor.salome) : diff --git a/InterfaceQT4/monPlusieursIntoPanel.py b/InterfaceQT4/monPlusieursIntoPanel.py index 5bdf9220..5b084b30 100644 --- a/InterfaceQT4/monPlusieursIntoPanel.py +++ b/InterfaceQT4/monPlusieursIntoPanel.py @@ -33,6 +33,7 @@ from politiquesValidation import PolitiquePlusieurs class DPlusInto(Ui_DPlusInto,QDialog): def __init__(self,parent ,modal ) : QDialog.__init__(self,parent) + self.RepIcon=parent.appliEficas.RepIcon if hasattr(parent,"leLayout"): parent.leLayout.removeWidget(parent.leLayout.widgetActive) parent.leLayout.widgetActive.close() @@ -45,9 +46,9 @@ class DPlusInto(Ui_DPlusInto,QDialog): parent.addWidget(parent.partieDroite) parent.leLayout.widgetActive=self self.setupUi(self) - icon = QIcon(self.RepIcon+"arrow_left.png") + icon = QIcon(self.RepIcon+"/arrow_left.png") self.BAjout1Val.setIcon(icon) - icon2 = QIcon(self.RepIcon+"arrow_right.png") + icon2 = QIcon(self.RepIcon+"/arrow_right.png") self.BSup1Val.setIcon(icon2) diff --git a/InterfaceQT4/monUniqueBasePanel.py b/InterfaceQT4/monUniqueBasePanel.py index bd0c5b5a..b61c558d 100644 --- a/InterfaceQT4/monUniqueBasePanel.py +++ b/InterfaceQT4/monUniqueBasePanel.py @@ -34,7 +34,7 @@ class DUnBase(Ui_DUnBase,QDialog): def __init__(self,parent ,modal ) : QDialog.__init__(self,parent) self.appliEficas=parent.appliEficas - self.RepIcon=self.appliEficas.RepIcon + self.RepIcon=parent.appliEficas.RepIcon if hasattr(parent,"leLayout"): parent.leLayout.removeWidget(parent.leLayout.widgetActive) parent.leLayout.widgetActive.close() @@ -47,8 +47,6 @@ class DUnBase(Ui_DUnBase,QDialog): parent.addWidget(parent.partieDroite) parent.leLayout.widgetActive=self self.setupUi(self) - icon = QIcon(self.RepIcon+"image240.png") - self.BSalome.setIcon(icon) # Import des panels @@ -80,6 +78,8 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur): def detruitBouton(self): + icon = QIcon(self.RepIcon+"/image240.png") + self.BSalome.setIcon(icon) mc = self.node.item.get_definition() if self.node.item.get_nom() != "FileName" : self.BFichier.close() diff --git a/UiQT4/desPlusieursBase.py b/UiQT4/desPlusieursBase.py index ab90eb30..f1fd6b75 100644 --- a/UiQT4/desPlusieursBase.py +++ b/UiQT4/desPlusieursBase.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'desPlusieursBase.ui' # -# Created: Fri Jun 19 11:40:12 2009 +# Created: Mon Jul 6 14:08:51 2009 # by: PyQt4 UI code generator 4.4.3 # # WARNING! All changes made in this file will be lost! @@ -32,9 +32,7 @@ class Ui_DPlusBase(object): self.LBValeurs.setMinimumSize(QtCore.QSize(200, 0)) self.LBValeurs.setObjectName("LBValeurs") self.verticalLayout_2.addWidget(self.LBValeurs) - self.gridLayout_2.addLayout(self.verticalLayout_2, 0, 0, 1, 1) - self.verticalLayout_5 = QtGui.QVBoxLayout() - self.verticalLayout_5.setObjectName("verticalLayout_5") + self.gridLayout_2.addLayout(self.verticalLayout_2, 0, 0, 7, 1) self.gridLayout = QtGui.QGridLayout() self.gridLayout.setObjectName("gridLayout") self.horizontalLayout = QtGui.QHBoxLayout() @@ -77,7 +75,7 @@ class Ui_DPlusBase(object): self.BSup1Val.setSizePolicy(sizePolicy) self.BSup1Val.setMinimumSize(QtCore.QSize(40, 30)) icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap("../../EficasV1/Editeur/icons/arrow_right.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon1.addPixmap(QtGui.QPixmap("../Editeur/icons/arrow_right.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.BSup1Val.setIcon(icon1) self.BSup1Val.setObjectName("BSup1Val") self.gridLayout.addWidget(self.BSup1Val, 2, 0, 1, 1) @@ -97,11 +95,9 @@ class Ui_DPlusBase(object): self.BView2D.setMinimumSize(QtCore.QSize(120, 30)) self.BView2D.setObjectName("BView2D") self.gridLayout.addWidget(self.BView2D, 2, 2, 1, 1) - self.verticalLayout_5.addLayout(self.gridLayout) + self.gridLayout_2.addLayout(self.gridLayout, 0, 1, 1, 1) spacerItem1 = QtGui.QSpacerItem(20, 158, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_5.addItem(spacerItem1) - self.verticalLayout_4 = QtGui.QVBoxLayout() - self.verticalLayout_4.setObjectName("verticalLayout_4") + self.gridLayout_2.addItem(spacerItem1, 1, 1, 1, 1) self.horizontalLayout_2 = QtGui.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") spacerItem2 = QtGui.QSpacerItem(150, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) @@ -121,18 +117,15 @@ class Ui_DPlusBase(object): self.bImport.setObjectName("bImport") self.verticalLayout.addWidget(self.bImport) self.horizontalLayout_2.addLayout(self.verticalLayout) - self.verticalLayout_4.addLayout(self.horizontalLayout_2) - self.verticalLayout_3 = QtGui.QVBoxLayout() - self.verticalLayout_3.setObjectName("verticalLayout_3") - spacerItem3 = QtGui.QSpacerItem(265, 48, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem3) + self.gridLayout_2.addLayout(self.horizontalLayout_2, 2, 1, 1, 1) + spacerItem3 = QtGui.QSpacerItem(289, 100, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_2.addItem(spacerItem3, 3, 1, 1, 1) self.Commentaire = QtGui.QLabel(self.Widget8) - self.Commentaire.setMinimumSize(QtCore.QSize(251, 21)) + self.Commentaire.setMinimumSize(QtCore.QSize(298, 61)) self.Commentaire.setObjectName("Commentaire") - self.verticalLayout_3.addWidget(self.Commentaire) + self.gridLayout_2.addWidget(self.Commentaire, 4, 1, 1, 1) spacerItem4 = QtGui.QSpacerItem(265, 48, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem4) - self.verticalLayout_4.addLayout(self.verticalLayout_3) + self.gridLayout_2.addItem(spacerItem4, 5, 1, 1, 1) self.horizontalLayout_3 = QtGui.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") spacerItem5 = QtGui.QSpacerItem(118, 27, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) @@ -144,9 +137,7 @@ class Ui_DPlusBase(object): self.bOk.setDefault(False) self.bOk.setObjectName("bOk") self.horizontalLayout_3.addWidget(self.bOk) - self.verticalLayout_4.addLayout(self.horizontalLayout_3) - self.verticalLayout_5.addLayout(self.verticalLayout_4) - self.gridLayout_2.addLayout(self.verticalLayout_5, 0, 1, 1, 1) + self.gridLayout_2.addLayout(self.horizontalLayout_3, 6, 1, 1, 1) self.tabuniqueinto.addTab(self.Widget8, "") self.gridLayout_4.addWidget(self.tabuniqueinto, 0, 0, 1, 1) diff --git a/UiQT4/desPlusieursBase.ui b/UiQT4/desPlusieursBase.ui index 265ee207..d94ed6da 100644 --- a/UiQT4/desPlusieursBase.ui +++ b/UiQT4/desPlusieursBase.ui @@ -26,7 +26,7 @@ Saisir Valeur - + @@ -51,353 +51,341 @@ - - - - - - - - - - 61 - 21 - - - - - 61 - 21 - - - - <font size="+1">Valeur</font> - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 168 - 18 - - - - - - - - - - - 0 - 0 - - + + + + + - 40 - 30 + 61 + 21 - - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + + + 61 + 21 + - + <font size="+1">Valeur</font> - - - ../Editeur/icons/arrow_left.png../Editeur/icons/arrow_left.png + + false - - - - - 0 - 0 - + + + + Qt::Horizontal - + + QSizePolicy::Expanding + + - 220 - 30 + 168 + 18 - + - - - - - 0 - 0 - - + + + + + + + 0 + 0 + + + + + 40 + 30 + + + + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + + + + + + + ../Editeur/icons/arrow_left.png../Editeur/icons/arrow_left.png + + + + + + + + 0 + 0 + + + + + 220 + 30 + + + + + + + + + 0 + 0 + + + + + 40 + 30 + + + + enleve l occurence selectionnee + + + + + + + ../Editeur/icons/arrow_right.png../Editeur/icons/arrow_right.png + + + + + + + + 0 + 0 + + + + + 40 + 30 + + + + ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + + + + + + + image240.pngimage240.png + + + + + + + + 120 + 30 + + + + Visualiser + + + + + + + + + Qt::Vertical + + + + 20 + 158 + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 150 + 20 + + + + + + + + - 40 + 100 30 - - enleve l occurence selectionnee - - - - - - - ../../EficasV1/Editeur/icons/arrow_right.png../../EficasV1/Editeur/icons/arrow_right.png - - - - - - - - 0 - 0 - - - + - 40 + 100 30 - ajoute la valeur saisie sous l occurence selectionnée (en fin de liste si il n y a pas de selection) + suppression du mot clef - + &Parametres + + + Alt+P - - - image240.pngimage240.png + + true - - + + - 120 + 100 + 30 + + + + + 100 30 + + suppression du mot clef + - Visualiser + &Importer + + + Alt+I + + + true + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 289 + 100 + + + + + + + + + 298 + 61 + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 265 + 48 + + + + + + - + - Qt::Vertical + Qt::Horizontal - 20 - 158 + 118 + 27 - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 150 - 20 - - - - - - - - - - - 100 - 30 - - - - - 100 - 30 - - - - suppression du mot clef - - - &Parametres - - - Alt+P - - - true - - - - - - - - 100 - 30 - - - - - 100 - 30 - - - - suppression du mot clef - - - &Importer - - - Alt+I - - - true - - - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 265 - 48 - - - - - - - - - 251 - 21 - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 265 - 48 - - - - - - - - - - - - Qt::Horizontal - - - - 118 - 27 - - - - - - - - - 160 - 30 - - - - - 160 - 30 - - - - validation de la saisie - - - &Valider - - - Shift+A, Alt+A, Alt+A, Alt+A - - - true - - - false - - - - - - + + + + 160 + 30 + + + + + 160 + 30 + + + + validation de la saisie + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + false + +