From b3233793cd98e04ec5e6d9730f953fe6b31d2416 Mon Sep 17 00:00:00 2001 From: vsr Date: Sun, 16 Oct 2011 20:22:03 +0000 Subject: [PATCH] Issue 0020512: EDF 1113 OTHER : Using webkit to display documentation Additional improvement: provide search capabilities to the help browser --- src/LightApp/LightApp_Application.cxx | 17 +++++++++++------ src/LightApp/resources/LightApp_msg_en.ts | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index be59d31e4..087efc14e 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -270,12 +270,17 @@ LightApp_Application::LightApp_Application() SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); QPixmap aLogo = aResMgr->loadPixmap( "LightApp", tr( "APP_DEFAULT_ICO" ), false ); - QtxWebBrowser::setData("browser:icon", aResMgr->loadPixmap( "LightApp", tr( "BROWSER_ICON" ) ) ); - QtxWebBrowser::setData("browser:title", tr( "BROWSER_TITLE" ) ); - QtxWebBrowser::setData("toolbar:title", tr( "BROWSER_TOOLBAR_TITLE" ) ); - QtxWebBrowser::setData("menu:file:title", tr( "BROWSER_FILEMENU" ) ); - QtxWebBrowser::setData("action:close:title", tr( "BROWSER_CLOSE" ) ); - QtxWebBrowser::setData("action:close:icon", aResMgr->loadPixmap( "LightApp", tr( "BROWSER_CLOSE_ICON" ) ) ); + QtxWebBrowser::setData("browser:icon", aResMgr->loadPixmap( "LightApp", tr( "BROWSER_ICON" ) ) ); + QtxWebBrowser::setData("browser:title", tr( "BROWSER_TITLE" ) ); + QtxWebBrowser::setData("toolbar:title", tr( "BROWSER_TOOLBAR_TITLE" ) ); + QtxWebBrowser::setData("menu:file:title", tr( "BROWSER_FILEMENU" ) ); + QtxWebBrowser::setData("action:close:title", tr( "BROWSER_CLOSE" ) ); + QtxWebBrowser::setData("action:close:icon", aResMgr->loadPixmap( "LightApp", tr( "BROWSER_CLOSE_ICON" ) ) ); + QtxWebBrowser::setData("action:back:title", tr( "BROWSER_BACK" ) ); + QtxWebBrowser::setData("action:forward:title", tr( "BROWSER_FORWARD" ) ); + QtxWebBrowser::setData("action:find:title", tr( "BROWSER_FIND" ) ); + QtxWebBrowser::setData("action:findnext:title", tr( "BROWSER_FINDNEXT" ) ); + QtxWebBrowser::setData("action:findprev:title", tr( "BROWSER_FINDPREV" ) ); desktop()->setWindowIcon( aLogo ); desktop()->setDockableMenuBar( false ); diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts index 70ebab37e..2588b85a7 100644 --- a/src/LightApp/resources/LightApp_msg_en.ts +++ b/src/LightApp/resources/LightApp_msg_en.ts @@ -66,6 +66,26 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITASBROWSER_CLOSE &Close + + BROWSER_BACK + Go Back + + + BROWSER_FORWARD + Go Forward + + + BROWSER_FIND + &Find... + + + BROWSER_FINDNEXT + Find &next + + + BROWSER_FINDPREV + Find &previous + LightApp_Application -- 2.39.2