From: jfa Date: Wed, 5 Dec 2007 12:32:09 +0000 (+0000) Subject: Fix bug 17577: Help in 4x: wrong part of the page displayed. X-Git-Tag: mergefrom_MERGE_MULTIPR_EVOLUTION_07-Dec-07~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1ede60ed44eef3d8f7873e26d9a4a20fe67082ae;p=modules%2Fvisu.git 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 37d7c3ab..c48e417b 100644 --- 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 f0ba9786..3aeac0cf 100644 --- 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( 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 cebb7b6e..51c7bda0 100644 --- 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 61da7c31..ca3d9f27 100644 --- 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( app->activeModule() );