Merge from V6_main_20120808 08Aug12

[modules/homard.git] / src / HOMARDGUI / CreateIteration.ui

diff --git a/src/HOMARDGUI/CreateIteration.ui b/src/HOMARDGUI/CreateIteration.ui
index dbe973d0fdb1ae32cadebcbf92b79f22ec501273..01a0d38b488314792e2eda698dbef10c34f79182 100644 (file)
--- a/src/HOMARDGUI/CreateIteration.ui
+++ b/src/HOMARDGUI/CreateIteration.ui
@@ -5,14 +5,184 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>587</width>
+    <width>610</width>
     <height>598</height>
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Create_Iteration</string>
+   <string>Create an iteration</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" >
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="6" column="0" colspan="4" >
+    <widget class="QGroupBox" name="GBField" >
+     <property name="title" >
+      <string>Field information</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="2" colspan="5" >
+       <widget class="QLineEdit" name="LEFieldFile" >
+        <property name="minimumSize" >
+         <size>
+          <width>282</width>
+          <height>21</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3" colspan="4" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>138</width>
+          <height>18</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="6" >
+       <widget class="QRadioButton" name="RBChosen" >
+        <property name="text" >
+         <string>Chosen time step</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="6" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>255</width>
+          <height>13</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="4" column="5" >
+       <widget class="QSpinBox" name="SpinBox_Rank" >
+        <property name="maximum" >
+         <number>1010000</number>
+        </property>
+        <property name="minimum" >
+         <number>-1</number>
+        </property>
+        <property name="value" >
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="4" >
+       <widget class="QLabel" name="Rank" >
+        <property name="text" >
+         <string>Rank</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2" colspan="2" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>13</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QSpinBox" name="SpinBox_TimeStep" >
+        <property name="maximum" >
+         <number>100000</number>
+        </property>
+        <property name="minimum" >
+         <number>-2</number>
+        </property>
+        <property name="value" >
+         <number>-1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="TimeStep" >
+        <property name="text" >
+         <string>Time step</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="4" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>138</width>
+          <height>28</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="3" colspan="3" >
+       <widget class="QRadioButton" name="RBLast" >
+        <property name="text" >
+         <string>Last time step</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="3" >
+       <widget class="QRadioButton" name="RBNo" >
+        <property name="text" >
+         <string>No time step</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushFieldFile" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="FieldFile" >
+        <property name="text" >
+         <string>Field file</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="0" column="0" colspan="2" >
     <widget class="QLabel" name="Iteration_Name" >
      <property name="text" >
@@ -41,11 +211,11 @@
     </widget>
    </item>
    <item row="1" column="1" >
-    <spacer name="verticalSpacer" >
+    <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>24</height>
@@ -93,11 +263,11 @@
     </widget>
    </item>
    <item row="2" column="1" >
-    <spacer name="verticalSpacer_6" >
+    <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>21</height>
@@ -122,11 +292,11 @@
     </widget>
    </item>
    <item row="3" column="1" >
-    <spacer name="verticalSpacer_1" >
+    <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>22</height>
@@ -155,11 +325,11 @@
     </widget>
    </item>
    <item row="5" column="1" >
-    <spacer name="verticalSpacer_3" >
+    <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>21</height>
@@ -167,170 +337,12 @@
      </property>
     </spacer>
    </item>
-   <item row="6" column="0" colspan="4" >
-    <widget class="QGroupBox" name="GBField" >
-     <property name="title" >
-      <string>Field information</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <item row="0" column="0" >
-       <widget class="QLabel" name="FieldFile" >
-        <property name="text" >
-         <string>Field File</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushFieldFile" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" colspan="6" >
-       <widget class="QLineEdit" name="LEFieldFile" >
-        <property name="minimumSize" >
-         <size>
-          <width>282</width>
-          <height>21</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3" colspan="4" >
-       <spacer name="verticalSpacer_7" >
-        <property name="orientation" >
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>138</width>
-          <height>18</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="0" colspan="3" >
-       <widget class="QRadioButton" name="RBNo" >
-        <property name="text" >
-         <string>No Time Step</string>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3" colspan="3" >
-       <widget class="QRadioButton" name="RBLast" >
-        <property name="text" >
-         <string>Last Time Step</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="7" >
-       <widget class="QRadioButton" name="RBChosen" >
-        <property name="text" >
-         <string>Chosen time step</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="4" >
-       <spacer name="verticalSpacer_4" >
-        <property name="orientation" >
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>138</width>
-          <height>28</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="TimeStep" >
-        <property name="text" >
-         <string>Time Step</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" >
-       <widget class="QSpinBox" name="SpinBox_TimeStep" >
-        <property name="minimum" >
-         <number>-2</number>
-        </property>
-        <property name="maximum" >
-         <number>100000</number>
-        </property>
-        <property name="value" >
-         <number>-1</number>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2" colspan="2" >
-       <spacer name="spacer" >
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>13</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="4" column="4" >
-       <widget class="QLabel" name="Rank" >
-        <property name="text" >
-         <string>Rank</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="5" >
-       <widget class="QSpinBox" name="SpinBox_Rank" >
-        <property name="minimum" >
-         <number>-1</number>
-        </property>
-        <property name="maximum" >
-         <number>1010000</number>
-        </property>
-        <property name="value" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="6" colspan="2" >
-       <spacer name="spacer_3" >
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>255</width>
-          <height>13</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="7" column="1" >
-    <spacer name="verticalSpacer_2" >
+    <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>22</height>
@@ -343,7 +355,13 @@
      <property name="title" >
       <string>Hypothesis</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_3" >
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item row="0" column="0" >
        <widget class="QComboBox" name="CBHypothese" >
         <property name="currentIndex" >
@@ -355,14 +373,14 @@
        </widget>
       </item>
       <item row="0" column="1" >
-       <spacer name="spacer_2" >
+       <spacer>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeType" >
          <enum>QSizePolicy::Fixed</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" >
          <size>
           <width>40</width>
           <height>13</height>
@@ -387,12 +405,12 @@
      </layout>
     </widget>
    </item>
-   <item row="9" column="0" colspan="2" >
-    <spacer name="verticalSpacer_5" >
+   <item row="9" column="0" >
+    <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" >
       <size>
        <width>20</width>
        <height>21</height>
@@ -405,11 +423,17 @@
      <property name="title" >
       <string/>
      </property>
-     <layout class="QGridLayout" name="gridLayout_4" >
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item row="0" column="0" >
        <widget class="QPushButton" name="buttonOk" >
         <property name="text" >
-         <string>&amp;Ok</string>
+         <string>OK</string>
         </property>
         <property name="autoDefault" >
          <bool>false</bool>
@@ -422,21 +446,21 @@
       <item row="0" column="1" >
        <widget class="QPushButton" name="buttonApply" >
         <property name="text" >
-         <string>&amp;Apply</string>
+         <string>Apply</string>
         </property>
        </widget>
       </item>
       <item row="0" column="2" >
        <widget class="QPushButton" name="buttonCancel" >
         <property name="text" >
-         <string>&amp;Cancel</string>
+         <string>Cancel</string>
         </property>
        </widget>
       </item>
       <item row="0" column="3" >
        <widget class="QPushButton" name="buttonHelp" >
         <property name="text" >
-         <string>&amp;Help</string>
+         <string>Help</string>
         </property>
        </widget>
       </item>