*** empty log message ***

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 557e15ad9346866a67db59cbc304ac53e2633fa7..1d2e8a8251338f1dd90471f0842fda158292b60a 100644 (file)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -382,6 +382,7 @@ class JDCEditor(QSplitter):
                       "Copie impossible",
                       "Aucun Objet n a ete copie ou coupe ")
           return
+      child=0
       try:
          child=self.QWParent.noeud_a_editer.doPaste(self.node_selected)
       except:

diff --git a/InterfaceQT4/monParamPanel.py b/InterfaceQT4/monParamPanel.py
index 7c4c2649873a5fb01d57f3209e6449cdeb068f34..bbc27622d98d8ee72a347757804ca54d43846e9a 100644 (file)
--- a/InterfaceQT4/monParamPanel.py
+++ b/InterfaceQT4/monParamPanel.py
@@ -65,11 +65,11 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
         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.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkParamPressed)
         self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommandChanged)
         self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommandChanged)
         self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
-        self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.BOkPressed)
+        self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.BOkParamPressed)
 
   def InitLEs(self):
         nom=self.node.item.get_nom()
@@ -95,6 +95,7 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
         self.node.item.set_nom(nom)
         self.node.item.set_valeur(val)
         self.node.update_texte()
+        self.node.update_node_valid()
         self.editor.init_modif()
         self.InitLEs()
 

diff --git a/UiQT4/myMain.ui b/UiQT4/myMain.ui
index 4a1e785c90d7eb5471c39c58af9bd97e1db70319..747b32d7c94c6fccd8ed805a437a2712ca90fd29 100644 (file)
--- a/UiQT4/myMain.ui
+++ b/UiQT4/myMain.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Eficas</class>
- <widget class="QMainWindow" name="Eficas" >
-  <property name="geometry" >
+ <widget class="QMainWindow" name="Eficas">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,239 +10,248 @@
     <height>811</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>MainWindow</string>
   </property>
-  <widget class="QWidget" name="centralwidget" />
-  <widget class="QMenuBar" name="menubar" >
-   <property name="geometry" >
+  <widget class="QWidget" name="centralwidget"/>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>1383</width>
-     <height>29</height>
+     <height>26</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuFichier" >
-    <property name="title" >
+   <widget class="QMenu" name="menuFichier">
+    <property name="title">
      <string>&amp;Fichier</string>
     </property>
-    <addaction name="action_Nouveau" />
-    <addaction name="actionNouvel_Include" />
-    <addaction name="action_Ouvrir" />
-    <addaction name="separator" />
-    <addaction name="actionEnregistrer" />
-    <addaction name="actionEnregistrer_sous" />
-    <addaction name="actionFermer" />
-    <addaction name="actionFermer_tout" />
-    <addaction name="separator" />
-    <addaction name="actionQuitter" />
+    <addaction name="action_Nouveau"/>
+    <addaction name="actionNouvel_Include"/>
+    <addaction name="action_Ouvrir"/>
+    <addaction name="separator"/>
+    <addaction name="actionEnregistrer"/>
+    <addaction name="actionEnregistrer_sous"/>
+    <addaction name="actionFermer"/>
+    <addaction name="actionFermer_tout"/>
+    <addaction name="separator"/>
+    <addaction name="actionQuitter"/>
    </widget>
-   <widget class="QMenu" name="menuEdition" >
-    <property name="title" >
+   <widget class="QMenu" name="menuEdition">
+    <property name="title">
      <string>Edition</string>
     </property>
-    <addaction name="actionCouper" />
-    <addaction name="actionCopier" />
-    <addaction name="actionColler" />
-    <addaction name="actionSupprimer" />
+    <addaction name="actionCouper"/>
+    <addaction name="actionCopier"/>
+    <addaction name="actionColler"/>
+    <addaction name="actionSupprimer"/>
    </widget>
-   <widget class="QMenu" name="menuJdC" >
-    <property name="title" >
+   <widget class="QMenu" name="menuJdC">
+    <property name="title">
      <string>JdC</string>
     </property>
-    <addaction name="actionRapport_de_Validation" />
-    <addaction name="actionFichier_Source" />
-    <addaction name="actionFichier_Resultat" />
+    <addaction name="actionRapport_de_Validation"/>
+    <addaction name="actionFichier_Source"/>
+    <addaction name="actionFichier_Resultat"/>
    </widget>
-   <widget class="QMenu" name="menu_Aide" >
-    <property name="title" >
+   <widget class="QMenu" name="menu_Aide">
+    <property name="title">
      <string>&amp;Aide</string>
     </property>
-    <addaction name="actionEficas" />
-    <addaction name="actionVersion" />
+    <addaction name="actionEficas"/>
+    <addaction name="actionVersion"/>
    </widget>
-   <widget class="QMenu" name="menuOptions" >
-    <property name="title" >
+   <widget class="QMenu" name="menuOptions">
+    <property name="title">
      <string>Options</string>
     </property>
-    <addaction name="actionParametres_Eficas" />
-    <addaction name="actionLecteur_Pdf" />
+    <addaction name="actionParametres_Eficas"/>
+    <addaction name="actionLecteur_Pdf"/>
    </widget>
-   <widget class="QMenu" name="menuPatrons" >
-    <property name="title" >
+   <widget class="QMenu" name="menuPatrons">
+    <property name="title">
      <string>Patrons</string>
     </property>
    </widget>
-   <addaction name="menuFichier" />
-   <addaction name="menuEdition" />
-   <addaction name="menuJdC" />
-   <addaction name="menu_Aide" />
-   <addaction name="menuOptions" />
-   <addaction name="menuPatrons" />
+   <addaction name="menuFichier"/>
+   <addaction name="menuEdition"/>
+   <addaction name="menuJdC"/>
+   <addaction name="menu_Aide"/>
+   <addaction name="menuOptions"/>
+   <addaction name="menuPatrons"/>
   </widget>
-  <widget class="QStatusBar" name="statusbar" />
-  <widget class="QToolBar" name="toolBar" >
-   <property name="windowTitle" >
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
     <string>toolBar</string>
    </property>
-   <attribute name="toolBarArea" >
+   <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
-   <attribute name="toolBarBreak" >
+   <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="action_Nouveau" />
-   <addaction name="action_Ouvrir" />
-   <addaction name="actionEnregistrer" />
-   <addaction name="separator" />
-   <addaction name="actionCouper" />
-   <addaction name="actionCopier" />
-   <addaction name="actionColler" />
+   <addaction name="action_Nouveau"/>
+   <addaction name="action_Ouvrir"/>
+   <addaction name="actionEnregistrer"/>
+   <addaction name="separator"/>
+   <addaction name="actionCouper"/>
+   <addaction name="actionCopier"/>
+   <addaction name="actionColler"/>
   </widget>
-  <action name="action_Nouveau" >
-   <property name="icon" >
+  <action name="action_Nouveau">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/New24.png</normaloff>../Editeur/icons/New24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Nouveau</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+N</string>
    </property>
   </action>
-  <action name="actionNouvel_Include" >
-   <property name="text" >
+  <action name="actionNouvel_Include">
+   <property name="text">
     <string>Nouvel Include</string>
    </property>
   </action>
-  <action name="action_Ouvrir" >
-   <property name="icon" >
+  <action name="action_Ouvrir">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Open24.png</normaloff>../Editeur/icons/Open24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Ouvrir</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+O</string>
    </property>
   </action>
-  <action name="actionEnregistrer" >
-   <property name="icon" >
+  <action name="actionEnregistrer">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Save24.png</normaloff>../Editeur/icons/Save24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Enregistrer</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+E</string>
    </property>
   </action>
-  <action name="actionEnregistrer_sous" >
-   <property name="text" >
+  <action name="actionEnregistrer_sous">
+   <property name="text">
     <string>Enregistrer sous</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Shift+E</string>
    </property>
   </action>
-  <action name="actionFermer" >
-   <property name="text" >
+  <action name="actionFermer">
+   <property name="text">
     <string>Fermer </string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+W</string>
    </property>
   </action>
-  <action name="actionFermer_tout" >
-   <property name="text" >
+  <action name="actionFermer_tout">
+   <property name="text">
     <string>Fermer tout</string>
    </property>
   </action>
-  <action name="actionCouper" >
-   <property name="icon" >
+  <action name="actionCouper">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Cut24.png</normaloff>../Editeur/icons/Cut24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Couper</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+X</string>
    </property>
+   <property name="shortcutContext">
+    <enum>Qt::ApplicationShortcut</enum>
+   </property>
   </action>
-  <action name="actionCopier" >
-   <property name="icon" >
+  <action name="actionCopier">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Copy24.png</normaloff>../Editeur/icons/Copy24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Copier</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+C</string>
    </property>
+   <property name="shortcutContext">
+    <enum>Qt::ApplicationShortcut</enum>
+   </property>
   </action>
-  <action name="actionColler" >
-   <property name="icon" >
+  <action name="actionColler">
+   <property name="icon">
     <iconset>
      <normaloff>../Editeur/icons/Paste24.png</normaloff>../Editeur/icons/Paste24.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Coller</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+V</string>
    </property>
+   <property name="shortcutContext">
+    <enum>Qt::ApplicationShortcut</enum>
+   </property>
   </action>
-  <action name="actionQuitter" >
-   <property name="text" >
+  <action name="actionQuitter">
+   <property name="text">
     <string>Quitter</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Q</string>
    </property>
   </action>
-  <action name="actionRapport_de_Validation" >
-   <property name="text" >
+  <action name="actionRapport_de_Validation">
+   <property name="text">
     <string>Rapport de Validation</string>
    </property>
   </action>
-  <action name="actionFichier_Source" >
-   <property name="text" >
+  <action name="actionFichier_Source">
+   <property name="text">
     <string>Fichier Source</string>
    </property>
   </action>
-  <action name="actionFichier_Resultat" >
-   <property name="text" >
+  <action name="actionFichier_Resultat">
+   <property name="text">
     <string>Fichier Résultat</string>
    </property>
   </action>
-  <action name="actionParametres_Eficas" >
-   <property name="text" >
+  <action name="actionParametres_Eficas">
+   <property name="text">
     <string>Parametres Eficas</string>
    </property>
   </action>
-  <action name="actionLecteur_Pdf" >
-   <property name="text" >
+  <action name="actionLecteur_Pdf">
+   <property name="text">
     <string>Lecteur Pdf</string>
    </property>
   </action>
-  <action name="actionEficas" >
-   <property name="text" >
+  <action name="actionEficas">
+   <property name="text">
     <string>Eficas</string>
    </property>
   </action>
-  <action name="actionVersion" >
-   <property name="text" >
+  <action name="actionVersion">
+   <property name="text">
     <string>Version</string>
    </property>
   </action>
-  <action name="actionSupprimer" >
-   <property name="text" >
+  <action name="actionSupprimer">
+   <property name="text">
     <string>Supprimer</string>
    </property>
   </action>