procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Open links in AboutBox without confirmation. 

Fixes #4148.
This commit is contained in:
John Preston 2017-12-11 12:56:43 +04:00
parent 9534121676
commit 38f7f48c17
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/boxes/about_box.cpp
View File

@ -30,6 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "platform/platform_file_utilities.h" #include "platform/platform_file_utilities.h"
#include "core/click_handler_types.h"
AboutBox::AboutBox(QWidget *parent) AboutBox::AboutBox(QWidget *parent)
: _version(this, lng_about_version(lt_version, QString::fromLatin1(AppVersionStr.c_str()) + (cAlphaVersion() ? " alpha" : "") + (cBetaVersion() ? qsl(" beta %1").arg(cBetaVersion()) : QString())), st::aboutVersionLink) : _version(this, lng_about_version(lt_version, QString::fromLatin1(AppVersionStr.c_str()) + (cAlphaVersion() ? " alpha" : "") + (cBetaVersion() ? qsl(" beta %1").arg(cBetaVersion()) : QString())), st::aboutVersionLink)
@ -43,7 +44,18 @@ void AboutBox::prepare() {
addButton(langFactory(lng_close), [this] { closeBox(); }); addButton(langFactory(lng_close), [this] { closeBox(); });
const auto linkHook = [](const ClickHandlerPtr &link, auto button) {
if (const auto url = dynamic_cast<UrlClickHandler*>(link.data())) {
url->UrlClickHandler::onClick(button);
return false;
}
return true;
};
_text3->setRichText(lng_about_text_3(lt_faq_open, qsl("[a href=\"%1\"]").arg(telegramFaqLink()), lt_faq_close, qsl("[/a]"))); _text3->setRichText(lng_about_text_3(lt_faq_open, qsl("[a href=\"%1\"]").arg(telegramFaqLink()), lt_faq_close, qsl("[/a]")));
_text1->setClickHandlerHook(linkHook);
_text2->setClickHandlerHook(linkHook);
_text3->setClickHandlerHook(linkHook);
_version->setClickedCallback([this] { showVersionHistory(); }); _version->setClickedCallback([this] { showVersionHistory(); });

2
Telegram/SourceFiles/core/click_handler_types.cpp
View File

@ -143,7 +143,7 @@ void HiddenUrlClickHandler::doOpen(QString url) {
Ui::show(Box<ConfirmBox>(lang(lng_open_this_link) + qsl("\n\n") + displayUrl, lang(lng_open_link), [urlText] { Ui::show(Box<ConfirmBox>(lang(lng_open_this_link) + qsl("\n\n") + displayUrl, lang(lng_open_link), [urlText] {
Ui::hideLayer(); Ui::hideLayer();
UrlClickHandler::doOpen(urlText); UrlClickHandler::doOpen(urlText);
})); }), LayerOption::KeepOther);
} else { } else {
UrlClickHandler::doOpen(urlText); UrlClickHandler::doOpen(urlText);
} }