summaryrefslogtreecommitdiff
path: root/src/plugins/help
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/help')
-rw-r--r--src/plugins/help/centralwidget.h1
-rw-r--r--src/plugins/help/docsettingspage.ui4
-rw-r--r--src/plugins/help/filtersettingspage.ui4
-rw-r--r--src/plugins/help/generalsettingspage.ui8
-rw-r--r--src/plugins/help/help.pro5
-rw-r--r--src/plugins/help/helpconstants.h20
-rw-r--r--src/plugins/help/helpfindsupport.cpp6
-rw-r--r--src/plugins/help/helpplugin.cpp16
-rw-r--r--src/plugins/help/xbelsupport.h2
9 files changed, 38 insertions, 28 deletions
diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h
index 1bff516df0..2939605897 100644
--- a/src/plugins/help/centralwidget.h
+++ b/src/plugins/help/centralwidget.h
@@ -41,6 +41,7 @@ QT_FORWARD_DECLARE_CLASS(QEvent)
QT_FORWARD_DECLARE_CLASS(QAction)
QT_FORWARD_DECLARE_CLASS(QStackedWidget)
QT_FORWARD_DECLARE_CLASS(QFocusEvent)
+QT_FORWARD_DECLARE_CLASS(QPrinter)
namespace Help {
namespace Internal {
diff --git a/src/plugins/help/docsettingspage.ui b/src/plugins/help/docsettingspage.ui
index 0b0d85f4f2..93fb3f9f8e 100644
--- a/src/plugins/help/docsettingspage.ui
+++ b/src/plugins/help/docsettingspage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>DocSettingsPage</class>
- <widget class="QWidget" name="DocSettingsPage">
+ <class>Help::Internal::DocSettingsPage</class>
+ <widget class="QWidget" name="Help::Internal::DocSettingsPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/help/filtersettingspage.ui b/src/plugins/help/filtersettingspage.ui
index fdbaf8e74d..af7fd81c8f 100644
--- a/src/plugins/help/filtersettingspage.ui
+++ b/src/plugins/help/filtersettingspage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>FilterSettingsPage</class>
- <widget class="QWidget" name="FilterSettingsPage">
+ <class>Help::Internal::FilterSettingsPage</class>
+ <widget class="QWidget" name="Help::Internal::FilterSettingsPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui
index 4726aa030f..c536c1fc85 100644
--- a/src/plugins/help/generalsettingspage.ui
+++ b/src/plugins/help/generalsettingspage.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>GeneralSettingsPage</class>
- <widget class="QWidget" name="GeneralSettingsPage">
+ <class>Help::Internal::GeneralSettingsPage</class>
+ <widget class="QWidget" name="Help::Internal::GeneralSettingsPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>491</width>
- <height>360</height>
+ <width>595</width>
+ <height>407</height>
</rect>
</property>
<property name="windowTitle">
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index c5616d2df1..af2cbbeab0 100644
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -1,6 +1,11 @@
TEMPLATE = lib
TARGET = Help
+
QT += network
+greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += printsupport
+ DEFINES += QT_NO_WEBKIT
+}
INCLUDEPATH += $$PWD
diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h
index 926d1c383c..c87f77d8df 100644
--- a/src/plugins/help/helpconstants.h
+++ b/src/plugins/help/helpconstants.h
@@ -37,7 +37,7 @@
#include <QtCore/QLatin1String>
namespace Help {
- namespace Constants {
+namespace Constants {
enum {
ShowHomePage = 0,
@@ -58,16 +58,16 @@ static const QLatin1String AboutBlank("about:blank");
static const QLatin1String WeAddedFilterKey("UnfilteredFilterInserted");
static const QLatin1String PreviousFilterNameKey("UnfilteredFilterName");
-const int P_MODE_HELP = 70;
-const char * const ID_MODE_HELP = "Help";
-const char * const HELP_CATEGORY = "H.Help";
-const char * const HELP_CATEGORY_ICON = ":/core/images/category_help.png";
-const char * const HELP_TR_CATEGORY = QT_TRANSLATE_NOOP("Help", "Help");
+const int P_MODE_HELP = 70;
+const char ID_MODE_HELP [] = "Help";
+const char HELP_CATEGORY[] = "H.Help";
+const char HELP_CATEGORY_ICON[] = ":/core/images/category_help.png";
+const char HELP_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Help", "Help");
-const char * const C_MODE_HELP = "Help Mode";
-const char * const C_HELP_SIDEBAR = "Help Sidebar";
+const char C_MODE_HELP [] = "Help Mode";
+const char C_HELP_SIDEBAR[] = "Help Sidebar";
- } // Constants
-} // Help
+} // Constants
+} // Help
#endif // HELPCONSTANTS_H
diff --git a/src/plugins/help/helpfindsupport.cpp b/src/plugins/help/helpfindsupport.cpp
index 5b7c99bee5..1387f7ad1d 100644
--- a/src/plugins/help/helpfindsupport.cpp
+++ b/src/plugins/help/helpfindsupport.cpp
@@ -53,8 +53,7 @@ bool HelpFindSupport::isEnabled() const
Find::FindFlags HelpFindSupport::supportedFindFlags() const
{
- return Find::FindBackward | Find::FindCaseSensitively
- | Find::FindWholeWords;
+ return Find::FindBackward | Find::FindCaseSensitively;
}
QString HelpFindSupport::currentFindString() const
@@ -103,8 +102,7 @@ HelpViewerFindSupport::HelpViewerFindSupport(HelpViewer *viewer)
Find::FindFlags HelpViewerFindSupport::supportedFindFlags() const
{
- return Find::FindBackward | Find::FindCaseSensitively
- | Find::FindWholeWords;
+ return Find::FindBackward | Find::FindCaseSensitively;
}
QString HelpViewerFindSupport::currentFindString() const
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 33152705b0..f14a721532 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -98,12 +98,12 @@
using namespace Help::Internal;
-const char * const SB_INDEX = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Index");
-const char * const SB_CONTENTS = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Contents");
-const char * const SB_BOOKMARKS = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Bookmarks");
-const char * const SB_SEARCH = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Search");
+const char SB_INDEX[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Index");
+const char SB_CONTENTS[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Contents");
+const char SB_BOOKMARKS[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Bookmarks");
+const char SB_SEARCH[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", "Search");
-const char * const SB_OPENPAGES = "OpenPages";
+const char SB_OPENPAGES[] = "OpenPages";
#define IMAGEPATH ":/help/images/"
#if defined(Q_OS_MAC)
@@ -883,6 +883,12 @@ void HelpPlugin::activateContext()
if (IContext *context = m_core->currentContextObject()) {
m_idFromContext = context->contextHelpId();
links = Core::HelpManager::instance()->linksForIdentifier(m_idFromContext);
+ if (links.isEmpty()) {
+ // Maybe this is already an URL...
+ QUrl url(m_idFromContext);
+ if (url.isValid())
+ links.insert(m_idFromContext, m_idFromContext);
+ }
}
if (HelpViewer* viewer = viewerForContextMode()) {
diff --git a/src/plugins/help/xbelsupport.h b/src/plugins/help/xbelsupport.h
index b797d6a9cb..301667aa60 100644
--- a/src/plugins/help/xbelsupport.h
+++ b/src/plugins/help/xbelsupport.h
@@ -34,7 +34,7 @@
#define XBELSUPPORT_H
#include <QtGui/QIcon>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
QT_FORWARD_DECLARE_CLASS(QIODevice)
QT_FORWARD_DECLARE_CLASS(QStandardItem)
View Lorry Controller Status