From ed3a977346009c22c30908a9e7b81f409d310b59 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 26 Sep 2016 21:47:37 +0300 Subject: Add support for links "news" and "copyright". Use for links in didyouknow window ItemLinkHandler. --- src/gui/windows/didyouknowwindow.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/gui/windows/didyouknowwindow.cpp') diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp index db9352243..04921cac3 100644 --- a/src/gui/windows/didyouknowwindow.cpp +++ b/src/gui/windows/didyouknowwindow.cpp @@ -31,10 +31,12 @@ #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/checkbox.h" +#include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/layout.h" #include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "utils/process.h" @@ -52,6 +54,7 @@ DidYouKnowWindow::DidYouKnowWindow() : // TRANSLATORS: did you know window name Window(_("Did You Know?"), Modal_false, nullptr, "didyouknow.xml"), ActionListener(), + mItemLinkHandler(new ItemLinkHandler), mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, Opaque_true, "browserbox.xml")), mScrollArea(new ScrollArea(this, mBrowserBox, @@ -80,7 +83,7 @@ DidYouKnowWindow::DidYouKnowWindow() : // TRANSLATORS: did you know window button Button *const okButton = new Button(this, _("Close"), "close", this); - mBrowserBox->setLinkHandler(this); + mBrowserBox->setLinkHandler(mItemLinkHandler); if (gui) mBrowserBox->setFont(gui->getHelpFont()); mBrowserBox->setProcessVars(true); @@ -107,6 +110,11 @@ void DidYouKnowWindow::postInit() widgetResized(Event(nullptr)); } +DidYouKnowWindow::~DidYouKnowWindow() +{ + delete2(mItemLinkHandler); +} + void DidYouKnowWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); @@ -133,13 +141,6 @@ void DidYouKnowWindow::action(const ActionEvent &event) } } -void DidYouKnowWindow::handleLink(const std::string &link, - MouseEvent *const event A_UNUSED) -{ - if (strStartWith(link, "http://") || strStartWith(link, "https://")) - openBrowser(link); -} - void DidYouKnowWindow::loadData(int num) { mBrowserBox->clearRows(); -- cgit v1.2.3-60-g2f50