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

Help: Open example documentation in extra window

Browse Source 
Also remove the hack that HelpManager::handleHelpRequest looks
for ?view=split in the URL and use an enum instead.

Change-Id: I4ad74775381cf0b321181358266d8e89c6e277b5
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
Eike Ziller
2014-06-20 17:24:18 +02:00
parent 513aba55a2
commit 8fc7035b18
10 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/helpmanager.h
View File

@@ -53,6 +53,13 @@ class CORE_EXPORT HelpManager : public QObject
Q_OBJECT
public:
enum HelpViewerLocation {
SideBySideIfPossible = 0,
SideBySideAlways = 1,
HelpModeAlways = 2,
ExternalHelpAlways = 3
};
typedef QHash<QString, QStringList> Filters;
static QObject *instance();
@@ -85,13 +92,16 @@ public:
static void addUserDefinedFilter(const QString &filter, const QStringList &attr);
public slots:
static void handleHelpRequest(const QString &url);
static void handleHelpRequest(const QUrl &url,
Core::HelpManager::HelpViewerLocation location = HelpModeAlways);
static void handleHelpRequest(const QString &url,
Core::HelpManager::HelpViewerLocation location = HelpModeAlways);
signals:
void setupFinished();
void documentationChanged();
void collectionFileChanged();
void helpRequested(const QUrl &url);
void helpRequested(const QUrl &url, Core::HelpManager::HelpViewerLocation location);
private:
explicit HelpManager(QObject *parent = 0);