Fix bug 17577: Help in 4x: wrong part of the page displayed.

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 37d7c3ab1407e4cda9f42090b9b39096a351d355..c48e417bd82048e5303adea90e5112a240d2a36d 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -1146,6 +1146,7 @@ VisuGUI
   VisuGUI_CursorDlg* CursorDlg =
     new VisuGUI_CursorDlg (GetDesktop(this), tr("DLG_LINEWIDTH_TITLE"), TRUE);
 
+  CursorDlg->helpFileName = "viewing_3d_presentations_intro_page.html#width_opacity_anchor";
   CursorDlg->Comment1->setText(tr("DLG_LINEWIDTH_CMT1"));
   CursorDlg->Comment2->setText(tr("DLG_LINEWIDTH_CMT2"));
   CursorDlg->SpinBox1->setMinValue(1);

diff --git a/src/VISUGUI/VisuGUI_CursorDlg.cxx b/src/VISUGUI/VisuGUI_CursorDlg.cxx
index f0ba97869f824798b13e3b19ff463161dc608749..3aeac0cfe784643b4f543b3c892263be4d8f11e0 100644 (file)
--- a/src/VISUGUI/VisuGUI_CursorDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CursorDlg.cxx
@@ -129,11 +129,10 @@ VisuGUI_CursorDlg::~VisuGUI_CursorDlg()
 */
 void VisuGUI_CursorDlg::onHelp()
 {
-  QString aHelpFileName = "viewing_3d_presentations_intro_page.html";
   LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
   if (app) {
     VisuGUI* aVisuGUI = dynamic_cast<VisuGUI*>( app->activeModule() );
-    app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName);
+    app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), helpFileName);
   }
   else {
     QString platform;
@@ -144,7 +143,7 @@ void VisuGUI_CursorDlg::onHelp()
 #endif
     SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"),
                           QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                          arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName),
+                          arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(helpFileName),
                           QObject::tr("BUT_OK"));
   }
 }

diff --git a/src/VISUGUI/VisuGUI_CursorDlg.h b/src/VISUGUI/VisuGUI_CursorDlg.h
index cebb7b6ed518ef078fbd4e1bd1a6a336ded8a11c..51c7bda02847b22031cba29360007c7f21ceb116 100644 (file)
--- a/src/VISUGUI/VisuGUI_CursorDlg.h
+++ b/src/VISUGUI/VisuGUI_CursorDlg.h
@@ -51,6 +51,7 @@ public:
     QPushButton* buttonOk;
     QPushButton* buttonCancel;
     QPushButton* buttonHelp;
+    QString      helpFileName;
 
 private:
     void keyPressEvent( QKeyEvent* e );

diff --git a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
index 61da7c310b4c17c5f52619e214f720f24b0d2e1e..ca3d9f275c5e36d9907805d6b1d86f1f1836be6a 100644 (file)
--- a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
+++ b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
@@ -180,7 +180,7 @@ void VisuGUI_TransparencyDlg::ClickOnOk()
 //=======================================================================
 void VisuGUI_TransparencyDlg::ClickOnHelp()
 {
-  QString aHelpFileName = "viewing_3d_presentations_intro_page.html";
+  QString aHelpFileName = "viewing_3d_presentations_intro_page.html#width_opacity_anchor";
   LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
   if (app) {
     VisuGUI* aVisuGUI = dynamic_cast<VisuGUI*>( app->activeModule() );