From 62543d2d486cf4e75a6c1940b6124b2d80ed2f0a Mon Sep 17 00:00:00 2001 From: mkr Date: Tue, 11 Apr 2006 08:42:15 +0000 Subject: [PATCH] Fix for IPAL12072 : Help button in Mesh module not work in following dialog boxes. --- src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx | 2 +- src/SMESHGUI/SMESHGUI_GroupDlg.cxx | 11 ++++++----- src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx index beeadb654..5a8f950a7 100644 --- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx @@ -324,7 +324,7 @@ SMESHGUI_CreatePolyhedralVolumeDlg::SMESHGUI_CreatePolyhedralVolumeDlg( SMESHGUI mySMESHGUI->SetActiveDialogBox( (QDialog*)this ) ; - myHelpFileName = "/files/adding_nodes_and_elements.htm#?"; //Adding_polyhedrons + myHelpFileName = "/files/adding_nodes_and_elements.htm#Adding_polyhedrons?"; Init(); } diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx index 3d599ac3c..6ba65dd80 100644 --- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx @@ -156,7 +156,7 @@ SMESHGUI_EditMeshDlg::SMESHGUI_EditMeshDlg (SMESHGUI* theModule, GroupMeshLayout->addWidget(LineEditMesh, 0, 2); DlgLayout->addWidget(GroupMesh, 1, 0); - myHelpFileName = "/files/merging_nodes.htm";// merging_elements.htm + myHelpFileName = "merge_elements.htm"; Init(); // Initialisations } diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx index 898fbf6a8..90906b5fb 100644 --- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx @@ -135,9 +135,6 @@ SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule, const char* name, myCurrentLineEdit = myMeshGroupLine; setSelectionMode(5); } - - bool isEditMode = !CORBA::is_nil( myGroupOnGeom ); - myHelpFileName = isEditMode ? "/files/editing_groups.htm" : "/files/creating_groups.htm"; } //================================================================================= @@ -152,10 +149,14 @@ void SMESHGUI_GroupDlg::initDialog(bool create) QPixmap image0 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_SELECT"))); - if (create) + if (create) { setCaption(tr("SMESH_CREATE_GROUP_TITLE")); - else + myHelpFileName = "/files/creating_groups.htm"; + } + else { setCaption(tr("SMESH_EDIT_GROUP_TITLE")); + myHelpFileName = "/files/editing_groups.htm"; + } setSizeGripEnabled(TRUE); diff --git a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx index a5c5dc3a9..d9fb08d3b 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx @@ -446,7 +446,7 @@ SMESHGUI_MeshInfosDlg::SMESHGUI_MeshInfosDlg (SMESHGUI* theModule, // init dialog with current selection onSelectionChanged(); - myHelpFileName = "/files/viewing_mesh_info.htm#advanced infos"; + myHelpFileName = "/files/viewing_mesh_info.htm#advanced_infos"; } //================================================================================= -- 2.30.2