ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-30 19:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

NPAL13898 Ok Apply Close laborious for User...

Browse Source
This commit is contained in:
dmv 2008-03-14 14:06:36 +00:00
parent af9ba5c340
commit f3e94fb681
32 changed files with 133 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
View File

@ -332,18 +332,18 @@ SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theModule,
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
buttonHelp = new QPushButton(GroupButtons, "buttonHelp"); buttonHelp = new QPushButton(GroupButtons, "buttonHelp");
buttonHelp->setText(tr("SMESH_BUT_HELP" )); buttonHelp->setText(tr("SMESH_BUT_HELP" ));
buttonHelp->setAutoDefault(TRUE); buttonHelp->setAutoDefault(TRUE);

10
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
View File

@ -448,17 +448,17 @@ SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theM
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
aGroupButtonsLayout->addWidget(buttonCancel, 0, 3); aGroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
aGroupButtonsLayout->addWidget(buttonApply, 0, 1); aGroupButtonsLayout->addWidget(buttonApply, 0, 0);
aGroupButtonsLayout->addItem( new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 2); aGroupButtonsLayout->addItem( new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
aGroupButtonsLayout->addWidget(buttonOk, 0, 0); aGroupButtonsLayout->addWidget(buttonOk, 0, 2);
buttonHelp = new QPushButton(GroupButtons, "buttonHelp"); buttonHelp = new QPushButton(GroupButtons, "buttonHelp");
buttonHelp->setText(tr("SMESH_BUT_HELP" )); buttonHelp->setText(tr("SMESH_BUT_HELP" ));
buttonHelp->setAutoDefault(TRUE); buttonHelp->setAutoDefault(TRUE);

10
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
View File

@ -186,18 +186,18 @@ SMESHGUI_BuildCompoundDlg::SMESHGUI_BuildCompoundDlg( SMESHGUI* theModule)
buttonCancel = new QPushButton (GroupButtons, "buttonCancel"); buttonCancel = new QPushButton (GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton (GroupButtons, "buttonApply"); buttonApply = new QPushButton (GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem (20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem (20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton (GroupButtons, "buttonOk"); buttonOk = new QPushButton (GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_BuildCompoundDlgLayout->addWidget(GroupButtons, 3, 0); SMESHGUI_BuildCompoundDlgLayout->addWidget(GroupButtons, 3, 0);
myHelpFileName = "building_compounds_page.html"; myHelpFileName = "building_compounds_page.html";

10
src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
View File

@ -314,18 +314,18 @@ SMESHGUI_ClippingDlg::SMESHGUI_ClippingDlg (SMESHGUI* theModule,
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
buttonHelp = new QPushButton(GroupButtons, "buttonHelp"); buttonHelp = new QPushButton(GroupButtons, "buttonHelp");
buttonHelp->setText(tr("SMESH_BUT_HELP" )); buttonHelp->setText(tr("SMESH_BUT_HELP" ));
buttonHelp->setAutoDefault(TRUE); buttonHelp->setAutoDefault(TRUE);

10
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
View File

@ -241,18 +241,18 @@ SMESHGUI_CreatePolyhedralVolumeDlg::SMESHGUI_CreatePolyhedralVolumeDlg( SMESHGUI
buttonCancel = new QPushButton( GroupButtons, "cancel" ); buttonCancel = new QPushButton( GroupButtons, "cancel" );
buttonCancel->setText( tr( "SMESH_BUT_CLOSE" ) ); buttonCancel->setText( tr( "SMESH_BUT_CLOSE" ) );
buttonCancel->setAutoDefault( TRUE ); buttonCancel->setAutoDefault( TRUE );
GroupButtonsLayout->addWidget( buttonCancel, 0, 3 ); GroupButtonsLayout->addWidget( buttonCancel, 0, 1 );
buttonApply = new QPushButton( GroupButtons, "apply" ); buttonApply = new QPushButton( GroupButtons, "apply" );
buttonApply->setText( tr( "SMESH_BUT_APPLY" ) ); buttonApply->setText( tr( "SMESH_BUT_APPLY" ) );
buttonApply->setAutoDefault( TRUE ); buttonApply->setAutoDefault( TRUE );
GroupButtonsLayout->addWidget( buttonApply, 0, 1 ); GroupButtonsLayout->addWidget( buttonApply, 0, 0 );
QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
GroupButtonsLayout->addItem( spacer_9, 0, 2 ); GroupButtonsLayout->addItem( spacer_9, 0, 3 );
buttonOk = new QPushButton( GroupButtons, "ok" ); buttonOk = new QPushButton( GroupButtons, "ok" );
buttonOk->setText( tr( "SMESH_BUT_OK" ) ); buttonOk->setText( tr( "SMESH_BUT_APPLY_AND_CLOSE" ) );
buttonOk->setAutoDefault( TRUE ); buttonOk->setAutoDefault( TRUE );
buttonOk->setDefault( TRUE ); buttonOk->setDefault( TRUE );
GroupButtonsLayout->addWidget( buttonOk, 0, 0 ); GroupButtonsLayout->addWidget( buttonOk, 0, 2 );
buttonHelp = new QPushButton(GroupButtons, "buttonHelp"); buttonHelp = new QPushButton(GroupButtons, "buttonHelp");
buttonHelp->setText(tr("SMESH_BUT_HELP" )); buttonHelp->setText(tr("SMESH_BUT_HELP" ));
buttonHelp->setAutoDefault(TRUE); buttonHelp->setAutoDefault(TRUE);

6
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
View File

@ -124,7 +124,7 @@ QFrame* SMESHGUI_DeleteGroupDlg::createButtonFrame (QWidget* theParent)
QFrame* aFrame = new QFrame(theParent); QFrame* aFrame = new QFrame(theParent);
aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken);
myOkBtn = new QPushButton(tr("SMESH_BUT_OK" ), aFrame); myOkBtn = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE"), aFrame);
myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame); myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame);
myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame); myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame);
myHelpBtn = new QPushButton(tr("SMESH_BUT_HELP"), aFrame); myHelpBtn = new QPushButton(tr("SMESH_BUT_HELP"), aFrame);
@ -133,10 +133,10 @@ QFrame* SMESHGUI_DeleteGroupDlg::createButtonFrame (QWidget* theParent)
QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING); QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING);
aLay->addWidget(myOkBtn);
aLay->addWidget(myApplyBtn); aLay->addWidget(myApplyBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myCloseBtn); aLay->addWidget(myCloseBtn);
aLay->addWidget(myOkBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myHelpBtn); aLay->addWidget(myHelpBtn);
// connect signals and slots // connect signals and slots

1
src/SMESHGUI/SMESHGUI_Dialog.cxx
View File

@ -43,6 +43,7 @@ SMESHGUI_Dialog::SMESHGUI_Dialog( QWidget* parent, const bool modal,
typeName( pr + MESH ) = tr( "DLG_MESH" ); typeName( pr + MESH ) = tr( "DLG_MESH" );
typeName( pr + HYPOTHESIS ) = tr( "DLG_HYPO" ); typeName( pr + HYPOTHESIS ) = tr( "DLG_HYPO" );
typeName( pr + ALGORITHM ) = tr( "DLG_ALGO" ); typeName( pr + ALGORITHM ) = tr( "DLG_ALGO" );
setButtonText(1, "A&pply and Close"); //rename OK to Apply and Close
if ( flags & Close ) if ( flags & Close )
setButtonPosition( Right, Close ); setButtonPosition( Right, Close );
} }

10
src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
View File

@ -352,18 +352,18 @@ SMESHGUI_EditMeshDlg::SMESHGUI_EditMeshDlg (SMESHGUI* theModule,
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer3 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer3 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer3, 0, 2); GroupButtonsLayout->addItem(spacer3, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
DlgLayout->addWidget(GroupButtons, 4, 0); DlgLayout->addWidget(GroupButtons, 4, 0);
/***************************************************************/ /***************************************************************/

8
src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
View File

@ -300,7 +300,7 @@ SMESHGUI_ExtrusionAlongPathDlg::SMESHGUI_ExtrusionAlongPathDlg( SMESHGUI* theMod
GroupButtonsLayout->setAlignment(Qt::AlignTop); GroupButtonsLayout->setAlignment(Qt::AlignTop);
GroupButtonsLayout->setSpacing(6); GroupButtonsLayout->setMargin(11); GroupButtonsLayout->setSpacing(6); GroupButtonsLayout->setMargin(11);
OkButton = new QPushButton(tr("SMESH_BUT_OK"), GroupButtons); OkButton = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE"), GroupButtons);
OkButton->setAutoDefault(true); OkButton->setAutoDefault(true);
OkButton->setDefault(true); OkButton->setDefault(true);
@ -314,9 +314,9 @@ SMESHGUI_ExtrusionAlongPathDlg::SMESHGUI_ExtrusionAlongPathDlg( SMESHGUI* theMod
HelpButton->setAutoDefault(true); HelpButton->setAutoDefault(true);
// layouting // layouting
GroupButtonsLayout->addWidget(OkButton, 0, 0); GroupButtonsLayout->addWidget(OkButton, 0, 2);
GroupButtonsLayout->addWidget(ApplyButton, 0, 1); GroupButtonsLayout->addWidget(ApplyButton, 0, 0);
GroupButtonsLayout->addWidget(CloseButton, 0, 3); GroupButtonsLayout->addWidget(CloseButton, 0, 1);
GroupButtonsLayout->addWidget(HelpButton, 0, 4); GroupButtonsLayout->addWidget(HelpButton, 0, 4);
GroupButtonsLayout->addColSpacing(2, 10); GroupButtonsLayout->addColSpacing(2, 10);
GroupButtonsLayout->setColStretch(2, 10); GroupButtonsLayout->setColStretch(2, 10);

10
src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
View File

@ -145,18 +145,18 @@ SMESHGUI_ExtrusionDlg::SMESHGUI_ExtrusionDlg (SMESHGUI* theModule,
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_ExtrusionDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_ExtrusionDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

4
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -1797,13 +1797,13 @@ QFrame* SMESHGUI_FilterDlg::createButtonFrame (QWidget* theParent)
{ {
QGroupBox* aGrp = new QGroupBox(1, Qt::Vertical, theParent); QGroupBox* aGrp = new QGroupBox(1, Qt::Vertical, theParent);
myButtons[ BTN_OK ] = new QPushButton(tr("SMESH_BUT_OK" ), aGrp);
myButtons[ BTN_Apply ] = new QPushButton(tr("SMESH_BUT_APPLY"), aGrp); myButtons[ BTN_Apply ] = new QPushButton(tr("SMESH_BUT_APPLY"), aGrp);
myButtons[ BTN_Cancel ] = new QPushButton(tr("SMESH_BUT_CANCEL"), aGrp);
myButtons[ BTN_OK ] = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE"), aGrp);
QLabel* aLbl = new QLabel(aGrp); QLabel* aLbl = new QLabel(aGrp);
aLbl->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); aLbl->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
myButtons[ BTN_Cancel ] = new QPushButton(tr("SMESH_BUT_CANCEL"), aGrp);
myButtons[ BTN_Close ] = new QPushButton(tr("SMESH_BUT_CLOSE"), aGrp); myButtons[ BTN_Close ] = new QPushButton(tr("SMESH_BUT_CLOSE"), aGrp);
myButtons[ BTN_Help ] = new QPushButton(tr("SMESH_BUT_HELP"), aGrp); myButtons[ BTN_Help ] = new QPushButton(tr("SMESH_BUT_HELP"), aGrp);

6
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
View File

@ -241,14 +241,14 @@ QFrame* SMESHGUI_FilterLibraryDlg::createButtonFrame (QWidget* theParent)
{ {
QGroupBox* aGrp = new QGroupBox(1, Qt::Vertical, theParent); QGroupBox* aGrp = new QGroupBox(1, Qt::Vertical, theParent);
myButtons[ BTN_OK ] = new QPushButton(tr("SMESH_BUT_OK" ), aGrp);
myButtons[ BTN_Apply ] = new QPushButton(tr("SMESH_BUT_APPLY"), aGrp); myButtons[ BTN_Apply ] = new QPushButton(tr("SMESH_BUT_APPLY"), aGrp);
myButtons[ BTN_Cancel ] = new QPushButton(tr("SMESH_BUT_CANCEL"), aGrp);
myButtons[ BTN_OK ] = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE"), aGrp);
QLabel* aLbl = new QLabel(aGrp); QLabel* aLbl = new QLabel(aGrp);
aLbl->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); aLbl->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
myButtons[ BTN_Cancel ] = new QPushButton(tr("SMESH_BUT_CANCEL"), aGrp); myButtons[ BTN_Close ] = new QPushButton(tr("SMESH_BUT_CLOSE"), aGrp);
myButtons[ BTN_Close ] = new QPushButton(tr("SMESH_BUT_CLOSE"), aGrp);
myButtons[ BTN_Help ] = new QPushButton(tr("SMESH_BUT_HELP"), aGrp); myButtons[ BTN_Help ] = new QPushButton(tr("SMESH_BUT_HELP"), aGrp);
connect(myButtons[ BTN_OK ], SIGNAL(clicked()), SLOT(onOk())); connect(myButtons[ BTN_OK ], SIGNAL(clicked()), SLOT(onOk()));

12
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
View File

@ -335,24 +335,24 @@ void SMESHGUI_GroupDlg::initDialog(bool create)
QHBoxLayout* aBtnLayout = new QHBoxLayout(aButtons, 11, 6); QHBoxLayout* aBtnLayout = new QHBoxLayout(aButtons, 11, 6);
aBtnLayout->setAutoAdd(false); aBtnLayout->setAutoAdd(false);
QPushButton* aOKBtn = new QPushButton(aButtons, "ok");
aOKBtn->setText(tr("SMESH_BUT_OK"));
aOKBtn->setAutoDefault(true);
aOKBtn->setDefault(true);
QPushButton* aApplyBtn = new QPushButton(aButtons, "apply"); QPushButton* aApplyBtn = new QPushButton(aButtons, "apply");
aApplyBtn->setText(tr("SMESH_BUT_APPLY")); aApplyBtn->setText(tr("SMESH_BUT_APPLY"));
aApplyBtn->setAutoDefault(true); aApplyBtn->setAutoDefault(true);
QPushButton* aCloseBtn = new QPushButton(aButtons, "close"); QPushButton* aCloseBtn = new QPushButton(aButtons, "close");
aCloseBtn->setText(tr("SMESH_BUT_CLOSE")); aCloseBtn->setText(tr("SMESH_BUT_CLOSE"));
aCloseBtn->setAutoDefault(true); aCloseBtn->setAutoDefault(true);
QPushButton* aOKBtn = new QPushButton(aButtons, "ok");
aOKBtn->setText(tr("SMESH_BUT_APPLY_AND_CLOSE"));
aOKBtn->setAutoDefault(true);
aOKBtn->setDefault(true);
QPushButton* aHelpBtn = new QPushButton(aButtons, "help"); QPushButton* aHelpBtn = new QPushButton(aButtons, "help");
aHelpBtn->setText(tr("SMESH_BUT_HELP")); aHelpBtn->setText(tr("SMESH_BUT_HELP"));
aHelpBtn->setAutoDefault(true); aHelpBtn->setAutoDefault(true);
aBtnLayout->addWidget(aOKBtn);
aBtnLayout->addWidget(aApplyBtn); aBtnLayout->addWidget(aApplyBtn);
aBtnLayout->addStretch();
aBtnLayout->addWidget(aCloseBtn); aBtnLayout->addWidget(aCloseBtn);
aBtnLayout->addWidget(aOKBtn);
aBtnLayout->addStretch();
aBtnLayout->addWidget(aHelpBtn); aBtnLayout->addWidget(aHelpBtn);
/***************************************************************/ /***************************************************************/

6
src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
View File

@ -149,7 +149,7 @@ QFrame* SMESHGUI_GroupOpDlg::createButtonFrame (QWidget* theParent)
QFrame* aFrame = new QFrame(theParent); QFrame* aFrame = new QFrame(theParent);
aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken);
myOkBtn = new QPushButton(tr("SMESH_BUT_OK" ), aFrame); myOkBtn = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE"), aFrame);
myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame); myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame);
myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame); myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame);
myHelpBtn = new QPushButton(tr("SMESH_BUT_HELP"), aFrame); myHelpBtn = new QPushButton(tr("SMESH_BUT_HELP"), aFrame);
@ -158,10 +158,10 @@ QFrame* SMESHGUI_GroupOpDlg::createButtonFrame (QWidget* theParent)
QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING); QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING);
aLay->addWidget(myOkBtn);
aLay->addWidget(myApplyBtn); aLay->addWidget(myApplyBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myCloseBtn); aLay->addWidget(myCloseBtn);
aLay->addWidget(myOkBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myHelpBtn); aLay->addWidget(myHelpBtn);
// connect signals and slots // connect signals and slots

10
src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx
View File

@ -145,18 +145,18 @@ SMESHGUI_MergeNodesDlg::SMESHGUI_MergeNodesDlg( SMESHGUI* theModule, const char*
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_MergeNodesDlgLayout->addWidget(GroupButtons, 4, 0); SMESHGUI_MergeNodesDlgLayout->addWidget(GroupButtons, 4, 0);
/***************************************************************/ /***************************************************************/

6
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
View File

@ -292,19 +292,19 @@ QFrame* SMESHGUI_MeshPatternDlg::createButtonFrame (QWidget* theParent)
QFrame* aFrame = new QFrame(theParent); QFrame* aFrame = new QFrame(theParent);
aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken);
myOkBtn = new QPushButton(tr("SMESH_BUT_OK" ), aFrame);
myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame); myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame);
myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame); myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame);
myOkBtn = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE"), aFrame);
myHelpBtn = new QPushButton(tr("SMESH_BUT_HELP"), aFrame); myHelpBtn = new QPushButton(tr("SMESH_BUT_HELP"), aFrame);
QSpacerItem* aSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* aSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING); QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING);
aLay->addWidget(myOkBtn);
aLay->addWidget(myApplyBtn); aLay->addWidget(myApplyBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myCloseBtn); aLay->addWidget(myCloseBtn);
aLay->addWidget(myOkBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myHelpBtn); aLay->addWidget(myHelpBtn);
connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk())); connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk()));

6
src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
View File

@ -132,19 +132,19 @@ QFrame* SMESHGUI_MoveNodesDlg::createButtonFrame (QWidget* theParent)
QFrame* aFrame = new QFrame(theParent); QFrame* aFrame = new QFrame(theParent);
aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken);
myOkBtn = new QPushButton(tr("SMESH_BUT_OK" ), aFrame);
myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame); myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame);
myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame); myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame);
myOkBtn = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE"), aFrame);
myHelpBtn = new QPushButton(tr("SMESH_BUT_HELP"), aFrame); myHelpBtn = new QPushButton(tr("SMESH_BUT_HELP"), aFrame);
QSpacerItem* aSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* aSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING); QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING);
aLay->addWidget(myOkBtn);
aLay->addWidget(myApplyBtn); aLay->addWidget(myApplyBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myCloseBtn); aLay->addWidget(myCloseBtn);
aLay->addWidget(myOkBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myHelpBtn); aLay->addWidget(myHelpBtn);
connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk())); connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk()));

6
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
View File

@ -233,19 +233,19 @@ QFrame* SMESHGUI_MultiEditDlg::createButtonFrame (QWidget* theParent)
QFrame* aFrame = new QFrame (theParent); QFrame* aFrame = new QFrame (theParent);
aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken);
myOkBtn = new QPushButton (tr("SMESH_BUT_OK" ), aFrame);
myApplyBtn = new QPushButton (tr("SMESH_BUT_APPLY"), aFrame); myApplyBtn = new QPushButton (tr("SMESH_BUT_APPLY"), aFrame);
myCloseBtn = new QPushButton (tr("SMESH_BUT_CLOSE"), aFrame); myCloseBtn = new QPushButton (tr("SMESH_BUT_CLOSE"), aFrame);
myOkBtn = new QPushButton (tr("SMESH_BUT_APPLY_AND_CLOSE"), aFrame);
myHelpBtn = new QPushButton (tr("SMESH_BUT_HELP"), aFrame); myHelpBtn = new QPushButton (tr("SMESH_BUT_HELP"), aFrame);
QSpacerItem* aSpacer = new QSpacerItem (0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* aSpacer = new QSpacerItem (0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
QHBoxLayout* aLay = new QHBoxLayout (aFrame, MARGIN, SPACING); QHBoxLayout* aLay = new QHBoxLayout (aFrame, MARGIN, SPACING);
aLay->addWidget(myOkBtn);
aLay->addWidget(myApplyBtn); aLay->addWidget(myApplyBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myCloseBtn); aLay->addWidget(myCloseBtn);
aLay->addWidget(myOkBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myHelpBtn); aLay->addWidget(myHelpBtn);
return aFrame; return aFrame;

10
src/SMESHGUI/SMESHGUI_NodesDlg.cxx
View File

@ -266,18 +266,18 @@ SMESHGUI_NodesDlg::SMESHGUI_NodesDlg (SMESHGUI* theModule,
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_NodesDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_NodesDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

2
src/SMESHGUI/SMESHGUI_Operation.cxx
View File

@ -81,6 +81,8 @@ void SMESHGUI_Operation::startOperation()
disconnect( dlg(), SIGNAL( dlgClose() ), this, SLOT( onCancel() ) ); disconnect( dlg(), SIGNAL( dlgClose() ), this, SLOT( onCancel() ) );
disconnect( dlg(), SIGNAL( dlgHelp() ), this, SLOT( onHelp() ) ); disconnect( dlg(), SIGNAL( dlgHelp() ), this, SLOT( onHelp() ) );
setButtonText(1, "&Ok"); //rename Apply and Close to OK
if( dlg()->testButtonFlags( QtxDialog::OK ) ) if( dlg()->testButtonFlags( QtxDialog::OK ) )
connect( dlg(), SIGNAL( dlgOk() ), this, SLOT( onOk() ) ); connect( dlg(), SIGNAL( dlgOk() ), this, SLOT( onOk() ) );

6
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
View File

@ -307,9 +307,6 @@ SMESHGUI_Preferences_ScalarBarDlg::SMESHGUI_Preferences_ScalarBarDlg( SMESHGUI*
myButtonGrpLayout->setAlignment( Qt::AlignTop ); myButtonGrpLayout->setAlignment( Qt::AlignTop );
myButtonGrpLayout->setSpacing( SPACING_SIZE ); myButtonGrpLayout->setMargin( MARGIN_SIZE ); myButtonGrpLayout->setSpacing( SPACING_SIZE ); myButtonGrpLayout->setMargin( MARGIN_SIZE );
myOkBtn = new QPushButton( tr( "SMESH_BUT_OK" ), myButtonGrp, "myOkBtn" );
myOkBtn->setAutoDefault( TRUE ); myOkBtn->setDefault( TRUE );
myButtonGrpLayout->addWidget( myOkBtn );
if ( mySelectionMgr ) { if ( mySelectionMgr ) {
myApplyBtn = new QPushButton( tr( "SMESH_BUT_APPLY" ), myButtonGrp, "myApplyBtn" ); myApplyBtn = new QPushButton( tr( "SMESH_BUT_APPLY" ), myButtonGrp, "myApplyBtn" );
myApplyBtn->setAutoDefault( TRUE ); myApplyBtn->setAutoDefault( TRUE );
@ -317,6 +314,9 @@ SMESHGUI_Preferences_ScalarBarDlg::SMESHGUI_Preferences_ScalarBarDlg( SMESHGUI*
} }
myButtonGrpLayout->addStretch(); myButtonGrpLayout->addStretch();
myCancelBtn = new QPushButton( tr( "SMESH_BUT_CANCEL" ), myButtonGrp, "myCancelBtn" ); myCancelBtn = new QPushButton( tr( "SMESH_BUT_CANCEL" ), myButtonGrp, "myCancelBtn" );
myOkBtn = new QPushButton( tr( "SMESH_BUT_APPLY_AND_CLOSE" ), myButtonGrp, "myOkBtn" );
myOkBtn->setAutoDefault( TRUE ); myOkBtn->setDefault( TRUE );
myButtonGrpLayout->addWidget( myOkBtn );
if ( mySelectionMgr ) if ( mySelectionMgr )
myCancelBtn->setText( tr( "SMESH_BUT_CLOSE" ) ); myCancelBtn->setText( tr( "SMESH_BUT_CLOSE" ) );
myCancelBtn->setAutoDefault( TRUE ); myCancelBtn->setAutoDefault( TRUE );

10
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
View File

@ -143,18 +143,18 @@ SMESHGUI_RemoveElementsDlg
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_RemoveElementsDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_RemoveElementsDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

10
src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
View File

@ -143,18 +143,18 @@ SMESHGUI_RemoveNodesDlg
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_RemoveNodesDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_RemoveNodesDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

10
src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
View File

@ -142,18 +142,18 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg( SMESHGUI* theModule, const cha
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_RenumberingDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_RenumberingDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

10
src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
View File

@ -149,18 +149,18 @@ SMESHGUI_RevolutionDlg::SMESHGUI_RevolutionDlg( SMESHGUI* theModule, const char*
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_RevolutionDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_RevolutionDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

10
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
View File

@ -150,18 +150,18 @@ SMESHGUI_RotationDlg::SMESHGUI_RotationDlg( SMESHGUI* theModule, const char* nam
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE")); buttonCancel->setText(tr("SMESH_BUT_CLOSE"));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY")); buttonApply->setText(tr("SMESH_BUT_APPLY"));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK")); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE"));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_RotationDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_RotationDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

10
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
View File

@ -155,18 +155,18 @@ SMESHGUI_SewingDlg::SMESHGUI_SewingDlg( SMESHGUI* theModule, const char* name,
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE")); buttonCancel->setText(tr("SMESH_BUT_CLOSE"));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY")); buttonApply->setText(tr("SMESH_BUT_APPLY"));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK")); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE"));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_SewingDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_SewingDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

6
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
View File

@ -157,7 +157,7 @@ QFrame* SMESHGUI_SingleEditDlg::createButtonFrame (QWidget* theParent)
QFrame* aFrame = new QFrame(theParent); QFrame* aFrame = new QFrame(theParent);
aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken); aFrame->setFrameStyle(QFrame::Box | QFrame::Sunken);
myOkBtn = new QPushButton(tr("SMESH_BUT_OK" ), aFrame); myOkBtn = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE" ), aFrame);
myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame); myApplyBtn = new QPushButton(tr("SMESH_BUT_APPLY"), aFrame);
myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame); myCloseBtn = new QPushButton(tr("SMESH_BUT_CLOSE"), aFrame);
myHelpBtn = new QPushButton (tr("SMESH_BUT_HELP"), aFrame); myHelpBtn = new QPushButton (tr("SMESH_BUT_HELP"), aFrame);
@ -166,10 +166,10 @@ QFrame* SMESHGUI_SingleEditDlg::createButtonFrame (QWidget* theParent)
QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING); QHBoxLayout* aLay = new QHBoxLayout(aFrame, MARGIN, SPACING);
aLay->addWidget(myOkBtn);
aLay->addWidget(myApplyBtn); aLay->addWidget(myApplyBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myCloseBtn); aLay->addWidget(myCloseBtn);
aLay->addWidget(myOkBtn);
aLay->addItem(aSpacer);
aLay->addWidget(myHelpBtn); aLay->addWidget(myHelpBtn);
return aFrame; return aFrame;

10
src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
View File

@ -149,18 +149,18 @@ SMESHGUI_SmoothingDlg::SMESHGUI_SmoothingDlg( SMESHGUI* theModule, const char* n
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_SmoothingDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_SmoothingDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

10
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
View File

@ -158,18 +158,18 @@ SMESHGUI_SymmetryDlg::SMESHGUI_SymmetryDlg( SMESHGUI* theModule, const char* nam
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_SymmetryDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_SymmetryDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

10
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
View File

@ -147,18 +147,18 @@ SMESHGUI_TranslationDlg::SMESHGUI_TranslationDlg( SMESHGUI* theModule, const cha
buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel = new QPushButton(GroupButtons, "buttonCancel");
buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setText(tr("SMESH_BUT_CLOSE" ));
buttonCancel->setAutoDefault(TRUE); buttonCancel->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonCancel, 0, 3); GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
buttonApply = new QPushButton(GroupButtons, "buttonApply"); buttonApply = new QPushButton(GroupButtons, "buttonApply");
buttonApply->setText(tr("SMESH_BUT_APPLY" )); buttonApply->setText(tr("SMESH_BUT_APPLY" ));
buttonApply->setAutoDefault(TRUE); buttonApply->setAutoDefault(TRUE);
GroupButtonsLayout->addWidget(buttonApply, 0, 1); GroupButtonsLayout->addWidget(buttonApply, 0, 0);
QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
GroupButtonsLayout->addItem(spacer_9, 0, 2); GroupButtonsLayout->addItem(spacer_9, 0, 3);
buttonOk = new QPushButton(GroupButtons, "buttonOk"); buttonOk = new QPushButton(GroupButtons, "buttonOk");
buttonOk->setText(tr("SMESH_BUT_OK" )); buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" ));
buttonOk->setAutoDefault(TRUE); buttonOk->setAutoDefault(TRUE);
buttonOk->setDefault(TRUE); buttonOk->setDefault(TRUE);
GroupButtonsLayout->addWidget(buttonOk, 0, 0); GroupButtonsLayout->addWidget(buttonOk, 0, 2);
SMESHGUI_TranslationDlgLayout->addWidget(GroupButtons, 2, 0); SMESHGUI_TranslationDlgLayout->addWidget(GroupButtons, 2, 0);
/***************************************************************/ /***************************************************************/

4
src/SMESHGUI/SMESH_msg_en.po
View File

@ -72,6 +72,10 @@ msgstr "&Close"
msgid "SMESH_BUT_OK" msgid "SMESH_BUT_OK"
msgstr "&Ok" msgstr "&Ok"
#Ok
msgid "SMESH_BUT_APPLY_AND_CLOSE"
msgstr "A&pply and Close"
#Yes #Yes
msgid "SMESH_BUT_YES" msgid "SMESH_BUT_YES"
msgstr "&Yes" msgstr "&Yes"