]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Porting to Qt4.
authormkr <mkr@opencascade.com>
Tue, 10 Jul 2007 11:06:29 +0000 (11:06 +0000)
committermkr <mkr@opencascade.com>
Tue, 10 Jul 2007 11:06:29 +0000 (11:06 +0000)
45 files changed:
src/EntityGUI/EntityGUI.cxx
src/EntityGUI/EntityGUI.h
src/EntityGUI/EntityGUI.pro [new file with mode: 0644]
src/EntityGUI/EntityGUI_1Sel_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_1Sel_QTD.h
src/EntityGUI/EntityGUI_1Spin.cxx
src/EntityGUI/EntityGUI_1Spin.h
src/EntityGUI/EntityGUI_1Spin_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_1Spin_QTD.h
src/EntityGUI/EntityGUI_2Spin.cxx
src/EntityGUI/EntityGUI_2Spin.h
src/EntityGUI/EntityGUI_2Spin_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_2Spin_QTD.h
src/EntityGUI/EntityGUI_3Spin.cxx
src/EntityGUI/EntityGUI_3Spin.h
src/EntityGUI/EntityGUI_3Spin_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_3Spin_QTD.h
src/EntityGUI/EntityGUI_4Spin.cxx
src/EntityGUI/EntityGUI_4Spin.h
src/EntityGUI/EntityGUI_4Spin_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_4Spin_QTD.h
src/EntityGUI/EntityGUI_Dir1_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_Dir1_QTD.h
src/EntityGUI/EntityGUI_Dir2_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_Dir2_QTD.h
src/EntityGUI/EntityGUI_Point_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_Point_QTD.h
src/EntityGUI/EntityGUI_Skeleton_QTD.cxx [deleted file]
src/EntityGUI/EntityGUI_Skeleton_QTD.h
src/EntityGUI/EntityGUI_SketcherDlg.cxx
src/EntityGUI/EntityGUI_SketcherDlg.h
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
src/EntityGUI/EntityGUI_SubShapeDlg.h
src/EntityGUI/Makefile.am
src/EntityGUI/UIFiles/EntityGUI_1Sel_QTD.ui
src/EntityGUI/UIFiles/EntityGUI_1Spin_QTD.ui
src/EntityGUI/UIFiles/EntityGUI_2Spin_QTD.ui
src/EntityGUI/UIFiles/EntityGUI_3Spin_QTD.ui
src/EntityGUI/UIFiles/EntityGUI_4Spin_QTD.ui
src/EntityGUI/UIFiles/EntityGUI_Dir1_QTD.ui
src/EntityGUI/UIFiles/EntityGUI_Dir2_QTD.ui
src/EntityGUI/UIFiles/EntityGUI_Point_QTD.ui
src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui
src/EntityGUI/UIFiles/ui_to_cxx
src/src.pro

index 8bdee4ae6c135be6223b465e3881cfcdf18abd1b..35387d0a6435188613acd252922935b369e80f0f 100644 (file)
 
 #include "EntityGUI.h"
 #include "GeometryGUI.h"
-#include "GEOM_AssemblyBuilder.h"
 
 #include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
 #include "SUIT_ViewWindow.h"
 #include "OCCViewer_ViewModel.h"
 #include "OCCViewer_ViewManager.h"
 #include "SalomeApp_Study.h"
-#include "SalomeApp_Tools.h"
 #include "SalomeApp_Application.h"
 
-#include <TopoDS_Compound.hxx>
-#include <BRep_Builder.hxx>
-#include <TopExp_Explorer.hxx>
+#include <TopoDS_Shape.hxx>
 
 #include "EntityGUI_SketcherDlg.h" // Sketcher
 #include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE
@@ -161,15 +156,18 @@ void EntityGUI::EraseSimulationShape()
   if ( !app ) return;
 
   // get all view windows at the desktop
-  QPtrList<SUIT_ViewWindow> aWndLst = app->desktop()->windows();
+  QList<SUIT_ViewWindow*> aWndLst = app->desktop()->windows();
   //get all view windows, which belong to the active study
-  QPtrList<SUIT_ViewWindow> aWndLstAS;
+  QList<SUIT_ViewWindow*> aWndLstAS;
   SUIT_ViewWindow* vw;
-  for ( vw = aWndLst.first(); vw; vw = aWndLst.next() )
+
+  QListIterator<SUIT_ViewWindow*> itWL( aWndLst );
+  while ( itWL.hasNext() && (vw = itWL.next()) )
     if ( vw->getViewManager()->study() == app->activeStudy() )
       aWndLstAS.append( vw );
 
-  for ( vw = aWndLstAS.first(); vw; vw = aWndLstAS.next() ) {
+  QListIterator<SUIT_ViewWindow*> itWLAS( aWndLstAS );
+  while ( itWLAS.hasNext() && (vw = itWLAS.next()) ) {
     if ( vw->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
       OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)(vw->getViewManager()))->getOCCViewer();
       Handle(AIS_InteractiveContext) ic = v3d->getAISContext();
index a4fd8c0014dd23835e8a4e54fb978b6afa16ff4f..0b73561732d3d5be6afda53b49f5e3bbba1db457 100644 (file)
 
 #include "SALOMEDSClient.hxx"
 
-#include <TopoDS_Shape.hxx>
 #include <AIS_Shape.hxx>
 
+class TopoDS_Shape;
+
 //=================================================================================
 // class    : EntityGUI
 // purpose  :
diff --git a/src/EntityGUI/EntityGUI.pro b/src/EntityGUI/EntityGUI.pro
new file mode 100644 (file)
index 0000000..1d58de1
--- /dev/null
@@ -0,0 +1,51 @@
+TEMPLATE = lib
+TARGET = EntityGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+QT_MT_LIBS = -L$$(QTDIR)/lib -lQtCore -lQtXml -lQtGui -lQtOpenGL
+
+CAS_TKTopAlgo = -L$${CASROOT}/Linux/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMGUI ../DlgRef ../GEOMBase ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMFiltersSelection ../SKETCHER $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMBase -lGEOMSketcher -lGEOM $${QT_MT_LIBS} $${CAS_TKTopAlgo} -lTKernel
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += ENTITYGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+HEADERS  = GEOM_EntityGUI.hxx
+
+SOURCES  = EntityGUI.cxx
+SOURCES += EntityGUI_1Spin.cxx
+SOURCES += EntityGUI_2Spin.cxx
+SOURCES += EntityGUI_3Spin.cxx
+SOURCES += EntityGUI_4Spin.cxx
+SOURCES += EntityGUI_SketcherDlg.cxx
+SOURCES += EntityGUI_SubShapeDlg.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
diff --git a/src/EntityGUI/EntityGUI_1Sel_QTD.cxx b/src/EntityGUI/EntityGUI_1Sel_QTD.cxx
deleted file mode 100644 (file)
index be05efc..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_1Sel_QTD.ui'
-**
-** Created: Thu Aug 12 19:03:19 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_1Sel_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_1Sel_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_1Sel_QTD::EntityGUI_1Sel_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_1Sel_QTD" );
-    resize( 329, 112 ); 
-    setCaption( trUtf8( "EntityGUI_1Sel_QTD" ) );
-    EntityGUI_1Sel_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_1Sel_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-    QSpacerItem* spacer = new QSpacerItem( 0, 163, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer, 2, 0 );
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 180, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer_2, 1, 2 );
-
-    PushButton1 = new QPushButton( GroupBox1, "PushButton1" );
-    PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) );
-    PushButton1->setText( trUtf8( "" ) );
-
-    Layout1->addWidget( PushButton1, 0, 1 );
-
-    LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" );
-    LineEdit1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, 0, 0, LineEdit1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( LineEdit1, 0, 2 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_1Sel_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_1Sel_QTD::~EntityGUI_1Sel_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
index 401ddddc74158e4fd006e46003ec934eae039c0e..aeb0a3fa1aba5c7f6e0eb712d6b5c57efa35e9a0 100644 (file)
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_1Sel_QTD.ui'
+/********************************************************************************
+** Form generated from reading ui file 'EntityGUI_1Sel_QTD.ui'
 **
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
+** Created: Tue Jul 10 10:38:07 2007
+**      by: Qt User Interface Compiler version 4.2.3
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
 #ifndef ENTITYGUI_1SEL_QTD_H
 #define ENTITYGUI_1SEL_QTD_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3MimeSourceFactory>
 
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
+class Ui_EntityGUI_1Sel_QTD
+{
+public:
+    QGridLayout *gridLayout;
+    QGroupBox *GroupBox1;
+    QGridLayout *gridLayout1;
+    QGridLayout *gridLayout2;
+    QGridLayout *gridLayout3;
+    QSpacerItem *spacerItem;
+    QPushButton *buttonApply;
+    QGridLayout *gridLayout4;
+    QPushButton *buttonRedo;
+    QPushButton *buttonUndo;
+    QGridLayout *gridLayout5;
+    QLabel *TextLabel1;
+    QSpacerItem *spacerItem1;
+    QPushButton *PushButton1;
+    QLineEdit *LineEdit1;
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_1Sel_QTD : public QWidget
-{ 
-    Q_OBJECT
+    void setupUi(QWidget *EntityGUI_1Sel_QTD)
+    {
+    EntityGUI_1Sel_QTD->setObjectName(QString::fromUtf8("EntityGUI_1Sel_QTD"));
+    gridLayout = new QGridLayout(EntityGUI_1Sel_QTD);
+    gridLayout->setSpacing(6);
+    gridLayout->setMargin(0);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    GroupBox1 = new QGroupBox(EntityGUI_1Sel_QTD);
+    GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
+    gridLayout1 = new QGridLayout(GroupBox1);
+    gridLayout1->setSpacing(6);
+    gridLayout1->setMargin(11);
+    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+    gridLayout2 = new QGridLayout();
+    gridLayout2->setSpacing(6);
+    gridLayout2->setMargin(0);
+    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+    gridLayout3 = new QGridLayout();
+    gridLayout3->setSpacing(6);
+    gridLayout3->setMargin(0);
+    gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
+    spacerItem = new QSpacerItem(0, 163, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout3->addItem(spacerItem, 2, 0, 1, 1);
+
+    buttonApply = new QPushButton(GroupBox1);
+    buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
+
+    gridLayout3->addWidget(buttonApply, 0, 0, 1, 1);
+
+    gridLayout4 = new QGridLayout();
+    gridLayout4->setSpacing(6);
+    gridLayout4->setMargin(0);
+    gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
+    buttonRedo = new QPushButton(GroupBox1);
+    buttonRedo->setObjectName(QString::fromUtf8("buttonRedo"));
+
+    gridLayout4->addWidget(buttonRedo, 0, 1, 1, 1);
+
+    buttonUndo = new QPushButton(GroupBox1);
+    buttonUndo->setObjectName(QString::fromUtf8("buttonUndo"));
+
+    gridLayout4->addWidget(buttonUndo, 0, 0, 1, 1);
+
+
+    gridLayout3->addLayout(gridLayout4, 1, 0, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout3, 0, 1, 1, 1);
+
+    gridLayout5 = new QGridLayout();
+    gridLayout5->setSpacing(6);
+    gridLayout5->setMargin(0);
+    gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
+    TextLabel1 = new QLabel(GroupBox1);
+    TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth());
+    TextLabel1->setSizePolicy(sizePolicy);
+    TextLabel1->setWordWrap(false);
+
+    gridLayout5->addWidget(TextLabel1, 0, 0, 1, 1);
+
+    spacerItem1 = new QSpacerItem(0, 180, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout5->addItem(spacerItem1, 1, 2, 1, 1);
+
+    PushButton1 = new QPushButton(GroupBox1);
+    PushButton1->setObjectName(QString::fromUtf8("PushButton1"));
+    QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy1.setHorizontalStretch(0);
+    sizePolicy1.setVerticalStretch(0);
+    sizePolicy1.setHeightForWidth(PushButton1->sizePolicy().hasHeightForWidth());
+    PushButton1->setSizePolicy(sizePolicy1);
+
+    gridLayout5->addWidget(PushButton1, 0, 1, 1, 1);
+
+    LineEdit1 = new QLineEdit(GroupBox1);
+    LineEdit1->setObjectName(QString::fromUtf8("LineEdit1"));
+    QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy2.setHorizontalStretch(0);
+    sizePolicy2.setVerticalStretch(0);
+    sizePolicy2.setHeightForWidth(LineEdit1->sizePolicy().hasHeightForWidth());
+    LineEdit1->setSizePolicy(sizePolicy2);
+
+    gridLayout5->addWidget(LineEdit1, 0, 2, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout5, 0, 0, 1, 1);
+
+
+    gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1);
+
+
+    gridLayout->addWidget(GroupBox1, 0, 0, 1, 1);
+
+
+    retranslateUi(EntityGUI_1Sel_QTD);
+
+    QSize size(329, 112);
+    size = size.expandedTo(EntityGUI_1Sel_QTD->minimumSizeHint());
+    EntityGUI_1Sel_QTD->resize(size);
+
+
+    QMetaObject::connectSlotsByName(EntityGUI_1Sel_QTD);
+    } // setupUi
+
+    void retranslateUi(QWidget *EntityGUI_1Sel_QTD)
+    {
+    EntityGUI_1Sel_QTD->setWindowTitle(QApplication::translate("EntityGUI_1Sel_QTD", "EntityGUI_1Sel_QTD", 0, QApplication::UnicodeUTF8));
+    GroupBox1->setTitle(QApplication::translate("EntityGUI_1Sel_QTD", "Values", 0, QApplication::UnicodeUTF8));
+    buttonApply->setText(QApplication::translate("EntityGUI_1Sel_QTD", "Create", 0, QApplication::UnicodeUTF8));
+    buttonRedo->setText(QApplication::translate("EntityGUI_1Sel_QTD", "Redo", 0, QApplication::UnicodeUTF8));
+    buttonUndo->setText(QApplication::translate("EntityGUI_1Sel_QTD", "Undo", 0, QApplication::UnicodeUTF8));
+    TextLabel1->setText(QApplication::translate("EntityGUI_1Sel_QTD", "TL1", 0, QApplication::UnicodeUTF8));
+    PushButton1->setText(QString());
+    Q_UNUSED(EntityGUI_1Sel_QTD);
+    } // retranslateUi
 
-public:
-    EntityGUI_1Sel_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_1Sel_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* buttonApply;
-    QPushButton* buttonRedo;
-    QPushButton* buttonUndo;
-    QLabel* TextLabel1;
-    QPushButton* PushButton1;
-    QLineEdit* LineEdit1;
-
-
-protected:
-    QGridLayout* EntityGUI_1Sel_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
-    QGridLayout* Layout1;
 };
 
+namespace Ui {
+    class EntityGUI_1Sel_QTD: public Ui_EntityGUI_1Sel_QTD {};
+} // namespace Ui
+
 #endif // ENTITYGUI_1SEL_QTD_H
index c8a62963f92450315b71473e30a50810809c2f79..14bbb116ca3e2d0a6533564bd9f017de2ef027a3 100644 (file)
 
 #include "EntityGUI_1Spin.h"
 
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
+#include "DlgRef_SpinBox.h"
 
 /* 
  *  Constructs a EntityGUI_1Spin which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-EntityGUI_1Spin::EntityGUI_1Spin(QWidget* parent, const char* name, WFlags fl)
-  :EntityGUI_1Spin_QTD(parent, name, fl)
+EntityGUI_1Spin::EntityGUI_1Spin(QWidget* parent, const char* name, Qt::WindowFlags fl)
+  :QWidget(parent, fl)
 {
-  SpinBox1->close(TRUE);
+  setupUi(this);
+
+  setObjectName(name);
+
+  SpinBox1->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox1->close();
 
   SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
+  gridLayout3->addWidget(SpinBox_DX, 0, 1);
 
 }
 
index 5631e0bac6600bb23824b36371474f0c92cc5cc1..a2e17112d5c68d2bd85cf9d5c9678656ba4527bf 100644 (file)
 #include "GEOM_EntityGUI.hxx"
 
 #include "EntityGUI_1Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin : public EntityGUI_1Spin_QTD
+class DlgRef_SpinBox;
+
+class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin : public QWidget, public Ui::EntityGUI_1Spin_QTD
 { 
     Q_OBJECT
 
 public:
-    EntityGUI_1Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
+    EntityGUI_1Spin(QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0);
     ~EntityGUI_1Spin();
 
     DlgRef_SpinBox* SpinBox_DX;
diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.cxx b/src/EntityGUI/EntityGUI_1Spin_QTD.cxx
deleted file mode 100644 (file)
index 98a476c..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_1Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:05:59 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_1Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_1Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_1Spin_QTD::EntityGUI_1Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_1Spin_QTD" );
-    resize( 255, 112 ); 
-    setCaption( trUtf8( "EntityGUI_1Spin_QTD" ) );
-    EntityGUI_1Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_1Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 1 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer_2, 2, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_1Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_1Spin_QTD::~EntityGUI_1Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
index e525552bb15c39c22c512109e958943900c6e7fe..7ee33ee37e7779b2f55cc14b63375da1665a6f1c 100644 (file)
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_1Spin_QTD.ui'
+/********************************************************************************
+** Form generated from reading ui file 'EntityGUI_1Spin_QTD.ui'
 **
-** Created: Fri Jul 30 16:05:59 2004
-**      by:  The User Interface Compiler (uic)
+** Created: Tue Jul 10 10:27:13 2007
+**      by: Qt User Interface Compiler version 4.2.3
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
 #ifndef ENTITYGUI_1SPIN_QTD_H
 #define ENTITYGUI_1SPIN_QTD_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3MimeSourceFactory>
 
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
+class Ui_EntityGUI_1Spin_QTD
+{
+public:
+    QGridLayout *gridLayout;
+    QGroupBox *GroupBox1;
+    QGridLayout *gridLayout1;
+    QGridLayout *gridLayout2;
+    QGridLayout *gridLayout3;
+    QLabel *TextLabel1;
+    QSpinBox *SpinBox1;
+    QSpacerItem *spacerItem;
+    QGridLayout *gridLayout4;
+    QGridLayout *gridLayout5;
+    QPushButton *buttonRedo;
+    QPushButton *buttonUndo;
+    QPushButton *buttonApply;
+    QSpacerItem *spacerItem1;
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_1Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
+    void setupUi(QWidget *EntityGUI_1Spin_QTD)
+    {
+    EntityGUI_1Spin_QTD->setObjectName(QString::fromUtf8("EntityGUI_1Spin_QTD"));
+    gridLayout = new QGridLayout(EntityGUI_1Spin_QTD);
+    gridLayout->setSpacing(6);
+    gridLayout->setMargin(0);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    GroupBox1 = new QGroupBox(EntityGUI_1Spin_QTD);
+    GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
+    gridLayout1 = new QGridLayout(GroupBox1);
+    gridLayout1->setSpacing(6);
+    gridLayout1->setMargin(11);
+    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+    gridLayout2 = new QGridLayout();
+    gridLayout2->setSpacing(6);
+    gridLayout2->setMargin(0);
+    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+    gridLayout3 = new QGridLayout();
+    gridLayout3->setSpacing(6);
+    gridLayout3->setMargin(0);
+    gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
+    TextLabel1 = new QLabel(GroupBox1);
+    TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth());
+    TextLabel1->setSizePolicy(sizePolicy);
+    TextLabel1->setWordWrap(false);
+
+    gridLayout3->addWidget(TextLabel1, 0, 0, 1, 1);
+
+    SpinBox1 = new QSpinBox(GroupBox1);
+    SpinBox1->setObjectName(QString::fromUtf8("SpinBox1"));
+    QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy1.setHorizontalStretch(0);
+    sizePolicy1.setVerticalStretch(0);
+    sizePolicy1.setHeightForWidth(SpinBox1->sizePolicy().hasHeightForWidth());
+    SpinBox1->setSizePolicy(sizePolicy1);
+
+    gridLayout3->addWidget(SpinBox1, 0, 1, 1, 1);
+
+    spacerItem = new QSpacerItem(0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout3->addItem(spacerItem, 3, 1, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout3, 0, 0, 1, 1);
+
+    gridLayout4 = new QGridLayout();
+    gridLayout4->setSpacing(6);
+    gridLayout4->setMargin(0);
+    gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
+    gridLayout5 = new QGridLayout();
+    gridLayout5->setSpacing(6);
+    gridLayout5->setMargin(0);
+    gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
+    buttonRedo = new QPushButton(GroupBox1);
+    buttonRedo->setObjectName(QString::fromUtf8("buttonRedo"));
+
+    gridLayout5->addWidget(buttonRedo, 0, 1, 1, 1);
+
+    buttonUndo = new QPushButton(GroupBox1);
+    buttonUndo->setObjectName(QString::fromUtf8("buttonUndo"));
+
+    gridLayout5->addWidget(buttonUndo, 0, 0, 1, 1);
+
+
+    gridLayout4->addLayout(gridLayout5, 1, 0, 1, 1);
+
+    buttonApply = new QPushButton(GroupBox1);
+    buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
+
+    gridLayout4->addWidget(buttonApply, 0, 0, 1, 1);
+
+    spacerItem1 = new QSpacerItem(0, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout4->addItem(spacerItem1, 2, 0, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout4, 0, 1, 1, 1);
+
+
+    gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1);
+
+
+    gridLayout->addWidget(GroupBox1, 0, 0, 1, 1);
+
+
+    retranslateUi(EntityGUI_1Spin_QTD);
+
+    QSize size(255, 112);
+    size = size.expandedTo(EntityGUI_1Spin_QTD->minimumSizeHint());
+    EntityGUI_1Spin_QTD->resize(size);
+
+
+    QMetaObject::connectSlotsByName(EntityGUI_1Spin_QTD);
+    } // setupUi
+
+    void retranslateUi(QWidget *EntityGUI_1Spin_QTD)
+    {
+    EntityGUI_1Spin_QTD->setWindowTitle(QApplication::translate("EntityGUI_1Spin_QTD", "EntityGUI_1Spin_QTD", 0, QApplication::UnicodeUTF8));
+    GroupBox1->setTitle(QApplication::translate("EntityGUI_1Spin_QTD", "Values", 0, QApplication::UnicodeUTF8));
+    TextLabel1->setText(QApplication::translate("EntityGUI_1Spin_QTD", "TL1", 0, QApplication::UnicodeUTF8));
+    buttonRedo->setText(QApplication::translate("EntityGUI_1Spin_QTD", "Redo", 0, QApplication::UnicodeUTF8));
+    buttonUndo->setText(QApplication::translate("EntityGUI_1Spin_QTD", "Undo", 0, QApplication::UnicodeUTF8));
+    buttonApply->setText(QApplication::translate("EntityGUI_1Spin_QTD", "Create", 0, QApplication::UnicodeUTF8));
+    Q_UNUSED(EntityGUI_1Spin_QTD);
+    } // retranslateUi
 
-public:
-    EntityGUI_1Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_1Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel1;
-    QSpinBox* SpinBox1;
-    QPushButton* buttonRedo;
-    QPushButton* buttonUndo;
-    QPushButton* buttonApply;
-
-
-protected:
-    QGridLayout* EntityGUI_1Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout1;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
 };
 
+namespace Ui {
+    class EntityGUI_1Spin_QTD: public Ui_EntityGUI_1Spin_QTD {};
+} // namespace Ui
+
 #endif // ENTITYGUI_1SPIN_QTD_H
index 8ed08eccc2024249f13fbb3c2a8d561faa97d69d..5882b36e9249aa3b8b6235496e384ac7b84f680f 100644 (file)
 
 #include "EntityGUI_2Spin.h"
 
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
+#include "DlgRef_SpinBox.h" 
 
 /* 
  *  Constructs a EntityGUI_2Spin which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-EntityGUI_2Spin::EntityGUI_2Spin(QWidget* parent, const char* name, WFlags fl)
-  :EntityGUI_2Spin_QTD(parent, name, fl)
+EntityGUI_2Spin::EntityGUI_2Spin(QWidget* parent, const char* name, Qt::WindowFlags fl)
+  :QWidget(parent, fl)
 {
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
+  setupUi(this);
+
+  setObjectName(name);
+
+  SpinBox1->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox1->close();
+  SpinBox2->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox2->close();
 
   SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
+  gridLayout3->addWidget(SpinBox_DX, 0, 1);
 
   SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout1->addWidget(SpinBox_DY, 1, 1);
+  gridLayout3->addWidget(SpinBox_DY, 1, 1);
 
 }
 
index 9d79e478af6222f0842744ffa57a90b3a2f70b2d..5bf0e61710a7b219ac4acea5b40e3ef27b71f250 100644 (file)
 #include "GEOM_EntityGUI.hxx"
 
 #include "EntityGUI_2Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin : public EntityGUI_2Spin_QTD
+class DlgRef_SpinBox;
+
+class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin : public QWidget, public Ui::EntityGUI_2Spin_QTD
 { 
     Q_OBJECT
 
 public:
-    EntityGUI_2Spin(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
+    EntityGUI_2Spin(QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0);
     ~EntityGUI_2Spin();
 
     DlgRef_SpinBox* SpinBox_DX;
diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.cxx b/src/EntityGUI/EntityGUI_2Spin_QTD.cxx
deleted file mode 100644 (file)
index b6f254d..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_2Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_2Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_2Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_2Spin_QTD::EntityGUI_2Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_2Spin_QTD" );
-    resize( 255, 112 ); 
-    setCaption( trUtf8( "EntityGUI_2Spin_QTD" ) );
-    EntityGUI_2Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_2Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox2, 1, 1 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 1 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer_2, 2, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_2Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_2Spin_QTD::~EntityGUI_2Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
index 718f80e428a7c4126c3aff3329ee5ebbf2658959..094f9c25f8282c4b4ea788bc72516b7ae9061caa 100644 (file)
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_2Spin_QTD.ui'
+/********************************************************************************
+** Form generated from reading ui file 'EntityGUI_2Spin_QTD.ui'
 **
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
+** Created: Tue Jul 10 10:30:02 2007
+**      by: Qt User Interface Compiler version 4.2.3
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
 #ifndef ENTITYGUI_2SPIN_QTD_H
 #define ENTITYGUI_2SPIN_QTD_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3MimeSourceFactory>
 
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
+class Ui_EntityGUI_2Spin_QTD
+{
+public:
+    QGridLayout *gridLayout;
+    QGroupBox *GroupBox1;
+    QGridLayout *gridLayout1;
+    QGridLayout *gridLayout2;
+    QGridLayout *gridLayout3;
+    QLabel *TextLabel2;
+    QLabel *TextLabel1;
+    QSpinBox *SpinBox1;
+    QSpinBox *SpinBox2;
+    QSpacerItem *spacerItem;
+    QGridLayout *gridLayout4;
+    QSpacerItem *spacerItem1;
+    QGridLayout *gridLayout5;
+    QPushButton *buttonUndo;
+    QPushButton *buttonRedo;
+    QPushButton *buttonApply;
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_2Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
+    void setupUi(QWidget *EntityGUI_2Spin_QTD)
+    {
+    EntityGUI_2Spin_QTD->setObjectName(QString::fromUtf8("EntityGUI_2Spin_QTD"));
+    gridLayout = new QGridLayout(EntityGUI_2Spin_QTD);
+    gridLayout->setSpacing(6);
+    gridLayout->setMargin(0);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    GroupBox1 = new QGroupBox(EntityGUI_2Spin_QTD);
+    GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
+    gridLayout1 = new QGridLayout(GroupBox1);
+    gridLayout1->setSpacing(6);
+    gridLayout1->setMargin(11);
+    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+    gridLayout2 = new QGridLayout();
+    gridLayout2->setSpacing(6);
+    gridLayout2->setMargin(0);
+    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+    gridLayout3 = new QGridLayout();
+    gridLayout3->setSpacing(6);
+    gridLayout3->setMargin(0);
+    gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
+    TextLabel2 = new QLabel(GroupBox1);
+    TextLabel2->setObjectName(QString::fromUtf8("TextLabel2"));
+    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(TextLabel2->sizePolicy().hasHeightForWidth());
+    TextLabel2->setSizePolicy(sizePolicy);
+    TextLabel2->setWordWrap(false);
+
+    gridLayout3->addWidget(TextLabel2, 1, 0, 1, 1);
+
+    TextLabel1 = new QLabel(GroupBox1);
+    TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+    QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy1.setHorizontalStretch(0);
+    sizePolicy1.setVerticalStretch(0);
+    sizePolicy1.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth());
+    TextLabel1->setSizePolicy(sizePolicy1);
+    TextLabel1->setWordWrap(false);
+
+    gridLayout3->addWidget(TextLabel1, 0, 0, 1, 1);
+
+    SpinBox1 = new QSpinBox(GroupBox1);
+    SpinBox1->setObjectName(QString::fromUtf8("SpinBox1"));
+    QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy2.setHorizontalStretch(0);
+    sizePolicy2.setVerticalStretch(0);
+    sizePolicy2.setHeightForWidth(SpinBox1->sizePolicy().hasHeightForWidth());
+    SpinBox1->setSizePolicy(sizePolicy2);
+
+    gridLayout3->addWidget(SpinBox1, 0, 1, 1, 1);
+
+    SpinBox2 = new QSpinBox(GroupBox1);
+    SpinBox2->setObjectName(QString::fromUtf8("SpinBox2"));
+    QSizePolicy sizePolicy3(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy3.setHorizontalStretch(0);
+    sizePolicy3.setVerticalStretch(0);
+    sizePolicy3.setHeightForWidth(SpinBox2->sizePolicy().hasHeightForWidth());
+    SpinBox2->setSizePolicy(sizePolicy3);
+
+    gridLayout3->addWidget(SpinBox2, 1, 1, 1, 1);
+
+    spacerItem = new QSpacerItem(0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout3->addItem(spacerItem, 3, 1, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout3, 0, 0, 1, 1);
+
+    gridLayout4 = new QGridLayout();
+    gridLayout4->setSpacing(6);
+    gridLayout4->setMargin(0);
+    gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
+    spacerItem1 = new QSpacerItem(0, 51, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout4->addItem(spacerItem1, 2, 0, 1, 1);
+
+    gridLayout5 = new QGridLayout();
+    gridLayout5->setSpacing(6);
+    gridLayout5->setMargin(0);
+    gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
+    buttonUndo = new QPushButton(GroupBox1);
+    buttonUndo->setObjectName(QString::fromUtf8("buttonUndo"));
+
+    gridLayout5->addWidget(buttonUndo, 0, 0, 1, 1);
+
+    buttonRedo = new QPushButton(GroupBox1);
+    buttonRedo->setObjectName(QString::fromUtf8("buttonRedo"));
+
+    gridLayout5->addWidget(buttonRedo, 0, 1, 1, 1);
+
+
+    gridLayout4->addLayout(gridLayout5, 1, 0, 1, 1);
+
+    buttonApply = new QPushButton(GroupBox1);
+    buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
+
+    gridLayout4->addWidget(buttonApply, 0, 0, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout4, 0, 1, 1, 1);
+
+
+    gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1);
+
+
+    gridLayout->addWidget(GroupBox1, 0, 0, 1, 1);
+
+
+    retranslateUi(EntityGUI_2Spin_QTD);
+
+    QSize size(255, 112);
+    size = size.expandedTo(EntityGUI_2Spin_QTD->minimumSizeHint());
+    EntityGUI_2Spin_QTD->resize(size);
+
+
+    QMetaObject::connectSlotsByName(EntityGUI_2Spin_QTD);
+    } // setupUi
+
+    void retranslateUi(QWidget *EntityGUI_2Spin_QTD)
+    {
+    EntityGUI_2Spin_QTD->setWindowTitle(QApplication::translate("EntityGUI_2Spin_QTD", "EntityGUI_2Spin_QTD", 0, QApplication::UnicodeUTF8));
+    GroupBox1->setTitle(QApplication::translate("EntityGUI_2Spin_QTD", "Values", 0, QApplication::UnicodeUTF8));
+    TextLabel2->setText(QApplication::translate("EntityGUI_2Spin_QTD", "TL2", 0, QApplication::UnicodeUTF8));
+    TextLabel1->setText(QApplication::translate("EntityGUI_2Spin_QTD", "TL1", 0, QApplication::UnicodeUTF8));
+    buttonUndo->setText(QApplication::translate("EntityGUI_2Spin_QTD", "Undo", 0, QApplication::UnicodeUTF8));
+    buttonRedo->setText(QApplication::translate("EntityGUI_2Spin_QTD", "Redo", 0, QApplication::UnicodeUTF8));
+    buttonApply->setText(QApplication::translate("EntityGUI_2Spin_QTD", "Create", 0, QApplication::UnicodeUTF8));
+    Q_UNUSED(EntityGUI_2Spin_QTD);
+    } // retranslateUi
 
-public:
-    EntityGUI_2Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_2Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QLabel* TextLabel2;
-    QLabel* TextLabel1;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-    QPushButton* buttonUndo;
-    QPushButton* buttonRedo;
-    QPushButton* buttonApply;
-
-
-protected:
-    QGridLayout* EntityGUI_2Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout1;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
 };
 
+namespace Ui {
+    class EntityGUI_2Spin_QTD: public Ui_EntityGUI_2Spin_QTD {};
+} // namespace Ui
+
 #endif // ENTITYGUI_2SPIN_QTD_H
index 8a0fb7e538a0a1d813d32f78231ee1c2db19ad5a..da1c8d05e50103faa38da09db39416c5930a5282 100644 (file)
 
 #include "EntityGUI_3Spin.h"
 
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
+#include "DlgRef_SpinBox.h"
 
 /* 
  *  Constructs a EntityGUI_3Spin which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-EntityGUI_3Spin::EntityGUI_3Spin(QWidget* parent,  const char* name, WFlags fl)
-  :EntityGUI_3Spin_QTD(parent, name, fl)
+EntityGUI_3Spin::EntityGUI_3Spin(QWidget* parent,  const char* name, Qt::WindowFlags fl)
+  :QWidget(parent, fl)
 {
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
+  setupUi(this);
+
+  setObjectName(name);
+
+  SpinBox1->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox1->close();
+  SpinBox2->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox2->close();
+  SpinBox3->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox3->close();
 
   SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
+  gridLayout5->addWidget(SpinBox_DX, 0, 1);
 
   SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout1->addWidget(SpinBox_DY, 1, 1);
+  gridLayout5->addWidget(SpinBox_DY, 1, 1);
 
   SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
-  Layout1->addWidget(SpinBox_DZ, 2, 1);
+  gridLayout5->addWidget(SpinBox_DZ, 2, 1);
 }
 
 
index 4b612bdf15d6ed6a5bc0fc2279a56fe532f37ac2..8f1fbdc393803012c08d3919014364682e1917ed 100644 (file)
 #include "GEOM_EntityGUI.hxx"
 
 #include "EntityGUI_3Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin : public EntityGUI_3Spin_QTD
+class DlgRef_SpinBox;
+
+class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin : public QWidget, public Ui::EntityGUI_3Spin_QTD
 { 
     Q_OBJECT
 
 public:
-    EntityGUI_3Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    EntityGUI_3Spin( QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0 );
     ~EntityGUI_3Spin();
 
     DlgRef_SpinBox* SpinBox_DX;
diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.cxx b/src/EntityGUI/EntityGUI_3Spin_QTD.cxx
deleted file mode 100644 (file)
index 98dbf69..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_3Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_3Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_3Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_3Spin_QTD::EntityGUI_3Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_3Spin_QTD" );
-    resize( 255, 125 ); 
-    setCaption( trUtf8( "EntityGUI_3Spin_QTD" ) );
-    EntityGUI_3Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_3Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 121, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer, 2, 0 );
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox2, 1, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer_2, 3, 1 );
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox3, 2, 1 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_3Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_3Spin_QTD::~EntityGUI_3Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
index 1235b160ba00bcf420a1ea7442d676b96f68c5b4..80811fa68c03bea7ff2ee3eb4ccb31ec21ba37ff 100644 (file)
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_3Spin_QTD.ui'
+/********************************************************************************
+** Form generated from reading ui file 'EntityGUI_3Spin_QTD.ui'
 **
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
+** Created: Tue Jul 10 10:33:45 2007
+**      by: Qt User Interface Compiler version 4.2.3
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
 #ifndef ENTITYGUI_3SPIN_QTD_H
 #define ENTITYGUI_3SPIN_QTD_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3MimeSourceFactory>
 
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
+class Ui_EntityGUI_3Spin_QTD
+{
+public:
+    QGridLayout *gridLayout;
+    QGroupBox *GroupBox1;
+    QGridLayout *gridLayout1;
+    QGridLayout *gridLayout2;
+    QGridLayout *gridLayout3;
+    QPushButton *buttonApply;
+    QSpacerItem *spacerItem;
+    QGridLayout *gridLayout4;
+    QPushButton *buttonUndo;
+    QPushButton *buttonRedo;
+    QGridLayout *gridLayout5;
+    QLabel *TextLabel2;
+    QLabel *TextLabel1;
+    QSpinBox *SpinBox1;
+    QSpinBox *SpinBox2;
+    QLabel *TextLabel3;
+    QSpacerItem *spacerItem1;
+    QSpinBox *SpinBox3;
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_3Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
+    void setupUi(QWidget *EntityGUI_3Spin_QTD)
+    {
+    EntityGUI_3Spin_QTD->setObjectName(QString::fromUtf8("EntityGUI_3Spin_QTD"));
+    gridLayout = new QGridLayout(EntityGUI_3Spin_QTD);
+    gridLayout->setSpacing(6);
+    gridLayout->setMargin(0);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    GroupBox1 = new QGroupBox(EntityGUI_3Spin_QTD);
+    GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
+    gridLayout1 = new QGridLayout(GroupBox1);
+    gridLayout1->setSpacing(6);
+    gridLayout1->setMargin(11);
+    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+    gridLayout2 = new QGridLayout();
+    gridLayout2->setSpacing(6);
+    gridLayout2->setMargin(0);
+    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+    gridLayout3 = new QGridLayout();
+    gridLayout3->setSpacing(6);
+    gridLayout3->setMargin(0);
+    gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
+    buttonApply = new QPushButton(GroupBox1);
+    buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
+
+    gridLayout3->addWidget(buttonApply, 0, 0, 1, 1);
+
+    spacerItem = new QSpacerItem(0, 121, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout3->addItem(spacerItem, 2, 0, 1, 1);
+
+    gridLayout4 = new QGridLayout();
+    gridLayout4->setSpacing(6);
+    gridLayout4->setMargin(0);
+    gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
+    buttonUndo = new QPushButton(GroupBox1);
+    buttonUndo->setObjectName(QString::fromUtf8("buttonUndo"));
+
+    gridLayout4->addWidget(buttonUndo, 0, 0, 1, 1);
+
+    buttonRedo = new QPushButton(GroupBox1);
+    buttonRedo->setObjectName(QString::fromUtf8("buttonRedo"));
+
+    gridLayout4->addWidget(buttonRedo, 0, 1, 1, 1);
+
+
+    gridLayout3->addLayout(gridLayout4, 1, 0, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout3, 0, 1, 1, 1);
+
+    gridLayout5 = new QGridLayout();
+    gridLayout5->setSpacing(6);
+    gridLayout5->setMargin(0);
+    gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
+    TextLabel2 = new QLabel(GroupBox1);
+    TextLabel2->setObjectName(QString::fromUtf8("TextLabel2"));
+    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(TextLabel2->sizePolicy().hasHeightForWidth());
+    TextLabel2->setSizePolicy(sizePolicy);
+    TextLabel2->setWordWrap(false);
+
+    gridLayout5->addWidget(TextLabel2, 1, 0, 1, 1);
+
+    TextLabel1 = new QLabel(GroupBox1);
+    TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+    QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy1.setHorizontalStretch(0);
+    sizePolicy1.setVerticalStretch(0);
+    sizePolicy1.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth());
+    TextLabel1->setSizePolicy(sizePolicy1);
+    TextLabel1->setWordWrap(false);
+
+    gridLayout5->addWidget(TextLabel1, 0, 0, 1, 1);
+
+    SpinBox1 = new QSpinBox(GroupBox1);
+    SpinBox1->setObjectName(QString::fromUtf8("SpinBox1"));
+    QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy2.setHorizontalStretch(0);
+    sizePolicy2.setVerticalStretch(0);
+    sizePolicy2.setHeightForWidth(SpinBox1->sizePolicy().hasHeightForWidth());
+    SpinBox1->setSizePolicy(sizePolicy2);
+
+    gridLayout5->addWidget(SpinBox1, 0, 1, 1, 1);
+
+    SpinBox2 = new QSpinBox(GroupBox1);
+    SpinBox2->setObjectName(QString::fromUtf8("SpinBox2"));
+    QSizePolicy sizePolicy3(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy3.setHorizontalStretch(0);
+    sizePolicy3.setVerticalStretch(0);
+    sizePolicy3.setHeightForWidth(SpinBox2->sizePolicy().hasHeightForWidth());
+    SpinBox2->setSizePolicy(sizePolicy3);
+
+    gridLayout5->addWidget(SpinBox2, 1, 1, 1, 1);
+
+    TextLabel3 = new QLabel(GroupBox1);
+    TextLabel3->setObjectName(QString::fromUtf8("TextLabel3"));
+    QSizePolicy sizePolicy4(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy4.setHorizontalStretch(0);
+    sizePolicy4.setVerticalStretch(0);
+    sizePolicy4.setHeightForWidth(TextLabel3->sizePolicy().hasHeightForWidth());
+    TextLabel3->setSizePolicy(sizePolicy4);
+    TextLabel3->setWordWrap(false);
+
+    gridLayout5->addWidget(TextLabel3, 2, 0, 1, 1);
+
+    spacerItem1 = new QSpacerItem(0, 82, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout5->addItem(spacerItem1, 3, 1, 1, 1);
+
+    SpinBox3 = new QSpinBox(GroupBox1);
+    SpinBox3->setObjectName(QString::fromUtf8("SpinBox3"));
+    QSizePolicy sizePolicy5(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy5.setHorizontalStretch(0);
+    sizePolicy5.setVerticalStretch(0);
+    sizePolicy5.setHeightForWidth(SpinBox3->sizePolicy().hasHeightForWidth());
+    SpinBox3->setSizePolicy(sizePolicy5);
+
+    gridLayout5->addWidget(SpinBox3, 2, 1, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout5, 0, 0, 1, 1);
+
+
+    gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1);
+
+
+    gridLayout->addWidget(GroupBox1, 0, 0, 1, 1);
+
+
+    retranslateUi(EntityGUI_3Spin_QTD);
+
+    QSize size(255, 125);
+    size = size.expandedTo(EntityGUI_3Spin_QTD->minimumSizeHint());
+    EntityGUI_3Spin_QTD->resize(size);
+
+
+    QMetaObject::connectSlotsByName(EntityGUI_3Spin_QTD);
+    } // setupUi
+
+    void retranslateUi(QWidget *EntityGUI_3Spin_QTD)
+    {
+    EntityGUI_3Spin_QTD->setWindowTitle(QApplication::translate("EntityGUI_3Spin_QTD", "EntityGUI_3Spin_QTD", 0, QApplication::UnicodeUTF8));
+    GroupBox1->setTitle(QApplication::translate("EntityGUI_3Spin_QTD", "Values", 0, QApplication::UnicodeUTF8));
+    buttonApply->setText(QApplication::translate("EntityGUI_3Spin_QTD", "Create", 0, QApplication::UnicodeUTF8));
+    buttonUndo->setText(QApplication::translate("EntityGUI_3Spin_QTD", "Undo", 0, QApplication::UnicodeUTF8));
+    buttonRedo->setText(QApplication::translate("EntityGUI_3Spin_QTD", "Redo", 0, QApplication::UnicodeUTF8));
+    TextLabel2->setText(QApplication::translate("EntityGUI_3Spin_QTD", "TL2", 0, QApplication::UnicodeUTF8));
+    TextLabel1->setText(QApplication::translate("EntityGUI_3Spin_QTD", "TL1", 0, QApplication::UnicodeUTF8));
+    TextLabel3->setText(QApplication::translate("EntityGUI_3Spin_QTD", "TL3", 0, QApplication::UnicodeUTF8));
+    Q_UNUSED(EntityGUI_3Spin_QTD);
+    } // retranslateUi
 
-public:
-    EntityGUI_3Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_3Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* buttonApply;
-    QPushButton* buttonUndo;
-    QPushButton* buttonRedo;
-    QLabel* TextLabel2;
-    QLabel* TextLabel1;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox3;
-
-
-protected:
-    QGridLayout* EntityGUI_3Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
-    QGridLayout* Layout1;
 };
 
+namespace Ui {
+    class EntityGUI_3Spin_QTD: public Ui_EntityGUI_3Spin_QTD {};
+} // namespace Ui
+
 #endif // ENTITYGUI_3SPIN_QTD_H
index 76ea42b22184325623b9f870536df048a2bb07eb..4f5e888bcfe32f93e82374d57a115321508b351c 100644 (file)
 
 #include "EntityGUI_4Spin.h"
 
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qgroupbox.h>
+#include "DlgRef_SpinBox.h"
 
 /* 
  *  Constructs a EntityGUI_4Spin which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-EntityGUI_4Spin::EntityGUI_4Spin(QWidget* parent,  const char* name, WFlags fl)
-  :EntityGUI_4Spin_QTD(parent, name, fl)
+EntityGUI_4Spin::EntityGUI_4Spin(QWidget* parent,  const char* name, Qt::WindowFlags fl)
+  :QWidget(parent, fl)
 {
-  SpinBox1->close(TRUE);
-  SpinBox2->close(TRUE);
-  SpinBox3->close(TRUE);
-  SpinBox4->close(TRUE);
+  setupUi(this);
+
+  setObjectName(name);
+
+  SpinBox1->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox1->close();
+  SpinBox2->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox2->close();
+  SpinBox3->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox3->close();
+  SpinBox4->setAttribute( Qt::WA_DeleteOnClose );
+  SpinBox4->close();
 
   SpinBox_DX = new DlgRef_SpinBox(GroupBox1, "SpinBox_DX");
-  Layout1->addWidget(SpinBox_DX, 0, 1);
+  gridLayout5->addWidget(SpinBox_DX, 0, 1);
 
   SpinBox_DY = new DlgRef_SpinBox(GroupBox1, "SpinBox_DY");
-  Layout1->addWidget(SpinBox_DY, 1, 1);
+  gridLayout5->addWidget(SpinBox_DY, 1, 1);
 
   SpinBox_DZ = new DlgRef_SpinBox(GroupBox1, "SpinBox_DZ");
-  Layout1->addWidget(SpinBox_DZ, 2, 1);
+  gridLayout5->addWidget(SpinBox_DZ, 2, 1);
 
   SpinBox_DS = new DlgRef_SpinBox(GroupBox1, "SpinBox_DS");
-  Layout1->addWidget(SpinBox_DS, 3, 1);
+  gridLayout5->addWidget(SpinBox_DS, 3, 1);
 }
 
 
index eeaf1965b8112c6508467b5945205bb7f9daf709..dcd5c6b142d135f902ab8d8cd4c68fd8b0a46e15 100644 (file)
 #include "GEOM_EntityGUI.hxx"
 
 #include "EntityGUI_4Spin_QTD.h"
-#include "DlgRef_SpinBox.h"
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin : public EntityGUI_4Spin_QTD
+class DlgRef_SpinBox;
+
+class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin : public QWidget, public Ui::EntityGUI_4Spin_QTD
 { 
     Q_OBJECT
 
 public:
-    EntityGUI_4Spin( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    EntityGUI_4Spin( QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0 );
     ~EntityGUI_4Spin();
 
     DlgRef_SpinBox* SpinBox_DX;
diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.cxx b/src/EntityGUI/EntityGUI_4Spin_QTD.cxx
deleted file mode 100644 (file)
index 8d8debd..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_4Spin_QTD.ui'
-**
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_4Spin_QTD.h"
-
-#include <qvariant.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_4Spin_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_4Spin_QTD::EntityGUI_4Spin_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_4Spin_QTD" );
-    resize( 255, 154 ); 
-    setCaption( trUtf8( "EntityGUI_4Spin_QTD" ) );
-    EntityGUI_4Spin_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_4Spin_QTDLayout"); 
-
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( trUtf8( "Values" ) );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->layout()->setSpacing( 6 );
-    GroupBox1->layout()->setMargin( 11 );
-    GroupBox1Layout = new QGridLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); 
-
-    Layout2 = new QGridLayout( 0, 1, 1, 0, 6, "Layout2"); 
-
-    buttonRedo = new QPushButton( GroupBox1, "buttonRedo" );
-    buttonRedo->setText( trUtf8( "Redo" ) );
-
-    Layout2->addWidget( buttonRedo, 0, 1 );
-
-    buttonUndo = new QPushButton( GroupBox1, "buttonUndo" );
-    buttonUndo->setText( trUtf8( "Undo" ) );
-
-    Layout2->addWidget( buttonUndo, 0, 0 );
-
-    Layout3->addLayout( Layout2, 1, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 45, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout3->addItem( spacer, 2, 0 );
-
-    buttonApply = new QPushButton( GroupBox1, "buttonApply" );
-    buttonApply->setText( trUtf8( "Create" ) );
-
-    Layout3->addWidget( buttonApply, 0, 0 );
-
-    Layout4->addLayout( Layout3, 0, 1 );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    SpinBox3 = new QSpinBox( GroupBox1, "SpinBox3" );
-    SpinBox3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox3->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox3, 2, 1 );
-
-    SpinBox2 = new QSpinBox( GroupBox1, "SpinBox2" );
-    SpinBox2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox2->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox2, 1, 1 );
-
-    TextLabel2 = new QLabel( GroupBox1, "TextLabel2" );
-    TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
-    TextLabel2->setText( trUtf8( "TL2" ) );
-
-    Layout1->addWidget( TextLabel2, 1, 0 );
-    QSpacerItem* spacer_2 = new QSpacerItem( 0, 70, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer_2, 4, 1 );
-
-    SpinBox4 = new QSpinBox( GroupBox1, "SpinBox4" );
-    SpinBox4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox4->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox4, 3, 1 );
-
-    TextLabel3 = new QLabel( GroupBox1, "TextLabel3" );
-    TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
-    TextLabel3->setText( trUtf8( "TL3" ) );
-
-    Layout1->addWidget( TextLabel3, 2, 0 );
-
-    SpinBox1 = new QSpinBox( GroupBox1, "SpinBox1" );
-    SpinBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox1->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( SpinBox1, 0, 1 );
-
-    TextLabel1 = new QLabel( GroupBox1, "TextLabel1" );
-    TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) );
-    TextLabel1->setText( trUtf8( "TL1" ) );
-
-    Layout1->addWidget( TextLabel1, 0, 0 );
-
-    TextLabel4 = new QLabel( GroupBox1, "TextLabel4" );
-    TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) );
-    TextLabel4->setText( trUtf8( "TL4" ) );
-
-    Layout1->addWidget( TextLabel4, 3, 0 );
-
-    Layout4->addLayout( Layout1, 0, 0 );
-
-    GroupBox1Layout->addLayout( Layout4, 0, 0 );
-
-    EntityGUI_4Spin_QTDLayout->addWidget( GroupBox1, 0, 0 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_4Spin_QTD::~EntityGUI_4Spin_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
index 6ec375d90d96a176ce00db979b0c1c94fab3146f..457de0b3920b539a2e3dee940f0e23653b230c32 100644 (file)
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_4Spin_QTD.ui'
+/********************************************************************************
+** Form generated from reading ui file 'EntityGUI_4Spin_QTD.ui'
 **
-** Created: Fri Jul 30 16:06:00 2004
-**      by:  The User Interface Compiler (uic)
+** Created: Tue Jul 10 10:35:47 2007
+**      by: Qt User Interface Compiler version 4.2.3
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
 #ifndef ENTITYGUI_4SPIN_QTD_H
 #define ENTITYGUI_4SPIN_QTD_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QSpinBox>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3MimeSourceFactory>
 
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QGroupBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
+class Ui_EntityGUI_4Spin_QTD
+{
+public:
+    QGridLayout *gridLayout;
+    QGroupBox *GroupBox1;
+    QGridLayout *gridLayout1;
+    QGridLayout *gridLayout2;
+    QGridLayout *gridLayout3;
+    QGridLayout *gridLayout4;
+    QPushButton *buttonRedo;
+    QPushButton *buttonUndo;
+    QSpacerItem *spacerItem;
+    QPushButton *buttonApply;
+    QGridLayout *gridLayout5;
+    QSpinBox *SpinBox3;
+    QSpinBox *SpinBox2;
+    QLabel *TextLabel2;
+    QSpacerItem *spacerItem1;
+    QSpinBox *SpinBox4;
+    QLabel *TextLabel3;
+    QSpinBox *SpinBox1;
+    QLabel *TextLabel1;
+    QLabel *TextLabel4;
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_4Spin_QTD : public QWidget
-{ 
-    Q_OBJECT
+    void setupUi(QWidget *EntityGUI_4Spin_QTD)
+    {
+    EntityGUI_4Spin_QTD->setObjectName(QString::fromUtf8("EntityGUI_4Spin_QTD"));
+    gridLayout = new QGridLayout(EntityGUI_4Spin_QTD);
+    gridLayout->setSpacing(6);
+    gridLayout->setMargin(0);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    GroupBox1 = new QGroupBox(EntityGUI_4Spin_QTD);
+    GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
+    gridLayout1 = new QGridLayout(GroupBox1);
+    gridLayout1->setSpacing(6);
+    gridLayout1->setMargin(11);
+    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+    gridLayout2 = new QGridLayout();
+    gridLayout2->setSpacing(6);
+    gridLayout2->setMargin(0);
+    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+    gridLayout3 = new QGridLayout();
+    gridLayout3->setSpacing(6);
+    gridLayout3->setMargin(0);
+    gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
+    gridLayout4 = new QGridLayout();
+    gridLayout4->setSpacing(6);
+    gridLayout4->setMargin(0);
+    gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
+    buttonRedo = new QPushButton(GroupBox1);
+    buttonRedo->setObjectName(QString::fromUtf8("buttonRedo"));
+
+    gridLayout4->addWidget(buttonRedo, 0, 1, 1, 1);
+
+    buttonUndo = new QPushButton(GroupBox1);
+    buttonUndo->setObjectName(QString::fromUtf8("buttonUndo"));
+
+    gridLayout4->addWidget(buttonUndo, 0, 0, 1, 1);
+
+
+    gridLayout3->addLayout(gridLayout4, 1, 0, 1, 1);
+
+    spacerItem = new QSpacerItem(0, 45, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout3->addItem(spacerItem, 2, 0, 1, 1);
+
+    buttonApply = new QPushButton(GroupBox1);
+    buttonApply->setObjectName(QString::fromUtf8("buttonApply"));
+
+    gridLayout3->addWidget(buttonApply, 0, 0, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout3, 0, 1, 1, 1);
+
+    gridLayout5 = new QGridLayout();
+    gridLayout5->setSpacing(6);
+    gridLayout5->setMargin(0);
+    gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
+    SpinBox3 = new QSpinBox(GroupBox1);
+    SpinBox3->setObjectName(QString::fromUtf8("SpinBox3"));
+    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(SpinBox3->sizePolicy().hasHeightForWidth());
+    SpinBox3->setSizePolicy(sizePolicy);
+
+    gridLayout5->addWidget(SpinBox3, 2, 1, 1, 1);
+
+    SpinBox2 = new QSpinBox(GroupBox1);
+    SpinBox2->setObjectName(QString::fromUtf8("SpinBox2"));
+    QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy1.setHorizontalStretch(0);
+    sizePolicy1.setVerticalStretch(0);
+    sizePolicy1.setHeightForWidth(SpinBox2->sizePolicy().hasHeightForWidth());
+    SpinBox2->setSizePolicy(sizePolicy1);
+
+    gridLayout5->addWidget(SpinBox2, 1, 1, 1, 1);
+
+    TextLabel2 = new QLabel(GroupBox1);
+    TextLabel2->setObjectName(QString::fromUtf8("TextLabel2"));
+    QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy2.setHorizontalStretch(0);
+    sizePolicy2.setVerticalStretch(0);
+    sizePolicy2.setHeightForWidth(TextLabel2->sizePolicy().hasHeightForWidth());
+    TextLabel2->setSizePolicy(sizePolicy2);
+    TextLabel2->setWordWrap(false);
+
+    gridLayout5->addWidget(TextLabel2, 1, 0, 1, 1);
+
+    spacerItem1 = new QSpacerItem(0, 70, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout5->addItem(spacerItem1, 4, 1, 1, 1);
+
+    SpinBox4 = new QSpinBox(GroupBox1);
+    SpinBox4->setObjectName(QString::fromUtf8("SpinBox4"));
+    QSizePolicy sizePolicy3(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy3.setHorizontalStretch(0);
+    sizePolicy3.setVerticalStretch(0);
+    sizePolicy3.setHeightForWidth(SpinBox4->sizePolicy().hasHeightForWidth());
+    SpinBox4->setSizePolicy(sizePolicy3);
+
+    gridLayout5->addWidget(SpinBox4, 3, 1, 1, 1);
+
+    TextLabel3 = new QLabel(GroupBox1);
+    TextLabel3->setObjectName(QString::fromUtf8("TextLabel3"));
+    QSizePolicy sizePolicy4(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy4.setHorizontalStretch(0);
+    sizePolicy4.setVerticalStretch(0);
+    sizePolicy4.setHeightForWidth(TextLabel3->sizePolicy().hasHeightForWidth());
+    TextLabel3->setSizePolicy(sizePolicy4);
+    TextLabel3->setWordWrap(false);
+
+    gridLayout5->addWidget(TextLabel3, 2, 0, 1, 1);
+
+    SpinBox1 = new QSpinBox(GroupBox1);
+    SpinBox1->setObjectName(QString::fromUtf8("SpinBox1"));
+    QSizePolicy sizePolicy5(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy5.setHorizontalStretch(0);
+    sizePolicy5.setVerticalStretch(0);
+    sizePolicy5.setHeightForWidth(SpinBox1->sizePolicy().hasHeightForWidth());
+    SpinBox1->setSizePolicy(sizePolicy5);
+
+    gridLayout5->addWidget(SpinBox1, 0, 1, 1, 1);
+
+    TextLabel1 = new QLabel(GroupBox1);
+    TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+    QSizePolicy sizePolicy6(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy6.setHorizontalStretch(0);
+    sizePolicy6.setVerticalStretch(0);
+    sizePolicy6.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth());
+    TextLabel1->setSizePolicy(sizePolicy6);
+    TextLabel1->setWordWrap(false);
+
+    gridLayout5->addWidget(TextLabel1, 0, 0, 1, 1);
+
+    TextLabel4 = new QLabel(GroupBox1);
+    TextLabel4->setObjectName(QString::fromUtf8("TextLabel4"));
+    QSizePolicy sizePolicy7(static_cast<QSizePolicy::Policy>(0), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy7.setHorizontalStretch(0);
+    sizePolicy7.setVerticalStretch(0);
+    sizePolicy7.setHeightForWidth(TextLabel4->sizePolicy().hasHeightForWidth());
+    TextLabel4->setSizePolicy(sizePolicy7);
+    TextLabel4->setWordWrap(false);
+
+    gridLayout5->addWidget(TextLabel4, 3, 0, 1, 1);
+
+
+    gridLayout2->addLayout(gridLayout5, 0, 0, 1, 1);
+
+
+    gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1);
+
+
+    gridLayout->addWidget(GroupBox1, 0, 0, 1, 1);
+
+
+    retranslateUi(EntityGUI_4Spin_QTD);
+
+    QSize size(255, 154);
+    size = size.expandedTo(EntityGUI_4Spin_QTD->minimumSizeHint());
+    EntityGUI_4Spin_QTD->resize(size);
+
+
+    QMetaObject::connectSlotsByName(EntityGUI_4Spin_QTD);
+    } // setupUi
+
+    void retranslateUi(QWidget *EntityGUI_4Spin_QTD)
+    {
+    EntityGUI_4Spin_QTD->setWindowTitle(QApplication::translate("EntityGUI_4Spin_QTD", "EntityGUI_4Spin_QTD", 0, QApplication::UnicodeUTF8));
+    GroupBox1->setTitle(QApplication::translate("EntityGUI_4Spin_QTD", "Values", 0, QApplication::UnicodeUTF8));
+    buttonRedo->setText(QApplication::translate("EntityGUI_4Spin_QTD", "Redo", 0, QApplication::UnicodeUTF8));
+    buttonUndo->setText(QApplication::translate("EntityGUI_4Spin_QTD", "Undo", 0, QApplication::UnicodeUTF8));
+    buttonApply->setText(QApplication::translate("EntityGUI_4Spin_QTD", "Create", 0, QApplication::UnicodeUTF8));
+    TextLabel2->setText(QApplication::translate("EntityGUI_4Spin_QTD", "TL2", 0, QApplication::UnicodeUTF8));
+    TextLabel3->setText(QApplication::translate("EntityGUI_4Spin_QTD", "TL3", 0, QApplication::UnicodeUTF8));
+    TextLabel1->setText(QApplication::translate("EntityGUI_4Spin_QTD", "TL1", 0, QApplication::UnicodeUTF8));
+    TextLabel4->setText(QApplication::translate("EntityGUI_4Spin_QTD", "TL4", 0, QApplication::UnicodeUTF8));
+    Q_UNUSED(EntityGUI_4Spin_QTD);
+    } // retranslateUi
 
-public:
-    EntityGUI_4Spin_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_4Spin_QTD();
-
-    QGroupBox* GroupBox1;
-    QPushButton* buttonRedo;
-    QPushButton* buttonUndo;
-    QPushButton* buttonApply;
-    QSpinBox* SpinBox3;
-    QSpinBox* SpinBox2;
-    QLabel* TextLabel2;
-    QSpinBox* SpinBox4;
-    QLabel* TextLabel3;
-    QSpinBox* SpinBox1;
-    QLabel* TextLabel1;
-    QLabel* TextLabel4;
-
-
-protected:
-    QGridLayout* EntityGUI_4Spin_QTDLayout;
-    QGridLayout* GroupBox1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* Layout3;
-    QGridLayout* Layout2;
-    QGridLayout* Layout1;
 };
 
+namespace Ui {
+    class EntityGUI_4Spin_QTD: public Ui_EntityGUI_4Spin_QTD {};
+} // namespace Ui
+
 #endif // ENTITYGUI_4SPIN_QTD_H
diff --git a/src/EntityGUI/EntityGUI_Dir1_QTD.cxx b/src/EntityGUI/EntityGUI_Dir1_QTD.cxx
deleted file mode 100644 (file)
index 9f051b2..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_Dir1_QTD.ui'
-**
-** Created: ven déc 12 11:17:09 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_Dir1_QTD.h"
-
-#include <qvariant.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_Dir1_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_Dir1_QTD::EntityGUI_Dir1_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_Dir1_QTD" );
-    resize( 131, 123 ); 
-    setCaption( trUtf8( "EntityGUI_Dir1_QTD" ) );
-    EntityGUI_Dir1_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Dir1_QTDLayout"); 
-
-    GroupDir1 = new QButtonGroup( this, "GroupDir1" );
-    GroupDir1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDir1->sizePolicy().hasHeightForWidth() ) );
-    GroupDir1->setTitle( trUtf8( "Direction" ) );
-    GroupDir1->setColumnLayout(0, Qt::Vertical );
-    GroupDir1->layout()->setSpacing( 6 );
-    GroupDir1->layout()->setMargin( 11 );
-    GroupDir1Layout = new QGridLayout( GroupDir1->layout() );
-    GroupDir1Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    RB_Dir12 = new QRadioButton( GroupDir1, "RB_Dir12" );
-    RB_Dir12->setText( trUtf8( "Perpendicular" ) );
-
-    Layout1->addWidget( RB_Dir12, 1, 0 );
-
-    RB_Dir13 = new QRadioButton( GroupDir1, "RB_Dir13" );
-    RB_Dir13->setText( trUtf8( "Tangent" ) );
-
-    Layout1->addWidget( RB_Dir13, 2, 0 );
-
-    RB_Dir11 = new QRadioButton( GroupDir1, "RB_Dir11" );
-    RB_Dir11->setText( trUtf8( "Angle" ) );
-
-    Layout1->addWidget( RB_Dir11, 0, 0 );
-
-    RB_Dir14 = new QRadioButton( GroupDir1, "RB_Dir14" );
-    RB_Dir14->setText( trUtf8( "VX-VY" ) );
-
-    Layout1->addWidget( RB_Dir14, 3, 0 );
-
-    GroupDir1Layout->addLayout( Layout1, 0, 0 );
-
-    EntityGUI_Dir1_QTDLayout->addWidget( GroupDir1, 0, 0 );
-
-    // tab order
-    setTabOrder( RB_Dir11, RB_Dir12 );
-    setTabOrder( RB_Dir12, RB_Dir13 );
-    setTabOrder( RB_Dir13, RB_Dir14 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_Dir1_QTD::~EntityGUI_Dir1_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
index 6ca2a113729fbc07a0563ec8265453e738225ade..6231eca615d60d14bfb4229c72c74163a1d5eaa5 100644 (file)
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_Dir1_QTD.ui'
+/********************************************************************************
+** Form generated from reading ui file 'EntityGUI_Dir1_QTD.ui'
 **
-** Created: ven déc 12 11:17:09 2003
-**      by:  The User Interface Compiler (uic)
+** Created: Tue Jul 10 10:20:45 2007
+**      by: Qt User Interface Compiler version 4.2.3
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
 #ifndef ENTITYGUI_DIR1_QTD_H
 #define ENTITYGUI_DIR1_QTD_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QRadioButton>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3MimeSourceFactory>
 
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QButtonGroup;
-class QRadioButton;
+class Ui_EntityGUI_Dir1_QTD
+{
+public:
+    QGridLayout *gridLayout;
+    QGroupBox *GroupDir1;
+    QGridLayout *gridLayout1;
+    QGridLayout *gridLayout2;
+    QRadioButton *RB_Dir12;
+    QRadioButton *RB_Dir13;
+    QRadioButton *RB_Dir11;
+    QRadioButton *RB_Dir14;
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir1_QTD : public QWidget
-{ 
-    Q_OBJECT
+    void setupUi(QWidget *EntityGUI_Dir1_QTD)
+    {
+    EntityGUI_Dir1_QTD->setObjectName(QString::fromUtf8("EntityGUI_Dir1_QTD"));
+    gridLayout = new QGridLayout(EntityGUI_Dir1_QTD);
+    gridLayout->setSpacing(6);
+    gridLayout->setMargin(0);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    GroupDir1 = new QGroupBox(EntityGUI_Dir1_QTD);
+    GroupDir1->setObjectName(QString::fromUtf8("GroupDir1"));
+    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(GroupDir1->sizePolicy().hasHeightForWidth());
+    GroupDir1->setSizePolicy(sizePolicy);
+    gridLayout1 = new QGridLayout(GroupDir1);
+    gridLayout1->setSpacing(6);
+    gridLayout1->setMargin(11);
+    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+    gridLayout2 = new QGridLayout();
+    gridLayout2->setSpacing(6);
+    gridLayout2->setMargin(0);
+    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+    RB_Dir12 = new QRadioButton(GroupDir1);
+    RB_Dir12->setObjectName(QString::fromUtf8("RB_Dir12"));
 
-public:
-    EntityGUI_Dir1_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_Dir1_QTD();
+    gridLayout2->addWidget(RB_Dir12, 1, 0, 1, 1);
+
+    RB_Dir13 = new QRadioButton(GroupDir1);
+    RB_Dir13->setObjectName(QString::fromUtf8("RB_Dir13"));
+
+    gridLayout2->addWidget(RB_Dir13, 2, 0, 1, 1);
+
+    RB_Dir11 = new QRadioButton(GroupDir1);
+    RB_Dir11->setObjectName(QString::fromUtf8("RB_Dir11"));
+
+    gridLayout2->addWidget(RB_Dir11, 0, 0, 1, 1);
+
+    RB_Dir14 = new QRadioButton(GroupDir1);
+    RB_Dir14->setObjectName(QString::fromUtf8("RB_Dir14"));
+
+    gridLayout2->addWidget(RB_Dir14, 3, 0, 1, 1);
 
-    QButtonGroup* GroupDir1;
-    QRadioButton* RB_Dir12;
-    QRadioButton* RB_Dir13;
-    QRadioButton* RB_Dir11;
-    QRadioButton* RB_Dir14;
 
+    gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1);
+
+
+    gridLayout->addWidget(GroupDir1, 0, 0, 1, 1);
+
+    QWidget::setTabOrder(RB_Dir11, RB_Dir12);
+    QWidget::setTabOrder(RB_Dir12, RB_Dir13);
+    QWidget::setTabOrder(RB_Dir13, RB_Dir14);
+
+    retranslateUi(EntityGUI_Dir1_QTD);
+
+    QSize size(131, 123);
+    size = size.expandedTo(EntityGUI_Dir1_QTD->minimumSizeHint());
+    EntityGUI_Dir1_QTD->resize(size);
+
+
+    QMetaObject::connectSlotsByName(EntityGUI_Dir1_QTD);
+    } // setupUi
+
+    void retranslateUi(QWidget *EntityGUI_Dir1_QTD)
+    {
+    EntityGUI_Dir1_QTD->setWindowTitle(QApplication::translate("EntityGUI_Dir1_QTD", "EntityGUI_Dir1_QTD", 0, QApplication::UnicodeUTF8));
+    GroupDir1->setTitle(QApplication::translate("EntityGUI_Dir1_QTD", "Direction", 0, QApplication::UnicodeUTF8));
+    RB_Dir12->setText(QApplication::translate("EntityGUI_Dir1_QTD", "Perpendicular", 0, QApplication::UnicodeUTF8));
+    RB_Dir13->setText(QApplication::translate("EntityGUI_Dir1_QTD", "Tangent", 0, QApplication::UnicodeUTF8));
+    RB_Dir11->setText(QApplication::translate("EntityGUI_Dir1_QTD", "Angle", 0, QApplication::UnicodeUTF8));
+    RB_Dir14->setText(QApplication::translate("EntityGUI_Dir1_QTD", "VX-VY", 0, QApplication::UnicodeUTF8));
+    Q_UNUSED(EntityGUI_Dir1_QTD);
+    } // retranslateUi
 
-protected:
-    QGridLayout* EntityGUI_Dir1_QTDLayout;
-    QGridLayout* GroupDir1Layout;
-    QGridLayout* Layout1;
 };
 
+namespace Ui {
+    class EntityGUI_Dir1_QTD: public Ui_EntityGUI_Dir1_QTD {};
+} // namespace Ui
+
 #endif // ENTITYGUI_DIR1_QTD_H
diff --git a/src/EntityGUI/EntityGUI_Dir2_QTD.cxx b/src/EntityGUI/EntityGUI_Dir2_QTD.cxx
deleted file mode 100644 (file)
index bb50998..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_Dir2_QTD.ui'
-**
-** Created: ven déc 12 11:17:10 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_Dir2_QTD.h"
-
-#include <qvariant.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_Dir2_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_Dir2_QTD::EntityGUI_Dir2_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_Dir2_QTD" );
-    resize( 124, 106 ); 
-    setCaption( trUtf8( "EntityGUI_Dir2_QTD" ) );
-    EntityGUI_Dir2_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Dir2_QTDLayout"); 
-
-    GroupDir2 = new QButtonGroup( this, "GroupDir2" );
-    GroupDir2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDir2->sizePolicy().hasHeightForWidth() ) );
-    GroupDir2->setTitle( trUtf8( "Direction" ) );
-    GroupDir2->setColumnLayout(0, Qt::Vertical );
-    GroupDir2->layout()->setSpacing( 6 );
-    GroupDir2->layout()->setMargin( 11 );
-    GroupDir2Layout = new QGridLayout( GroupDir2->layout() );
-    GroupDir2Layout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    RB_Dir22 = new QRadioButton( GroupDir2, "RB_Dir22" );
-    RB_Dir22->setText( trUtf8( "X" ) );
-
-    Layout1->addWidget( RB_Dir22, 1, 0 );
-
-    RB_Dir23 = new QRadioButton( GroupDir2, "RB_Dir23" );
-    RB_Dir23->setText( trUtf8( "Y" ) );
-
-    Layout1->addWidget( RB_Dir23, 2, 0 );
-    QSpacerItem* spacer = new QSpacerItem( 0, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
-    Layout1->addItem( spacer, 3, 0 );
-
-    RB_Dir21 = new QRadioButton( GroupDir2, "RB_Dir21" );
-    RB_Dir21->setText( trUtf8( "Length" ) );
-
-    Layout1->addWidget( RB_Dir21, 0, 0 );
-
-    GroupDir2Layout->addLayout( Layout1, 0, 0 );
-
-    EntityGUI_Dir2_QTDLayout->addWidget( GroupDir2, 0, 0 );
-
-    // tab order
-    setTabOrder( RB_Dir21, RB_Dir22 );
-    setTabOrder( RB_Dir22, RB_Dir23 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_Dir2_QTD::~EntityGUI_Dir2_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
index 17480e83f2bb74b756ca84352fe6a5e2dd57068e..5cffa22f83989bcd417c8f4e3d4d8df127b852fe 100644 (file)
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_Dir2_QTD.ui'
+/********************************************************************************
+** Form generated from reading ui file 'EntityGUI_Dir2_QTD.ui'
 **
-** Created: ven déc 12 11:17:09 2003
-**      by:  The User Interface Compiler (uic)
+** Created: Tue Jul 10 10:24:41 2007
+**      by: Qt User Interface Compiler version 4.2.3
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
 #ifndef ENTITYGUI_DIR2_QTD_H
 #define ENTITYGUI_DIR2_QTD_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3MimeSourceFactory>
 
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QButtonGroup;
-class QRadioButton;
+class Ui_EntityGUI_Dir2_QTD
+{
+public:
+    QGridLayout *gridLayout;
+    QGroupBox *GroupDir2;
+    QGridLayout *gridLayout1;
+    QGridLayout *gridLayout2;
+    QRadioButton *RB_Dir22;
+    QRadioButton *RB_Dir23;
+    QSpacerItem *spacerItem;
+    QRadioButton *RB_Dir21;
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_Dir2_QTD : public QWidget
-{ 
-    Q_OBJECT
+    void setupUi(QWidget *EntityGUI_Dir2_QTD)
+    {
+    EntityGUI_Dir2_QTD->setObjectName(QString::fromUtf8("EntityGUI_Dir2_QTD"));
+    gridLayout = new QGridLayout(EntityGUI_Dir2_QTD);
+    gridLayout->setSpacing(6);
+    gridLayout->setMargin(0);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    GroupDir2 = new QGroupBox(EntityGUI_Dir2_QTD);
+    GroupDir2->setObjectName(QString::fromUtf8("GroupDir2"));
+    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(7));
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(GroupDir2->sizePolicy().hasHeightForWidth());
+    GroupDir2->setSizePolicy(sizePolicy);
+    gridLayout1 = new QGridLayout(GroupDir2);
+    gridLayout1->setSpacing(6);
+    gridLayout1->setMargin(11);
+    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+    gridLayout2 = new QGridLayout();
+    gridLayout2->setSpacing(6);
+    gridLayout2->setMargin(0);
+    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+    RB_Dir22 = new QRadioButton(GroupDir2);
+    RB_Dir22->setObjectName(QString::fromUtf8("RB_Dir22"));
 
-public:
-    EntityGUI_Dir2_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_Dir2_QTD();
+    gridLayout2->addWidget(RB_Dir22, 1, 0, 1, 1);
+
+    RB_Dir23 = new QRadioButton(GroupDir2);
+    RB_Dir23->setObjectName(QString::fromUtf8("RB_Dir23"));
+
+    gridLayout2->addWidget(RB_Dir23, 2, 0, 1, 1);
+
+    spacerItem = new QSpacerItem(0, 20, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    gridLayout2->addItem(spacerItem, 3, 0, 1, 1);
+
+    RB_Dir21 = new QRadioButton(GroupDir2);
+    RB_Dir21->setObjectName(QString::fromUtf8("RB_Dir21"));
+
+    gridLayout2->addWidget(RB_Dir21, 0, 0, 1, 1);
 
-    QButtonGroup* GroupDir2;
-    QRadioButton* RB_Dir22;
-    QRadioButton* RB_Dir23;
-    QRadioButton* RB_Dir21;
 
+    gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1);
+
+
+    gridLayout->addWidget(GroupDir2, 0, 0, 1, 1);
+
+    QWidget::setTabOrder(RB_Dir21, RB_Dir22);
+    QWidget::setTabOrder(RB_Dir22, RB_Dir23);
+
+    retranslateUi(EntityGUI_Dir2_QTD);
+
+    QSize size(124, 106);
+    size = size.expandedTo(EntityGUI_Dir2_QTD->minimumSizeHint());
+    EntityGUI_Dir2_QTD->resize(size);
+
+
+    QMetaObject::connectSlotsByName(EntityGUI_Dir2_QTD);
+    } // setupUi
+
+    void retranslateUi(QWidget *EntityGUI_Dir2_QTD)
+    {
+    EntityGUI_Dir2_QTD->setWindowTitle(QApplication::translate("EntityGUI_Dir2_QTD", "EntityGUI_Dir2_QTD", 0, QApplication::UnicodeUTF8));
+    GroupDir2->setTitle(QApplication::translate("EntityGUI_Dir2_QTD", "Direction", 0, QApplication::UnicodeUTF8));
+    RB_Dir22->setText(QApplication::translate("EntityGUI_Dir2_QTD", "X", 0, QApplication::UnicodeUTF8));
+    RB_Dir23->setText(QApplication::translate("EntityGUI_Dir2_QTD", "Y", 0, QApplication::UnicodeUTF8));
+    RB_Dir21->setText(QApplication::translate("EntityGUI_Dir2_QTD", "Length", 0, QApplication::UnicodeUTF8));
+    Q_UNUSED(EntityGUI_Dir2_QTD);
+    } // retranslateUi
 
-protected:
-    QGridLayout* EntityGUI_Dir2_QTDLayout;
-    QGridLayout* GroupDir2Layout;
-    QGridLayout* Layout1;
 };
 
+namespace Ui {
+    class EntityGUI_Dir2_QTD: public Ui_EntityGUI_Dir2_QTD {};
+} // namespace Ui
+
 #endif // ENTITYGUI_DIR2_QTD_H
diff --git a/src/EntityGUI/EntityGUI_Point_QTD.cxx b/src/EntityGUI/EntityGUI_Point_QTD.cxx
deleted file mode 100644 (file)
index bc2a482..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_Point_QTD.ui'
-**
-** Created: ven déc 12 11:17:08 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-#include "EntityGUI_Point_QTD.h"
-
-#include <qvariant.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/* 
- *  Constructs a EntityGUI_Point_QTD which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f'.
- */
-EntityGUI_Point_QTD::EntityGUI_Point_QTD( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_Point_QTD" );
-    resize( 124, 106 ); 
-    setCaption( trUtf8( "EntityGUI_Point_QTD" ) );
-    EntityGUI_Point_QTDLayout = new QGridLayout( this, 1, 1, 0, 6, "EntityGUI_Point_QTDLayout"); 
-
-    GroupPoint = new QButtonGroup( this, "GroupPoint" );
-    GroupPoint->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupPoint->sizePolicy().hasHeightForWidth() ) );
-    GroupPoint->setTitle( trUtf8( "Point" ) );
-    GroupPoint->setColumnLayout(0, Qt::Vertical );
-    GroupPoint->layout()->setSpacing( 6 );
-    GroupPoint->layout()->setMargin( 11 );
-    GroupPointLayout = new QGridLayout( GroupPoint->layout() );
-    GroupPointLayout->setAlignment( Qt::AlignTop );
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    RB_Point2 = new QRadioButton( GroupPoint, "RB_Point2" );
-    RB_Point2->setText( trUtf8( "Relative" ) );
-
-    Layout1->addWidget( RB_Point2, 1, 0 );
-
-    RB_Point1 = new QRadioButton( GroupPoint, "RB_Point1" );
-    RB_Point1->setText( trUtf8( "Absolute" ) );
-
-    Layout1->addWidget( RB_Point1, 0, 0 );
-
-    RB_Point3 = new QRadioButton( GroupPoint, "RB_Point3" );
-    RB_Point3->setText( trUtf8( "Selection" ) );
-
-    Layout1->addWidget( RB_Point3, 2, 0 );
-
-    GroupPointLayout->addLayout( Layout1, 0, 0 );
-
-    EntityGUI_Point_QTDLayout->addWidget( GroupPoint, 0, 0 );
-
-    // tab order
-    setTabOrder( RB_Point1, RB_Point2 );
-    setTabOrder( RB_Point2, RB_Point3 );
-}
-
-/*  
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_Point_QTD::~EntityGUI_Point_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
index 453b098075b8d4fb5816ef66650e21d7bc4cc0dd..897833f5e8bb5ea62c84d93916d87a9c317007a7 100644 (file)
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_Point_QTD.ui'
+/********************************************************************************
+** Form generated from reading ui file 'EntityGUI_Point_QTD.ui'
 **
-** Created: ven déc 12 11:17:08 2003
-**      by:  The User Interface Compiler (uic)
+** Created: Mon Jul 9 17:24:53 2007
+**      by: Qt User Interface Compiler version 4.2.3
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
+
 #ifndef ENTITYGUI_POINT_QTD_H
 #define ENTITYGUI_POINT_QTD_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QRadioButton>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3MimeSourceFactory>
+
+class Ui_EntityGUI_Point_QTD
+{
+public:
+    QGridLayout *gridLayout;
+    QGroupBox *GroupPoint;
+    QGridLayout *gridLayout1;
+    QGridLayout *gridLayout2;
+    QRadioButton *RB_Point2;
+    QRadioButton *RB_Point1;
+    QRadioButton *RB_Point3;
 
-#include <qvariant.h>
-#include <qwidget.h>
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QButtonGroup;
-class QRadioButton;
+    void setupUi(QWidget *EntityGUI_Point_QTD)
+    {
+    EntityGUI_Point_QTD->setObjectName(QString::fromUtf8("EntityGUI_Point_QTD"));
+    gridLayout = new QGridLayout(EntityGUI_Point_QTD);
+    gridLayout->setSpacing(6);
+    gridLayout->setMargin(0);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    GroupPoint = new QGroupBox(EntityGUI_Point_QTD);
+    GroupPoint->setObjectName(QString::fromUtf8("GroupPoint"));
+    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(GroupPoint->sizePolicy().hasHeightForWidth());
+    GroupPoint->setSizePolicy(sizePolicy);
+    gridLayout1 = new QGridLayout(GroupPoint);
+    gridLayout1->setSpacing(6);
+    gridLayout1->setMargin(11);
+    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+    gridLayout2 = new QGridLayout();
+    gridLayout2->setSpacing(6);
+    gridLayout2->setMargin(0);
+    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+    RB_Point2 = new QRadioButton(GroupPoint);
+    RB_Point2->setObjectName(QString::fromUtf8("RB_Point2"));
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_Point_QTD : public QWidget
-{ 
-    Q_OBJECT
+    gridLayout2->addWidget(RB_Point2, 1, 0, 1, 1);
+
+    RB_Point1 = new QRadioButton(GroupPoint);
+    RB_Point1->setObjectName(QString::fromUtf8("RB_Point1"));
+
+    gridLayout2->addWidget(RB_Point1, 0, 0, 1, 1);
+
+    RB_Point3 = new QRadioButton(GroupPoint);
+    RB_Point3->setObjectName(QString::fromUtf8("RB_Point3"));
+
+    gridLayout2->addWidget(RB_Point3, 2, 0, 1, 1);
 
-public:
-    EntityGUI_Point_QTD( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-    ~EntityGUI_Point_QTD();
 
-    QButtonGroup* GroupPoint;
-    QRadioButton* RB_Point2;
-    QRadioButton* RB_Point1;
-    QRadioButton* RB_Point3;
+    gridLayout1->addLayout(gridLayout2, 0, 0, 1, 1);
 
 
-protected:
-    QGridLayout* EntityGUI_Point_QTDLayout;
-    QGridLayout* GroupPointLayout;
-    QGridLayout* Layout1;
+    gridLayout->addWidget(GroupPoint, 0, 0, 1, 1);
+
+    QWidget::setTabOrder(RB_Point1, RB_Point2);
+    QWidget::setTabOrder(RB_Point2, RB_Point3);
+
+    retranslateUi(EntityGUI_Point_QTD);
+
+    QSize size(124, 106);
+    size = size.expandedTo(EntityGUI_Point_QTD->minimumSizeHint());
+    EntityGUI_Point_QTD->resize(size);
+
+
+    QMetaObject::connectSlotsByName(EntityGUI_Point_QTD);
+    } // setupUi
+
+    void retranslateUi(QWidget *EntityGUI_Point_QTD)
+    {
+    EntityGUI_Point_QTD->setWindowTitle(QApplication::translate("EntityGUI_Point_QTD", "EntityGUI_Point_QTD", 0, QApplication::UnicodeUTF8));
+    GroupPoint->setTitle(QApplication::translate("EntityGUI_Point_QTD", "Point", 0, QApplication::UnicodeUTF8));
+    RB_Point2->setText(QApplication::translate("EntityGUI_Point_QTD", "Relative", 0, QApplication::UnicodeUTF8));
+    RB_Point1->setText(QApplication::translate("EntityGUI_Point_QTD", "Absolute", 0, QApplication::UnicodeUTF8));
+    RB_Point3->setText(QApplication::translate("EntityGUI_Point_QTD", "Selection", 0, QApplication::UnicodeUTF8));
+    Q_UNUSED(EntityGUI_Point_QTD);
+    } // retranslateUi
+
 };
 
+namespace Ui {
+    class EntityGUI_Point_QTD: public Ui_EntityGUI_Point_QTD {};
+} // namespace Ui
+
 #endif // ENTITYGUI_POINT_QTD_H
diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx b/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx
deleted file mode 100644 (file)
index 863f45f..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form implementation generated from reading ui file 'EntityGUI_Skeleton_QTD.ui'
-**
-** Created: Fri Mar 17 15:47:14 2006
-**      by: The User Interface Compiler ($Id$)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "EntityGUI_Skeleton_QTD.h"
-
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-/*
- *  Constructs a EntityGUI_Skeleton_QTD as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- *
- *  The dialog will by default be modeless, unless you set 'modal' to
- *  TRUE to construct a modal dialog.
- */
-EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl )
-{
-    if ( !name )
-       setName( "EntityGUI_Skeleton_QTD" );
-    setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    EntityGUI_Skeleton_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "EntityGUI_Skeleton_QTDLayout"); 
-
-    Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); 
-
-    GroupVal = new QGroupBox( this, "GroupVal" );
-    GroupVal->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupVal->sizePolicy().hasHeightForWidth() ) );
-
-    Layout1->addWidget( GroupVal, 2, 0 );
-
-    GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
-    GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
-    GroupConstructors->setColumnLayout(0, Qt::Vertical );
-    GroupConstructors->layout()->setSpacing( 6 );
-    GroupConstructors->layout()->setMargin( 11 );
-    GroupConstructorsLayout = new QGridLayout( GroupConstructors->layout() );
-    GroupConstructorsLayout->setAlignment( Qt::AlignTop );
-
-    Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2"); 
-
-    RadioButton1 = new QRadioButton( GroupConstructors, "RadioButton1" );
-    Layout2->addWidget( RadioButton1 );
-
-    RadioButton2 = new QRadioButton( GroupConstructors, "RadioButton2" );
-    Layout2->addWidget( RadioButton2 );
-
-    GroupConstructorsLayout->addLayout( Layout2, 0, 0 );
-
-    Layout1->addWidget( GroupConstructors, 0, 0 );
-
-    GroupDest = new QGroupBox( this, "GroupDest" );
-    GroupDest->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest->sizePolicy().hasHeightForWidth() ) );
-    GroupDest->setColumnLayout(0, Qt::Vertical );
-    GroupDest->layout()->setSpacing( 6 );
-    GroupDest->layout()->setMargin( 11 );
-    GroupDestLayout = new QGridLayout( GroupDest->layout() );
-    GroupDestLayout->setAlignment( Qt::AlignTop );
-
-    Layout5 = new QGridLayout( 0, 1, 1, 0, 6, "Layout5"); 
-
-    GroupDest1 = new QButtonGroup( GroupDest, "GroupDest1" );
-    GroupDest1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest1->sizePolicy().hasHeightForWidth() ) );
-    GroupDest1->setColumnLayout(0, Qt::Vertical );
-    GroupDest1->layout()->setSpacing( 6 );
-    GroupDest1->layout()->setMargin( 11 );
-    GroupDest1Layout = new QGridLayout( GroupDest1->layout() );
-    GroupDest1Layout->setAlignment( Qt::AlignTop );
-
-    Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); 
-
-    RB_Dest2 = new QRadioButton( GroupDest1, "RB_Dest2" );
-
-    Layout4->addWidget( RB_Dest2, 0, 1 );
-
-    RB_Dest1 = new QRadioButton( GroupDest1, "RB_Dest1" );
-
-    Layout4->addWidget( RB_Dest1, 0, 0 );
-
-    GroupDest1Layout->addLayout( Layout4, 0, 0 );
-
-    Layout5->addMultiCellWidget( GroupDest1, 0, 0, 0, 1 );
-
-    GroupDest2 = new QButtonGroup( GroupDest, "GroupDest2" );
-    GroupDest2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest2->sizePolicy().hasHeightForWidth() ) );
-    GroupDest2->setColumnLayout(0, Qt::Vertical );
-    GroupDest2->layout()->setSpacing( 6 );
-    GroupDest2->layout()->setMargin( 11 );
-    GroupDest2Layout = new QGridLayout( GroupDest2->layout() );
-    GroupDest2Layout->setAlignment( Qt::AlignTop );
-
-    Layout5->addWidget( GroupDest2, 1, 0 );
-
-    GroupDest3 = new QButtonGroup( GroupDest, "GroupDest3" );
-    GroupDest3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest3->sizePolicy().hasHeightForWidth() ) );
-    GroupDest3->setColumnLayout(0, Qt::Vertical );
-    GroupDest3->layout()->setSpacing( 6 );
-    GroupDest3->layout()->setMargin( 11 );
-    GroupDest3Layout = new QGridLayout( GroupDest3->layout() );
-    GroupDest3Layout->setAlignment( Qt::AlignTop );
-
-    Layout5->addWidget( GroupDest3, 1, 1 );
-
-    GroupDestLayout->addLayout( Layout5, 0, 0 );
-
-    Layout1->addWidget( GroupDest, 1, 0 );
-
-    GroupButtons = new QGroupBox( this, "GroupButtons" );
-    GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
-    GroupButtons->setColumnLayout(0, Qt::Vertical );
-    GroupButtons->layout()->setSpacing( 6 );
-    GroupButtons->layout()->setMargin( 11 );
-    GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() );
-    GroupButtonsLayout->setAlignment( Qt::AlignTop );
-
-    Layout3 = new QHBoxLayout( 0, 0, 6, "Layout3"); 
-
-    buttonEnd = new QPushButton( GroupButtons, "buttonEnd" );
-    Layout3->addWidget( buttonEnd );
-
-    buttonClose = new QPushButton( GroupButtons, "buttonClose" );
-    Layout3->addWidget( buttonClose );
-    Spacer1 = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
-    Layout3->addItem( Spacer1 );
-
-    buttonCancel = new QPushButton( GroupButtons, "buttonCancel" );
-    Layout3->addWidget( buttonCancel );
-
-    buttonHelp = new QPushButton( GroupButtons, "buttonHelp" );
-    Layout3->addWidget( buttonHelp );
-    GroupButtonsLayout->addLayout( Layout3 );
-
-    Layout1->addWidget( GroupButtons, 3, 0 );
-
-    EntityGUI_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 );
-    languageChange();
-    resize( QSize(317, 276).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-
-    // tab order
-    setTabOrder( RadioButton1, RadioButton2 );
-    setTabOrder( RadioButton2, RB_Dest1 );
-    setTabOrder( RB_Dest1, RB_Dest2 );
-    setTabOrder( RB_Dest2, buttonEnd );
-    setTabOrder( buttonEnd, buttonClose );
-    setTabOrder( buttonClose, buttonCancel );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-EntityGUI_Skeleton_QTD::~EntityGUI_Skeleton_QTD()
-{
-    // no need to delete child widgets, Qt does it all for us
-}
-
-/*
- *  Sets the strings of the subwidgets using the current
- *  language.
- */
-void EntityGUI_Skeleton_QTD::languageChange()
-{
-    setCaption( tr( "EntityGUI_Skeleton_QTD" ) );
-    GroupVal->setTitle( QString::null );
-    GroupConstructors->setTitle( tr( "Element Type" ) );
-    RadioButton1->setText( tr( "Segment" ) );
-    RadioButton2->setText( tr( "Arc" ) );
-    GroupDest->setTitle( tr( "Destination" ) );
-    GroupDest1->setTitle( tr( "Type" ) );
-    RB_Dest2->setText( tr( "Direction" ) );
-    RB_Dest1->setText( tr( "Point" ) );
-    GroupDest2->setTitle( QString::null );
-    GroupDest3->setTitle( QString::null );
-    GroupButtons->setTitle( QString::null );
-    buttonEnd->setText( tr( "End Sketch" ) );
-    buttonClose->setText( tr( "Close Sketch" ) );
-    buttonCancel->setText( tr( "&Cancel" ) );
-    buttonHelp->setText( tr( "&Help" ) );
-}
-
index 70468d719d957f0cda4dcbeffc20f39d840fe0ae..ee39349c49664612751666763375eba7ec4ebd45 100644 (file)
-// Copyright (C) 2005  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 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
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-/****************************************************************************
-** Form interface generated from reading ui file 'EntityGUI_Skeleton_QTD.ui'
+/********************************************************************************
+** Form generated from reading ui file 'EntityGUI_Skeleton_QTD.ui'
 **
-** Created: Fri Mar 17 15:47:13 2006
-**      by: The User Interface Compiler ($Id$)
+** Created: Mon Jul 9 17:21:08 2007
+**      by: Qt User Interface Compiler version 4.2.3
 **
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
+** WARNING! All changes made in this file will be lost when recompiling ui file!
+********************************************************************************/
 
 #ifndef ENTITYGUI_SKELETON_QTD_H
 #define ENTITYGUI_SKELETON_QTD_H
 
-#include "GEOM_EntityGUI.hxx"
+#include <QtCore/QVariant>
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QDialog>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QPushButton>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpacerItem>
+#include <Qt3Support/Q3MimeSourceFactory>
 
-#include <qvariant.h>
-#include <qdialog.h>
+class Ui_EntityGUI_Skeleton_QTD
+{
+public:
+    QGridLayout *gridLayout;
+    QGridLayout *gridLayout1;
+    QGroupBox *GroupVal;
+    QGroupBox *GroupConstructors;
+    QGridLayout *gridLayout2;
+    QHBoxLayout *hboxLayout;
+    QRadioButton *RadioButton1;
+    QRadioButton *RadioButton2;
+    QGroupBox *GroupDest;
+    QGridLayout *gridLayout3;
+    QGridLayout *gridLayout4;
+    QGroupBox *GroupDest1;
+    QGridLayout *gridLayout5;
+    QGridLayout *gridLayout6;
+    QRadioButton *RB_Dest2;
+    QRadioButton *RB_Dest1;
+    QGroupBox *GroupDest2;
+    QGridLayout *gridLayout7;
+    QGroupBox *GroupDest3;
+    QGridLayout *gridLayout8;
+    QGroupBox *GroupButtons;
+    QHBoxLayout *hboxLayout1;
+    QHBoxLayout *hboxLayout2;
+    QPushButton *buttonEnd;
+    QPushButton *buttonClose;
+    QSpacerItem *spacerItem;
+    QPushButton *buttonCancel;
+    QPushButton *buttonHelp;
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QSpacerItem;
-class QGroupBox;
-class QButtonGroup;
-class QRadioButton;
-class QPushButton;
+    void setupUi(QDialog *EntityGUI_Skeleton_QTD)
+    {
+    EntityGUI_Skeleton_QTD->setObjectName(QString::fromUtf8("EntityGUI_Skeleton_QTD"));
+    QSizePolicy sizePolicy(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(7));
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(EntityGUI_Skeleton_QTD->sizePolicy().hasHeightForWidth());
+    EntityGUI_Skeleton_QTD->setSizePolicy(sizePolicy);
+    gridLayout = new QGridLayout(EntityGUI_Skeleton_QTD);
+    gridLayout->setSpacing(6);
+    gridLayout->setMargin(11);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    gridLayout1 = new QGridLayout();
+    gridLayout1->setSpacing(6);
+    gridLayout1->setMargin(0);
+    gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+    GroupVal = new QGroupBox(EntityGUI_Skeleton_QTD);
+    GroupVal->setObjectName(QString::fromUtf8("GroupVal"));
+    QSizePolicy sizePolicy1(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(7));
+    sizePolicy1.setHorizontalStretch(0);
+    sizePolicy1.setVerticalStretch(0);
+    sizePolicy1.setHeightForWidth(GroupVal->sizePolicy().hasHeightForWidth());
+    GroupVal->setSizePolicy(sizePolicy1);
 
-class GEOM_ENTITYGUI_EXPORT EntityGUI_Skeleton_QTD : public QDialog
-{
-    Q_OBJECT
+    gridLayout1->addWidget(GroupVal, 2, 0, 1, 1);
 
-public:
-    EntityGUI_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~EntityGUI_Skeleton_QTD();
-
-    QGroupBox* GroupVal;
-    QButtonGroup* GroupConstructors;
-    QRadioButton* RadioButton1;
-    QRadioButton* RadioButton2;
-    QGroupBox* GroupDest;
-    QButtonGroup* GroupDest1;
-    QRadioButton* RB_Dest2;
-    QRadioButton* RB_Dest1;
-    QButtonGroup* GroupDest2;
-    QButtonGroup* GroupDest3;
-    QGroupBox* GroupButtons;
-    QPushButton* buttonEnd;
-    QPushButton* buttonClose;
-    QPushButton* buttonCancel;
-    QPushButton* buttonHelp;
-
-protected:
-    QGridLayout* EntityGUI_Skeleton_QTDLayout;
-    QGridLayout* Layout1;
-    QGridLayout* GroupConstructorsLayout;
-    QHBoxLayout* Layout2;
-    QGridLayout* GroupDestLayout;
-    QGridLayout* Layout5;
-    QGridLayout* GroupDest1Layout;
-    QGridLayout* Layout4;
-    QGridLayout* GroupDest2Layout;
-    QGridLayout* GroupDest3Layout;
-    QHBoxLayout* GroupButtonsLayout;
-    QHBoxLayout* Layout3;
-    QSpacerItem* Spacer1;
-
-protected slots:
-    virtual void languageChange();
+    GroupConstructors = new QGroupBox(EntityGUI_Skeleton_QTD);
+    GroupConstructors->setObjectName(QString::fromUtf8("GroupConstructors"));
+    QSizePolicy sizePolicy2(static_cast<QSizePolicy::Policy>(5), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy2.setHorizontalStretch(0);
+    sizePolicy2.setVerticalStretch(0);
+    sizePolicy2.setHeightForWidth(GroupConstructors->sizePolicy().hasHeightForWidth());
+    GroupConstructors->setSizePolicy(sizePolicy2);
+    gridLayout2 = new QGridLayout(GroupConstructors);
+    gridLayout2->setSpacing(6);
+    gridLayout2->setMargin(11);
+    gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
+    hboxLayout = new QHBoxLayout();
+    hboxLayout->setSpacing(6);
+    hboxLayout->setMargin(0);
+    hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+    RadioButton1 = new QRadioButton(GroupConstructors);
+    RadioButton1->setObjectName(QString::fromUtf8("RadioButton1"));
+
+    hboxLayout->addWidget(RadioButton1);
+
+    RadioButton2 = new QRadioButton(GroupConstructors);
+    RadioButton2->setObjectName(QString::fromUtf8("RadioButton2"));
+
+    hboxLayout->addWidget(RadioButton2);
+
+
+    gridLayout2->addLayout(hboxLayout, 0, 0, 1, 1);
+
+
+    gridLayout1->addWidget(GroupConstructors, 0, 0, 1, 1);
+
+    GroupDest = new QGroupBox(EntityGUI_Skeleton_QTD);
+    GroupDest->setObjectName(QString::fromUtf8("GroupDest"));
+    QSizePolicy sizePolicy3(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy3.setHorizontalStretch(0);
+    sizePolicy3.setVerticalStretch(0);
+    sizePolicy3.setHeightForWidth(GroupDest->sizePolicy().hasHeightForWidth());
+    GroupDest->setSizePolicy(sizePolicy3);
+    gridLayout3 = new QGridLayout(GroupDest);
+    gridLayout3->setSpacing(6);
+    gridLayout3->setMargin(11);
+    gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
+    gridLayout4 = new QGridLayout();
+    gridLayout4->setSpacing(6);
+    gridLayout4->setMargin(0);
+    gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
+    GroupDest1 = new QGroupBox(GroupDest);
+    GroupDest1->setObjectName(QString::fromUtf8("GroupDest1"));
+    QSizePolicy sizePolicy4(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy4.setHorizontalStretch(0);
+    sizePolicy4.setVerticalStretch(0);
+    sizePolicy4.setHeightForWidth(GroupDest1->sizePolicy().hasHeightForWidth());
+    GroupDest1->setSizePolicy(sizePolicy4);
+    gridLayout5 = new QGridLayout(GroupDest1);
+    gridLayout5->setSpacing(6);
+    gridLayout5->setMargin(11);
+    gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
+    gridLayout6 = new QGridLayout();
+    gridLayout6->setSpacing(6);
+    gridLayout6->setMargin(0);
+    gridLayout6->setObjectName(QString::fromUtf8("gridLayout6"));
+    RB_Dest2 = new QRadioButton(GroupDest1);
+    RB_Dest2->setObjectName(QString::fromUtf8("RB_Dest2"));
+
+    gridLayout6->addWidget(RB_Dest2, 0, 1, 1, 1);
+
+    RB_Dest1 = new QRadioButton(GroupDest1);
+    RB_Dest1->setObjectName(QString::fromUtf8("RB_Dest1"));
+
+    gridLayout6->addWidget(RB_Dest1, 0, 0, 1, 1);
+
+
+    gridLayout5->addLayout(gridLayout6, 0, 0, 1, 1);
+
+
+    gridLayout4->addWidget(GroupDest1, 0, 0, 1, 2);
+
+    GroupDest2 = new QGroupBox(GroupDest);
+    GroupDest2->setObjectName(QString::fromUtf8("GroupDest2"));
+    QSizePolicy sizePolicy5(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(7));
+    sizePolicy5.setHorizontalStretch(0);
+    sizePolicy5.setVerticalStretch(0);
+    sizePolicy5.setHeightForWidth(GroupDest2->sizePolicy().hasHeightForWidth());
+    GroupDest2->setSizePolicy(sizePolicy5);
+    gridLayout7 = new QGridLayout(GroupDest2);
+    gridLayout7->setSpacing(6);
+    gridLayout7->setMargin(11);
+    gridLayout7->setObjectName(QString::fromUtf8("gridLayout7"));
+
+    gridLayout4->addWidget(GroupDest2, 1, 0, 1, 1);
+
+    GroupDest3 = new QGroupBox(GroupDest);
+    GroupDest3->setObjectName(QString::fromUtf8("GroupDest3"));
+    QSizePolicy sizePolicy6(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(7));
+    sizePolicy6.setHorizontalStretch(0);
+    sizePolicy6.setVerticalStretch(0);
+    sizePolicy6.setHeightForWidth(GroupDest3->sizePolicy().hasHeightForWidth());
+    GroupDest3->setSizePolicy(sizePolicy6);
+    gridLayout8 = new QGridLayout(GroupDest3);
+    gridLayout8->setSpacing(6);
+    gridLayout8->setMargin(11);
+    gridLayout8->setObjectName(QString::fromUtf8("gridLayout8"));
+
+    gridLayout4->addWidget(GroupDest3, 1, 1, 1, 1);
+
+
+    gridLayout3->addLayout(gridLayout4, 0, 0, 1, 1);
+
+
+    gridLayout1->addWidget(GroupDest, 1, 0, 1, 1);
+
+    GroupButtons = new QGroupBox(EntityGUI_Skeleton_QTD);
+    GroupButtons->setObjectName(QString::fromUtf8("GroupButtons"));
+    QSizePolicy sizePolicy7(static_cast<QSizePolicy::Policy>(7), static_cast<QSizePolicy::Policy>(0));
+    sizePolicy7.setHorizontalStretch(0);
+    sizePolicy7.setVerticalStretch(0);
+    sizePolicy7.setHeightForWidth(GroupButtons->sizePolicy().hasHeightForWidth());
+    GroupButtons->setSizePolicy(sizePolicy7);
+    hboxLayout1 = new QHBoxLayout(GroupButtons);
+    hboxLayout1->setSpacing(6);
+    hboxLayout1->setMargin(11);
+    hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+    hboxLayout2 = new QHBoxLayout();
+    hboxLayout2->setSpacing(6);
+    hboxLayout2->setMargin(0);
+    hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+    buttonEnd = new QPushButton(GroupButtons);
+    buttonEnd->setObjectName(QString::fromUtf8("buttonEnd"));
+
+    hboxLayout2->addWidget(buttonEnd);
+
+    buttonClose = new QPushButton(GroupButtons);
+    buttonClose->setObjectName(QString::fromUtf8("buttonClose"));
+
+    hboxLayout2->addWidget(buttonClose);
+
+    spacerItem = new QSpacerItem(91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+    hboxLayout2->addItem(spacerItem);
+
+    buttonCancel = new QPushButton(GroupButtons);
+    buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
+
+    hboxLayout2->addWidget(buttonCancel);
+
+    buttonHelp = new QPushButton(GroupButtons);
+    buttonHelp->setObjectName(QString::fromUtf8("buttonHelp"));
+
+    hboxLayout2->addWidget(buttonHelp);
+
+
+    hboxLayout1->addLayout(hboxLayout2);
+
+
+    gridLayout1->addWidget(GroupButtons, 3, 0, 1, 1);
+
+
+    gridLayout->addLayout(gridLayout1, 0, 0, 1, 1);
+
+    QWidget::setTabOrder(RadioButton1, RadioButton2);
+    QWidget::setTabOrder(RadioButton2, RB_Dest1);
+    QWidget::setTabOrder(RB_Dest1, RB_Dest2);
+    QWidget::setTabOrder(RB_Dest2, buttonEnd);
+    QWidget::setTabOrder(buttonEnd, buttonClose);
+    QWidget::setTabOrder(buttonClose, buttonCancel);
+
+    retranslateUi(EntityGUI_Skeleton_QTD);
+
+    QSize size(317, 276);
+    size = size.expandedTo(EntityGUI_Skeleton_QTD->minimumSizeHint());
+    EntityGUI_Skeleton_QTD->resize(size);
+
+
+    QMetaObject::connectSlotsByName(EntityGUI_Skeleton_QTD);
+    } // setupUi
+
+    void retranslateUi(QDialog *EntityGUI_Skeleton_QTD)
+    {
+    EntityGUI_Skeleton_QTD->setWindowTitle(QApplication::translate("EntityGUI_Skeleton_QTD", "EntityGUI_Skeleton_QTD", 0, QApplication::UnicodeUTF8));
+    GroupVal->setTitle(QString());
+    GroupConstructors->setTitle(QApplication::translate("EntityGUI_Skeleton_QTD", "Element Type", 0, QApplication::UnicodeUTF8));
+    RadioButton1->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Segment", 0, QApplication::UnicodeUTF8));
+    RadioButton2->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Arc", 0, QApplication::UnicodeUTF8));
+    GroupDest->setTitle(QApplication::translate("EntityGUI_Skeleton_QTD", "Destination", 0, QApplication::UnicodeUTF8));
+    GroupDest1->setTitle(QApplication::translate("EntityGUI_Skeleton_QTD", "Type", 0, QApplication::UnicodeUTF8));
+    RB_Dest2->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Direction", 0, QApplication::UnicodeUTF8));
+    RB_Dest1->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Point", 0, QApplication::UnicodeUTF8));
+    GroupDest2->setTitle(QString());
+    GroupDest3->setTitle(QString());
+    GroupButtons->setTitle(QString());
+    buttonEnd->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "End Sketch", 0, QApplication::UnicodeUTF8));
+    buttonClose->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "Close Sketch", 0, QApplication::UnicodeUTF8));
+    buttonCancel->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "&Cancel", 0, QApplication::UnicodeUTF8));
+    buttonHelp->setText(QApplication::translate("EntityGUI_Skeleton_QTD", "&Help", 0, QApplication::UnicodeUTF8));
+    Q_UNUSED(EntityGUI_Skeleton_QTD);
+    } // retranslateUi
 
 };
 
+namespace Ui {
+    class EntityGUI_Skeleton_QTD: public Ui_EntityGUI_Skeleton_QTD {};
+} // namespace Ui
+
 #endif // ENTITYGUI_SKELETON_QTD_H
index 5a3baf23fd3d9395012eeda343b1be63100f28d5..b9f1a82e6fa650275b4cc6c13639458f37c7d9b2 100644 (file)
 
 #include "EntityGUI_SketcherDlg.h"
 #include "Sketcher_Profile.hxx"
-#include "GEOM_Displayer.h"
 #include "GEOMBase.h"
 
+#include "EntityGUI_1Spin.h"
+#include "EntityGUI_2Spin.h"
+#include "EntityGUI_3Spin.h"
+#include "EntityGUI_4Spin.h"
+
+#include "DlgRef_SpinBox.h"
+
+#include "GeometryGUI.h"
+
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 #include "SUIT_MessageBox.h"
@@ -39,8 +47,7 @@
 #include "LightApp_Application.h"
 #include "LightApp_SelectionMgr.h"
 
-#include <qpushbutton.h>
-#include <qlabel.h>
+#include <QKeyEvent>
 
 #include <BRep_Tool.hxx>
 #include <TopExp.hxx>
@@ -52,8 +59,6 @@
 
 #include "GEOMImpl_Types.hxx"
 
-#include "utilities.h"
-
 using namespace std;
 
 //=================================================================================
@@ -64,33 +69,43 @@ using namespace std;
 //            TRUE to construct a modal dialog.
 //=================================================================================
 EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
-                                             const char* name, bool modal, WFlags fl,
+                                             const char* name, bool modal, Qt::WindowFlags fl,
                                             const double lineWidth)
-  :EntityGUI_Skeleton_QTD(parent, name, modal, WStyle_Customize |
-                          WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose),
+  :QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
    myIsAllAdded( false ),
    GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
    myGeometryGUI( GUI ),
    myLineWidth( lineWidth )
 {
+  setupUi(this);
+
+  setModal( modal );
+  setAttribute( Qt::WA_DeleteOnClose );
+
   myGeometryGUI->SetActiveDialogBox(this);
 
-  if ( !name ) setName("EntityGUI_SketcherDlg");
+  if ( !name ) 
+    setObjectName("EntityGUI_SketcherDlg");
+  else
+    setObjectName(name);
 
   buttonCancel->setText(tr("GEOM_BUT_CANCEL"));
   buttonEnd->setText(tr("GEOM_BUT_END_SKETCH"));
   buttonClose->setText(tr("GEOM_BUT_CLOSE_SKETCH"));
   buttonHelp->setText(tr("GEOM_BUT_HELP"));
 
-  GroupVal->close(TRUE);
-  GroupDest2->close(TRUE);
-  GroupDest3->close(TRUE);
+  GroupVal->setAttribute( Qt::WA_DeleteOnClose );
+  GroupVal->close();
+  GroupDest2->setAttribute( Qt::WA_DeleteOnClose );
+  GroupDest2->close();
+  GroupDest3->setAttribute( Qt::WA_DeleteOnClose );
+  GroupDest3->close();
 
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_UNDO")));
   QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REDO")));
 
-  setCaption(tr("GEOM_SKETCHER_TITLE"));
+  setWindowTitle(tr("GEOM_SKETCHER_TITLE"));
 
   GroupConstructors->setTitle(tr("GEOM_SKETCHER_EL"));
   RadioButton1->setText(tr("GEOM_SKETCHER_SEGMENT"));
@@ -101,39 +116,55 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
   RB_Dest2->setText(tr("GEOM_SKETCHER_DIR"));
 
   /***************************************************************/
-  GroupPt = new EntityGUI_Point_QTD(GroupDest, "GroupPt");
+  GroupPt = new Ui::EntityGUI_Point_QTD();
+  QWidget* aGroupPtWidget = new QWidget(GroupDest);
+  GroupPt->setupUi(aGroupPtWidget);
+  aGroupPtWidget->setObjectName("GroupPt");
+
   GroupPt->GroupPoint->setTitle(tr("GEOM_SKETCHER_POINT"));
   GroupPt->RB_Point1->setText(tr("GEOM_SKETCHER_ABS"));
   GroupPt->RB_Point2->setText(tr("GEOM_SKETCHER_REL"));
   GroupPt->RB_Point3->setText(tr("GEOM_SKETCHER_SEL"));
 
-  GroupD1 = new EntityGUI_Dir1_QTD(GroupDest, "GroupD1");
+  GroupD1 = new Ui::EntityGUI_Dir1_QTD();
+  QWidget* aGroupD1Widget = new QWidget(GroupDest);
+  GroupD1->setupUi(aGroupD1Widget);
+  aGroupD1Widget->setObjectName("GroupD1");
+
   GroupD1->GroupDir1->setTitle(tr("GEOM_SKETCHER_DIR"));
   GroupD1->RB_Dir11->setText(tr("GEOM_SKETCHER_ANGLE"));
   GroupD1->RB_Dir12->setText(tr("GEOM_SKETCHER_PER"));
   GroupD1->RB_Dir13->setText(tr("GEOM_SKETCHER_TAN"));
   GroupD1->RB_Dir14->setText(tr("GEOM_SKETCHER_VXVY"));
 
-  GroupD2 = new EntityGUI_Dir2_QTD(GroupDest, "GroupD2");
+  GroupD2 = new Ui::EntityGUI_Dir2_QTD();
+  QWidget* aGroupD2Widget = new QWidget(GroupDest);
+  GroupD2->setupUi(aGroupD2Widget);
+  aGroupD2Widget->setObjectName("GroupD2");
+
   GroupD2->GroupDir2->setTitle(tr("GEOM_SKETCHER_DIR"));
   GroupD2->RB_Dir21->setText(tr("GEOM_SKETCHER_LENGTH"));
   GroupD2->RB_Dir22->setText(tr("GEOM_SKETCHER_X"));
   GroupD2->RB_Dir23->setText(tr("GEOM_SKETCHER_Y"));
 
-  Group1Sel = new EntityGUI_1Sel_QTD(this, "Group1Sel");
+  Group1Sel = new Ui::EntityGUI_1Sel_QTD();
+  QWidget* aGroup1SelWidget = new QWidget(this);
+  Group1Sel->setupUi(aGroup1SelWidget);
+  aGroup1SelWidget->setObjectName("Group1Sel");
+
   Group1Sel->TextLabel1->setText(tr("GEOM_SKETCHER_POINT2"));
   Group1Sel->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
   Group1Sel->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group1Sel->PushButton1->setPixmap(image0);
-  Group1Sel->buttonUndo->setPixmap(image1);
-  Group1Sel->buttonRedo->setPixmap(image2);
+  Group1Sel->PushButton1->setIcon(image0);
+  Group1Sel->buttonUndo->setIcon(image1);
+  Group1Sel->buttonRedo->setIcon(image2);
   Group1Sel->LineEdit1->setReadOnly( true );
 
   Group1Spin = new EntityGUI_1Spin(this, "Group1Spin");
   Group1Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
   Group1Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group1Spin->buttonUndo->setPixmap(image1);
-  Group1Spin->buttonRedo->setPixmap(image2);
+  Group1Spin->buttonUndo->setIcon(image1);
+  Group1Spin->buttonRedo->setIcon(image2);
   QWidget::setTabOrder(Group1Spin->SpinBox_DX , Group1Spin->buttonApply);
   QWidget::setTabOrder(Group1Spin->buttonApply, Group1Spin->buttonUndo);
   QWidget::setTabOrder(Group1Spin->buttonUndo , Group1Spin->buttonRedo);
@@ -141,8 +172,8 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
   Group2Spin = new EntityGUI_2Spin(this, "Group2Spin");
   Group2Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
   Group2Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group2Spin->buttonUndo->setPixmap(image1);
-  Group2Spin->buttonRedo->setPixmap(image2);
+  Group2Spin->buttonUndo->setIcon(image1);
+  Group2Spin->buttonRedo->setIcon(image2);
   QWidget::setTabOrder(Group2Spin->SpinBox_DX , Group2Spin->SpinBox_DY);
   QWidget::setTabOrder(Group2Spin->SpinBox_DY , Group2Spin->buttonApply);
   QWidget::setTabOrder(Group2Spin->buttonApply, Group2Spin->buttonUndo);
@@ -151,8 +182,8 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
   Group3Spin = new EntityGUI_3Spin(this, "Group3Spin");
   Group3Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
   Group3Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group3Spin->buttonUndo->setPixmap(image1);
-  Group3Spin->buttonRedo->setPixmap(image2);
+  Group3Spin->buttonUndo->setIcon(image1);
+  Group3Spin->buttonRedo->setIcon(image2);
   QWidget::setTabOrder(Group3Spin->SpinBox_DX , Group3Spin->SpinBox_DY);
   QWidget::setTabOrder(Group3Spin->SpinBox_DY , Group3Spin->SpinBox_DZ);
   QWidget::setTabOrder(Group3Spin->SpinBox_DZ , Group3Spin->buttonApply);
@@ -162,8 +193,8 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
   Group4Spin = new EntityGUI_4Spin(this, "Group4Spin");
   Group4Spin->GroupBox1->setTitle(tr("GEOM_SKETCHER_VALUES"));
   Group4Spin->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
-  Group4Spin->buttonUndo->setPixmap(image1);
-  Group4Spin->buttonRedo->setPixmap(image2);
+  Group4Spin->buttonUndo->setIcon(image1);
+  Group4Spin->buttonRedo->setIcon(image2);
   QWidget::setTabOrder(Group4Spin->SpinBox_DX , Group4Spin->SpinBox_DY);
   QWidget::setTabOrder(Group4Spin->SpinBox_DY , Group4Spin->SpinBox_DZ);
   QWidget::setTabOrder(Group4Spin->SpinBox_DZ , Group4Spin->SpinBox_DS);
@@ -171,15 +202,15 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
   QWidget::setTabOrder(Group4Spin->buttonApply, Group4Spin->buttonUndo);
   QWidget::setTabOrder(Group4Spin->buttonUndo , Group4Spin->buttonRedo);
 
-  Layout5->addMultiCellWidget(GroupPt, 1, 1, 0, 1);
-  Layout5->addWidget(GroupD1, 1, 0);
-  Layout5->addWidget(GroupD2, 1, 1);
+  gridLayout4->addWidget(aGroupPtWidget, 1, 0, 1, 2);
+  gridLayout4->addWidget(aGroupD1Widget, 1, 0);
+  gridLayout4->addWidget(aGroupD2Widget, 1, 1);
 
-  Layout1->addWidget(Group1Sel, 2, 0);
-  Layout1->addWidget(Group1Spin, 2, 0);
-  Layout1->addWidget(Group2Spin, 2, 0);
-  Layout1->addWidget(Group3Spin, 2, 0);
-  Layout1->addWidget(Group4Spin, 2, 0);
+  gridLayout1->addWidget(aGroup1SelWidget, 2, 0);
+  gridLayout1->addWidget(Group1Spin, 2, 0);
+  gridLayout1->addWidget(Group2Spin, 2, 0);
+  gridLayout1->addWidget(Group3Spin, 2, 0);
+  gridLayout1->addWidget(Group4Spin, 2, 0);
   /***************************************************************/
 
   /* signals and slots connections */
@@ -272,7 +303,7 @@ bool EntityGUI_SketcherDlg::eventFilter (QObject* object, QEvent* event)
 {
   if (event->type() == QEvent::KeyPress) {
     QKeyEvent* ke = (QKeyEvent*)event;
-    if (ke->key() == Key_Return) {
+    if (ke->key() == Qt::Key_Return) {
       if (object == Group1Spin->SpinBox_DX) {
         Group1Spin->buttonApply->animateClick();
         return true;
@@ -295,7 +326,7 @@ bool EntityGUI_SketcherDlg::eventFilter (QObject* object, QEvent* event)
     }
   }
 
-  return EntityGUI_Skeleton_QTD::eventFilter(object, event);
+  return QDialog::eventFilter(object, event);
 }
 
 
@@ -358,7 +389,7 @@ void EntityGUI_SketcherDlg::InitClick()
 {
   disconnect(myGeometryGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  Group1Sel->hide();
+  ::qobject_cast<QWidget*>( Group1Sel->gridLayout->parent() )->hide();
   Group1Spin->hide();
   Group2Spin->hide();
   Group3Spin->hide();
@@ -377,14 +408,14 @@ void EntityGUI_SketcherDlg::TypeClicked(int constructorId)
   myConstructorId = constructorId;
   if ( myConstructorId == 0 )     // SEGMENT
   {
-    GroupD2->setEnabled(true);
+    ::qobject_cast<QWidget*>( GroupD2->gridLayout->parent() )->setEnabled(true);
     RB_Dest1->setEnabled(true);
     RB_Dest1->setChecked(true);
     DestClicked(1);
   }
   else if (  myConstructorId == 1 ) // ARC
   {
-    GroupD2->setEnabled(false);
+    ::qobject_cast<QWidget*>( GroupD2->gridLayout->parent() )->setEnabled(false);
     RB_Dest1->setEnabled(false);
     RB_Dest2->setChecked(true);
     DestClicked(0);
@@ -398,21 +429,21 @@ void EntityGUI_SketcherDlg::TypeClicked(int constructorId)
 //=================================================================================
 void EntityGUI_SketcherDlg::DestClicked( int constructorId )
 {
-  GroupPt->hide();
-  GroupD1->hide();
-  GroupD2->hide();
+  ::qobject_cast<QWidget*>( GroupPt->gridLayout->parent() )->hide();
+  ::qobject_cast<QWidget*>( GroupD1->gridLayout->parent() )->hide();
+  ::qobject_cast<QWidget*>( GroupD2->gridLayout->parent() )->hide();
 
   if ( constructorId == 1 )
   {  // Point
     GroupPt->RB_Point1->setChecked(true);
-    GroupPt->show();
+    ::qobject_cast<QWidget*>( GroupPt->gridLayout->parent() )->show();
     PointClicked(1);  // XY
   }
   else if (  constructorId == 0 )
   {  // Direction
     GroupD1->RB_Dir11->setChecked(true);
-    GroupD1->show();
-    GroupD2->show();
+    ::qobject_cast<QWidget*>( GroupD1->gridLayout->parent() )->show();
+    ::qobject_cast<QWidget*>( GroupD2->gridLayout->parent() )->show();
     Dir1Clicked(2);  // Angle
   }
 }
@@ -469,7 +500,7 @@ void EntityGUI_SketcherDlg::PointClicked(int constructorId)
       myEditCurrentArgument = Group1Sel->LineEdit1;
       connect(myGeometryGUI->getApp()->selectionMgr(),
              SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-      Group1Sel->show();
+      ::qobject_cast<QWidget*>( Group1Sel->gridLayout->parent() )->show();
       Group1Sel->buttonApply->setFocus();
       SelectionIntoArgument();
     }
@@ -720,16 +751,16 @@ void EntityGUI_SketcherDlg::ClickOnEnd()
     // Verify validity of commands
     if ( myCommand.count() <= 2 )
     {
-      SUIT_MessageBox::error1( SUIT_Session::session()->activeApplication()->desktop(),
-                              tr( "GEOM_ERROR_STATUS" ), tr( "CANNOT_CLOSE" ), tr( "BUT_OK" ) );
+      SUIT_MessageBox::critical( SUIT_Session::session()->activeApplication()->desktop(),
+                                tr( "GEOM_ERROR_STATUS" ), tr( "CANNOT_CLOSE" ), tr( "BUT_OK" ) );
       return;
     }
 
     QString Command = myCommand.join( "" ) + GetNewCommand();
-    Sketcher_Profile aProfile (Command.ascii());
+    Sketcher_Profile aProfile (Command.toAscii());
 
     Command = myCommand.join( "" );
-    aProfile = Sketcher_Profile(Command.ascii());
+    aProfile = Sketcher_Profile(Command.toAscii());
     TopoDS_Shape myShape;
     if ( aProfile.IsDone() )
       myShape = aProfile.GetShape();
@@ -806,10 +837,10 @@ void EntityGUI_SketcherDlg::ClickOnHelp()
                platform = "application";
 #endif
 
-    SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
-                          QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                          arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
-                          QObject::tr("BUT_OK"));
+    SUIT_MessageBox::warning(0, QObject::tr("WRN_WARNING"),
+                            QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+                            arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName),
+                            QObject::tr("BUT_OK"));
   }
 }
 
@@ -1325,13 +1356,13 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
 
     //Last Shape
     QString Command1 = myCommand.join( "" );
-    Sketcher_Profile aProfile1 (Command1.ascii());
+    Sketcher_Profile aProfile1 (Command1.toAscii());
     if(aProfile1.IsDone())
       myShape1 = aProfile1.GetShape();
 
     //Current Shape
     QString Command2 = Command1 + GetNewCommand();
-    Sketcher_Profile aProfile2 (Command2.ascii());
+    Sketcher_Profile aProfile2 (Command2.toAscii());
     if(aProfile2.IsDone())
       myShape2 = aProfile2.GetShape();
 
@@ -1367,7 +1398,7 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
         myLastX1 == myLastX2 && myLastY1 == myLastY2 ) || myIsAllAdded ) {
     cmd = myCommand.join( "" );
 
-    if ( Group1Sel->isVisible() ) {
+    if ( ::qobject_cast<QWidget*>( Group1Sel->gridLayout->parent() )->isVisible() ) {
       Group1Sel->buttonApply->setEnabled(false);
       //Group1Sel->buttonApply->setFocus();
     }
@@ -1391,7 +1422,7 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
   else {
     cmd = myCommand.join( "" ) + GetNewCommand();
 
-    if ( Group1Sel->isVisible() ) {
+    if ( ::qobject_cast<QWidget*>( Group1Sel->gridLayout->parent() )->isVisible() ) {
       Group1Sel->buttonApply->setEnabled(true);
       //Group1Sel->buttonApply->setFocus();
     }
@@ -1429,7 +1460,7 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
   WPlane[8] = myWPlane.XDirection().Z();
 
   GEOM::GEOM_Object_var anObj =
-    GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeSketcher( cmd.latin1(), WPlane );
+    GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeSketcher( cmd.toLatin1(), WPlane );
 
   if ( !anObj->_is_nil() )
     objects.push_back( anObj._retn() );
@@ -1495,7 +1526,7 @@ bool EntityGUI_SketcherDlg::createShapes( GEOM::GEOM_Object_ptr theObject,
        aShape.ShapeType() != TopAbs_WIRE && aShape.ShapeType() != TopAbs_VERTEX )
     return false;
 
-  if ( Group1Sel->isVisible()  && !Group1Sel->buttonApply->isEnabled()  ||
+  if ( ::qobject_cast<QWidget*>( Group1Sel->gridLayout->parent() )->isVisible()  && !Group1Sel->buttonApply->isEnabled()  ||
        Group1Spin->isVisible() && !Group1Spin->buttonApply->isEnabled() ||
        Group2Spin->isVisible() && !Group2Spin->buttonApply->isEnabled() ||
        Group3Spin->isVisible() && !Group3Spin->buttonApply->isEnabled() ||
@@ -1536,7 +1567,7 @@ void  EntityGUI_SketcherDlg::keyPressEvent( QKeyEvent* e )
   if ( e->isAccepted() )
     return;
 
-  if ( e->key() == Key_F1 )
+  if ( e->key() == Qt::Key_F1 )
     {
       e->accept();
       ClickOnHelp();
index 64260b2ae166c2bd28a3a6fc4cd3506ca24effb9..60db0a59bc66dd8942f15e516747cb706d9aa608 100644 (file)
 #include "EntityGUI_Point_QTD.h"
 #include "EntityGUI_Dir1_QTD.h"
 #include "EntityGUI_Dir2_QTD.h"
-
 #include "EntityGUI_1Sel_QTD.h"
-#include "EntityGUI_1Spin.h"
-#include "EntityGUI_2Spin.h"
-#include "EntityGUI_3Spin.h"
-#include "EntityGUI_4Spin.h"
-
-#include "EntityGUI.h"
-#include "GeometryGUI.h"
 
-#include <gp_Dir.hxx>
+class EntityGUI_1Spin;
+class EntityGUI_2Spin;
+class EntityGUI_3Spin;
+class EntityGUI_4Spin;
 
-#include <qwidget.h>
-#include <qgroupbox.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+class GeometryGUI;
 
 //=================================================================================
 // class    : EntityGUI_Dlg
 // purpose  :
 //=================================================================================
-class GEOM_ENTITYGUI_EXPORT EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QTD, public GEOMBase_Helper
+class GEOM_ENTITYGUI_EXPORT EntityGUI_SketcherDlg : public QDialog, public Ui::EntityGUI_Skeleton_QTD, public GEOMBase_Helper
 { 
     Q_OBJECT
 
 public:
     EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent = 0,
-                         const char* name = 0, bool modal = FALSE, WFlags fl = 0,
+                         const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0,
                          const double lineWidth = 2.);
     ~EntityGUI_SketcherDlg();
 
@@ -106,11 +96,11 @@ private :
     Standard_Real myLastX1, myLastY1;
     Standard_Real myLastX2, myLastY2;
 
-    EntityGUI_Point_QTD* GroupPt;
-    EntityGUI_Dir1_QTD* GroupD1;
-    EntityGUI_Dir2_QTD* GroupD2;
+    Ui::EntityGUI_Point_QTD* GroupPt;
+    Ui::EntityGUI_Dir1_QTD* GroupD1;
+    Ui::EntityGUI_Dir2_QTD* GroupD2;
 
-    EntityGUI_1Sel_QTD* Group1Sel;
+    Ui::EntityGUI_1Sel_QTD* Group1Sel;
     EntityGUI_1Spin* Group1Spin;
     EntityGUI_2Spin* Group2Spin;
     EntityGUI_3Spin* Group3Spin;
index cb6483921b171e42901b6f4bddeb8a8dbc7d8957..f5eac405f7f44454762a66f4d1093786ec8507ea 100644 (file)
 //  $Header$
 
 #include "EntityGUI_SubShapeDlg.h"
-#include "GEOM_Displayer.h"
+
+#include "GeometryGUI.h"
+#include "GEOMBase.h"
 
 #include "SUIT_Desktop.h"
+#include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
+#include "SUIT_ViewManager.h"
+#include "SUIT_ViewWindow.h"
 #include "OCCViewer_ViewModel.h"
 #include "SalomeApp_Application.h"
 #include "LightApp_SelectionMgr.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopTools_MapOfShape.hxx>
 
-#include <qmessagebox.h>
-#include <qlabel.h>
-#include <qcombobox.h>
+#include <QMessageBox>
 
 //=================================================================================
 // class    : EntityGUI_SubShapeDlg
 //            TRUE to construct a modal dialog.
 //=================================================================================
 EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                             const char* name, bool modal, WFlags fl)
+                                             const char* name, bool modal, Qt::WindowFlags fl)
   :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl)
 {
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUBSHAPE")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_SUBSHAPE_TITLE"));
+  setWindowTitle(tr("GEOM_SUBSHAPE_TITLE"));
 
   /***************************************************************/
   GroupConstructors->setTitle(tr("GEOM_SUB_SHAPE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  RadioButton1->setIcon(image0);
+  RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton2->close();
+  RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton3->close();
+
+  GroupPoints = new Ui::DlgRef_1Sel1Check1List_QTD();
+  QWidget* aGroupPointsWidget = new QWidget(this);
+  GroupPoints->setupUi(aGroupPointsWidget);
+  aGroupPointsWidget->setObjectName("GroupPoints");
 
-  GroupPoints = new DlgRef_1Sel1Check1List_QTD(this, "GroupPoints");
   GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_MAIN_OBJECT"));
   GroupPoints->TextLabel2->setText(tr("GEOM_SUBSHAPE_TYPE"));
   GroupPoints->CheckButton1->setText(tr("GEOM_SUBSHAPE_SELECT"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  GroupPoints->PushButton1->setIcon(image1);
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 1, 0);
+  gridLayout1->addWidget(aGroupPointsWidget, 1, 0);
   /***************************************************************/
 
   setHelpFileName("explode.htm");
@@ -106,15 +114,15 @@ void EntityGUI_SubShapeDlg::Init()
   myWithShape = true;
 
   /* type for sub shape selection */
-  GroupPoints->ComboBox1->insertItem("Compound");
-  GroupPoints->ComboBox1->insertItem("Compsolid");
-  GroupPoints->ComboBox1->insertItem("Solid");
-  GroupPoints->ComboBox1->insertItem("Shell");
-  GroupPoints->ComboBox1->insertItem("Face");
-  GroupPoints->ComboBox1->insertItem("Wire");
-  GroupPoints->ComboBox1->insertItem("Edge");
-  GroupPoints->ComboBox1->insertItem("Vertex");
-  GroupPoints->ComboBox1->insertItem("Shape");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Compound");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Compsolid");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Solid");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Shell");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Face");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Wire");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Edge");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Vertex");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Shape");
 
   if (SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() 
       != OCCViewer_Viewer::Type())
@@ -227,7 +235,7 @@ void EntityGUI_SubShapeDlg::SelectionIntoArgument()
   GroupPoints->LineEdit1->setText( aString );
 
 
-  int SelectedShapeType = GroupPoints->ComboBox1->currentItem();
+  int SelectedShapeType = GroupPoints->ComboBox1->currentIndex();
   int count = GroupPoints->ComboBox1->count();
 
   if ( myWithShape )
@@ -250,7 +258,7 @@ void EntityGUI_SubShapeDlg::SelectionIntoArgument()
   {
     if ( myWithShape == false )
     {
-      GroupPoints->ComboBox1->insertItem( "Shape" );
+      GroupPoints->ComboBox1->insertItem( GroupPoints->ComboBox1->count(), "Shape" );
       myWithShape = true;
     }
   }
@@ -273,16 +281,16 @@ void EntityGUI_SubShapeDlg::SelectionIntoArgument()
     {
       if ( myShape.ShapeType() != TopAbs_COMPOUND )
       {
-        GroupPoints->ComboBox1->setCurrentItem( 0 );
+        GroupPoints->ComboBox1->setCurrentIndex( 0 );
         ComboTextChanged();
       }
     }
     else
-      GroupPoints->ComboBox1->setCurrentItem(count1 - count + SelectedShapeType);
+      GroupPoints->ComboBox1->setCurrentIndex(count1 - count + SelectedShapeType);
   }
   else
   {
-    GroupPoints->ComboBox1->setCurrentItem( 0 );
+    GroupPoints->ComboBox1->setCurrentIndex( 0 );
     ComboTextChanged();
   }
 
@@ -367,26 +375,26 @@ void EntityGUI_SubShapeDlg::ResetStateOfDialog()
   myShape.Nullify();
   myEditCurrentArgument->setText("");
 
-  int SelectedShapeType = GroupPoints->ComboBox1->currentItem();
+  int SelectedShapeType = GroupPoints->ComboBox1->currentIndex();
   int count = GroupPoints->ComboBox1->count();
   if ( myWithShape )
     count = count - 1;
 
   /* type for sub shape selection */
   GroupPoints->ComboBox1->clear();
-  GroupPoints->ComboBox1->insertItem("Compound");
-  GroupPoints->ComboBox1->insertItem("Compsolid");
-  GroupPoints->ComboBox1->insertItem("Solid");
-  GroupPoints->ComboBox1->insertItem("Shell");
-  GroupPoints->ComboBox1->insertItem("Face");
-  GroupPoints->ComboBox1->insertItem("Wire");
-  GroupPoints->ComboBox1->insertItem("Edge");
-  GroupPoints->ComboBox1->insertItem("Vertex");
-  GroupPoints->ComboBox1->insertItem("Shape");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Compound");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Compsolid");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Solid");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Shell");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Face");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Wire");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Edge");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Vertex");
+  GroupPoints->ComboBox1->insertItem(GroupPoints->ComboBox1->count(), "Shape");
   
   myWithShape = true;
   
-  GroupPoints->ComboBox1->setCurrentItem( 8 - count + SelectedShapeType );
+  GroupPoints->ComboBox1->setCurrentIndex( 8 - count + SelectedShapeType );
   ComboTextChanged();
 
   updateButtonState();
@@ -488,7 +496,7 @@ bool EntityGUI_SubShapeDlg::isAllSubShapes() const
 //=================================================================================
 int EntityGUI_SubShapeDlg::shapeType() const
 {
-  int type = GroupPoints->ComboBox1->currentItem();
+  int type = GroupPoints->ComboBox1->currentIndex();
 
   if (myObject->_is_nil())
     return type;
index 5d70497e9fc9d0194b23615c4e444d50a58dab85..d99635118e1dae8cdc0d7e5bc8ac4cd8a4b37ca3 100644 (file)
@@ -33,7 +33,6 @@
 #include "GEOMBase_Skeleton.h"
 #include "DlgRef_1Sel1Check1List_QTD.h"
 
-
 //=================================================================================
 // class    : EntityGUI_SubShapeDlg
 // purpose  :
@@ -44,7 +43,7 @@ class GEOM_ENTITYGUI_EXPORT EntityGUI_SubShapeDlg : public GEOMBase_Skeleton
 
 public:
     EntityGUI_SubShapeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-                         const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+                         const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
     ~EntityGUI_SubShapeDlg();
 
 protected:
@@ -85,7 +84,7 @@ private:
 
     bool                                myWithShape;  
     
-    DlgRef_1Sel1Check1List_QTD*         GroupPoints;
+    Ui::DlgRef_1Sel1Check1List_QTD*     GroupPoints;
     ObjectList                          myResult;
 };
 
index 2afe2a1a28a41607c471f2def2db64ffb5a88371..4964aed39a813c4bc1c0ce6575a36a4bc74af38a 100644 (file)
@@ -37,15 +37,6 @@ salomeinclude_HEADERS = \
        GEOM_EntityGUI.hxx
 
 dist_libEntityGUI_la_SOURCES = EntityGUI.cxx \
-       EntityGUI_Skeleton_QTD.cxx \
-       EntityGUI_Point_QTD.cxx \
-       EntityGUI_Dir1_QTD.cxx \
-       EntityGUI_Dir2_QTD.cxx \
-       EntityGUI_1Sel_QTD.cxx \
-       EntityGUI_1Spin_QTD.cxx \
-       EntityGUI_2Spin_QTD.cxx \
-       EntityGUI_3Spin_QTD.cxx \
-       EntityGUI_4Spin_QTD.cxx \
        EntityGUI_1Spin.cxx \
        EntityGUI_2Spin.cxx \
        EntityGUI_3Spin.cxx \
@@ -54,15 +45,6 @@ dist_libEntityGUI_la_SOURCES = EntityGUI.cxx \
        EntityGUI_SubShapeDlg.cxx
 
 MOC_FILES = \
-       EntityGUI_Skeleton_QTD_moc.cxx \
-       EntityGUI_Point_QTD_moc.cxx \
-       EntityGUI_Dir1_QTD_moc.cxx \
-       EntityGUI_Dir2_QTD_moc.cxx \
-       EntityGUI_1Sel_QTD_moc.cxx \
-       EntityGUI_1Spin_QTD_moc.cxx \
-       EntityGUI_2Spin_QTD_moc.cxx \
-       EntityGUI_3Spin_QTD_moc.cxx \
-       EntityGUI_4Spin_QTD_moc.cxx \
        EntityGUI_1Spin_moc.cxx \
        EntityGUI_2Spin_moc.cxx \
        EntityGUI_3Spin_moc.cxx \
index c88df1ae6b168bdb54d4e7beb895017558d91f15..9611e596cf85145b880a13e8282296b54ed3c165 100644 (file)
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_1Sel_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_1Sel_QTD</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>EntityGUI_1Sel_QTD</class>
+  <widget class="QWidget" name="EntityGUI_1Sel_QTD" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>329</width>
+        <height>112</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>329</width>
-            <height>112</height>
-        </rect>
+    <property name="windowTitle" >
+      <string>EntityGUI_1Sel_QTD</string>
     </property>
-    <property name="caption">
-        <string>EntityGUI_1Sel_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
+    <layout class="QGridLayout" >
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item row="0" column="0" >
+        <widget class="QGroupBox" name="GroupBox1" >
+          <property name="title" >
+            <string>Values</string>
+          </property>
+          <layout class="QGridLayout" >
+            <property name="margin" >
+              <number>11</number>
             </property>
-            <property name="title">
-                <string>Values</string>
+            <property name="spacing" >
+              <number>6</number>
             </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
+            <item row="0" column="0" >
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>0</number>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
+                <property name="spacing" >
+                  <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
+                <item row="0" column="1" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
                     </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
+                    <item row="2" column="0" >
+                      <spacer name="Spacer5" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>163</height>
+                          </size>
+                        </property>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
                         </property>
-                        <property name="margin">
-                            <number>0</number>
+                      </spacer>
+                    </item>
+                    <item row="0" column="0" >
+                      <widget class="QPushButton" name="buttonApply" >
+                        <property name="text" >
+                          <string>Create</string>
                         </property>
-                        <property name="spacing">
-                            <number>6</number>
+                      </widget>
+                    </item>
+                    <item row="1" column="0" >
+                      <layout class="QGridLayout" >
+                        <property name="margin" >
+                          <number>0</number>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
+                        <property name="spacing" >
+                          <number>6</number>
+                        </property>
+                        <item row="0" column="1" >
+                          <widget class="QPushButton" name="buttonRedo" >
+                            <property name="text" >
+                              <string>Redo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>163</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
+                          </widget>
+                        </item>
+                        <item row="0" column="0" >
+                          <widget class="QPushButton" name="buttonUndo" >
+                            <property name="text" >
+                              <string>Undo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <spacer row="1" column="2">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>180</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>PushButton1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
-                                </widget>
-                                <widget class="QLineEdit" row="0" column="2">
-                                    <property name="name">
-                                        <cstring>LineEdit1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>3</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
+                          </widget>
+                        </item>
+                      </layout>
+                    </item>
+                  </layout>
+                </item>
+                <item row="0" column="0" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
+                    </property>
+                    <item row="0" column="0" >
+                      <widget class="QLabel" name="TextLabel1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL1</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="1" column="2" >
+                      <spacer name="Spacer1" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>180</height>
+                          </size>
+                        </property>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
+                        </property>
+                      </spacer>
+                    </item>
+                    <item row="0" column="1" >
+                      <widget class="QPushButton" name="PushButton1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string/>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="0" column="2" >
+                      <widget class="QLineEdit" name="LineEdit1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                      </widget>
+                    </item>
+                  </layout>
+                </item>
+              </layout>
+            </item>
+          </layout>
         </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
-
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+</ui>
index e1d0a715141863bbe752f17a287e9c343454b667..8985fa8b022d08a3e0da15e4d3de3bce499dab35 100644 (file)
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_1Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_1Spin_QTD</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>EntityGUI_1Spin_QTD</class>
+  <widget class="QWidget" name="EntityGUI_1Spin_QTD" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>255</width>
+        <height>112</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>255</width>
-            <height>112</height>
-        </rect>
+    <property name="windowTitle" >
+      <string>EntityGUI_1Spin_QTD</string>
     </property>
-    <property name="caption">
-        <string>EntityGUI_1Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
+    <layout class="QGridLayout" >
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item row="0" column="0" >
+        <widget class="QGroupBox" name="GroupBox1" >
+          <property name="title" >
+            <string>Values</string>
+          </property>
+          <layout class="QGridLayout" >
+            <property name="margin" >
+              <number>11</number>
             </property>
-            <property name="title">
-                <string>Values</string>
+            <property name="spacing" >
+              <number>6</number>
             </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
+            <item row="0" column="0" >
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>0</number>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
+                <property name="spacing" >
+                  <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
+                <item row="0" column="0" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
                     </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
+                    <property name="spacing" >
+                      <number>6</number>
+                    </property>
+                    <item row="0" column="0" >
+                      <widget class="QLabel" name="TextLabel1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL1</string>
                         </property>
-                        <property name="margin">
-                            <number>0</number>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
                         </property>
-                        <property name="spacing">
-                            <number>6</number>
+                      </widget>
+                    </item>
+                    <item row="0" column="1" >
+                      <widget class="QSpinBox" name="SpinBox1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
+                      </widget>
+                    </item>
+                    <item row="3" column="1" >
+                      <spacer name="Spacer1" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>82</height>
+                          </size>
+                        </property>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
+                        </property>
+                      </spacer>
+                    </item>
+                  </layout>
+                </item>
+                <item row="0" column="1" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
+                    </property>
+                    <item row="1" column="0" >
+                      <layout class="QGridLayout" >
+                        <property name="margin" >
+                          <number>0</number>
+                        </property>
+                        <property name="spacing" >
+                          <number>6</number>
+                        </property>
+                        <item row="0" column="1" >
+                          <widget class="QPushButton" name="buttonRedo" >
+                            <property name="text" >
+                              <string>Redo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <spacer row="3" column="1">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>82</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
+                          </widget>
+                        </item>
+                        <item row="0" column="0" >
+                          <widget class="QPushButton" name="buttonUndo" >
+                            <property name="text" >
+                              <string>Undo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>40</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
+                          </widget>
+                        </item>
+                      </layout>
+                    </item>
+                    <item row="0" column="0" >
+                      <widget class="QPushButton" name="buttonApply" >
+                        <property name="text" >
+                          <string>Create</string>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="2" column="0" >
+                      <spacer name="Spacer5" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>40</height>
+                          </size>
+                        </property>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
+                        </property>
+                      </spacer>
+                    </item>
+                  </layout>
+                </item>
+              </layout>
+            </item>
+          </layout>
         </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+</ui>
index 938383c07c0469cceb11458ff781f16db6c546ad..ec014f1708de498f92add8926ea69888f8a1b86c 100644 (file)
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_2Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_2Spin_QTD</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>EntityGUI_2Spin_QTD</class>
+  <widget class="QWidget" name="EntityGUI_2Spin_QTD" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>255</width>
+        <height>112</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>255</width>
-            <height>112</height>
-        </rect>
+    <property name="windowTitle" >
+      <string>EntityGUI_2Spin_QTD</string>
     </property>
-    <property name="caption">
-        <string>EntityGUI_2Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
+    <layout class="QGridLayout" >
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item row="0" column="0" >
+        <widget class="QGroupBox" name="GroupBox1" >
+          <property name="title" >
+            <string>Values</string>
+          </property>
+          <layout class="QGridLayout" >
+            <property name="margin" >
+              <number>11</number>
             </property>
-            <property name="title">
-                <string>Values</string>
+            <property name="spacing" >
+              <number>6</number>
             </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
+            <item row="0" column="0" >
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>0</number>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
+                <property name="spacing" >
+                  <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
+                <item row="0" column="0" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
                     </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
+                    <item row="1" column="0" >
+                      <widget class="QLabel" name="TextLabel2" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL2</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="0" column="0" >
+                      <widget class="QLabel" name="TextLabel1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL1</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="0" column="1" >
+                      <widget class="QSpinBox" name="SpinBox1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="1" column="1" >
+                      <widget class="QSpinBox" name="SpinBox2" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
                         </property>
-                        <property name="margin">
-                            <number>0</number>
+                      </widget>
+                    </item>
+                    <item row="3" column="1" >
+                      <spacer name="Spacer1" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>82</height>
+                          </size>
                         </property>
-                        <property name="spacing">
-                            <number>6</number>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
+                        </property>
+                      </spacer>
+                    </item>
+                  </layout>
+                </item>
+                <item row="0" column="1" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
+                    </property>
+                    <item row="2" column="0" >
+                      <spacer name="Spacer5" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>51</height>
+                          </size>
+                        </property>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
+                        </property>
+                      </spacer>
+                    </item>
+                    <item row="1" column="0" >
+                      <layout class="QGridLayout" >
+                        <property name="margin" >
+                          <number>0</number>
+                        </property>
+                        <property name="spacing" >
+                          <number>6</number>
+                        </property>
+                        <item row="0" column="0" >
+                          <widget class="QPushButton" name="buttonUndo" >
+                            <property name="text" >
+                              <string>Undo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <spacer row="3" column="1">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>82</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
+                          </widget>
+                        </item>
+                        <item row="0" column="1" >
+                          <widget class="QPushButton" name="buttonRedo" >
+                            <property name="text" >
+                              <string>Redo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>51</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
+                          </widget>
+                        </item>
+                      </layout>
+                    </item>
+                    <item row="0" column="0" >
+                      <widget class="QPushButton" name="buttonApply" >
+                        <property name="text" >
+                          <string>Create</string>
+                        </property>
+                      </widget>
+                    </item>
+                  </layout>
+                </item>
+              </layout>
+            </item>
+          </layout>
         </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+</ui>
index c094d57919cd39db5e3ee2149ac93cbac59ffc9b..08b867ef9726f7cf7310aea98afc93566c3805c0 100644 (file)
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_3Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_3Spin_QTD</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>EntityGUI_3Spin_QTD</class>
+  <widget class="QWidget" name="EntityGUI_3Spin_QTD" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>255</width>
+        <height>125</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>255</width>
-            <height>125</height>
-        </rect>
+    <property name="windowTitle" >
+      <string>EntityGUI_3Spin_QTD</string>
     </property>
-    <property name="caption">
-        <string>EntityGUI_3Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
+    <layout class="QGridLayout" >
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item row="0" column="0" >
+        <widget class="QGroupBox" name="GroupBox1" >
+          <property name="title" >
+            <string>Values</string>
+          </property>
+          <layout class="QGridLayout" >
+            <property name="margin" >
+              <number>11</number>
             </property>
-            <property name="title">
-                <string>Values</string>
+            <property name="spacing" >
+              <number>6</number>
             </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
+            <item row="0" column="0" >
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>0</number>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
+                <property name="spacing" >
+                  <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
+                <item row="0" column="1" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
                     </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
+                    <item row="0" column="0" >
+                      <widget class="QPushButton" name="buttonApply" >
+                        <property name="text" >
+                          <string>Create</string>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="2" column="0" >
+                      <spacer name="Spacer5" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>121</height>
+                          </size>
+                        </property>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
                         </property>
-                        <property name="margin">
-                            <number>0</number>
+                      </spacer>
+                    </item>
+                    <item row="1" column="0" >
+                      <layout class="QGridLayout" >
+                        <property name="margin" >
+                          <number>0</number>
                         </property>
-                        <property name="spacing">
-                            <number>6</number>
+                        <property name="spacing" >
+                          <number>6</number>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
+                        <item row="0" column="0" >
+                          <widget class="QPushButton" name="buttonUndo" >
+                            <property name="text" >
+                              <string>Undo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>121</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
+                          </widget>
+                        </item>
+                        <item row="0" column="1" >
+                          <widget class="QPushButton" name="buttonRedo" >
+                            <property name="text" >
+                              <string>Redo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <spacer row="3" column="1">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>82</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QSpinBox" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
+                          </widget>
+                        </item>
+                      </layout>
+                    </item>
+                  </layout>
+                </item>
+                <item row="0" column="0" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
+                    </property>
+                    <item row="1" column="0" >
+                      <widget class="QLabel" name="TextLabel2" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL2</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="0" column="0" >
+                      <widget class="QLabel" name="TextLabel1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL1</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="0" column="1" >
+                      <widget class="QSpinBox" name="SpinBox1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="1" column="1" >
+                      <widget class="QSpinBox" name="SpinBox2" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="2" column="0" >
+                      <widget class="QLabel" name="TextLabel3" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL3</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="3" column="1" >
+                      <spacer name="Spacer1" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>82</height>
+                          </size>
+                        </property>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
+                        </property>
+                      </spacer>
+                    </item>
+                    <item row="2" column="1" >
+                      <widget class="QSpinBox" name="SpinBox3" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                      </widget>
+                    </item>
+                  </layout>
+                </item>
+              </layout>
+            </item>
+          </layout>
         </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+</ui>
index 956ce0d1bf04901ba62b68c125e9c0b125933486..d6b3453be8e94fcfcf7b7903c07f99ad2a233b2c 100644 (file)
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_4Spin_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_4Spin_QTD</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>EntityGUI_4Spin_QTD</class>
+  <widget class="QWidget" name="EntityGUI_4Spin_QTD" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>255</width>
+        <height>154</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>255</width>
-            <height>154</height>
-        </rect>
+    <property name="windowTitle" >
+      <string>EntityGUI_4Spin_QTD</string>
     </property>
-    <property name="caption">
-        <string>EntityGUI_4Spin_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QGroupBox" row="0" column="0">
-            <property name="name">
-                <cstring>GroupBox1</cstring>
+    <layout class="QGridLayout" >
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item row="0" column="0" >
+        <widget class="QGroupBox" name="GroupBox1" >
+          <property name="title" >
+            <string>Values</string>
+          </property>
+          <layout class="QGridLayout" >
+            <property name="margin" >
+              <number>11</number>
             </property>
-            <property name="title">
-                <string>Values</string>
+            <property name="spacing" >
+              <number>6</number>
             </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
+            <item row="0" column="0" >
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>0</number>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
+                <property name="spacing" >
+                  <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout4</cstring>
+                <item row="0" column="1" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
                     </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
+                    <property name="spacing" >
+                      <number>6</number>
+                    </property>
+                    <item row="1" column="0" >
+                      <layout class="QGridLayout" >
+                        <property name="margin" >
+                          <number>0</number>
                         </property>
-                        <property name="spacing">
-                            <number>6</number>
+                        <property name="spacing" >
+                          <number>6</number>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="1">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
+                        <item row="0" column="1" >
+                          <widget class="QPushButton" name="buttonRedo" >
+                            <property name="text" >
+                              <string>Redo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QLayoutWidget" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>Layout2</cstring>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>0</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QPushButton" row="0" column="1">
-                                            <property name="name">
-                                                <cstring>buttonRedo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Redo</string>
-                                            </property>
-                                        </widget>
-                                        <widget class="QPushButton" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>buttonUndo</cstring>
-                                            </property>
-                                            <property name="text">
-                                                <string>Undo</string>
-                                            </property>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                                <spacer row="2" column="0">
-                                    <property name="name">
-                                        <cstring>Spacer5</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>45</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>buttonApply</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Create</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout1</cstring>
+                          </widget>
+                        </item>
+                        <item row="0" column="0" >
+                          <widget class="QPushButton" name="buttonUndo" >
+                            <property name="text" >
+                              <string>Undo</string>
                             </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QSpinBox" row="2" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL2</string>
-                                    </property>
-                                </widget>
-                                <spacer row="4" column="1">
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Vertical</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>0</width>
-                                            <height>70</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QSpinBox" row="3" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="2" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL3</string>
-                                    </property>
-                                </widget>
-                                <widget class="QSpinBox" row="0" column="1">
-                                    <property name="name">
-                                        <cstring>SpinBox1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="0" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL1</string>
-                                    </property>
-                                </widget>
-                                <widget class="QLabel" row="3" column="0">
-                                    <property name="name">
-                                        <cstring>TextLabel4</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="text">
-                                        <string>TL4</string>
-                                    </property>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
+                          </widget>
+                        </item>
+                      </layout>
+                    </item>
+                    <item row="2" column="0" >
+                      <spacer name="Spacer5" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>45</height>
+                          </size>
+                        </property>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
+                        </property>
+                      </spacer>
+                    </item>
+                    <item row="0" column="0" >
+                      <widget class="QPushButton" name="buttonApply" >
+                        <property name="text" >
+                          <string>Create</string>
+                        </property>
+                      </widget>
+                    </item>
+                  </layout>
+                </item>
+                <item row="0" column="0" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
+                    </property>
+                    <property name="spacing" >
+                      <number>6</number>
+                    </property>
+                    <item row="2" column="1" >
+                      <widget class="QSpinBox" name="SpinBox3" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="1" column="1" >
+                      <widget class="QSpinBox" name="SpinBox2" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="1" column="0" >
+                      <widget class="QLabel" name="TextLabel2" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL2</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="4" column="1" >
+                      <spacer name="Spacer1" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>0</width>
+                            <height>70</height>
+                          </size>
+                        </property>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Vertical</enum>
+                        </property>
+                      </spacer>
+                    </item>
+                    <item row="3" column="1" >
+                      <widget class="QSpinBox" name="SpinBox4" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="2" column="0" >
+                      <widget class="QLabel" name="TextLabel3" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL3</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="0" column="1" >
+                      <widget class="QSpinBox" name="SpinBox1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="0" column="0" >
+                      <widget class="QLabel" name="TextLabel1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL1</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                    <item row="3" column="0" >
+                      <widget class="QLabel" name="TextLabel4" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                          </sizepolicy>
+                        </property>
+                        <property name="text" >
+                          <string>TL4</string>
+                        </property>
+                        <property name="wordWrap" >
+                          <bool>false</bool>
+                        </property>
+                      </widget>
+                    </item>
+                  </layout>
+                </item>
+              </layout>
+            </item>
+          </layout>
         </widget>
-    </grid>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+</ui>
index 59f644641bbee55f2638fd1c262fd6ca7dd69fc0..17e1dca5036bed998c84d9c1955ed1b5612597dd 100644 (file)
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_Dir1_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_Dir1_QTD</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>EntityGUI_Dir1_QTD</class>
+  <widget class="QWidget" name="EntityGUI_Dir1_QTD" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>131</width>
+        <height>123</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>131</width>
-            <height>123</height>
-        </rect>
+    <property name="windowTitle" >
+      <string>EntityGUI_Dir1_QTD</string>
     </property>
-    <property name="caption">
-        <string>EntityGUI_Dir1_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QButtonGroup" row="0" column="0">
-            <property name="name">
-                <cstring>GroupDir1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>0</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
+    <layout class="QGridLayout" >
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item row="0" column="0" >
+        <widget class="QGroupBox" name="GroupDir1" >
+          <property name="sizePolicy" >
+            <sizepolicy>
+              <hsizetype>7</hsizetype>
+              <vsizetype>0</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+            </sizepolicy>
+          </property>
+          <property name="title" >
+            <string>Direction</string>
+          </property>
+          <layout class="QGridLayout" >
+            <property name="margin" >
+              <number>11</number>
             </property>
-            <property name="title">
-                <string>Direction</string>
+            <property name="spacing" >
+              <number>6</number>
             </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
+            <item row="0" column="0" >
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>0</number>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
+                <property name="spacing" >
+                  <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
+                <item row="1" column="0" >
+                  <widget class="QRadioButton" name="RB_Dir12" >
+                    <property name="text" >
+                      <string>Perpendicular</string>
+                    </property>
+                  </widget>
+                </item>
+                <item row="2" column="0" >
+                  <widget class="QRadioButton" name="RB_Dir13" >
+                    <property name="text" >
+                      <string>Tangent</string>
+                    </property>
+                  </widget>
+                </item>
+                <item row="0" column="0" >
+                  <widget class="QRadioButton" name="RB_Dir11" >
+                    <property name="text" >
+                      <string>Angle</string>
+                    </property>
+                  </widget>
+                </item>
+                <item row="3" column="0" >
+                  <widget class="QRadioButton" name="RB_Dir14" >
+                    <property name="text" >
+                      <string>VX-VY</string>
                     </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QRadioButton" row="1" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir12</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Perpendicular</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="2" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir13</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Tangent</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="0" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir11</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Angle</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="3" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir14</cstring>
-                            </property>
-                            <property name="text">
-                                <string>VX-VY</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
+                  </widget>
+                </item>
+              </layout>
+            </item>
+          </layout>
         </widget>
-    </grid>
-</widget>
-<tabstops>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <tabstops>
     <tabstop>RB_Dir11</tabstop>
     <tabstop>RB_Dir12</tabstop>
     <tabstop>RB_Dir13</tabstop>
     <tabstop>RB_Dir14</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+  </tabstops>
+</ui>
index 617d3c3f6a33f38ec51a385d919cbebcf1e4df44..8d2cd15791ae0efc88f90dd97295075d856686d4 100644 (file)
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_Dir2_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_Dir2_QTD</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>EntityGUI_Dir2_QTD</class>
+  <widget class="QWidget" name="EntityGUI_Dir2_QTD" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>124</width>
+        <height>106</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>124</width>
-            <height>106</height>
-        </rect>
+    <property name="windowTitle" >
+      <string>EntityGUI_Dir2_QTD</string>
     </property>
-    <property name="caption">
-        <string>EntityGUI_Dir2_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QButtonGroup" row="0" column="0">
-            <property name="name">
-                <cstring>GroupDir2</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>7</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
+    <layout class="QGridLayout" >
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item row="0" column="0" >
+        <widget class="QGroupBox" name="GroupDir2" >
+          <property name="sizePolicy" >
+            <sizepolicy>
+              <hsizetype>7</hsizetype>
+              <vsizetype>7</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+            </sizepolicy>
+          </property>
+          <property name="title" >
+            <string>Direction</string>
+          </property>
+          <layout class="QGridLayout" >
+            <property name="margin" >
+              <number>11</number>
             </property>
-            <property name="title">
-                <string>Direction</string>
+            <property name="spacing" >
+              <number>6</number>
             </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
+            <item row="0" column="0" >
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>0</number>
                 </property>
-                <property name="margin">
-                    <number>11</number>
+                <property name="spacing" >
+                  <number>6</number>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
+                <item row="1" column="0" >
+                  <widget class="QRadioButton" name="RB_Dir22" >
+                    <property name="text" >
+                      <string>X</string>
+                    </property>
+                  </widget>
+                </item>
+                <item row="2" column="0" >
+                  <widget class="QRadioButton" name="RB_Dir23" >
+                    <property name="text" >
+                      <string>Y</string>
+                    </property>
+                  </widget>
+                </item>
+                <item row="3" column="0" >
+                  <spacer name="Spacer4" >
+                    <property name="sizeHint" >
+                      <size>
+                        <width>0</width>
+                        <height>20</height>
+                      </size>
+                    </property>
+                    <property name="sizeType" >
+                      <enum>Expanding</enum>
+                    </property>
+                    <property name="orientation" >
+                      <enum>Vertical</enum>
+                    </property>
+                  </spacer>
+                </item>
+                <item row="0" column="0" >
+                  <widget class="QRadioButton" name="RB_Dir21" >
+                    <property name="text" >
+                      <string>Length</string>
                     </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QRadioButton" row="1" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir22</cstring>
-                            </property>
-                            <property name="text">
-                                <string>X</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="2" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir23</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Y</string>
-                            </property>
-                        </widget>
-                        <spacer row="3" column="0">
-                            <property name="name">
-                                <cstring>Spacer4</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Vertical</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>0</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QRadioButton" row="0" column="0">
-                            <property name="name">
-                                <cstring>RB_Dir21</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Length</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
+                  </widget>
+                </item>
+              </layout>
+            </item>
+          </layout>
         </widget>
-    </grid>
-</widget>
-<tabstops>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <tabstops>
     <tabstop>RB_Dir21</tabstop>
     <tabstop>RB_Dir22</tabstop>
     <tabstop>RB_Dir23</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+  </tabstops>
+</ui>
index 8e0bd22ad7e94d002558d971e0bb49ab434ec8da..668d778e5a110f8d77544eaf95df2bdccba848d2 100644 (file)
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_Point_QTD</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>EntityGUI_Point_QTD</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>EntityGUI_Point_QTD</class>
+  <widget class="QWidget" name="EntityGUI_Point_QTD" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>124</width>
+        <height>106</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>124</width>
-            <height>106</height>
-        </rect>
+    <property name="windowTitle" >
+      <string>EntityGUI_Point_QTD</string>
     </property>
-    <property name="caption">
-        <string>EntityGUI_Point_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QButtonGroup" row="0" column="0">
-            <property name="name">
-                <cstring>GroupPoint</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>0</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
+    <layout class="QGridLayout" >
+      <property name="margin" >
+        <number>0</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item row="0" column="0" >
+        <widget class="QGroupBox" name="GroupPoint" >
+          <property name="sizePolicy" >
+            <sizepolicy>
+              <hsizetype>7</hsizetype>
+              <vsizetype>0</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+            </sizepolicy>
+          </property>
+          <property name="title" >
+            <string>Point</string>
+          </property>
+          <layout class="QGridLayout" >
+            <property name="margin" >
+              <number>11</number>
             </property>
-            <property name="title">
-                <string>Point</string>
+            <property name="spacing" >
+              <number>6</number>
             </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>11</number>
+            <item row="0" column="0" >
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>0</number>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
+                <property name="spacing" >
+                  <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
-                    <property name="name">
-                        <cstring>Layout1</cstring>
+                <item row="1" column="0" >
+                  <widget class="QRadioButton" name="RB_Point2" >
+                    <property name="text" >
+                      <string>Relative</string>
+                    </property>
+                  </widget>
+                </item>
+                <item row="0" column="0" >
+                  <widget class="QRadioButton" name="RB_Point1" >
+                    <property name="text" >
+                      <string>Absolute</string>
+                    </property>
+                  </widget>
+                </item>
+                <item row="2" column="0" >
+                  <widget class="QRadioButton" name="RB_Point3" >
+                    <property name="text" >
+                      <string>Selection</string>
                     </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <property name="margin">
-                            <number>0</number>
-                        </property>
-                        <property name="spacing">
-                            <number>6</number>
-                        </property>
-                        <widget class="QRadioButton" row="1" column="0">
-                            <property name="name">
-                                <cstring>RB_Point2</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Relative</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="0" column="0">
-                            <property name="name">
-                                <cstring>RB_Point1</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Absolute</string>
-                            </property>
-                        </widget>
-                        <widget class="QRadioButton" row="2" column="0">
-                            <property name="name">
-                                <cstring>RB_Point3</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Selection</string>
-                            </property>
-                        </widget>
-                    </grid>
-                </widget>
-            </grid>
+                  </widget>
+                </item>
+              </layout>
+            </item>
+          </layout>
         </widget>
-    </grid>
-</widget>
-<tabstops>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <tabstops>
     <tabstop>RB_Point1</tabstop>
     <tabstop>RB_Point2</tabstop>
     <tabstop>RB_Point3</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+  </tabstops>
+</ui>
index c257a8086550a369caca1dabd8a24e64b50abc51..6e65ff423a604745e2042852eda7a781c7151eb9 100644 (file)
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>EntityGUI_Skeleton_QTD</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>EntityGUI_Skeleton_QTD</cstring>
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>EntityGUI_Skeleton_QTD</class>
+  <widget class="QDialog" name="EntityGUI_Skeleton_QTD" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>317</width>
+        <height>276</height>
+      </rect>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>317</width>
-            <height>276</height>
-        </rect>
+    <property name="sizePolicy" >
+      <sizepolicy>
+        <hsizetype>5</hsizetype>
+        <vsizetype>7</vsizetype>
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+      </sizepolicy>
     </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>7</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
+    <property name="windowTitle" >
+      <string>EntityGUI_Skeleton_QTD</string>
     </property>
-    <property name="caption">
-        <string>EntityGUI_Skeleton_QTD</string>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>11</number>
-        </property>
-        <property name="spacing">
+    <layout class="QGridLayout" >
+      <property name="margin" >
+        <number>11</number>
+      </property>
+      <property name="spacing" >
+        <number>6</number>
+      </property>
+      <item row="0" column="0" >
+        <layout class="QGridLayout" >
+          <property name="margin" >
+            <number>0</number>
+          </property>
+          <property name="spacing" >
             <number>6</number>
-        </property>
-        <widget class="QLayoutWidget" row="0" column="0">
-            <property name="name">
-                <cstring>Layout1</cstring>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
+          </property>
+          <item row="2" column="0" >
+            <widget class="QGroupBox" name="GroupVal" >
+              <property name="sizePolicy" >
+                <sizepolicy>
+                  <hsizetype>7</hsizetype>
+                  <vsizetype>7</vsizetype>
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                </sizepolicy>
+              </property>
+              <property name="title" >
+                <string/>
+              </property>
+            </widget>
+          </item>
+          <item row="0" column="0" >
+            <widget class="QGroupBox" name="GroupConstructors" >
+              <property name="sizePolicy" >
+                <sizepolicy>
+                  <hsizetype>5</hsizetype>
+                  <vsizetype>0</vsizetype>
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                </sizepolicy>
+              </property>
+              <property name="title" >
+                <string>Element Type</string>
+              </property>
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>11</number>
                 </property>
-                <property name="spacing">
-                    <number>6</number>
+                <property name="spacing" >
+                  <number>6</number>
                 </property>
-                <widget class="QGroupBox" row="2" column="0">
-                    <property name="name">
-                        <cstring>GroupVal</cstring>
+                <item row="0" column="0" >
+                  <layout class="QHBoxLayout" >
+                    <property name="margin" >
+                      <number>0</number>
                     </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>7</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
+                    <property name="spacing" >
+                      <number>6</number>
                     </property>
-                    <property name="title">
-                        <string></string>
+                    <item>
+                      <widget class="QRadioButton" name="RadioButton1" >
+                        <property name="text" >
+                          <string>Segment</string>
+                        </property>
+                      </widget>
+                    </item>
+                    <item>
+                      <widget class="QRadioButton" name="RadioButton2" >
+                        <property name="text" >
+                          <string>Arc</string>
+                        </property>
+                      </widget>
+                    </item>
+                  </layout>
+                </item>
+              </layout>
+            </widget>
+          </item>
+          <item row="1" column="0" >
+            <widget class="QGroupBox" name="GroupDest" >
+              <property name="sizePolicy" >
+                <sizepolicy>
+                  <hsizetype>7</hsizetype>
+                  <vsizetype>0</vsizetype>
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                </sizepolicy>
+              </property>
+              <property name="title" >
+                <string>Destination</string>
+              </property>
+              <layout class="QGridLayout" >
+                <property name="margin" >
+                  <number>11</number>
+                </property>
+                <property name="spacing" >
+                  <number>6</number>
+                </property>
+                <item row="0" column="0" >
+                  <layout class="QGridLayout" >
+                    <property name="margin" >
+                      <number>0</number>
                     </property>
-                </widget>
-                <widget class="QButtonGroup" row="0" column="0">
-                    <property name="name">
-                        <cstring>GroupConstructors</cstring>
+                    <property name="spacing" >
+                      <number>6</number>
                     </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>5</hsizetype>
+                    <item rowspan="1" row="0" column="0" colspan="2" >
+                      <widget class="QGroupBox" name="GroupDest1" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
+                            <hsizetype>7</hsizetype>
                             <vsizetype>0</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="title">
-                        <string>Element Type</string>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
+                          </sizepolicy>
                         </property>
-                        <property name="margin">
-                            <number>11</number>
+                        <property name="title" >
+                          <string>Type</string>
                         </property>
-                        <property name="spacing">
+                        <layout class="QGridLayout" >
+                          <property name="margin" >
+                            <number>11</number>
+                          </property>
+                          <property name="spacing" >
                             <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout2</cstring>
-                            </property>
-                            <hbox>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>RadioButton1</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Segment</string>
-                                    </property>
+                          </property>
+                          <item row="0" column="0" >
+                            <layout class="QGridLayout" >
+                              <property name="margin" >
+                                <number>0</number>
+                              </property>
+                              <property name="spacing" >
+                                <number>6</number>
+                              </property>
+                              <item row="0" column="1" >
+                                <widget class="QRadioButton" name="RB_Dest2" >
+                                  <property name="text" >
+                                    <string>Direction</string>
+                                  </property>
                                 </widget>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>RadioButton2</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Arc</string>
-                                    </property>
+                              </item>
+                              <item row="0" column="0" >
+                                <widget class="QRadioButton" name="RB_Dest1" >
+                                  <property name="text" >
+                                    <string>Point</string>
+                                  </property>
                                 </widget>
-                            </hbox>
-                        </widget>
-                    </grid>
-                </widget>
-                <widget class="QGroupBox" row="1" column="0">
-                    <property name="name">
-                        <cstring>GroupDest</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
+                              </item>
+                            </layout>
+                          </item>
+                        </layout>
+                      </widget>
+                    </item>
+                    <item row="1" column="0" >
+                      <widget class="QGroupBox" name="GroupDest2" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
                             <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
+                            <vsizetype>7</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="title">
-                        <string>Destination</string>
-                    </property>
-                    <grid>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
+                          </sizepolicy>
                         </property>
-                        <property name="margin">
-                            <number>11</number>
+                        <property name="title" >
+                          <string/>
                         </property>
-                        <property name="spacing">
+                        <layout class="QGridLayout" >
+                          <property name="margin" >
+                            <number>11</number>
+                          </property>
+                          <property name="spacing" >
                             <number>6</number>
-                        </property>
-                        <widget class="QLayoutWidget" row="0" column="0">
-                            <property name="name">
-                                <cstring>Layout5</cstring>
-                            </property>
-                            <grid>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2">
-                                    <property name="name">
-                                        <cstring>GroupDest1</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="title">
-                                        <string>Type</string>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>11</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                        <widget class="QLayoutWidget" row="0" column="0">
-                                            <property name="name">
-                                                <cstring>Layout4</cstring>
-                                            </property>
-                                            <grid>
-                                                <property name="name">
-                                                    <cstring>unnamed</cstring>
-                                                </property>
-                                                <property name="margin">
-                                                    <number>0</number>
-                                                </property>
-                                                <property name="spacing">
-                                                    <number>6</number>
-                                                </property>
-                                                <widget class="QRadioButton" row="0" column="1">
-                                                    <property name="name">
-                                                        <cstring>RB_Dest2</cstring>
-                                                    </property>
-                                                    <property name="text">
-                                                        <string>Direction</string>
-                                                    </property>
-                                                </widget>
-                                                <widget class="QRadioButton" row="0" column="0">
-                                                    <property name="name">
-                                                        <cstring>RB_Dest1</cstring>
-                                                    </property>
-                                                    <property name="text">
-                                                        <string>Point</string>
-                                                    </property>
-                                                </widget>
-                                            </grid>
-                                        </widget>
-                                    </grid>
-                                </widget>
-                                <widget class="QButtonGroup" row="1" column="0">
-                                    <property name="name">
-                                        <cstring>GroupDest2</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>7</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="title">
-                                        <string></string>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>11</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                    </grid>
-                                </widget>
-                                <widget class="QButtonGroup" row="1" column="1">
-                                    <property name="name">
-                                        <cstring>GroupDest3</cstring>
-                                    </property>
-                                    <property name="sizePolicy">
-                                        <sizepolicy>
-                                            <hsizetype>7</hsizetype>
-                                            <vsizetype>7</vsizetype>
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="title">
-                                        <string></string>
-                                    </property>
-                                    <grid>
-                                        <property name="name">
-                                            <cstring>unnamed</cstring>
-                                        </property>
-                                        <property name="margin">
-                                            <number>11</number>
-                                        </property>
-                                        <property name="spacing">
-                                            <number>6</number>
-                                        </property>
-                                    </grid>
-                                </widget>
-                            </grid>
-                        </widget>
-                    </grid>
-                </widget>
-                <widget class="QGroupBox" row="3" column="0">
-                    <property name="name">
-                        <cstring>GroupButtons</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
+                          </property>
+                        </layout>
+                      </widget>
+                    </item>
+                    <item row="1" column="1" >
+                      <widget class="QGroupBox" name="GroupDest3" >
+                        <property name="sizePolicy" >
+                          <sizepolicy>
                             <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
+                            <vsizetype>7</vsizetype>
                             <horstretch>0</horstretch>
                             <verstretch>0</verstretch>
-                        </sizepolicy>
+                          </sizepolicy>
+                        </property>
+                        <property name="title" >
+                          <string/>
+                        </property>
+                        <layout class="QGridLayout" >
+                          <property name="margin" >
+                            <number>11</number>
+                          </property>
+                          <property name="spacing" >
+                            <number>6</number>
+                          </property>
+                        </layout>
+                      </widget>
+                    </item>
+                  </layout>
+                </item>
+              </layout>
+            </widget>
+          </item>
+          <item row="3" column="0" >
+            <widget class="QGroupBox" name="GroupButtons" >
+              <property name="sizePolicy" >
+                <sizepolicy>
+                  <hsizetype>7</hsizetype>
+                  <vsizetype>0</vsizetype>
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                </sizepolicy>
+              </property>
+              <property name="title" >
+                <string/>
+              </property>
+              <layout class="QHBoxLayout" >
+                <property name="margin" >
+                  <number>11</number>
+                </property>
+                <property name="spacing" >
+                  <number>6</number>
+                </property>
+                <item>
+                  <layout class="QHBoxLayout" >
+                    <property name="margin" >
+                      <number>0</number>
                     </property>
-                    <property name="title">
-                        <string></string>
+                    <property name="spacing" >
+                      <number>6</number>
                     </property>
-                    <hbox>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
+                    <item>
+                      <widget class="QPushButton" name="buttonEnd" >
+                        <property name="text" >
+                          <string>End Sketch</string>
                         </property>
-                        <property name="margin">
-                            <number>11</number>
+                      </widget>
+                    </item>
+                    <item>
+                      <widget class="QPushButton" name="buttonClose" >
+                        <property name="text" >
+                          <string>Close Sketch</string>
                         </property>
-                        <property name="spacing">
-                            <number>6</number>
+                      </widget>
+                    </item>
+                    <item>
+                      <spacer name="Spacer1" >
+                        <property name="sizeHint" >
+                          <size>
+                            <width>91</width>
+                            <height>0</height>
+                          </size>
                         </property>
-                        <widget class="QLayoutWidget">
-                            <property name="name">
-                                <cstring>Layout3</cstring>
-                            </property>
-                            <hbox>
-                                <property name="name">
-                                    <cstring>unnamed</cstring>
-                                </property>
-                                <property name="margin">
-                                    <number>0</number>
-                                </property>
-                                <property name="spacing">
-                                    <number>6</number>
-                                </property>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonEnd</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>End Sketch</string>
-                                    </property>
-                                </widget>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonClose</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>Close Sketch</string>
-                                    </property>
-                                </widget>
-                                <spacer>
-                                    <property name="name">
-                                        <cstring>Spacer1</cstring>
-                                    </property>
-                                    <property name="orientation">
-                                        <enum>Horizontal</enum>
-                                    </property>
-                                    <property name="sizeType">
-                                        <enum>Expanding</enum>
-                                    </property>
-                                    <property name="sizeHint">
-                                        <size>
-                                            <width>91</width>
-                                            <height>0</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                                <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonCancel</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>&amp;Cancel</string>
-                                    </property>
-                                </widget>
-                               <widget class="QPushButton">
-                                    <property name="name">
-                                        <cstring>buttonHelp</cstring>
-                                    </property>
-                                    <property name="text">
-                                        <string>&amp;Help</string>
-                                    </property>
-                                </widget>
-                            </hbox>
-                        </widget>
-                    </hbox>
-                </widget>
-            </grid>
-        </widget>
-    </grid>
-</widget>
-<tabstops>
+                        <property name="sizeType" >
+                          <enum>Expanding</enum>
+                        </property>
+                        <property name="orientation" >
+                          <enum>Horizontal</enum>
+                        </property>
+                      </spacer>
+                    </item>
+                    <item>
+                      <widget class="QPushButton" name="buttonCancel" >
+                        <property name="text" >
+                          <string>&amp;Cancel</string>
+                        </property>
+                      </widget>
+                    </item>
+                    <item>
+                      <widget class="QPushButton" name="buttonHelp" >
+                        <property name="text" >
+                          <string>&amp;Help</string>
+                        </property>
+                      </widget>
+                    </item>
+                  </layout>
+                </item>
+              </layout>
+            </widget>
+          </item>
+        </layout>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <tabstops>
     <tabstop>RadioButton1</tabstop>
     <tabstop>RadioButton2</tabstop>
     <tabstop>RB_Dest1</tabstop>
     <tabstop>buttonEnd</tabstop>
     <tabstop>buttonClose</tabstop>
     <tabstop>buttonCancel</tabstop>
-</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+  </tabstops>
+</ui>
index 13bc0ac3d4160741f922978dede6a866ceb62f8b..4fef1c79ed782ebdd4681ec6f3e759dc965c709e 100755 (executable)
 # 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
+#// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #!/bin/sh
 
-uic -o EntityGUI_Skeleton_QTD.h EntityGUI_Skeleton_QTD.ui
-uic -o EntityGUI_Skeleton_QTD.cxx -impl EntityGUI_Skeleton_QTD.h EntityGUI_Skeleton_QTD.ui
+uic -o ../EntityGUI_Skeleton_QTD.h EntityGUI_Skeleton_QTD.ui
 
-uic -o EntityGUI_Point_QTD.h EntityGUI_Point_QTD.ui
-uic -o EntityGUI_Point_QTD.cxx -impl EntityGUI_Point_QTD.h EntityGUI_Point_QTD.ui
+uic -o ../EntityGUI_Point_QTD.h EntityGUI_Point_QTD.ui
 
-uic -o EntityGUI_Dir1_QTD.h EntityGUI_Dir1_QTD.ui
-uic -o EntityGUI_Dir1_QTD.cxx -impl EntityGUI_Dir1_QTD.h EntityGUI_Dir1_QTD.ui
+uic -o ../EntityGUI_Dir1_QTD.h EntityGUI_Dir1_QTD.ui
 
-uic -o EntityGUI_Dir2_QTD.h EntityGUI_Dir2_QTD.ui
-uic -o EntityGUI_Dir2_QTD.cxx -impl EntityGUI_Dir2_QTD.h EntityGUI_Dir2_QTD.ui
+uic -o ../EntityGUI_Dir2_QTD.h EntityGUI_Dir2_QTD.ui
 
-uic -o EntityGUI_1Spin_QTD.h EntityGUI_1Spin_QTD.ui
-uic -o EntityGUI_1Spin_QTD.cxx -impl EntityGUI_1Spin_QTD.h EntityGUI_1Spin_QTD.ui
+uic -o ../EntityGUI_1Spin_QTD.h EntityGUI_1Spin_QTD.ui
 
-uic -o EntityGUI_2Spin_QTD.h EntityGUI_2Spin_QTD.ui
-uic -o EntityGUI_2Spin_QTD.cxx -impl EntityGUI_2Spin_QTD.h EntityGUI_2Spin_QTD.ui
+uic -o ../EntityGUI_2Spin_QTD.h EntityGUI_2Spin_QTD.ui
 
-uic -o EntityGUI_3Spin_QTD.h EntityGUI_3Spin_QTD.ui
-uic -o EntityGUI_3Spin_QTD.cxx -impl EntityGUI_3Spin_QTD.h EntityGUI_3Spin_QTD.ui
+uic -o ../EntityGUI_3Spin_QTD.h EntityGUI_3Spin_QTD.ui
 
-uic -o EntityGUI_4Spin_QTD.h EntityGUI_4Spin_QTD.ui
-uic -o EntityGUI_4Spin_QTD.cxx -impl EntityGUI_4Spin_QTD.h EntityGUI_4Spin_QTD.ui
+uic -o ../EntityGUI_4Spin_QTD.h EntityGUI_4Spin_QTD.ui
 
-uic -o EntityGUI_1Sel_QTD.h EntityGUI_1Sel_QTD.ui
-uic -o EntityGUI_1Sel_QTD.cxx -impl EntityGUI_1Sel_QTD.h EntityGUI_1Sel_QTD.ui
+uic -o ../EntityGUI_1Sel_QTD.h EntityGUI_1Sel_QTD.ui
index 83d25693e36d6b043c3ff122453ef63369d64c7b..f9df99fb58b5cb0cd60a14853a95f63c66230e98 100644 (file)
@@ -29,7 +29,7 @@ SUBDIRS += DisplayGUI
 SUBDIRS += BasicGUI
 SUBDIRS += PrimitiveGUI
 SUBDIRS += GenerationGUI
-#SUBDIRS += EntityGUI
+SUBDIRS += EntityGUI
 #SUBDIRS += BuildGUI
 #SUBDIRS += BooleanGUI
 #SUBDIRS += TransformationGUI