feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Move OpenPagesManager::createPage to HelpWidget

Browse Source 
Removes some unneeded indirection.

Task-number: QTCREATORBUG-20558
Change-Id: I65d8d31e10300da3015f388ac490b8be6e090f29
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2019-09-11 15:34:42 +02:00
parent bd228ab6dd
commit bef986f3fd
5 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/help/helpwidget.cpp
View File

@@ -315,7 +315,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
QAction *openPage = openMenu->addAction(tr("Open in New Page"));
connect(openPage, &QAction::triggered, this, [this]() {
if (HelpViewer *viewer = currentViewer())
OpenPagesManager::instance().createPage(viewer->source());
openNewPage(viewer->source());
});
}
QAction *openExternal = openMenu->addAction(tr("Open in Window"));
@@ -563,9 +563,7 @@ HelpViewer *HelpWidget::insertViewer(int index, const QUrl &url, qreal zoom)
});
connect(viewer, &HelpViewer::loadFinished, this, &HelpWidget::highlightSearchTerms);
connect(viewer, &HelpViewer::newPageRequested, [](const QUrl &url) {
OpenPagesManager::instance().createPage(url);
});
connect(viewer, &HelpViewer::newPageRequested, this, &HelpWidget::openNewPage);
connect(viewer, &HelpViewer::externalPageRequested, this, &openUrlInWindow);
updateCloseButton();
m_model.endInsertRows();
@@ -601,11 +599,21 @@ HelpViewer *HelpWidget::viewerAt(int index) const
void HelpWidget::open(const QUrl &url, bool newPage)
{
if (newPage)
OpenPagesManager::instance().createPage(url);
openNewPage(url);
else
setSource(url);
}
HelpViewer *HelpWidget::openNewPage(const QUrl &url)
{
if (url.isValid() && HelpViewer::launchWithExternalApp(url))
return nullptr;
HelpViewer *page = addViewer(url);
setCurrentIndex(viewerCount() - 1);
return page;
}
void HelpWidget::showLinks(const QMap<QString, QUrl> &links,
const QString &keyword, bool newPage)
{
@@ -638,7 +646,7 @@ void HelpWidget::openFromSearch(const QUrl &url, const QStringList &searchTerms,
{
m_searchTerms = searchTerms;
if (newPage)
OpenPagesManager::instance().createPage(url);
openNewPage(url);
else {
HelpViewer* viewer = currentViewer();
QTC_ASSERT(viewer, return);