mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-28 18:30:35 +05:00
Fix of IPAL19560 (Qt4 porting: Colors/Size - problems in "Preferences - Set Color" dialog).
This commit is contained in:
parent
cb9918baac
commit
14f66eecc8
@ -32,6 +32,7 @@
|
|||||||
// SALOME GUI includes
|
// SALOME GUI includes
|
||||||
#include <SUIT_Desktop.h>
|
#include <SUIT_Desktop.h>
|
||||||
#include <QtxColorButton.h>
|
#include <QtxColorButton.h>
|
||||||
|
#include <QtxIntSpinBox.h>
|
||||||
|
|
||||||
// Qt includes
|
// Qt includes
|
||||||
#include <QGroupBox>
|
#include <QGroupBox>
|
||||||
@ -88,7 +89,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
|
|||||||
SpinBox_Width->setButtonSymbols( QSpinBox::PlusMinus );
|
SpinBox_Width->setButtonSymbols( QSpinBox::PlusMinus );
|
||||||
|
|
||||||
QLabel* TextLabel_ShrinkCoeff = new QLabel( tr( "Shrink coef." ), ButtonGroup1 );
|
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->setRange( 20, 100 );
|
||||||
SpinBox_Shrink->setSingleStep( 1 );
|
SpinBox_Shrink->setSingleStep( 1 );
|
||||||
SpinBox_Shrink->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
|
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( TextLabel_Fill, 0, 0 );
|
||||||
ButtonGroup1Layout->addWidget( btnFillColor, 0, 1 );
|
ButtonGroup1Layout->addWidget( btnFillColor, 0, 1 );
|
||||||
ButtonGroup1Layout->addWidget( TextLabel_BackFace, 1, 0 );
|
ButtonGroup1Layout->addWidget( TextLabel_BackFace, 0, 2 );
|
||||||
ButtonGroup1Layout->addWidget( btnBackFaceColor, 1, 1 );
|
ButtonGroup1Layout->addWidget( btnBackFaceColor, 0, 3 );
|
||||||
ButtonGroup1Layout->addWidget( TextLabel_Outine, 2, 0 );
|
ButtonGroup1Layout->addWidget( TextLabel_Outine, 1, 0 );
|
||||||
ButtonGroup1Layout->addWidget( btnOutlineColor, 2, 1 );
|
ButtonGroup1Layout->addWidget( btnOutlineColor, 1, 1 );
|
||||||
ButtonGroup1Layout->addWidget( TextLabel_Width, 0, 2 );
|
ButtonGroup1Layout->addWidget( TextLabel_Width, 1, 2 );
|
||||||
ButtonGroup1Layout->addWidget( SpinBox_Width, 0, 3 );
|
ButtonGroup1Layout->addWidget( SpinBox_Width, 1, 3 );
|
||||||
ButtonGroup1Layout->addWidget( TextLabel_ShrinkCoeff, 1, 2 );
|
ButtonGroup1Layout->addWidget( TextLabel_ShrinkCoeff, 2, 0 );
|
||||||
ButtonGroup1Layout->addWidget( SpinBox_Shrink, 1, 3 );
|
ButtonGroup1Layout->addWidget( SpinBox_Shrink, 2, 1, 1, 3 );
|
||||||
|
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
QGroupBox* ButtonGroup2 = new QGroupBox( tr( "Nodes" ), this );
|
QGroupBox* ButtonGroup2 = new QGroupBox( tr( "Nodes" ), this );
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
|
|
||||||
class QSpinBox;
|
class QSpinBox;
|
||||||
class SMESHGUI;
|
class SMESHGUI;
|
||||||
|
class QtxIntSpinBox;
|
||||||
class QtxColorButton;
|
class QtxColorButton;
|
||||||
|
|
||||||
class SMESHGUI_EXPORT SMESHGUI_Preferences_ColorDlg : public QDialog
|
class SMESHGUI_EXPORT SMESHGUI_Preferences_ColorDlg : public QDialog
|
||||||
@ -65,7 +66,7 @@ private:
|
|||||||
QtxColorButton* btnBackFaceColor;
|
QtxColorButton* btnBackFaceColor;
|
||||||
QtxColorButton* btnOutlineColor;
|
QtxColorButton* btnOutlineColor;
|
||||||
QSpinBox* SpinBox_Width;
|
QSpinBox* SpinBox_Width;
|
||||||
QSpinBox* SpinBox_Shrink;
|
QtxIntSpinBox* SpinBox_Shrink;
|
||||||
QtxColorButton* btnNodeColor;
|
QtxColorButton* btnNodeColor;
|
||||||
QSpinBox* SpinBox_Nodes_Size;
|
QSpinBox* SpinBox_Nodes_Size;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user