*** empty log message ***

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 0980a233f91e85040e874617bfe803a93a33bd9b..356939e88f26b0d03ef3bd46bc1b216349faf26e 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -43,7 +43,7 @@ docdir             = $(datadir)/doc/@PACKAGE@
 ui_%.h: %.ui
        $(UIC) -o $@ $<
 
-EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po)
+EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.po)
 
 mostlyclean-local:
        rm -f @builddir@/*_moc.cxx

diff --git a/src/DlgRef/DlgRef_1Spin_QTD.ui b/src/DlgRef/DlgRef_1Spin_QTD.ui
index 399d55d518248ddf4193771c851a01c01fda2830..f41430d31143905941eda5c23a75cf4801439102 100644 (file)
--- a/src/DlgRef/DlgRef_1Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_1Spin_QTD.ui
@@ -20,7 +20,7 @@
     <number>0</number>
    </property>
    <item row="0" column="0" >
-    <widget class="QGroupBox" name="SpinBox_DX" >
+    <widget class="QGroupBox" name="GroupBox1" >
      <property name="title" >
       <string/>
      </property>

diff --git a/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui
index de366ec0b6c2c861ad4b81a929e75af8394861de..4811fde405c732a8b21ba19cff7408a97e8bbfbd 100644 (file)
--- a/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui
@@ -17,7 +17,7 @@
     <number>0</number>
    </property>
    <property name="spacing" >
-    <number>0</number>
+    <number>6</number>
    </property>
    <item row="0" column="0" >
     <widget class="QGroupBox" name="GroupBox1" >
@@ -31,16 +31,7 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item rowspan="2" row="4" column="1" colspan="2" >
-       <widget class="QDoubleSpinBox" name="SpinBox_DY" />
-      </item>
-      <item row="6" column="1" colspan="2" >
-       <widget class="QDoubleSpinBox" name="SpinBox_DZ" />
-      </item>
-      <item rowspan="2" row="2" column="1" colspan="2" >
-       <widget class="QDoubleSpinBox" name="SpinBox_DX" />
-      </item>
-      <item rowspan="2" row="5" column="0" >
+      <item row="4" column="0" >
        <widget class="QLabel" name="TextLabel5" >
         <property name="sizePolicy" >
          <sizepolicy>
@@ -51,14 +42,14 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>TL4</string>
+         <string>TL5</string>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item rowspan="2" row="3" column="0" >
+      <item row="3" column="0" >
        <widget class="QLabel" name="TextLabel4" >
         <property name="sizePolicy" >
          <sizepolicy>
@@ -94,8 +85,8 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
@@ -105,15 +96,18 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string/>
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
       </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
@@ -123,12 +117,15 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string/>
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
@@ -138,18 +135,15 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
+         <string/>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
+      <item row="1" column="2" >
+       <widget class="QLineEdit" name="LineEdit2" />
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
+      <item row="1" column="1" >
+       <widget class="QPushButton" name="PushButton2" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
@@ -159,13 +153,19 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
+         <string/>
         </property>
        </widget>
       </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QDoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="4" column="1" colspan="2" >
+       <widget class="QDoubleSpinBox" name="SpinBox_DZ" />
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QDoubleSpinBox" name="SpinBox_DY" />
+      </item>
      </layout>
     </widget>
    </item>

diff --git a/src/DlgRef/DlgRef_2Spin_QTD.ui b/src/DlgRef/DlgRef_2Spin_QTD.ui
index 422d6dec5064cda55324611e05c79ed7b40dacf4..1b7ebd07a47340866dcffb09b087533493c41e24 100644 (file)
--- a/src/DlgRef/DlgRef_2Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_2Spin_QTD.ui
@@ -31,14 +31,8 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="2" column="1" >
-       <widget class="QDoubleSpinBox" name="SpinBox_DY" />
-      </item>
-      <item rowspan="2" row="0" column="1" >
-       <widget class="QDoubleSpinBox" name="SpinBox_DX" />
-      </item>
-      <item rowspan="2" row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
@@ -48,15 +42,18 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>TL2</string>
+         <string>TL1</string>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
+      <item row="0" column="1" >
+       <widget class="QDoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
@@ -66,13 +63,16 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>TL1</string>
+         <string>TL2</string>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
         </property>
        </widget>
       </item>
+      <item row="1" column="1" >
+       <widget class="QDoubleSpinBox" name="SpinBox_DY" />
+      </item>
      </layout>
     </widget>
    </item>

diff --git a/src/DlgRef/DlgRef_3Spin1Check_QTD.ui b/src/DlgRef/DlgRef_3Spin1Check_QTD.ui
index 47379431f76f904431817059606fc3dac7e2df22..1b688dfdf25362d881a375879119c4d95695624f 100644 (file)
--- a/src/DlgRef/DlgRef_3Spin1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_3Spin1Check_QTD.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>100</width>
-    <height>114</height>
+    <height>110</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -17,7 +17,7 @@
     <number>0</number>
    </property>
    <property name="spacing" >
-    <number>6</number>
+    <number>0</number>
    </property>
    <item row="0" column="0" >
     <widget class="QGroupBox" name="GroupBox1" >
@@ -31,24 +31,15 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="4" column="0" colspan="2" >
+      <item row="3" column="0" colspan="2" >
        <widget class="QCheckBox" name="CheckButton1" >
         <property name="text" >
          <string/>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" >
-       <widget class="QDoubleSpinBox" name="SpinBox_DZ" />
-      </item>
-      <item row="2" column="1" >
-       <widget class="QDoubleSpinBox" name="SpinBox_DY" />
-      </item>
-      <item rowspan="2" row="0" column="1" >
-       <widget class="QDoubleSpinBox" name="SpinBox_DX" />
-      </item>
-      <item rowspan="2" row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
@@ -58,15 +49,15 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>TL2</string>
+         <string>TL3</string>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
@@ -76,15 +67,15 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>TL1</string>
+         <string>TL2</string>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
@@ -94,13 +85,22 @@
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>TL3</string>
+         <string>TL1</string>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
         </property>
        </widget>
       </item>
+      <item row="0" column="1" >
+       <widget class="QDoubleSpinBox" name="SpinBox_DX" />
+      </item>
+      <item row="1" column="1" >
+       <widget class="QDoubleSpinBox" name="SpinBox_DY" />
+      </item>
+      <item row="2" column="1" >
+       <widget class="QDoubleSpinBox" name="SpinBox_DZ" />
+      </item>
      </layout>
     </widget>
    </item>

diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am
index b9a320184ea3da2e509b881e8d2ebe6e244981c3..cc3b6666d859e32ff71f6a4bbbd9f631e2f3d281 100644 (file)
--- a/src/DlgRef/Makefile.am
+++ b/src/DlgRef/Makefile.am
@@ -1,31 +1,28 @@
-#  GEOM DLGREF : 
+# GEOM DLGREF : 
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
 # 
-#  This library is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU Lesser General Public 
-#  License as published by the Free Software Foundation; either 
-#  version 2.1 of the License. 
+# This library is free software; you can redistribute it and/or 
+# modify it under the terms of the GNU Lesser General Public 
+# License as published by the Free Software Foundation; either 
+# version 2.1 of the License. 
 # 
-#  This library is distributed in the hope that it will be useful, 
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#  Lesser General Public License for more details. 
+# This library is distributed in the hope that it will be useful, 
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# Lesser General Public License for more details. 
 # 
-#  You should have received a copy of the GNU Lesser General Public 
-#  License along with this library; if not, write to the Free Software 
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+# You should have received a copy of the GNU Lesser General Public 
+# License along with this library; if not, write to the Free Software 
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+# File    : Makefile.am
+# Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
+# Package : DlgRef
 #
-#
-#  File   : Makefile.in
-#  Author : Damien COQUERET (OCC)
-#  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : GEOM
-#  $Header: 
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
@@ -33,117 +30,13 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libDlgRef.la
 
 # Sources files
-dist_libDlgRef_la_SOURCES = \
+dist_libDlgRef_la_SOURCES =    \
+       GEOM_DlgRef.h           \
        GEOM_DlgRef.cxx
 
-#      DlgRef_SpinBox.cxx \
-#      DlgRef_1Sel1Spin.cxx \
-#      DlgRef_1Sel2Spin.cxx \
-#      DlgRef_1Sel3Spin.cxx \
-#      DlgRef_1Sel4Spin.cxx \
-#      DlgRef_1Sel5Spin.cxx \
-#      DlgRef_2Sel1Spin.cxx \
-#      DlgRef_2Sel2Spin.cxx \
-#      DlgRef_2Sel3Spin.cxx \
-#      DlgRef_1Sel1Spin1Check.cxx \
-#      DlgRef_2Sel1Spin2Check.cxx \
-#      DlgRef_2Sel2Spin1Check.cxx \
-#      DlgRef_2Sel4Spin1Check.cxx \
-#      DlgRef_3Sel4Spin2Check.cxx \
-#      DlgRef_3Sel3Spin1Check.cxx \
-#      DlgRef_1Spin.cxx \
-#      DlgRef_2Spin.cxx \
-#      DlgRef_3Spin.cxx \
-#      DlgRef_3Spin1Check.cxx \
-#      DlgRef_3Sel1Spin.cxx \
-#      DlgRef_4Sel1Spin2Check.cxx
-
 MOC_FILES = \
        GEOM_DlgRef_moc.cxx
 
-#      DlgRef_SpinBox_moc.cxx \
-#      DlgRef_1Sel1Spin_moc.cxx \
-#      DlgRef_1Sel2Spin_moc.cxx \
-#      DlgRef_1Sel3Spin_moc.cxx \
-#      DlgRef_1Sel4Spin_moc.cxx \
-#      DlgRef_1Sel5Spin_moc.cxx \
-#      DlgRef_2Sel1Spin_moc.cxx \
-#      DlgRef_2Sel2Spin_moc.cxx \
-#      DlgRef_2Sel3Spin_moc.cxx \
-#      DlgRef_1Sel1Spin1Check_moc.cxx \
-#      DlgRef_2Sel1Spin2Check_moc.cxx \
-#      DlgRef_2Sel2Spin1Check_moc.cxx \
-#      DlgRef_2Sel4Spin1Check_moc.cxx \
-#      DlgRef_3Sel4Spin2Check_moc.cxx \
-#      DlgRef_3Sel3Spin1Check_moc.cxx \
-#      DlgRef_1Spin_moc.cxx \
-#      DlgRef_2Spin_moc.cxx \
-#      DlgRef_3Spin_moc.cxx \
-#      DlgRef_3Spin1Check_moc.cxx \
-#      DlgRef_3Sel1Spin_moc.cxx \
-#      DlgRef_1Sel_Ext_moc.cxx \
-#      DlgRef_4Sel1Spin2Check_moc.cxx
-
-# header files 
-#salomeinclude_HEADERS = \
-#      GEOM_DlgRef.h
-#      DlgRef_Skeleton_QTD.h \
-#      DlgRef_1Sel_QTD.h \
-#      DlgRef_2Sel_QTD.h \
-#      DlgRef_3Sel_QTD.h \
-#      DlgRef_1Sel1Check_QTD.h \
-#      DlgRef_1Sel3Check_QTD.h \
-#      DlgRef_1Sel1Check1List_QTD.h \
-#      DlgRef_1Sel1Spin_QTD.h \
-#      DlgRef_1Sel2Spin_QTD.h \
-#      DlgRef_1Sel3Spin_QTD.h \
-#      DlgRef_1Sel4Spin_QTD.h \
-#      DlgRef_1Sel5Spin_QTD.h \
-#      DlgRef_2Sel1Spin_QTD.h \
-#      DlgRef_2Sel2Spin_QTD.h \
-#      DlgRef_2Sel3Spin_QTD.h \
-#      DlgRef_1Sel1Spin1Check_QTD.h \
-#      DlgRef_2Sel1Spin2Check_QTD.h \
-#      DlgRef_2Sel2Spin1Check_QTD.h \
-#      DlgRef_2Sel4Spin1Check_QTD.h \
-#      DlgRef_3Sel4Spin2Check_QTD.h \
-#      DlgRef_4Sel1List_QTD.h \
-#      DlgRef_2Sel1List_QTD.h \
-#      DlgRef_1List1Spin1Btn_QTD.h \
-#      DlgRef_4Sel1List1Check_QTD.h \
-#      DlgRef_1Spin_QTD.h \
-#      DlgRef_2Spin_QTD.h \
-#      DlgRef_3Spin_QTD.h \
-#      DlgRef_3Spin1Check_QTD.h \
-#      DlgRef_3Sel3Spin1Check_QTD.h \
-#      DlgRef_4Sel1Spin2Check_QTD.h \
-#      DlgRef_SpinBox.h \
-#      DlgRef_1Sel1Spin.h \
-#      DlgRef_1Sel2Spin.h \
-#      DlgRef_1Sel3Spin.h \
-#      DlgRef_1Sel4Spin.h \
-#      DlgRef_1Sel5Spin.h \
-#      DlgRef_2Sel1Spin.h \
-#      DlgRef_2Sel2Spin.h \
-#      DlgRef_2Sel3Spin.h \
-#      DlgRef_1Sel1Spin1Check.h \
-#      DlgRef_2Sel1Spin2Check.h \
-#      DlgRef_2Sel2Spin1Check.h \
-#      DlgRef_2Sel4Spin1Check.h \
-#      DlgRef_3Sel4Spin2Check.h \
-#      DlgRef_3Sel3Spin1Check.h \
-#      DlgRef_1Spin.h \
-#      DlgRef_2Spin.h \
-#      DlgRef_3Spin.h \
-#      DlgRef_3Spin1Check.h \
-#      DlgRef_3Sel1Spin.h \
-#      DlgRef_1Sel_Ext.h \
-#      DlgRef_3Check_QTD.h \
-#      DlgRef_6Sel_QTD.h \
-#      DlgRef_4Sel1Spin2Check.h \
-#      DlgRef_3Sel1Check_QTD.h \
-#      GEOM_DlgRef.hxx
-
 UIC_FILES = \
        ui_DlgRef_1List1Spin1Btn_QTD.h  \
        ui_DlgRef_1Sel1Check1List_QTD.h \
@@ -183,11 +76,10 @@ UIC_FILES = \
 BUILT_SOURCES = $(UIC_FILES)
 
 nodist_libDlgRef_la_SOURCES =  \
-       GEOM_DlgRef.h           \
        $(MOC_FILES)            \
        $(UIC_FILES)
 
-# additionnal information to compile and link file
+# additional information to compile and link file
 libDlgRef_la_CPPFLAGS = \
        $(QT_INCLUDES)