X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Preferences_ColorDlg.cxx;h=efd681fef1ef48461d4b9f75801f908dd88b1009;hb=a3a6c690baad8a568546cceff02dad9af440e9ca;hp=b1ad47d13f9f0e36c8e9ff9d14adc2f9d59c38a3;hpb=58a5f9cfd1440a25d9a647d79797a1aa232be958;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx index b1ad47d13..efd681fef 100644 --- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -66,7 +66,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul mySMESHGUI( theModule ) { setModal( true ); - setWindowTitle( tr( "Preferences - Set Color" ) ); + setWindowTitle( tr( "DIALOG_TITLE" ) ); setSizeGripEnabled( true ); // ------------------------------- @@ -75,26 +75,26 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul topLayout->setMargin( MARGIN ); // ------------------------------- - QGroupBox* ButtonGroup1 = new QGroupBox( tr( "Elements" ), this ); + QGroupBox* ButtonGroup1 = new QGroupBox( tr( "GRP_ELEMENTS" ), this ); QGridLayout* ButtonGroup1Layout = new QGridLayout( ButtonGroup1 ); ButtonGroup1Layout->setSpacing( SPACING ); ButtonGroup1Layout->setMargin( MARGIN ); - QLabel* TextLabel_Fill = new QLabel( tr( "Surface color" ), ButtonGroup1 ); + QLabel* TextLabel_Fill = new QLabel( tr( "SURFACE_COLOR_LBL" ), ButtonGroup1 ); toolSurfColor = new QtxBiColorTool(ButtonGroup1); - toolSurfColor->setText("Back surface color"); + toolSurfColor->setText( tr( "BACKSURFACE_COLOR_LBL" )); - QLabel* TextLabel_Outline = new QLabel( tr( "Outline color" ), ButtonGroup1 ); + QLabel* TextLabel_Outline = new QLabel( tr( "OUTLINE_COLOR_LBL" ), ButtonGroup1 ); btnOutlineColor = new QtxColorButton( ButtonGroup1 ); - QLabel* TextLabel_Wireframe = new QLabel( tr( "Wireframe color" ), ButtonGroup1 ); + QLabel* TextLabel_Wireframe = new QLabel( tr( "WIREFRAME_COLOR_LBL" ), ButtonGroup1 ); btnWireframeColor = new QtxColorButton( ButtonGroup1 ); - QLabel* TextLabel_0DElements_Color = new QLabel( tr( "0D elements" ), ButtonGroup1 ); + QLabel* TextLabel_0DElements_Color = new QLabel( tr( "0D_ELEMENTS_COLOR_LBL" ), ButtonGroup1 ); btn0DElementsColor = new QtxColorButton( ButtonGroup1 ); - QLabel* TextLabel_0DElements_Size = new QLabel( tr( "Size of 0D elements" ), ButtonGroup1 ); + QLabel* TextLabel_0DElements_Size = new QLabel( tr( "0D_ELEMENTS_SIZE_LBL" ), ButtonGroup1 ); SpinBox_0DElements_Size = new SalomeApp_IntSpinBox( ButtonGroup1 ); SpinBox_0DElements_Size->setAcceptNames( false ); // No Notebook variables allowed SpinBox_0DElements_Size->setRange( 1, 10 ); @@ -102,7 +102,18 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul SpinBox_0DElements_Size->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); SpinBox_0DElements_Size->setButtonSymbols( QSpinBox::PlusMinus ); - QLabel* TextLabel_Width = new QLabel( tr( "Width" ), ButtonGroup1 ); + QLabel* TextLabel_BallElem_Color = new QLabel( tr( "BALL_ELEMENTS_COLOR_LBL" ), ButtonGroup1 ); + btnBallElemColor = new QtxColorButton( ButtonGroup1 ); + + QLabel* TextLabel_BallElem_Size = new QLabel( tr( "BALL_ELEMENTS_SIZE_LBL" ), ButtonGroup1 ); + SpinBox_BallElem_Size = new SalomeApp_IntSpinBox( ButtonGroup1 ); + SpinBox_BallElem_Size->setAcceptNames( false ); // No Notebook variables allowed + SpinBox_BallElem_Size->setRange( 1, 10 ); + SpinBox_BallElem_Size->setSingleStep( 1 ); + SpinBox_BallElem_Size->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); + SpinBox_BallElem_Size->setButtonSymbols( QSpinBox::PlusMinus ); + + QLabel* TextLabel_Width = new QLabel( tr( "LINE_WIDTH_LBL" ), ButtonGroup1 ); SpinBox_Width = new SalomeApp_IntSpinBox( ButtonGroup1 ); SpinBox_Width->setAcceptNames( false ); // No Notebook variables allowed SpinBox_Width->setRange( 1, 5 ); @@ -110,7 +121,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul SpinBox_Width->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); SpinBox_Width->setButtonSymbols( QSpinBox::PlusMinus ); - QLabel* TextLabel_ShrinkCoeff = new QLabel( tr( "Shrink coef." ), ButtonGroup1 ); + QLabel* TextLabel_ShrinkCoeff = new QLabel( tr( "SHRINK_COEF_LBL" ), ButtonGroup1 ); SpinBox_Shrink = new SalomeApp_IntSpinBox( ButtonGroup1 ); SpinBox_Shrink->setAcceptNames( false ); // No Notebook variables allowed SpinBox_Shrink->setRange( 20, 100 ); @@ -118,35 +129,42 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul SpinBox_Shrink->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); SpinBox_Shrink->setButtonSymbols( QSpinBox::PlusMinus ); - ButtonGroup1Layout->addWidget( TextLabel_Fill, 0, 0 ); - ButtonGroup1Layout->addWidget( toolSurfColor, 0, 1, 1, 3 ); + int row = 0; + ButtonGroup1Layout->addWidget( TextLabel_Fill, row, 0 ); + ButtonGroup1Layout->addWidget( toolSurfColor, row++, 1, 1, 3 ); + + ButtonGroup1Layout->addWidget( TextLabel_Outline, row, 0 ); + ButtonGroup1Layout->addWidget( btnOutlineColor, row, 1 ); + ButtonGroup1Layout->addWidget( TextLabel_Wireframe, row, 2 ); + ButtonGroup1Layout->addWidget( btnWireframeColor, row++, 3 ); + + ButtonGroup1Layout->addWidget( TextLabel_0DElements_Color, row, 0 ); + ButtonGroup1Layout->addWidget( btn0DElementsColor, row, 1 ); - ButtonGroup1Layout->addWidget( TextLabel_Outline, 1, 0 ); - ButtonGroup1Layout->addWidget( btnOutlineColor, 1, 1 ); - ButtonGroup1Layout->addWidget( TextLabel_Wireframe, 1, 2 ); - ButtonGroup1Layout->addWidget( btnWireframeColor, 1, 3 ); + ButtonGroup1Layout->addWidget( TextLabel_0DElements_Size, row, 2 ); + ButtonGroup1Layout->addWidget( SpinBox_0DElements_Size, row++, 3 ); - ButtonGroup1Layout->addWidget( TextLabel_0DElements_Color, 2, 0 ); - ButtonGroup1Layout->addWidget( btn0DElementsColor, 2, 1 ); + ButtonGroup1Layout->addWidget( TextLabel_BallElem_Color, row, 0 ); + ButtonGroup1Layout->addWidget( btnBallElemColor, row, 1 ); - ButtonGroup1Layout->addWidget( TextLabel_0DElements_Size, 2, 2 ); - ButtonGroup1Layout->addWidget( SpinBox_0DElements_Size, 2, 3 ); + ButtonGroup1Layout->addWidget( TextLabel_BallElem_Size, row, 2 ); + ButtonGroup1Layout->addWidget( SpinBox_BallElem_Size, row++, 3 ); - ButtonGroup1Layout->addWidget( TextLabel_Width, 3, 0 ); - ButtonGroup1Layout->addWidget( SpinBox_Width, 3, 1 ); - ButtonGroup1Layout->addWidget( TextLabel_ShrinkCoeff, 3, 2 ); - ButtonGroup1Layout->addWidget( SpinBox_Shrink, 3, 3 ); + ButtonGroup1Layout->addWidget( TextLabel_Width, row, 0 ); + ButtonGroup1Layout->addWidget( SpinBox_Width, row, 1 ); + ButtonGroup1Layout->addWidget( TextLabel_ShrinkCoeff, row, 2 ); + ButtonGroup1Layout->addWidget( SpinBox_Shrink, row, 3 ); // ------------------------------- - QGroupBox* ButtonGroup2 = new QGroupBox( tr( "Nodes" ), this ); + QGroupBox* ButtonGroup2 = new QGroupBox( tr( "GRP_NODES" ), this ); QGridLayout* ButtonGroup2Layout = new QGridLayout( ButtonGroup2 ); ButtonGroup2Layout->setSpacing( SPACING ); ButtonGroup2Layout->setMargin( MARGIN ); - QLabel* TextLabel_Nodes_Color = new QLabel( tr( "Color" ), ButtonGroup2 ); + QLabel* TextLabel_Nodes_Color = new QLabel( tr( "NODES_COLOR_LBL" ), ButtonGroup2 ); btnNodeColor = new QtxColorButton( ButtonGroup2 ); - QGroupBox* MarkerGroup = new QGroupBox( tr( "Marker" ), ButtonGroup2 ); + QGroupBox* MarkerGroup = new QGroupBox( tr( "NODES_MARKER_LBL" ), ButtonGroup2 ); QVBoxLayout* MarkerGroupLayout = new QVBoxLayout( MarkerGroup ); MarkerGroupLayout->setSpacing( 0 ); MarkerGroupLayout->setMargin( 0 ); @@ -155,51 +173,54 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul MarkerGroupLayout->addWidget( MarkerWidget ); - ButtonGroup2Layout->addWidget( TextLabel_Nodes_Color, 0, 0 ); - ButtonGroup2Layout->addWidget( btnNodeColor, 0, 1 ); - ButtonGroup2Layout->addWidget( MarkerGroup, 1, 0, 1, 3 ); - ButtonGroup2Layout->setColumnStretch( 2, 1 ); + row = 0; + ButtonGroup2Layout->addWidget( TextLabel_Nodes_Color, row, 0 ); + ButtonGroup2Layout->addWidget( btnNodeColor, row++, 1 ); + ButtonGroup2Layout->addWidget( MarkerGroup, row++, 0, 1, 3 ); + ButtonGroup2Layout->setColumnStretch( row, 1 ); // ------------------------------- - QGroupBox* ButtonGroup3 = new QGroupBox( tr( "Orientation of faces" ), this ); + QGroupBox* ButtonGroup3 = new QGroupBox( tr( "GRP_ORIENTATION" ), this ); QGridLayout* ButtonGroup3Layout = new QGridLayout( ButtonGroup3 ); ButtonGroup3Layout->setSpacing( SPACING ); ButtonGroup3Layout->setMargin( MARGIN ); - QLabel* TextLabel_Orientation_Color = new QLabel( tr( "Color" ), ButtonGroup3 ); + QLabel* TextLabel_Orientation_Color = new QLabel( tr( "ORIENTATION_COLOR_LBL" ), ButtonGroup3 ); btnOrientationColor = new QtxColorButton( ButtonGroup3 ); - QLabel* TextLabel_Orientation_Scale = new QLabel( tr( "Scale" ), ButtonGroup3 ); + QLabel* TextLabel_Orientation_Scale = new QLabel( tr( "ORIENTATION_SCALE_LBL" ), ButtonGroup3 ); SpinBox_Orientation_Scale = new SMESHGUI_SpinBox( ButtonGroup3 ); SpinBox_Orientation_Scale->setAcceptNames( false ); // No Notebook variables allowed SpinBox_Orientation_Scale->RangeStepAndValidator( .05, .5, .05, "parametric_precision" ); SpinBox_Orientation_Scale->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); SpinBox_Orientation_Scale->setButtonSymbols( QSpinBox::PlusMinus ); - CheckBox_Orientation_3DVectors = new QCheckBox( tr( "3D vectors" ), ButtonGroup3 ); + CheckBox_Orientation_3DVectors = new QCheckBox( tr( "3D_VECTORS_LBL" ), ButtonGroup3 ); - ButtonGroup3Layout->addWidget( TextLabel_Orientation_Color, 0, 0 ); - ButtonGroup3Layout->addWidget( btnOrientationColor, 0, 1 ); - ButtonGroup3Layout->addWidget( TextLabel_Orientation_Scale, 0, 2 ); - ButtonGroup3Layout->addWidget( SpinBox_Orientation_Scale, 0, 3 ); - ButtonGroup3Layout->addWidget( CheckBox_Orientation_3DVectors, 1, 0, 1, 4 ); + row = 0; + ButtonGroup3Layout->addWidget( TextLabel_Orientation_Color, row, 0 ); + ButtonGroup3Layout->addWidget( btnOrientationColor, row, 1 ); + ButtonGroup3Layout->addWidget( TextLabel_Orientation_Scale, row, 2 ); + ButtonGroup3Layout->addWidget( SpinBox_Orientation_Scale, row++, 3 ); + ButtonGroup3Layout->addWidget( CheckBox_Orientation_3DVectors, row, 0, 1, 4 ); // ------------------------------- - QGroupBox* ButtonGroup4 = new QGroupBox( tr( "Selection" ), this ); + QGroupBox* ButtonGroup4 = new QGroupBox( tr( "GRP_SELECTION" ), this ); QGridLayout* ButtonGroup4Layout = new QGridLayout( ButtonGroup4 ); ButtonGroup3Layout->setSpacing( SPACING ); ButtonGroup3Layout->setMargin( MARGIN ); - QLabel* TextLabel_Selection_Color = new QLabel( tr( "Selection color" ), ButtonGroup4 ); + QLabel* TextLabel_Selection_Color = new QLabel( tr( "SELECTION_COLOR_LBL" ), ButtonGroup4 ); btnSelectionColor = new QtxColorButton( ButtonGroup4 ); - QLabel* TextLabel_Preselection_Color = new QLabel( tr( "Pre-selection color" ), ButtonGroup4 ); + QLabel* TextLabel_Preselection_Color = new QLabel( tr( "PRESELECTION_COLOR_LBL" ), ButtonGroup4 ); btnPreselectionColor = new QtxColorButton( ButtonGroup4 ); - ButtonGroup4Layout->addWidget( TextLabel_Selection_Color, 0, 0 ); - ButtonGroup4Layout->addWidget( btnSelectionColor, 0, 1 ); - ButtonGroup4Layout->addWidget( TextLabel_Preselection_Color, 0, 2 ); - ButtonGroup4Layout->addWidget( btnPreselectionColor, 0, 3 ); + row = 0; + ButtonGroup4Layout->addWidget( TextLabel_Selection_Color, row, 0 ); + ButtonGroup4Layout->addWidget( btnSelectionColor, row, 1 ); + ButtonGroup4Layout->addWidget( TextLabel_Preselection_Color, row, 2 ); + ButtonGroup4Layout->addWidget( btnPreselectionColor, row, 3 ); // ------------------------------- QGroupBox* GroupButtons = new QGroupBox( this ); @@ -207,14 +228,14 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul GroupButtonsLayout->setSpacing( SPACING ); GroupButtonsLayout->setMargin( MARGIN ); - QPushButton* buttonOk = new QPushButton( tr( "&OK" ), GroupButtons ); + QPushButton* buttonOk = new QPushButton( tr( "SMESH_BUT_OK" ), GroupButtons ); buttonOk->setAutoDefault( true ); buttonOk->setDefault( true ); - QPushButton* buttonCancel = new QPushButton( tr( "&Cancel" ), GroupButtons ); + QPushButton* buttonCancel = new QPushButton( tr( "SMESH_BUT_CANCEL" ), GroupButtons ); buttonCancel->setAutoDefault( true ); - QPushButton* buttonHelp = new QPushButton( tr( "&Help" ), GroupButtons ); + QPushButton* buttonHelp = new QPushButton( tr( "SMESH_BUT_HELP" ), GroupButtons ); buttonHelp->setAutoDefault( true ); GroupButtonsLayout->addWidget( buttonOk ); @@ -340,9 +361,10 @@ void SMESHGUI_Preferences_ColorDlg::SetColor( int type, const QColor& color ) case 3 : btnNodeColor->setColor( color ); break; // node case 4 : btnOutlineColor->setColor( color ); break; // outline case 5 : btn0DElementsColor->setColor( color ); break; // 0d elements - case 6 : btnOrientationColor->setColor( color ); break; // orientation of faces - case 7 : btnSelectionColor->setColor( color ); break; // selection color - case 8 : btnPreselectionColor->setColor( color ); break; // pre-selection color + case 6 : btnBallElemColor->setColor( color ); break; // ball elements + case 7 : btnOrientationColor->setColor( color ); break; // orientation of faces + case 8 : btnSelectionColor->setColor( color ); break; // selection color + case 9 : btnPreselectionColor->setColor( color ); break; // pre-selection color default: break; } } @@ -360,9 +382,10 @@ QColor SMESHGUI_Preferences_ColorDlg::GetColor( int type ) case 3 : color = btnNodeColor->color(); break; // node case 4 : color = btnOutlineColor->color(); break; // node case 5 : color = btn0DElementsColor->color(); break; // 0d elements - case 6 : color = btnOrientationColor->color(); break; // orientation of faces - case 7 : color = btnSelectionColor->color(); break; // selection color - case 8 : color = btnPreselectionColor->color(); break; // pre-selection color + case 6 : color = btnBallElemColor->color(); break; // 0d elements + case 7 : color = btnOrientationColor->color(); break; // orientation of faces + case 8 : color = btnSelectionColor->color(); break; // selection color + case 9 : color = btnPreselectionColor->color(); break; // pre-selection color default: break; } @@ -379,6 +402,7 @@ void SMESHGUI_Preferences_ColorDlg::SetIntValue( int type, int value ) case 1 : SpinBox_Width->setValue( value ); break; // width case 2 : SpinBox_Shrink->setValue( value ); break; // shrink coeff case 3 : SpinBox_0DElements_Size->setValue( value ); break; // 0d elements + case 4 : SpinBox_BallElem_Size->setValue( value ); break; // 0d elements default: break; } } @@ -394,6 +418,7 @@ int SMESHGUI_Preferences_ColorDlg::GetIntValue( int type ) case 1 : res = SpinBox_Width->value(); break; // width case 2 : res = SpinBox_Shrink->value(); break; // shrink coeff case 3 : res = SpinBox_0DElements_Size->value(); break; // 0d elements + case 4 : res = SpinBox_BallElem_Size->value(); break; // 0d elements default: break; } return res;