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

Help: Make it possible to duplicate search view

Browse Source 
Change-Id: I6fac9f721fc3e2f877d9f600f9dea6650558516a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Eike Ziller
2014-10-10 15:32:46 +02:00
parent d7105cc245
commit 002093828a
5 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/help/searchwidget.cpp
View File

@@ -104,7 +104,7 @@ void SearchWidget::showEvent(QShowEvent *event)
vLayout->setMargin(0);
vLayout->setSpacing(0);
searchEngine = (&LocalHelpManager::helpEngine())->searchEngine();
searchEngine = new QHelpSearchEngine(&LocalHelpManager::helpEngine(), this);
Utils::StyledBar *toolbar = new Utils::StyledBar(this);
toolbar->setSingleRow(false);
@@ -129,8 +129,10 @@ void SearchWidget::showEvent(QShowEvent *event)
setFocusProxy(queryWidget);
connect(queryWidget, SIGNAL(search()), this, SLOT(search()));
connect(resultWidget, SIGNAL(requestShowLink(QUrl)), this,
SIGNAL(linkActivated(QUrl)));
connect(resultWidget, &QHelpSearchResultWidget::requestShowLink, this,
[this](const QUrl &url) {
emit linkActivated(url, false/*newPage*/);
});
connect(searchEngine, SIGNAL(searchingStarted()), this,
SLOT(searchingStarted()));
@@ -224,7 +226,7 @@ bool SearchWidget::eventFilter(QObject *o, QEvent *e)
bool controlPressed = me->modifiers() & Qt::ControlModifier;
if ((me->button() == Qt::LeftButton && controlPressed)
|| (me->button() == Qt::MidButton)) {
OpenPagesManager::instance().createPageFromSearch(link);
emit linkActivated(link, true/*newPage*/);
}
}
}
@@ -261,9 +263,9 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
QAction *usedAction = menu.exec(mapToGlobal(contextMenuEvent->pos()));
if (usedAction == openLink)
emit linkActivated(link);
emit linkActivated(link, false/*newPage*/);
else if (usedAction == openLinkInNewTab)
OpenPagesManager::instance().createPageFromSearch(link);
emit linkActivated(link, true/*newPage*/);
else if (usedAction == copyAnchorAction)
QApplication::clipboard()->setText(link.toString());
}
@@ -274,7 +276,7 @@ SearchSideBarItem::SearchSideBarItem()
: SideBarItem(new SearchWidget, QLatin1String(Constants::HELP_SEARCH))
{
widget()->setWindowTitle(tr(Constants::SB_SEARCH));
connect(widget(), SIGNAL(linkActivated(QUrl)), this, SIGNAL(linkActivated(QUrl)));
connect(widget(), SIGNAL(linkActivated(QUrl,bool)), this, SIGNAL(linkActivated(QUrl,bool)));
}
QList<QToolButton *> SearchSideBarItem::createToolBarWidgets()