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

HelpIndexFilter: Use Acceptor for LocatorFilterEntry

Browse Source 
Change-Id: If5fbe4f4c7d0f3c7cda3d232be596937b73c6fd0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2023-04-12 00:02:43 +02:00
parent eb98f2f404
commit fe067e1d49
4 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/help/helpindexfilter.cpp
View File

@@ -3,15 +3,16 @@
#include "helpindexfilter.h" #include "helpindexfilter.h"
#include "helpmanager.h"
#include "helptr.h"
#include "localhelpmanager.h" #include "localhelpmanager.h"
#include "helpmanager.h"
#include "helpplugin.h"
#include "helptr.h"
#include <coreplugin/icore.h>
#include <coreplugin/helpmanager.h> #include <coreplugin/helpmanager.h>
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/utilsicons.h>
#include <utils/tasktree.h> #include <utils/tasktree.h>
#include <utils/utilsicons.h>
#include <QHelpEngine> #include <QHelpEngine>
#include <QHelpFilterEngine> #include <QHelpFilterEngine>
@@ -77,9 +78,14 @@ QList<LocatorFilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<LocatorFi
m_lastEntry = entry; m_lastEntry = entry;
QList<LocatorFilterEntry> entries; QList<LocatorFilterEntry> entries;
for (const QString &keyword : std::as_const(m_lastIndicesCache)) { for (const QString &key : std::as_const(m_lastIndicesCache)) {
const int index = keyword.indexOf(entry, 0, cs); const int index = key.indexOf(entry, 0, cs);
LocatorFilterEntry filterEntry(this, keyword); LocatorFilterEntry filterEntry;
filterEntry.displayName = key;
filterEntry.acceptor = [key] {
HelpPlugin::showLinksInCurrentViewer(LocalHelpManager::linksForKeyword(key), key);
return AcceptResult();
};
filterEntry.displayIcon = m_icon; filterEntry.displayIcon = m_icon;
filterEntry.highlightInfo = {index, int(entry.length())}; filterEntry.highlightInfo = {index, int(entry.length())};
entries.append(filterEntry); entries.append(filterEntry);
@@ -87,17 +93,6 @@ QList<LocatorFilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<LocatorFi
return entries; return entries;
} }
void HelpIndexFilter::accept(const LocatorFilterEntry &selection,
QString *newText, int *selectionStart, int *selectionLength) const
{
Q_UNUSED(newText)
Q_UNUSED(selectionStart)
Q_UNUSED(selectionLength)
const QString &key = selection.displayName;
const QMultiMap<QString, QUrl> links = LocalHelpManager::linksForKeyword(key);
emit linksActivated(links, key);
}
void HelpIndexFilter::invalidateCache() void HelpIndexFilter::invalidateCache()
{ {
m_needsUpdate = true; m_needsUpdate = true;

10
src/plugins/help/helpindexfilter.h
View File

@@ -5,10 +5,6 @@
#include <coreplugin/locator/ilocatorfilter.h> #include <coreplugin/locator/ilocatorfilter.h>
#include <QIcon>
#include <QMultiMap>
#include <QUrl>
namespace Help { namespace Help {
namespace Internal { namespace Internal {
@@ -22,12 +18,6 @@ public:
void prepareSearch(const QString &entry) override; void prepareSearch(const QString &entry) override;
QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
const QString &entry) override; const QString &entry) override;
void accept(const Core::LocatorFilterEntry &selection,
QString *newText, int *selectionStart, int *selectionLength) const override;
signals:
void linksActivated(const QMultiMap<QString, QUrl> &links, const QString &key) const;
private: private:
void invalidateCache(); void invalidateCache();

8
src/plugins/help/helpplugin.cpp
View File

@@ -165,6 +165,11 @@ void HelpPlugin::showHelpUrl(const QUrl &url, Core::HelpManager::HelpViewerLocat
dd->showHelpUrl(url, location); dd->showHelpUrl(url, location);
} }
void HelpPlugin::showLinksInCurrentViewer(const QMultiMap<QString, QUrl> &links, const QString &key)
{
dd->showLinksInCurrentViewer(links, key);
}
void HelpPlugin::initialize() void HelpPlugin::initialize()
{ {
dd = new HelpPluginPrivate; dd = new HelpPluginPrivate;
@@ -265,9 +270,6 @@ HelpPluginPrivate::HelpPluginPrivate()
ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_SUPPORT); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_SUPPORT);
connect(action, &QAction::triggered, this, &HelpPluginPrivate::slotSystemInformation); connect(action, &QAction::triggered, this, &HelpPluginPrivate::slotSystemInformation);
connect(&helpIndexFilter, &HelpIndexFilter::linksActivated,
this, &HelpPluginPrivate::showLinksInCurrentViewer);
connect(ModeManager::instance(), &ModeManager::currentModeChanged, connect(ModeManager::instance(), &ModeManager::currentModeChanged,
this, &HelpPluginPrivate::modeChanged); this, &HelpPluginPrivate::modeChanged);

2
src/plugins/help/helpplugin.h
View File

@@ -26,6 +26,8 @@ public:
~HelpPlugin() final; ~HelpPlugin() final;
static void showHelpUrl(const QUrl &url, Core::HelpManager::HelpViewerLocation location); static void showHelpUrl(const QUrl &url, Core::HelpManager::HelpViewerLocation location);
static void showLinksInCurrentViewer(const QMultiMap<QString, QUrl> &links,
const QString &key);
static HelpViewer *createHelpViewer(); static HelpViewer *createHelpViewer();
static HelpWidget *modeHelpWidget(); static HelpWidget *modeHelpWidget();