dbaccess/inc/helpids.h | 3 +++ dbaccess/source/ui/dlg/dbwizsetup.cxx | 4 ++++ 2 files changed, 7 insertions(+)
New commits: commit 4a3964c904388c433066f7d1ab6f457374618182 Author: Rafael Lima <rafael.palma.l...@gmail.com> AuthorDate: Thu Sep 22 01:18:20 2022 +0200 Commit: Rafael Lima <rafael.palma.l...@gmail.com> CommitDate: Thu Dec 1 14:28:07 2022 +0100 tdf#149221 Handle HID on Database Wizard dialog This patch sets a help ID (HID) for the Wizard roadmap, so that when the focus is not on any specific page the general dialog help page is called. To finish this patch I'll create an additional patch in the "help" repo to define the target HID. Change-Id: I0fdce25f3b1a92836190e5a03d70a0832e0f1feb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140332 Tested-by: Jenkins Tested-by: Heiko Tietze <heiko.tie...@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org> Reviewed-by: Rafael Lima <rafael.palma.l...@gmail.com> diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h index 86c233f9d619..2c013c173397 100644 --- a/dbaccess/inc/helpids.h +++ b/dbaccess/inc/helpids.h @@ -104,6 +104,9 @@ inline constexpr OStringLiteral HID_DBWIZ_PREVIOUS = "DBACCESS_HID_DBWIZ_PREVIOU inline constexpr OStringLiteral HID_DBWIZ_NEXT = "DBACCESS_HID_DBWIZ_NEXT"; inline constexpr OStringLiteral HID_DBWIZ_CANCEL = "DBACCESS_HID_DBWIZ_CANCEL"; inline constexpr OStringLiteral HID_DBWIZ_FINISH = "DBACCESS_HID_DBWIZ_FINISH"; +inline constexpr OStringLiteral HID_DBWIZ_HELP = "DBACCESS_HID_DBWIZ_HELP"; + +inline constexpr OStringLiteral HID_DBWIZ_ROADMAP = "DBACCESS_HID_DBWIZ_ROADMAP"; #endif diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 93db6c8fa9d6..d3d4c1dbde16 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -153,10 +153,14 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(weld::Window* _pParent aPath.push_back(PAGE_DBSETUPWIZARD_INTRO); declarePath( static_cast<PathId>(m_pCollection->size()+1), aPath); + // Set general help ID for the roadmap + SetRoadmapHelpId(HID_DBWIZ_ROADMAP); + m_xPrevPage->set_help_id(HID_DBWIZ_PREVIOUS); m_xNextPage->set_help_id(HID_DBWIZ_NEXT); m_xCancel->set_help_id(HID_DBWIZ_CANCEL); m_xFinish->set_help_id(HID_DBWIZ_FINISH); + m_xHelp->set_help_id(HID_DBWIZ_HELP); ActivatePage(); setTitleBase(DBA_RES(STR_DBWIZARDTITLE)); m_xAssistant->set_current_page(0);