X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_RenumberingDlg.cxx;h=9bff6dacd615d8cb472ebff3af68cbbd30485022;hb=c3e2a7b12ebefec0110115c2a571d809d6097d3d;hp=f886e45d5f02995cb6b8f4dbaac3db767177264b;hpb=c38c10811a065cf5b13e8807ed71864d92ca7d80;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx index f886e45d5..9bff6dacd 100644 --- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -36,7 +36,11 @@ #include "SMESH_TypeFilter.hxx" #include "SMDS_Mesh.hxx" +#include "SUIT_Desktop.h" #include "SUIT_Session.h" +#include "SUIT_MessageBox.h" + +#include "LightApp_Application.h" #include "SALOME_ListIO.hxx" @@ -55,15 +59,18 @@ using namespace std; +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + //================================================================================= // class : SMESHGUI_RenumberingDlg() // purpose : //================================================================================= -SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg (QWidget* parent, const char* name, - SalomeApp_SelectionMgr* Sel, +SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg( SMESHGUI* theModule, const char* name, const int unit, bool modal, WFlags fl) - : QDialog(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | - WStyle_Title | WStyle_SysMenu | Qt::WDestructiveClose) + : QDialog( SMESH::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder | + WStyle_Title | WStyle_SysMenu | Qt::WDestructiveClose), + mySMESHGUI( theModule ), + mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ) { myUnit = unit; @@ -90,10 +97,14 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg (QWidget* parent, const char* n /***************************************************************/ GroupConstructors = new QButtonGroup(this, "GroupConstructors"); - if (unit == 0) + if (unit == 0) { GroupConstructors->setTitle(tr("SMESH_NODES" )); - else if (unit == 1) + myHelpFileName = "renumbering_nodes_and_elements_page.html#renumbering_nodes_anchor"; + } + else if (unit == 1) { GroupConstructors->setTitle(tr("SMESH_ELEMENTS" )); + myHelpFileName = "renumbering_nodes_and_elements_page.html#renumbering_elements_anchor"; + } GroupConstructors->setExclusive(TRUE); GroupConstructors->setColumnLayout(0, Qt::Vertical); GroupConstructors->layout()->setSpacing(0); @@ -124,6 +135,10 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg (QWidget* parent, const char* n GroupButtonsLayout->setAlignment(Qt::AlignTop); GroupButtonsLayout->setSpacing(6); GroupButtonsLayout->setMargin(11); + buttonHelp = new QPushButton(GroupButtons, "buttonHelp"); + buttonHelp->setText(tr("SMESH_BUT_HELP" )); + buttonHelp->setAutoDefault(TRUE); + GroupButtonsLayout->addWidget(buttonHelp, 0, 4); buttonCancel = new QPushButton(GroupButtons, "buttonCancel"); buttonCancel->setText(tr("SMESH_BUT_CLOSE" )); buttonCancel->setAutoDefault(TRUE); @@ -135,7 +150,7 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg (QWidget* parent, const char* n QSpacerItem* spacer_9 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); GroupButtonsLayout->addItem(spacer_9, 0, 2); buttonOk = new QPushButton(GroupButtons, "buttonOk"); - buttonOk->setText(tr("SMESH_BUT_OK" )); + buttonOk->setText(tr("SMESH_BUT_APPLY_AND_CLOSE" )); buttonOk->setAutoDefault(TRUE); buttonOk->setDefault(TRUE); GroupButtonsLayout->addWidget(buttonOk, 0, 0); @@ -170,7 +185,7 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg (QWidget* parent, const char* n GroupMeshLayout->addWidget(LineEditMesh, 0, 2); SMESHGUI_RenumberingDlgLayout->addWidget(GroupMesh, 1, 0); - Init(Sel); /* Initialisations */ + Init(); /* Initialisations */ } //================================================================================= @@ -186,13 +201,11 @@ SMESHGUI_RenumberingDlg::~SMESHGUI_RenumberingDlg() // function : Init() // purpose : //================================================================================= -void SMESHGUI_RenumberingDlg::Init (SalomeApp_SelectionMgr* Sel) +void SMESHGUI_RenumberingDlg::Init() { GroupMesh->show(); myConstructorId = 0; Constructor1->setChecked(TRUE); - mySelectionMgr = Sel; - mySMESHGUI = SMESHGUI::GetSMESHGUI(); mySMESHGUI->SetActiveDialogBox((QDialog*)this); myMesh = SMESH::SMESH_Mesh::_nil(); @@ -203,6 +216,7 @@ void SMESHGUI_RenumberingDlg::Init (SalomeApp_SelectionMgr* Sel) connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); + connect(buttonHelp, SIGNAL(clicked()), this, SLOT(ClickOnHelp())); connect(GroupConstructors, SIGNAL(clicked(int)), SLOT(ConstructorsClicked(int))); connect(SelectButton, SIGNAL (clicked()), this, SLOT(SetEditCurrentArgument())); @@ -211,10 +225,6 @@ void SMESHGUI_RenumberingDlg::Init (SalomeApp_SelectionMgr* Sel) /* to close dialog if study change */ connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - /* Move widget on the botton right corner of main widget */ - int x, y; - mySMESHGUI->DefineDlgPosition(this, x, y); - this->move(x, y); this->show(); /* displays Dialog */ myEditCurrentArgument = LineEditMesh; @@ -274,7 +284,7 @@ void SMESHGUI_RenumberingDlg::ClickOnApply() { } - mySelectionMgr->clearSelected(); + //mySelectionMgr->clearSelected(); SMESH::UpdateView(); } } @@ -295,13 +305,36 @@ void SMESHGUI_RenumberingDlg::ClickOnOk() //================================================================================= void SMESHGUI_RenumberingDlg::ClickOnCancel() { - mySelectionMgr->clearSelected(); + //mySelectionMgr->clearSelected(); mySelectionMgr->clearFilters(); disconnect(mySelectionMgr, 0, this, 0); mySMESHGUI->ResetState(); reject(); } +//================================================================================= +// function : ClickOnHelp() +// purpose : +//================================================================================= +void SMESHGUI_RenumberingDlg::ClickOnHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) + app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName); + else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif + SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(myHelpFileName), + QObject::tr("BUT_OK")); + } +} + //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed or other case @@ -419,3 +452,20 @@ void SMESHGUI_RenumberingDlg::hideEvent (QHideEvent * e) if (!isMinimized()) ClickOnCancel(); } + +//================================================================================= +// function : keyPressEvent() +// purpose : +//================================================================================= +void SMESHGUI_RenumberingDlg::keyPressEvent( QKeyEvent* e ) +{ + QDialog::keyPressEvent( e ); + if ( e->isAccepted() ) + return; + + if ( e->key() == Key_F1 ) + { + e->accept(); + ClickOnHelp(); + } +}