Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
86b01665
Commit
86b01665
authored
Dec 04, 2008
by
Patrick Star
Browse files
Merge branch 'beta' into 0.9.1-beta
parents
5489c83d
4d60687b
Changes
5
Hide whitespace changes
Inline
Side-by-side
shared/help/help.pri
View file @
86b01665
...
...
@@ -9,7 +9,8 @@ HEADERS += \
$$PWD/helpviewer.h \
$$PWD/contentwindow.h \
$$PWD/bookmarkmanager.h \
$$PWD/../namespace_global.h
$$PWD/../namespace_global.h \
$$PWD/indexwindow.h
SOURCES += \
$$PWD/filternamedialog.cpp \
...
...
@@ -19,7 +20,7 @@ SOURCES += \
$$PWD/contentwindow.cpp \
$$PWD/bookmarkmanager.cpp
FORMS
+= \
FORMS
+= \
$$PWD/filternamedialog.ui \
$$PWD/topicchooser.ui \
$$PWD/bookmarkdialog.ui
src/plugins/cpptools/cpphoverhandler.cpp
View file @
86b01665
...
...
@@ -60,7 +60,7 @@
using
namespace
CppTools
::
Internal
;
CppHoverHandler
::
CppHoverHandler
(
CppModelManager
*
manager
,
QObject
*
parent
)
:
QObject
(
parent
),
m_manager
(
manager
)
:
QObject
(
parent
),
m_manager
(
manager
)
,
m_helpEngineNeedsSetup
(
false
)
{
QFileInfo
fi
(
ExtensionSystem
::
PluginManager
::
instance
()
->
getObject
<
Core
::
ICore
>
()
->
settings
()
->
fileName
());
m_helpEngine
=
new
QHelpEngineCore
(
fi
.
absolutePath
()
...
...
@@ -68,6 +68,7 @@ CppHoverHandler::CppHoverHandler(CppModelManager *manager, QObject *parent)
//m_helpEngine->setAutoSaveFilter(false);
m_helpEngine
->
setupData
();
m_helpEngine
->
setCurrentFilter
(
tr
(
"Unfiltered"
));
m_helpEngineNeedsSetup
=
m_helpEngine
->
registeredDocumentations
().
count
()
==
0
;
}
void
CppHoverHandler
::
updateContextHelpId
(
TextEditor
::
ITextEditor
*
editor
,
int
pos
)
...
...
@@ -234,6 +235,12 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
}
}
if
(
m_helpEngineNeedsSetup
&&
m_helpEngine
->
registeredDocumentations
().
count
()
>
0
)
{
m_helpEngine
->
setupData
();
m_helpEngineNeedsSetup
=
false
;
}
if
(
!
m_helpId
.
isEmpty
()
&&
!
m_helpEngine
->
linksForIdentifier
(
m_helpId
).
isEmpty
())
{
m_toolTip
=
QString
(
QLatin1String
(
"<table><tr><td valign=middle><nobr>%1</td>"
"<td><img src=
\"
:/cpptools/images/f1.svg
\"
></td></tr></table>"
)).
arg
(
Qt
::
escape
(
m_toolTip
));
...
...
src/plugins/cpptools/cpphoverhandler.h
View file @
86b01665
...
...
@@ -68,6 +68,7 @@ private:
QHelpEngineCore
*
m_helpEngine
;
QString
m_helpId
;
QString
m_toolTip
;
bool
m_helpEngineNeedsSetup
;
};
}
// namespace Internal
...
...
src/plugins/help/help.pro
View file @
86b01665
...
...
@@ -16,8 +16,8 @@ HEADERS += helpplugin.h \
searchwidget
.
h
\
helpfindsupport
.
h
\
help_global
.
h
\
helpindexfilter
.
h
\
indexwindow
.
h
helpindexfilter
.
h
SOURCES
+=
helpplugin
.
cpp
\
docsettingspage
.
cpp
\
filtersettingspage
.
cpp
\
...
...
@@ -26,6 +26,7 @@ SOURCES += helpplugin.cpp \
searchwidget
.
cpp
\
helpfindsupport
.
cpp
\
helpindexfilter
.
cpp
FORMS
+=
docsettingspage
.
ui
\
filtersettingspage
.
ui
RESOURCES
+=
help
.
qrc
...
...
src/plugins/help/indexwindow.h
deleted
100644 → 0
View file @
5489c83d
/***************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Qt Software Information (qt-info@nokia.com)
**
**
** Non-Open Source Usage
**
** Licensees may use this file in accordance with the Qt Beta Version
** License Agreement, Agreement version 2.2 provided with the Software or,
** alternatively, in accordance with the terms contained in a written
** agreement between you and Nokia.
**
** GNU General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU General
** Public License versions 2.0 or 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the packaging
** of this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
**
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** http://www.gnu.org/copyleft/gpl.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt GPL Exception
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef INDEXWINDOW_H
#define INDEXWINDOW_H
#include
<QtCore/QUrl>
#include
<QtGui/QWidget>
#include
<QtGui/QLineEdit>
QT_BEGIN_NAMESPACE
class
QHelpIndexWidget
;
class
QHelpEngine
;
class
IndexWindow
:
public
QWidget
{
Q_OBJECT
public:
IndexWindow
(
QHelpEngine
*
helpEngine
,
QWidget
*
parent
=
0
);
~
IndexWindow
();
void
setSearchLineEditText
(
const
QString
&
text
);
QString
searchLineEditText
()
const
{
return
m_searchLineEdit
->
text
();
}
signals:
void
linkActivated
(
const
QUrl
&
link
);
void
linksActivated
(
const
QMap
<
QString
,
QUrl
>
&
links
,
const
QString
&
keyword
);
void
escapePressed
();
private
slots
:
void
filterIndices
(
const
QString
&
filter
);
void
enableSearchLineEdit
();
void
disableSearchLineEdit
();
private:
bool
eventFilter
(
QObject
*
obj
,
QEvent
*
e
);
void
focusInEvent
(
QFocusEvent
*
e
);
QLineEdit
*
m_searchLineEdit
;
QHelpIndexWidget
*
m_indexWidget
;
QHelpEngine
*
m_helpEngine
;
};
QT_END_NAMESPACE
#endif // INDEXWINDOW_H
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment