From: dmv Date: Thu, 13 Mar 2008 07:20:53 +0000 (+0000) Subject: NPAL 12483 Translate an object vector distance correct Dialog layouts and size X-Git-Tag: V4_1_2rc1~34 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=416b6928cfde511204169fc33e8c467b90780346;p=modules%2Fgeom.git NPAL 12483 Translate an object vector distance correct Dialog layouts and size --- diff --git a/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.cxx b/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.cxx index 62a38f066..a67adf48f 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.cxx +++ b/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.cxx @@ -1,7 +1,7 @@ /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_3Sel3Spin2Check_QTD.ui' ** -** Created: Tue Feb 12 16:21:38 2008 +** Created: Wed Mar 12 11:57:09 2008 ** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! @@ -10,12 +10,12 @@ #include "DlgRef_3Sel3Spin2Check_QTD.h" #include -#include #include +#include #include -#include #include #include +#include #include #include #include @@ -37,96 +37,97 @@ DlgRef_3Sel3Spin2Check_QTD::DlgRef_3Sel3Spin2Check_QTD( QWidget* parent, const c GroupBox1->setColumnLayout(0, Qt::Vertical ); GroupBox1->layout()->setSpacing( 6 ); GroupBox1->layout()->setMargin( 11 ); - GroupBox1Layout = new QHBoxLayout( GroupBox1->layout() ); + GroupBox1Layout = new QGridLayout( GroupBox1->layout() ); GroupBox1Layout->setAlignment( Qt::AlignTop ); layout1 = new QGridLayout( 0, 1, 1, 0, 6, "layout1"); - Spacer3 = new QSpacerItem( 20, 130, QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout1->addItem( Spacer3, 8, 3 ); - PushButton1 = new QPushButton( GroupBox1, "PushButton1" ); - PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) ); + TextLabel2 = new QLabel( GroupBox1, "TextLabel2" ); + TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); - layout1->addWidget( PushButton1, 0, 1 ); + layout1->addWidget( TextLabel2, 1, 0 ); + + SpinBox_3 = new QSpinBox( GroupBox1, "SpinBox_3" ); + SpinBox_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox_3->sizePolicy().hasHeightForWidth() ) ); + + layout1->addWidget( SpinBox_3, 5, 2 ); TextLabel3 = new QLabel( GroupBox1, "TextLabel3" ); TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); layout1->addWidget( TextLabel3, 2, 0 ); - CheckBox1 = new QCheckBox( GroupBox1, "CheckBox1" ); + LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" ); - layout1->addMultiCellWidget( CheckBox1, 6, 6, 0, 1 ); + layout1->addWidget( LineEdit2, 1, 2 ); + + PushButton2 = new QPushButton( GroupBox1, "PushButton2" ); + PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) ); + + layout1->addWidget( PushButton2, 1, 1 ); TextLabel6 = new QLabel( GroupBox1, "TextLabel6" ); TextLabel6->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel6->sizePolicy().hasHeightForWidth() ) ); layout1->addWidget( TextLabel6, 5, 0 ); - SpinBox_2 = new QSpinBox( GroupBox1, "SpinBox_2" ); - SpinBox_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox_2->sizePolicy().hasHeightForWidth() ) ); + PushButton1 = new QPushButton( GroupBox1, "PushButton1" ); + PushButton1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton1->sizePolicy().hasHeightForWidth() ) ); - layout1->addMultiCellWidget( SpinBox_2, 4, 4, 2, 3 ); + layout1->addWidget( PushButton1, 0, 1 ); - LineEdit2 = new QLineEdit( GroupBox1, "LineEdit2" ); + CheckBox1 = new QCheckBox( GroupBox1, "CheckBox1" ); - layout1->addMultiCellWidget( LineEdit2, 1, 1, 2, 3 ); + layout1->addMultiCellWidget( CheckBox1, 6, 6, 0, 2 ); - LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" ); + SpinBox_2 = new QSpinBox( GroupBox1, "SpinBox_2" ); + SpinBox_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox_2->sizePolicy().hasHeightForWidth() ) ); - layout1->addMultiCellWidget( LineEdit1, 0, 0, 2, 3 ); + layout1->addWidget( SpinBox_2, 4, 2 ); - LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" ); + TextLabel5 = new QLabel( GroupBox1, "TextLabel5" ); + TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) ); - layout1->addMultiCellWidget( LineEdit3, 2, 2, 2, 3 ); + layout1->addWidget( TextLabel5, 4, 0 ); - PushButton2 = new QPushButton( GroupBox1, "PushButton2" ); - PushButton2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton2->sizePolicy().hasHeightForWidth() ) ); + TextLabel1 = new QLabel( GroupBox1, "TextLabel1" ); + TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) ); - layout1->addWidget( PushButton2, 1, 1 ); + layout1->addWidget( TextLabel1, 0, 0 ); - TextLabel2 = new QLabel( GroupBox1, "TextLabel2" ); - TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); + TextLabel4 = new QLabel( GroupBox1, "TextLabel4" ); + TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) ); - layout1->addWidget( TextLabel2, 1, 0 ); + layout1->addWidget( TextLabel4, 3, 0 ); CheckBox2 = new QCheckBox( GroupBox1, "CheckBox2" ); layout1->addMultiCellWidget( CheckBox2, 7, 7, 0, 2 ); - TextLabel1 = new QLabel( GroupBox1, "TextLabel1" ); - TextLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel1->sizePolicy().hasHeightForWidth() ) ); + LineEdit1 = new QLineEdit( GroupBox1, "LineEdit1" ); - layout1->addWidget( TextLabel1, 0, 0 ); + layout1->addWidget( LineEdit1, 0, 2 ); + Spacer3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + layout1->addItem( Spacer3, 8, 2 ); + + LineEdit3 = new QLineEdit( GroupBox1, "LineEdit3" ); + + layout1->addWidget( LineEdit3, 2, 2 ); PushButton3 = new QPushButton( GroupBox1, "PushButton3" ); PushButton3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, PushButton3->sizePolicy().hasHeightForWidth() ) ); layout1->addWidget( PushButton3, 2, 1 ); - TextLabel5 = new QLabel( GroupBox1, "TextLabel5" ); - TextLabel5->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel5->sizePolicy().hasHeightForWidth() ) ); - - layout1->addWidget( TextLabel5, 4, 0 ); - SpinBox_1 = new QSpinBox( GroupBox1, "SpinBox_1" ); SpinBox_1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox_1->sizePolicy().hasHeightForWidth() ) ); - layout1->addMultiCellWidget( SpinBox_1, 3, 3, 2, 3 ); - - SpinBox_3 = new QSpinBox( GroupBox1, "SpinBox_3" ); - SpinBox_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, SpinBox_3->sizePolicy().hasHeightForWidth() ) ); - - layout1->addMultiCellWidget( SpinBox_3, 5, 5, 2, 3 ); - - TextLabel4 = new QLabel( GroupBox1, "TextLabel4" ); - TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, TextLabel4->sizePolicy().hasHeightForWidth() ) ); + layout1->addWidget( SpinBox_1, 3, 2 ); - layout1->addWidget( TextLabel4, 3, 0 ); - GroupBox1Layout->addLayout( layout1 ); + GroupBox1Layout->addLayout( layout1, 0, 0 ); DlgRef_3Sel3Spin2Check_QTDLayout->addWidget( GroupBox1 ); languageChange(); - resize( QSize(338, 274).expandedTo(minimumSizeHint()) ); + resize( QSize(263, 254).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // tab order @@ -139,6 +140,7 @@ DlgRef_3Sel3Spin2Check_QTD::DlgRef_3Sel3Spin2Check_QTD( QWidget* parent, const c setTabOrder( SpinBox_1, SpinBox_2 ); setTabOrder( SpinBox_2, SpinBox_3 ); setTabOrder( SpinBox_3, CheckBox1 ); + setTabOrder( CheckBox1, CheckBox2 ); } /* @@ -157,16 +159,16 @@ void DlgRef_3Sel3Spin2Check_QTD::languageChange() { setCaption( tr( "DlgRef_3Sel3Spin2Check_QTD" ) ); GroupBox1->setTitle( QString::null ); - PushButton1->setText( QString::null ); + TextLabel2->setText( tr( "TL2" ) ); TextLabel3->setText( tr( "TL3" ) ); - CheckBox1->setText( QString::null ); - TextLabel6->setText( tr( "TL6" ) ); PushButton2->setText( QString::null ); - TextLabel2->setText( tr( "TL2" ) ); - CheckBox2->setText( QString::null ); - TextLabel1->setText( tr( "TL1" ) ); - PushButton3->setText( QString::null ); + TextLabel6->setText( tr( "TL6" ) ); + PushButton1->setText( QString::null ); + CheckBox1->setText( QString::null ); TextLabel5->setText( tr( "TL5" ) ); + TextLabel1->setText( tr( "TL1" ) ); TextLabel4->setText( tr( "TL4" ) ); + CheckBox2->setText( QString::null ); + PushButton3->setText( QString::null ); } diff --git a/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.h b/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.h index f04ad90af..a05f7fa09 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.h +++ b/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.h @@ -1,7 +1,7 @@ /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_3Sel3Spin2Check_QTD.ui' ** -** Created: Tue Feb 12 16:21:38 2008 +** Created: Wed Mar 12 11:57:09 2008 ** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! @@ -18,11 +18,11 @@ class QHBoxLayout; class QGridLayout; class QSpacerItem; class QGroupBox; -class QPushButton; class QLabel; -class QCheckBox; class QSpinBox; class QLineEdit; +class QPushButton; +class QCheckBox; class DlgRef_3Sel3Spin2Check_QTD : public QWidget { @@ -33,27 +33,27 @@ public: ~DlgRef_3Sel3Spin2Check_QTD(); QGroupBox* GroupBox1; - QPushButton* PushButton1; + QLabel* TextLabel2; + QSpinBox* SpinBox_3; QLabel* TextLabel3; - QCheckBox* CheckBox1; + QLineEdit* LineEdit2; + QPushButton* PushButton2; QLabel* TextLabel6; + QPushButton* PushButton1; + QCheckBox* CheckBox1; QSpinBox* SpinBox_2; - QLineEdit* LineEdit2; + QLabel* TextLabel5; + QLabel* TextLabel1; + QLabel* TextLabel4; + QCheckBox* CheckBox2; QLineEdit* LineEdit1; QLineEdit* LineEdit3; - QPushButton* PushButton2; - QLabel* TextLabel2; - QCheckBox* CheckBox2; - QLabel* TextLabel1; QPushButton* PushButton3; - QLabel* TextLabel5; QSpinBox* SpinBox_1; - QSpinBox* SpinBox_3; - QLabel* TextLabel4; protected: QVBoxLayout* DlgRef_3Sel3Spin2Check_QTDLayout; - QHBoxLayout* GroupBox1Layout; + QGridLayout* GroupBox1Layout; QGridLayout* layout1; QSpacerItem* Spacer3; diff --git a/src/DlgRef/UIFiles/DlgRef_3Sel3Spin2Check_QTD.ui b/src/DlgRef/UIFiles/DlgRef_3Sel3Spin2Check_QTD.ui index 55c0b280c..5e26eb510 100644 --- a/src/DlgRef/UIFiles/DlgRef_3Sel3Spin2Check_QTD.ui +++ b/src/DlgRef/UIFiles/DlgRef_3Sel3Spin2Check_QTD.ui @@ -8,8 +8,8 @@ 0 0 - 338 - 274 + 263 + 254 @@ -48,7 +48,7 @@ - + unnamed @@ -58,7 +58,7 @@ 6 - + layout1 @@ -66,38 +66,34 @@ unnamed - + - Spacer3 - - - Vertical + TextLabel2 - - Expanding + + + 0 + 0 + 0 + 0 + - - - 20 - 130 - + + TL2 - - + + - PushButton1 + SpinBox_3 - 0 + 7 0 0 0 - - - @@ -115,9 +111,22 @@ TL3 - + - CheckBox1 + LineEdit2 + + + + + PushButton2 + + + + 0 + 0 + 0 + 0 + @@ -139,53 +148,46 @@ TL6 - + - SpinBox_2 + PushButton1 - 7 + 0 0 0 0 - - - - LineEdit2 + + - + - LineEdit1 + CheckBox1 - - - - LineEdit3 + + - + - PushButton2 + SpinBox_2 - 0 + 7 0 0 0 - - - - + - TextLabel2 + TextLabel5 @@ -196,15 +198,7 @@ - TL2 - - - - - CheckBox2 - - - + TL5 @@ -223,9 +217,9 @@ TL1 - + - PushButton3 + TextLabel4 @@ -236,70 +230,76 @@ - + TL4 - + - TextLabel5 - - - - 0 - 0 - 0 - 0 - + CheckBox2 - TL5 + - + - SpinBox_1 + LineEdit1 - - - 7 - 0 - 0 - 0 - + + + + Spacer3 + + + Vertical + + + Expanding + + + + 20 + 20 + + + + + + LineEdit3 - + - SpinBox_3 + PushButton3 - 7 + 0 0 0 0 + + + - + - TextLabel4 + SpinBox_1 - 0 + 7 0 0 0 - - TL4 - - + @@ -314,6 +314,7 @@ SpinBox_2 SpinBox_3 CheckBox1 + CheckBox2