Merge branch 'V7_7_BR' into hydro/imps_2015

[modules/geom.git] / src / GEOMBase / GEOMBase_Skeleton.cxx

diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index b496494474e5cf58de895ba84c229a2e488b3e4a..fd6e5ed691087a705d2273a1730dbc65853e7ac9 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -25,6 +25,7 @@
 // Author : Damien COQUERET, Open CASCADE S.A.S.
 
 #include "GEOMBase_Skeleton.h"
+#include "GEOMBase_DlgSkeleton.h"
 #include "GEOMBase.h"
 
 #include <DlgRef.h>
@@ -62,7 +63,7 @@ GEOMBase_Skeleton::GEOMBase_Skeleton( GeometryGUI* theGeometryGUI, QWidget* pare
 
   setModal( modal );
 
-  myMainFrame = new DlgRef_Skeleton( this );
+  myMainFrame = new GEOMBase_DlgSkeleton( this );
   QVBoxLayout* topLayout = new QVBoxLayout( this );
   topLayout->setMargin( 0 ); topLayout->setSpacing( 0 );
   topLayout->addWidget( myMainFrame );
@@ -347,8 +348,15 @@ void GEOMBase_Skeleton::unsetConstructorId()
 void GEOMBase_Skeleton::ClickOnHelp()
 {
   LightApp_Application* app = (LightApp_Application*)( SUIT_Session::session()->activeApplication() );
+
+  QString context;
+  if(myHelpContext.isEmpty()) {
+    context = myGeomGUI ? app->moduleName( myGeomGUI->moduleName() ) : QString("");
+  } else {
+    context = myHelpContext;
+  }
   if ( app ) 
-    app->onHelpContextModule( myGeomGUI ? app->moduleName( myGeomGUI->moduleName() ) : QString(""), myHelpFileName );
+    app->onHelpContextModule( context , myHelpFileName );
   else {
     QString platform;
 #ifdef WIN32
@@ -372,7 +380,7 @@ void GEOMBase_Skeleton::setHelpFileName( const QString& theName )
   myHelpFileName = theName;
 }
 
-DlgRef_Skeleton* GEOMBase_Skeleton::mainFrame()
+GEOMBase_DlgSkeleton* GEOMBase_Skeleton::mainFrame()
 {
   return myMainFrame;
 }