merge Nizhny

[tools/eficas.git] / UiQT4 / desChoixCommandes.ui

diff --git a/UiQT4/desChoixCommandes.ui b/UiQT4/desChoixCommandes.ui
index 19512d66b5dc5019b807e8dde55672e4969db50c..47c13539735faa5dc4e2a947c8a6437ae517cdc2 100644 (file)
--- a/UiQT4/desChoixCommandes.ui
+++ b/UiQT4/desChoixCommandes.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1188</width>
+    <width>1244</width>
     <height>652</height>
    </rect>
   </property>
@@ -30,9 +30,9 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
-    <widget class="QFrame" name="frame_2">
+    <widget class="QFrame" name="frameAffichage">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -40,7 +40,13 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>4</height>
+       <height>130</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>130</height>
       </size>
      </property>
      <property name="styleSheet">
@@ -52,49 +58,57 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
       <item>
        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="sizeConstraint">
+         <enum>QLayout::SetFixedSize</enum>
+        </property>
         <item>
          <widget class="QLabel" name="label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Affichage&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
          </widget>
         </item>
         <item>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0">
-           <widget class="QRadioButton" name="RBalpha">
-            <property name="toolTip">
-             <string>affiche les commandes par ordre alphabetique</string>
-            </property>
-            <property name="text">
-             <string>Alphabetique</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QRadioButton" name="RBOrdre">
-            <property name="toolTip">
-             <string>affiche les commandes selon les thèmes</string>
-            </property>
-            <property name="text">
-             <string>Ordre de la modélisation</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QRadioButton" name="RBGroupe">
-            <property name="toolTip">
-             <string>affiche les commandes selon les thèmes</string>
-            </property>
-            <property name="text">
-             <string>Par Groupe</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
+         <widget class="QRadioButton" name="RBalpha">
+          <property name="toolTip">
+           <string>affiche les commandes par ordre alphabetique</string>
+          </property>
+          <property name="text">
+           <string>Alphabetique</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RBOrdre">
+          <property name="toolTip">
+           <string>affiche les commandes selon les thèmes</string>
+          </property>
+          <property name="text">
+           <string>Ordre de la modélisation</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RBGroupe">
+          <property name="toolTip">
+           <string>affiche les commandes selon les thèmes</string>
+          </property>
+          <property name="text">
+           <string>Par Groupe</string>
+          </property>
+         </widget>
         </item>
        </layout>
       </item>
@@ -105,14 +119,17 @@
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>382</width>
-          <height>18</height>
+          <width>109</width>
+          <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item>
        <layout class="QVBoxLayout" name="verticalLayout_3">
+        <property name="spacing">
+         <number>0</number>
+        </property>
         <item>
          <widget class="QLabel" name="textLabel6">
           <property name="sizePolicy">
@@ -124,9 +141,18 @@
           <property name="minimumSize">
            <size>
             <width>141</width>
-            <height>40</height>
+            <height>35</height>
            </size>
           </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>35</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>selectionne les mots qui CONTIENNENT l expression</string>
+          </property>
           <property name="frameShape">
            <enum>QFrame::Box</enum>
           </property>
@@ -170,14 +196,128 @@
          </widget>
         </item>
         <item>
-         <spacer name="verticalSpacer_4">
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QRadioButton" name="RBCasse">
+            <property name="text">
+             <string>Sensible à la casse</string>
+            </property>
+            <property name="autoExclusive">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="RBClear">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>200</width>
+              <height>40</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>200</width>
+              <height>40</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>ré-affiche toutes les commandes</string>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">background-color:rgb(104,110,149);
+color :white;
+border-radius : 12px
+</string>
+            </property>
+            <property name="text">
+             <string>Effacer </string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>108</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_5">
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QToolButton" name="RBRegle">
+            <property name="minimumSize">
+             <size>
+              <width>21</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>21</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="focusPolicy">
+             <enum>Qt::ClickFocus</enum>
+            </property>
+            <property name="toolTip">
+             <string>affiche les régles de validité</string>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">border : 0px</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset>
+              <normaloff>../Editeur/icons/lettreRblanc30.png</normaloff>../Editeur/icons/lettreRblanc30.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>21</width>
+              <height>31</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="labelRegle">
+            <property name="text">
+             <string>Règles de construction</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>306</width>
-            <height>5</height>
+            <width>20</width>
+            <height>40</height>
            </size>
           </property>
          </spacer>
@@ -185,11 +325,6 @@
        </layout>
       </item>
      </layout>
-     <zorder>horizontalSpacer</zorder>
-     <zorder>RBOrdre</zorder>
-     <zorder>LEFiltre</zorder>
-     <zorder>textLabel6</zorder>
-     <zorder>label</zorder>
     </widget>
    </item>
    <item>
@@ -211,8 +346,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>1170</width>
-        <height>512</height>
+        <width>1226</width>
+        <height>498</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -223,22 +358,6 @@
          </property>
         </layout>
        </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>10</width>
-           <height>5</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
     </widget>