Issue 0020580: get rid of QtxDoubleSpinBox class and use SalomeApp_DoubleSpinBox...

diff --git a/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui
index 5bb4e299c97eaf14e589512a188c1bb5b12847c7..43cbcba2b5606a086fd5653beb4575803b0637c0 100644 (file)
--- a/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui
@@ -72,7 +72,7 @@
        </widget>
       </item>
       <item row="2" column="1" colspan="2" >
-       <widget class="QtxDoubleSpinBox" name="SpinBox_S" />
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_S" />
       </item>
       <item row="1" column="0" colspan="3" >
        <widget class="QGroupBox" name="groupBox" >
@@ -112,7 +112,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QtxDoubleSpinBox" name="SpinBox_DX" />
+          <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" />
          </item>
          <item>
           <widget class="QLabel" name="TextLabel4" >
@@ -131,7 +131,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QtxDoubleSpinBox" name="SpinBox_DY" />
+          <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" />
          </item>
          <item>
           <widget class="QLabel" name="TextLabel5" >
@@ -150,7 +150,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QtxDoubleSpinBox" name="SpinBox_DZ" />
+          <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" />
          </item>
         </layout>
        </widget>
@@ -196,9 +196,9 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>QtxDoubleSpinBox</class>
+   <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >QtxDoubleSpinBox.h</header>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

diff --git a/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui
index eb2fd7743025440f81e6b8c4db35b5fe6514f9dc..1b945b5a806df94e56e286eec4256b23d76af864 100644 (file)
--- a/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui
@@ -108,7 +108,7 @@
          </widget>
         </item>
         <item row="1" column="3" >
-         <widget class="QtxDoubleSpinBox" name="SpinBox5" />
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox5" />
         </item>
         <item row="0" column="0" >
          <widget class="QLabel" name="TextLabel2" >
@@ -127,7 +127,7 @@
          </widget>
         </item>
         <item row="0" column="1" >
-         <widget class="QtxDoubleSpinBox" name="SpinBox1" />
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox1" />
         </item>
         <item row="1" column="2" >
          <widget class="QLabel" name="TextLabel6" >
@@ -146,13 +146,13 @@
          </widget>
         </item>
         <item row="0" column="3" >
-         <widget class="QtxDoubleSpinBox" name="SpinBox2" />
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox2" />
         </item>
         <item row="2" column="1" >
-         <widget class="QtxDoubleSpinBox" name="SpinBox3" />
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox3" />
         </item>
         <item row="1" column="1" >
-         <widget class="QtxDoubleSpinBox" name="SpinBox4" />
+         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox4" />
         </item>
         <item row="1" column="0" >
          <widget class="QLabel" name="TextLabel5" >
@@ -213,9 +213,9 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>QtxDoubleSpinBox</class>
+   <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >QtxDoubleSpinBox.h</header>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
index ac29be9fd2989f39ebbef4d08fef1009b8e4d5c3..e04d287954da5dbf72f96969346ed7b20261ba60 100644 (file)
--- a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
@@ -75,13 +75,13 @@
        </widget>
       </item>
       <item row="3" column="1" colspan="2" >
-       <widget class="QtxDoubleSpinBox" name="SpinBox1" />
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox1" />
       </item>
       <item row="5" column="1" colspan="2" >
-       <widget class="QtxDoubleSpinBox" name="SpinBox3" />
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox3" />
       </item>
       <item row="4" column="1" colspan="2" >
-       <widget class="QtxDoubleSpinBox" name="SpinBox2" />
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox2" />
       </item>
       <item row="1" column="1" >
        <widget class="QPushButton" name="PushButton2" >
@@ -236,9 +236,9 @@
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>QtxDoubleSpinBox</class>
+   <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >QtxDoubleSpinBox.h</header>
+   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
index a3171f10a4ff0ce6c467943195038d1285e5a104..72c3845a17f8e0fa47aa11bcce99414addabd746 100755 (executable)
--- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
@@ -25,7 +25,7 @@
 
 #include "EntityGUI_3DSketcherDlg.h"
 #include "EntityGUI_Widgets.h"
-#include <QtxDoubleSpinBox.h>
+#include <SalomeApp_DoubleSpinBox.h>
 
 #include <GEOMBase.h>
 #include <GeometryGUI.h>

diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
index 000461777012c92c38da2b16ca80afd04a617bf8..472812cdbe03241ba1d49745975faf0741bca9b7 100644 (file)
--- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
@@ -25,7 +25,7 @@
 //
 #include "EntityGUI_SketcherDlg.h"
 #include "EntityGUI_Widgets.h"
-#include <QtxDoubleSpinBox.h>
+#include <SalomeApp_DoubleSpinBox.h>
 
 #include <GEOMBase.h>
 #include <GeometryGUI.h>

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
index 4277f21f4ecb939b6f150d1eddc8f33b1094bef1..ad7352efd0ae00f4e4bb3b1a803c30cf7b0660ce 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
@@ -26,7 +26,7 @@
 #include "GEOMToolsGUI_DeflectionDlg.h"
 #include <GeometryGUI.h>
 #include <LightApp_Application.h>
-#include <QtxDoubleSpinBox.h>
+#include <SalomeApp_DoubleSpinBox.h>
 
 #include <SUIT_MessageBox.h>
 #include <SUIT_ResourceMgr.h>
@@ -71,10 +71,11 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
   TextLabel1->setText(tr("GEOM_DEFLECTION"));
   GroupC1Layout->addWidget(TextLabel1, 0, 0);
 
-  SpinBox = new QtxDoubleSpinBox (GroupC1);
+  SpinBox = new SalomeApp_DoubleSpinBox (GroupC1);
   // Obtain precision from preferences
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-  int aPrecision = resMgr->integerValue( "Geometry", "parametric_precision", 6 );  
+  int aPrecision = resMgr->integerValue( "Geometry", "parametric_precision", 6 ); 
+  SpinBox->setAcceptNames( false );
   SpinBox->setPrecision( aPrecision );
   SpinBox->setDecimals( aPrecision );
   SpinBox->setRange( DEFLECTION_MIN, 1.0 );

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h
index e5b3fe9e6187d438be84fa89e8949ca107681e47..1a78d79e14c61e7d9b9b42d867caf8bbcdc75131 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h
@@ -30,7 +30,7 @@
 
 #include <QDialog>
 
-class QtxDoubleSpinBox;
+class SalomeApp_DoubleSpinBox;
 
 //=================================================================================
 // class    : GEOMToolsGUI_DeflectionDlg
@@ -54,7 +54,7 @@ private:
  void       keyPressEvent( QKeyEvent* );
 
 private:
- QtxDoubleSpinBox*         SpinBox;
+ SalomeApp_DoubleSpinBox*  SpinBox;
  QString                   myHelpFileName;
 };
 

diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
index dd1409e1682586826fd3b22b6371ef05d926508f..9511421cc656fff562eae53b8321733cd989a51f 100644 (file)
--- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
@@ -24,7 +24,7 @@
 // Author : Damien COQUERET, Open CASCADE S.A.S.
 //
 #include "OperationGUI_ChamferDlg.h"
-#include <QtxDoubleSpinBox.h>
+#include <SalomeApp_DoubleSpinBox.h>
 
 #include <DlgRef.h>
 #include <GeometryGUI.h>

diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.cxx b/src/OperationGUI/OperationGUI_ClippingDlg.cxx
index d79a897dd21c6b76adfd29932a4e63e80879e8e3..04ecc78f4f1cd8524a0035e85fe4a930efe5641f 100644 (file)
--- a/src/OperationGUI/OperationGUI_ClippingDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ClippingDlg.cxx
@@ -28,7 +28,7 @@
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
-#include <QtxDoubleSpinBox.h>
+#include <SalomeApp_DoubleSpinBox.h>
 
 #include <SUIT_Session.h>
 #include <SUIT_Desktop.h>

diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index 9829ad24e16fcd6a6fa7ae8c7e3f3d400e0bb9b5..8d14e0c5790ea4f5e12c8b6218ebde8657b9a050 100644 (file)
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -28,7 +28,7 @@
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
-#include <QtxDoubleSpinBox.h>
+#include <SalomeApp_DoubleSpinBox.h>
 
 #include <SalomeApp_Application.h>
 #include <LightApp_SelectionMgr.h>

diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx
index 58daf586ea7931b9097f64bfde3d851bf6d8a56c..f4e4d1e2d04099499f3feddbe8e768222a266558 100644 (file)
--- a/src/RepairGUI/RepairGUI_GlueDlg.cxx
+++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx
@@ -28,7 +28,7 @@
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
-#include <QtxDoubleSpinBox.h>
+#include <SalomeApp_DoubleSpinBox.h>
 
 #include <SalomeApp_Application.h>
 #include <LightApp_SelectionMgr.h>

diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx
index f0e13e85e09f65fc5c7cce3f4c7e629737910371..8e3c3bb367ba31dbea0f2af27fa2ec26692e1fa7 100644 (file)
--- a/src/RepairGUI/RepairGUI_SewingDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SewingDlg.cxx
@@ -28,7 +28,7 @@
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
-#include <QtxDoubleSpinBox.h>
+#include <SalomeApp_DoubleSpinBox.h>
 
 #include <SalomeApp_Application.h>
 #include <LightApp_SelectionMgr.h>

diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
index 6073f4cbdc096a35de1c2061d4c9ae319ab6b36e..93a84d2fe1d5b90b98b9ad3d83cbe3f4e3debb64 100755 (executable)
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
@@ -29,7 +29,6 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 #include <GEOMImpl_Types.hxx>
-#include <QtxDoubleSpinBox.h>
 
 #include <SalomeApp_Application.h>
 #include <SalomeApp_DoubleSpinBox.h>