Join modifications from branch BR_JYP

[tools/hxx2salome.git] / src / hxx2salome.ui

diff --git a/src/hxx2salome.ui b/src/hxx2salome.ui
index 2e2ceb8bf3259dff2eda2357d5fbeaf9270908fe..b9f4a54f7beca4df1ac90a6f36e53a54b3d66071 100644 (file)
--- a/src/hxx2salome.ui
+++ b/src/hxx2salome.ui
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>520</width>
-            <height>383</height>
+            <height>429</height>
         </rect>
     </property>
     <property name="caption">
@@ -225,34 +225,34 @@
     </widget>
     <widget class="QPushButton">
         <property name="name">
-            <cstring>CloseButton</cstring>
+            <cstring>GenButton</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>390</x>
-                <y>340</y>
+                <x>30</x>
+                <y>380</y>
                 <width>86</width>
                 <height>28</height>
             </rect>
         </property>
         <property name="text">
-            <string>Close</string>
+            <string>Generate</string>
         </property>
     </widget>
     <widget class="QPushButton">
         <property name="name">
-            <cstring>GenButton</cstring>
+            <cstring>CloseButton</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>30</x>
-                <y>340</y>
+                <x>390</x>
+                <y>380</y>
                 <width>86</width>
                 <height>28</height>
             </rect>
         </property>
         <property name="text">
-            <string>Generate</string>
+            <string>Close</string>
         </property>
     </widget>
     <widget class="QGroupBox">
@@ -264,56 +264,72 @@
                 <x>10</x>
                 <y>200</y>
                 <width>500</width>
-                <height>130</height>
+                <height>160</height>
             </rect>
         </property>
         <property name="title">
             <string>Output</string>
         </property>
-        <widget class="QPushButton">
+        <widget class="QLabel">
             <property name="name">
-                <cstring>OutputTreeButton</cstring>
+                <cstring>OutputTreeLabel</cstring>
             </property>
             <property name="geometry">
                 <rect>
-                    <x>380</x>
+                    <x>30</x>
                     <y>30</y>
-                    <width>80</width>
+                    <width>140</width>
                     <height>30</height>
                 </rect>
             </property>
             <property name="text">
-                <string>Browse ...</string>
+                <string>Salome component tree</string>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="QLineEdit">
             <property name="name">
-                <cstring>OutputTreeLabel</cstring>
+                <cstring>OutputTreeText</cstring>
             </property>
             <property name="geometry">
                 <rect>
-                    <x>30</x>
+                    <x>180</x>
                     <y>30</y>
-                    <width>140</width>
+                    <width>190</width>
+                    <height>30</height>
+                </rect>
+            </property>
+        </widget>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>textLabel1</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>230</x>
+                    <y>120</y>
+                    <width>259</width>
                     <height>30</height>
                 </rect>
             </property>
             <property name="text">
-                <string>Salome component tree</string>
+                <string>(if checked, generation can take a long time)</string>
             </property>
         </widget>
-        <widget class="QLineEdit">
+        <widget class="QPushButton">
             <property name="name">
-                <cstring>OutputTreeText</cstring>
+                <cstring>OutputTreeButton</cstring>
             </property>
             <property name="geometry">
                 <rect>
-                    <x>180</x>
+                    <x>380</x>
                     <y>30</y>
-                    <width>190</width>
+                    <width>80</width>
                     <height>30</height>
                 </rect>
             </property>
+            <property name="text">
+                <string>Browse ...</string>
+            </property>
         </widget>
         <widget class="QComboBox">
             <item>
@@ -356,34 +372,34 @@
         </widget>
         <widget class="QCheckBox">
             <property name="name">
-                <cstring>Compile</cstring>
+                <cstring>makeGUI</cstring>
             </property>
             <property name="geometry">
                 <rect>
                     <x>200</x>
                     <y>70</y>
-                    <width>210</width>
-                    <height>30</height>
+                    <width>241</width>
+                    <height>31</height>
                 </rect>
             </property>
             <property name="text">
-                <string>Compile Salome Component</string>
+                <string>Generate file structure for GUI</string>
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="QCheckBox">
             <property name="name">
-                <cstring>textLabel1</cstring>
+                <cstring>Compile</cstring>
             </property>
             <property name="geometry">
                 <rect>
-                    <x>230</x>
-                    <y>90</y>
-                    <width>259</width>
+                    <x>200</x>
+                    <y>100</y>
+                    <width>210</width>
                     <height>30</height>
                 </rect>
             </property>
             <property name="text">
-                <string>(if checked, generation can take a long time)</string>
+                <string>Compile Salome Component</string>
             </property>
         </widget>
     </widget>
@@ -474,9 +490,6 @@
         <slot>ShellChoice_activated(int)</slot>
     </connection>
 </connections>
-<includes>
-    <include location="local" impldecl="in implementation">hxx2salome.ui.h</include>
-</includes>
 <variables>
     <variable>QString CppLibDir;</variable>
     <variable>QString SalomeDir;</variable>