From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Fri, 4 Jul 2008 07:51:57 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V1_14a10~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=628b6ab2dbcb1ec7fdbf6d957a7a6cd3764e2fa1;p=tools%2Feficas.git

*** empty log message ***
---

diff --git a/InterfaceQT/compoformule.py b/InterfaceQT/compoformule.py
index 6f3bd9dd..02dcdc0d 100644
--- a/InterfaceQT/compoformule.py
+++ b/InterfaceQT/compoformule.py
@@ -20,6 +20,10 @@ class FormuleNode(browser.JDCNode,typeNode.PopUpMenuNode):
       from monFormulePanel import MonFormulePanel
       return MonFormulePanel(self,parent=self.editor)
         
+   
+    def createPopUpMenu(self):
+      typeNode.PopUpMenuNode.createPopUpMenu(self)
+
             
 class FORMULETreeItem(compooper.EtapeTreeItem):
     """
diff --git a/InterfaceQT/monFonctionPanel.py b/InterfaceQT/monFonctionPanel.py
index 8a0a3f3d..b69d3819 100644
--- a/InterfaceQT/monFonctionPanel.py
+++ b/InterfaceQT/monFonctionPanel.py
@@ -83,6 +83,7 @@ class MonFonctionPanel(MonPlusieursBasePanel):
             commentaire += QString(str(self.nbValeurs)) 
             commentaire += QString(" valeurs")
             #self.Commentaire.setText(commentaire)
+	    self.LEValeur.setText(QString(str(liste)))
             self.editor.affiche_infos(commentaire)
             return
 
diff --git a/InterfaceQT/qtEficas.py b/InterfaceQT/qtEficas.py
index 780cf355..7914ef84 100644
--- a/InterfaceQT/qtEficas.py
+++ b/InterfaceQT/qtEficas.py
@@ -61,7 +61,7 @@ class Appli(Eficas):
         self.setCentralWidget(self.viewmanager)
 
         self.recentMenu = QPopupMenu(self.Fichier)
-        self.Fichier.insertItem(self.trUtf8('&Recents'), self.recentMenu)
+        self.Fichier.insertItem(self.trUtf8('&Recents'), self.recentMenu,99,8)
         self.connect(self.recentMenu,SIGNAL('aboutToShow()'),self.handleShowRecentMenu)
         self.connect(self,PYSIGNAL('preferencesChanged'),
                      self.viewmanager.handlePreferencesChanged)
diff --git a/Ui/desCommande.ui b/Ui/desCommande.ui
index 8bff53b5..1ebda2c3 100644
--- a/Ui/desCommande.ui
+++ b/Ui/desCommande.ui
@@ -122,76 +122,49 @@
                 <attribute name="title">
                     <string>Ajouter Mot-Clef</string>
                 </attribute>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>textLabel1</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>11</y>
-                            <width>226</width>
-                            <height>18</height>
-                        </rect>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>0</width>
-                            <height>0</height>
-                        </size>
-                    </property>
-                    <property name="text">
-                        <string>&lt;h3&gt;&lt;p align="center"&gt;&lt;u&gt;&lt;b&gt;Mots Clefs Permis&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QListBox">
-                    <property name="name">
-                        <cstring>LBMCPermis</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>35</y>
-                            <width>226</width>
-                            <height>342</height>
-                        </rect>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>0</width>
-                            <height>0</height>
-                        </size>
-                    </property>
-                </widget>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>textLabel1_2</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>243</x>
-                            <y>11</y>
-                            <width>225</width>
-                            <height>18</height>
-                        </rect>
-                    </property>
-                    <property name="text">
-                        <string>&lt;h3&gt;&lt;p align="center"&gt;&lt;u&gt;&lt;b&gt;Règles&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QListBox">
+                <grid>
                     <property name="name">
-                        <cstring>LBRegles</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>243</x>
-                            <y>35</y>
-                            <width>225</width>
-                            <height>342</height>
-                        </rect>
+                        <cstring>unnamed</cstring>
                     </property>
-                </widget>
+                    <widget class="QLabel" row="0" column="0">
+                        <property name="name">
+                            <cstring>textLabel1</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>0</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string>&lt;h3&gt;&lt;p align="center"&gt;&lt;u&gt;&lt;b&gt;Mots Clefs Permis&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
+                        </property>
+                    </widget>
+                    <widget class="QListBox" row="1" column="1">
+                        <property name="name">
+                            <cstring>LBRegles</cstring>
+                        </property>
+                    </widget>
+                    <widget class="QListBox" row="1" column="0">
+                        <property name="name">
+                            <cstring>LBMCPermis</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>0</height>
+                            </size>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="0" column="1">
+                        <property name="name">
+                            <cstring>textLabel1_2</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;h3&gt;&lt;p align="center"&gt;&lt;u&gt;&lt;b&gt;Règles&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
+                        </property>
+                    </widget>
+                </grid>
             </widget>
             <widget class="QWidget">
                 <property name="name">
diff --git a/Ui/desListeParam.ui b/Ui/desListeParam.ui
index 25f30d85..5296fb55 100644
--- a/Ui/desListeParam.ui
+++ b/Ui/desListeParam.ui
@@ -23,6 +23,9 @@
             <property name="name">
                 <cstring>LBParam</cstring>
             </property>
+            <property name="selectionMode">
+                <enum>Single</enum>
+            </property>
         </widget>
     </grid>
 </widget>
diff --git a/Ui/myMain.ui b/Ui/myMain.ui
index 210e50a1..da2aec89 100644
--- a/Ui/myMain.ui
+++ b/Ui/myMain.ui
@@ -176,10 +176,10 @@
             <string>Enregistrer</string>
         </property>
         <property name="menuText">
-            <string>&amp;Enregistrer</string>
+            <string>Enregistrer</string>
         </property>
         <property name="accel">
-            <string>Ctrl+E</string>
+            <string>Ctrl+S</string>
         </property>
     </action>
     <action>