pour Include Carmel

diff --git a/InterfaceQT4/monIncludePanel.py b/InterfaceQT4/monIncludePanel.py
index 7660ee58a55dde40ccc1e6991d2ff880e9f3117f..cfceb88389de53ef4d94971eeba6a0ed327aeb97 100644 (file)
--- a/InterfaceQT4/monIncludePanel.py
+++ b/InterfaceQT4/monIncludePanel.py
@@ -56,6 +56,7 @@ class MonIncludePanel(DInc,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
   """
   def __init__(self,node, parent = None,name = None,fl = 0):
         #print "MonIncludePanel"
+        self.parentQT=parent
         DInc.__init__(self,parent,fl)
         QTPanel.__init__(self,node,parent)
         QTPanelTBW2.__init__(self,node,parent)
@@ -81,6 +82,8 @@ class MonIncludePanel(DInc,QTPanelTBW1,QTPanelTBW2,QTPanelTBW3):
   def pageBad(self) :
         self.TWChoix.removeTab(2)
         self.TWChoix.setCurrentIndex(2)
+        if self.parentQT.appliEficas.code!="Aster" :
+           self.textLabelbad.setText("La commande Include n a pas encore de fichier associe")
 
   def BBrowsePressed(self):
       self.node.makeEdit()

diff --git a/UiQT4/desInclude.ui b/UiQT4/desInclude.ui
index 3fd283fe3ff9d93fe0bdb75bedf7072d0cf3d747..a2abbb60898735ddaae3fbe37e270ae0ef2109ad 100644 (file)
--- a/UiQT4/desInclude.ui
+++ b/UiQT4/desInclude.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DInc1</class>
- <widget class="QWidget" name="DInc1" >
-  <property name="geometry" >
+ <widget class="QWidget" name="DInc1">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,39 +10,39 @@
     <height>511</height>
    </rect>
   </property>
-  <property name="minimumSize" >
+  <property name="minimumSize">
    <size>
     <width>505</width>
     <height>0</height>
    </size>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>DMacro</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="1" column="0" colspan="3" >
-    <widget class="QLabel" name="Commentaire" >
-     <property name="text" >
+  <layout class="QGridLayout">
+   <item row="1" column="0" colspan="3">
+    <widget class="QLabel" name="Commentaire">
+     <property name="text">
       <string/>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="3" >
-    <widget class="QTabWidget" name="TWChoix" >
-     <property name="currentIndex" >
-      <number>2</number>
+   <item row="0" column="0" colspan="3">
+    <widget class="QTabWidget" name="TWChoix">
+     <property name="currentIndex">
+      <number>3</number>
      </property>
-     <widget class="QWidget" name="MotClef" >
-      <attribute name="title" >
+     <widget class="QWidget" name="MotClef">
+      <attribute name="title">
        <string>Ajouter Mot-Clef</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="1" column="0" >
-        <widget class="QListWidget" name="LBMCPermis" >
-         <property name="minimumSize" >
+      <layout class="QGridLayout">
+       <item row="1" column="0">
+        <widget class="QListWidget" name="LBMCPermis">
+         <property name="minimumSize">
           <size>
            <width>0</width>
            <height>0</height>
@@ -49,71 +50,71 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="textLabel1" >
-         <property name="minimumSize" >
+       <item row="0" column="0">
+        <widget class="QLabel" name="textLabel1">
+         <property name="minimumSize">
           <size>
            <width>0</width>
            <height>0</height>
           </size>
          </property>
-         <property name="text" >
-          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Mots Clefs Permis&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
+         <property name="text">
+          <string>&lt;h3&gt;&lt;p align=&quot;center&quot;&gt;&lt;u&gt;&lt;b&gt;Mots Clefs Permis&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" >
-        <widget class="QListWidget" name="LBRegles" />
+       <item row="1" column="1">
+        <widget class="QListWidget" name="LBRegles"/>
        </item>
-       <item row="0" column="1" >
-        <widget class="QLabel" name="textLabel1_2" >
-         <property name="text" >
-          <string>&lt;h3>&lt;p align="center">&lt;u>&lt;b>Régles&lt;/b>&lt;/u>&lt;/p>&lt;/h3></string>
+       <item row="0" column="1">
+        <widget class="QLabel" name="textLabel1_2">
+         <property name="text">
+          <string>&lt;h3&gt;&lt;p align=&quot;center&quot;&gt;&lt;u&gt;&lt;b&gt;Régles&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>false</bool>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="Commande" >
-      <attribute name="title" >
+     <widget class="QWidget" name="Commande">
+      <attribute name="title">
        <string>Nouvelle Commande</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2" >
-       <item row="0" column="0" colspan="3" >
-        <widget class="QLabel" name="textLabel1_4" >
-         <property name="text" >
-          <string>&lt;b>&lt;u>Commandes :&lt;/u>&lt;/b></string>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="0" colspan="3">
+        <widget class="QLabel" name="textLabel1_4">
+         <property name="text">
+          <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item rowspan="2" row="0" column="3" >
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
+       <item row="0" column="3" rowspan="2">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
           <string>Affichage</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout" >
-          <item row="0" column="0" >
-           <widget class="QRadioButton" name="RBalpha" >
-            <property name="text" >
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QRadioButton" name="RBalpha">
+            <property name="text">
              <string>alphabétique</string>
             </property>
-            <property name="checked" >
+            <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QRadioButton" name="RBGroupe" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QRadioButton" name="RBGroupe">
+            <property name="text">
              <string>par groupe</string>
             </property>
            </widget>
@@ -121,25 +122,25 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="textLabel6" >
-         <property name="minimumSize" >
+       <item row="1" column="0">
+        <widget class="QLabel" name="textLabel6">
+         <property name="minimumSize">
           <size>
            <width>50</width>
            <height>30</height>
           </size>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Filtre</string>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" >
-        <widget class="QLineEdit" name="LEFiltre" >
-         <property name="minimumSize" >
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="LEFiltre">
+         <property name="minimumSize">
           <size>
            <width>160</width>
            <height>30</height>
@@ -147,34 +148,34 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="2" >
-        <widget class="QPushButton" name="BNext" >
-         <property name="text" >
+       <item row="1" column="2">
+        <widget class="QPushButton" name="BNext">
+         <property name="text">
           <string>Suivant</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="4" >
-        <widget class="QListWidget" name="LBNouvCommande" />
+       <item row="2" column="0" colspan="4">
+        <widget class="QListWidget" name="LBNouvCommande"/>
        </item>
-       <item row="3" column="0" colspan="4" >
-        <widget class="QLabel" name="textLabel4" >
-         <property name="text" >
+       <item row="3" column="0" colspan="4">
+        <widget class="QLabel" name="textLabel4">
+         <property name="text">
           <string>La commande choisie sera ajoutée APRES la commande courante</string>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>false</bool>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="maPageOk" >
-      <attribute name="title" >
+     <widget class="QWidget" name="maPageOk">
+      <attribute name="title">
        <string>Fichier Include</string>
       </attribute>
-      <widget class="QLabel" name="textLabel1_3" >
-       <property name="geometry" >
+      <widget class="QLabel" name="textLabel1_3">
+       <property name="geometry">
         <rect>
          <x>30</x>
          <y>10</y>
@@ -182,15 +183,15 @@
          <height>41</height>
         </rect>
        </property>
-       <property name="text" >
-        <string>&lt;font size="+1">La commande INCLUDE requiert un nom de Fichier :&lt;/font></string>
+       <property name="text">
+        <string>&lt;font size=&quot;+1&quot;&gt;La commande INCLUDE requiert un nom de Fichier :&lt;/font&gt;</string>
        </property>
-       <property name="wordWrap" >
+       <property name="wordWrap">
         <bool>false</bool>
        </property>
       </widget>
-      <widget class="QLineEdit" name="LENomFichier" >
-       <property name="geometry" >
+      <widget class="QLineEdit" name="LENomFichier">
+       <property name="geometry">
         <rect>
          <x>20</x>
          <y>50</y>
@@ -198,21 +199,21 @@
          <height>40</height>
         </rect>
        </property>
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize" >
+       <property name="minimumSize">
         <size>
          <width>450</width>
          <height>40</height>
         </size>
        </property>
       </widget>
-      <widget class="QPushButton" name="BBrowse" >
-       <property name="geometry" >
+      <widget class="QPushButton" name="BBrowse">
+       <property name="geometry">
         <rect>
          <x>20</x>
          <y>110</y>
@@ -220,18 +221,18 @@
          <height>41</height>
         </rect>
        </property>
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Edit</string>
        </property>
       </widget>
-      <widget class="QPushButton" name="BChangeFile" >
-       <property name="geometry" >
+      <widget class="QPushButton" name="BChangeFile">
+       <property name="geometry">
         <rect>
          <x>20</x>
          <y>160</y>
@@ -239,33 +240,33 @@
          <height>41</height>
         </rect>
        </property>
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Autre Fichier</string>
        </property>
       </widget>
      </widget>
-     <widget class="QWidget" name="maPageBad" >
-      <attribute name="title" >
+     <widget class="QWidget" name="maPageBad">
+      <attribute name="title">
        <string>Fichier Inc</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" >
-        <widget class="QLabel" name="textLabel1_5" >
-         <property name="text" >
-          <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+      <layout class="QGridLayout">
+       <item row="0" column="0">
+        <widget class="QLabel" name="textLabelbad">
+         <property name="text">
+          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large;">&lt;span style=" font-size:11pt; font-weight:600;">La commande INCLUDE n'a pas de fichier associé. &lt;/span>&lt;/p>
-&lt;p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; font-weight:600;">&lt;span style=" font-size:large;">Il faut d'abord choisir un numéro d'unité&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large;&quot;&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;La commande INCLUDE n'a pas de fichier associé. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:large;&quot;&gt;Il faut d'abord choisir un numéro d'unité&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>false</bool>
          </property>
         </widget>
@@ -274,44 +275,44 @@ p, li { white-space: pre-wrap; }
      </widget>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QPushButton" name="BAlpha" >
-     <property name="text" >
+   <item row="2" column="0">
+    <widget class="QPushButton" name="BAlpha">
+     <property name="text">
       <string>Tri Alpha</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="bOk" >
-     <property name="minimumSize" >
+   <item row="2" column="2">
+    <widget class="QPushButton" name="bOk">
+     <property name="minimumSize">
       <size>
        <width>161</width>
        <height>30</height>
       </size>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>validation de la saisie</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>&amp;Valider</string>
      </property>
-     <property name="shortcut" >
+     <property name="shortcut">
       <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
      </property>
-     <property name="autoDefault" >
+     <property name="autoDefault">
       <bool>true</bool>
      </property>
-     <property name="default" >
+     <property name="default">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" >
-    <spacer name="horizontalSpacer" >
-     <property name="orientation" >
+   <item row="2" column="1">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
@@ -321,7 +322,7 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>LEFiltre</tabstop>