From 07db0732edd419a91bc4ddf04c23a4409ee5290b Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 16 Apr 2017 12:09:36 +0200 Subject: [PATCH] refs #935, showHelp function, so other widgets can invoke help --- src/blackgui/guiapplication.cpp | 18 +++++++++++------- src/blackgui/guiapplication.h | 3 +++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index 12f017918..4a544c7bf 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -518,21 +518,25 @@ namespace BlackGui void CGuiApplication::addMenuHelp(QMenu &menu) { - QWidget *w = mainApplicationWindow(); + const QWidget *w = mainApplicationWindow(); if (!w) { return; } - - const CGlobalSetup gs = this->getGlobalSetup(); - const CUrl helpPage = gs.getHelpPageUrl(); - if (helpPage.isEmpty()) { return; } QAction *a = menu.addAction(w->style()->standardIcon(QStyle::SP_TitleBarContextHelpButton), "Online help"); - bool c = connect(a, &QAction::triggered, this, [helpPage]() + const bool c = connect(a, &QAction::triggered, this, [this]() { - QDesktopServices::openUrl(helpPage); + this->showHelp(); }); Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); Q_UNUSED(c); } + void CGuiApplication::showHelp() + { + const CGlobalSetup gs = this->getGlobalSetup(); + const CUrl helpPage = gs.getHelpPageUrl(); + if (helpPage.isEmpty()) { return; } + QDesktopServices::openUrl(helpPage); + } + const CStyleSheetUtility &CGuiApplication::getStyleSheetUtility() const { return this->m_styleSheetUtility; diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index 81c7ff44a..033373e31 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -133,6 +133,9 @@ namespace BlackGui //! Help operations void addMenuHelp(QMenu &menu); + //! Show help page (online help) + void showHelp(); + //! Style sheet handling const CStyleSheetUtility &getStyleSheetUtility() const;