From 14f66eecc8123b6f1ace08ba40b1e7059cc9f7af Mon Sep 17 00:00:00 2001 From: akl Date: Fri, 25 Apr 2008 11:31:43 +0000 Subject: [PATCH] Fix of IPAL19560 (Qt4 porting: Colors/Size - problems in "Preferences - Set Color" dialog). --- .../SMESHGUI_Preferences_ColorDlg.cxx | 19 ++++++++++--------- src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h | 3 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx index 63a5fc1dd..3263368db 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx @@ -32,6 +32,7 @@ // SALOME GUI includes #include #include +#include // Qt includes #include @@ -88,7 +89,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul SpinBox_Width->setButtonSymbols( QSpinBox::PlusMinus ); QLabel* TextLabel_ShrinkCoeff = new QLabel( tr( "Shrink coef." ), ButtonGroup1 ); - SpinBox_Shrink = new QSpinBox( ButtonGroup1 ); + SpinBox_Shrink = new QtxIntSpinBox( ButtonGroup1 ); SpinBox_Shrink->setRange( 20, 100 ); SpinBox_Shrink->setSingleStep( 1 ); SpinBox_Shrink->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); @@ -96,14 +97,14 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul ButtonGroup1Layout->addWidget( TextLabel_Fill, 0, 0 ); ButtonGroup1Layout->addWidget( btnFillColor, 0, 1 ); - ButtonGroup1Layout->addWidget( TextLabel_BackFace, 1, 0 ); - ButtonGroup1Layout->addWidget( btnBackFaceColor, 1, 1 ); - ButtonGroup1Layout->addWidget( TextLabel_Outine, 2, 0 ); - ButtonGroup1Layout->addWidget( btnOutlineColor, 2, 1 ); - ButtonGroup1Layout->addWidget( TextLabel_Width, 0, 2 ); - ButtonGroup1Layout->addWidget( SpinBox_Width, 0, 3 ); - ButtonGroup1Layout->addWidget( TextLabel_ShrinkCoeff, 1, 2 ); - ButtonGroup1Layout->addWidget( SpinBox_Shrink, 1, 3 ); + ButtonGroup1Layout->addWidget( TextLabel_BackFace, 0, 2 ); + ButtonGroup1Layout->addWidget( btnBackFaceColor, 0, 3 ); + ButtonGroup1Layout->addWidget( TextLabel_Outine, 1, 0 ); + ButtonGroup1Layout->addWidget( btnOutlineColor, 1, 1 ); + ButtonGroup1Layout->addWidget( TextLabel_Width, 1, 2 ); + ButtonGroup1Layout->addWidget( SpinBox_Width, 1, 3 ); + ButtonGroup1Layout->addWidget( TextLabel_ShrinkCoeff, 2, 0 ); + ButtonGroup1Layout->addWidget( SpinBox_Shrink, 2, 1, 1, 3 ); // ------------------------------- QGroupBox* ButtonGroup2 = new QGroupBox( tr( "Nodes" ), this ); diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h index d37092a4d..7cba88049 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h +++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.h @@ -34,6 +34,7 @@ class QSpinBox; class SMESHGUI; +class QtxIntSpinBox; class QtxColorButton; class SMESHGUI_EXPORT SMESHGUI_Preferences_ColorDlg : public QDialog @@ -65,7 +66,7 @@ private: QtxColorButton* btnBackFaceColor; QtxColorButton* btnOutlineColor; QSpinBox* SpinBox_Width; - QSpinBox* SpinBox_Shrink; + QtxIntSpinBox* SpinBox_Shrink; QtxColorButton* btnNodeColor; QSpinBox* SpinBox_Nodes_Size; }; -- 2.30.2