*** empty log message ***

diff --git a/UiQT4/OptionsEditeur.ui b/UiQT4/OptionsEditeur.ui
index 8f705d42f9d9b8935256e2d8599245d4cbbca345..b86f436cd8904860b3931ddafe59030aab510b57 100644 (file)
--- a/UiQT4/OptionsEditeur.ui
+++ b/UiQT4/OptionsEditeur.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>570</width>
-    <height>575</height>
+    <width>586</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Options Aster</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox1">
      <property name="minimumSize">
@@ -25,108 +25,108 @@
      <property name="title">
       <string>Configurer une Version</string>
      </property>
-     <widget class="QLabel" name="textLabel1_3">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>60</y>
-        <width>280</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Répertoire d'accès au catalogue :</string>
-      </property>
-      <property name="wordWrap">
-       <bool>false</bool>
-      </property>
-     </widget>
-     <widget class="QLabel" name="textLabel1_2_2">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>120</y>
-        <width>280</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Répertoire d'accès aux matériaux :</string>
-      </property>
-      <property name="wordWrap">
-       <bool>false</bool>
-      </property>
-     </widget>
-     <widget class="QComboBox" name="CBVersions">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>20</y>
-        <width>90</width>
-        <height>30</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="LERepMat">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>140</y>
-        <width>501</width>
-        <height>31</height>
-       </rect>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>501</width>
-        <height>31</height>
-       </size>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="LERepCata">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>80</y>
-        <width>501</width>
-        <height>31</height>
-       </rect>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>501</width>
-        <height>31</height>
-       </size>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="Bok">
-      <property name="geometry">
-       <rect>
-        <x>440</x>
-        <y>20</y>
-        <width>90</width>
-        <height>31</height>
-       </rect>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>90</width>
-        <height>31</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>Valider</string>
-      </property>
-      <property name="autoDefault">
-       <bool>false</bool>
-      </property>
-     </widget>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QComboBox" name="CBVersions"/>
+      </item>
+      <item row="0" column="1">
+       <widget class="QPushButton" name="Bok">
+        <property name="minimumSize">
+         <size>
+          <width>90</width>
+          <height>31</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Valider</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="textLabel1_3">
+          <property name="text">
+           <string>Répertoire d'accès au catalogue :</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="LERepCata">
+          <property name="minimumSize">
+           <size>
+            <width>501</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QLabel" name="textLabel1_2_2">
+          <property name="text">
+           <string>Répertoire d'accès aux matériaux :</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="LERepMat">
+          <property name="minimumSize">
+           <size>
+            <width>501</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="3" column="0" colspan="2">
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QLabel" name="textLabel1">
+          <property name="text">
+           <string>Repertoire d'acces à la documentation :</string>
+          </property>
+          <property name="wordWrap">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="LERepDoc">
+          <property name="minimumSize">
+           <size>
+            <width>520</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
     </widget>
    </item>
    <item row="1" column="0">
@@ -140,123 +140,52 @@
      <property name="title">
       <string>Gérer les versions</string>
      </property>
-     <widget class="QLineEdit" name="LEVersionAjout">
-      <property name="geometry">
-       <rect>
-        <x>120</x>
-        <y>31</y>
-        <width>101</width>
-        <height>30</height>
-       </rect>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>101</width>
-        <height>30</height>
-       </size>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="LEVersionSup">
-      <property name="geometry">
-       <rect>
-        <x>410</x>
-        <y>30</y>
-        <width>101</width>
-        <height>30</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="PBSup">
-      <property name="geometry">
-       <rect>
-        <x>300</x>
-        <y>20</y>
-        <width>101</width>
-        <height>41</height>
-       </rect>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>101</width>
-        <height>41</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>Supprimer
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QPushButton" name="PBajout">
+        <property name="minimumSize">
+         <size>
+          <width>101</width>
+          <height>41</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Ajouter
 Version :</string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="PBajout">
-      <property name="geometry">
-       <rect>
-        <x>10</x>
-        <y>20</y>
-        <width>101</width>
-        <height>41</height>
-       </rect>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>101</width>
-        <height>41</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>Ajouter
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="LEVersionAjout">
+        <property name="minimumSize">
+         <size>
+          <width>101</width>
+          <height>30</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QPushButton" name="PBSup">
+        <property name="minimumSize">
+         <size>
+          <width>101</width>
+          <height>41</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Supprimer
 Version :</string>
-      </property>
-     </widget>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLineEdit" name="LEVersionSup"/>
+      </item>
+     </layout>
     </widget>
    </item>
    <item row="2" column="0">
-    <widget class="QGroupBox" name="groupBox3">
-     <property name="minimumSize">
-      <size>
-       <width>548</width>
-       <height>90</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Doc</string>
-     </property>
-     <widget class="QLineEdit" name="LERepDoc">
-      <property name="geometry">
-       <rect>
-        <x>20</x>
-        <y>50</y>
-        <width>520</width>
-        <height>31</height>
-       </rect>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>520</width>
-        <height>31</height>
-       </size>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QLabel" name="textLabel1">
-      <property name="geometry">
-       <rect>
-        <x>20</x>
-        <y>20</y>
-        <width>280</width>
-        <height>30</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Repertoire d'acces à la documentation :</string>
-      </property>
-      <property name="wordWrap">
-       <bool>false</bool>
-      </property>
-     </widget>
-    </widget>
-   </item>
-   <item row="3" column="0">
     <widget class="QGroupBox" name="groupBox3_2">
      <property name="minimumSize">
       <size>
@@ -304,7 +233,7 @@ Version :</string>
      </widget>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="3" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QCheckBox" name="Bdefaut">

diff --git a/UiQT4/desChoixCode.ui b/UiQT4/desChoixCode.ui
index 6e827193fac5f607c4a8c32a5ef4bb5b87c2cdd4..05d134bc7e11b305f9701c84c0f1a43ebe5948d2 100644 (file)
--- a/UiQT4/desChoixCode.ui
+++ b/UiQT4/desChoixCode.ui
@@ -13,124 +13,7 @@
   <property name="windowTitle">
    <string>Choix du code</string>
   </property>
-  <widget class="QRadioButton" name="rB_Openturns_Wrapper">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>201</y>
-     <width>162</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>30</height>
-    </size>
-   </property>
-   <property name="text">
-    <string>Openturns_Wrapper</string>
-   </property>
-  </widget>
-  <widget class="QRadioButton" name="rB_Openturns_Study">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>170</y>
-     <width>162</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>30</height>
-    </size>
-   </property>
-   <property name="text">
-    <string>Openturns_Study</string>
-   </property>
-  </widget>
-  <widget class="QRadioButton" name="rB_Aster">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>46</y>
-     <width>162</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>30</height>
-    </size>
-   </property>
-   <property name="text">
-    <string>Aster</string>
-   </property>
-   <property name="checked">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QRadioButton" name="rB_Cuve2dg">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>108</y>
-     <width>162</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>30</height>
-    </size>
-   </property>
-   <property name="text">
-    <string>Cuve2dg</string>
-   </property>
-  </widget>
-  <widget class="QRadioButton" name="rB_Carmel3D">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>77</y>
-     <width>162</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>30</height>
-    </size>
-   </property>
-   <property name="text">
-    <string>Carmel3D</string>
-   </property>
-  </widget>
-  <widget class="QRadioButton" name="rB_MAP">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>139</y>
-     <width>162</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>30</height>
-    </size>
-   </property>
-   <property name="text">
-    <string>MAP</string>
-   </property>
-  </widget>
-  <widget class="QWidget" name="">
+  <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
      <x>0</x>

diff --git a/UiQT4/myMain.ui b/UiQT4/myMain.ui
index c625d5374f5bf23b12235fb66d8d3b2ae9c1bebd..cac0c4fee5fed6037c67890a0e7a754bdbb9adff 100644 (file)
--- a/UiQT4/myMain.ui
+++ b/UiQT4/myMain.ui
@@ -65,18 +65,10 @@
     <addaction name="actionEficas"/>
     <addaction name="actionVersion"/>
    </widget>
-   <widget class="QMenu" name="menuOptions">
-    <property name="title">
-     <string>Options</string>
-    </property>
-    <addaction name="actionParametres_Eficas"/>
-    <addaction name="actionLecteur_Pdf"/>
-   </widget>
    <addaction name="menuFichier"/>
    <addaction name="menuEdition"/>
    <addaction name="menuJdC"/>
    <addaction name="menu_Aide"/>
-   <addaction name="menuOptions"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QToolBar" name="toolBar">