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

Introduce QML-based welcome screen using desktop components

Browse Source 
Implements new XML-based format for examples, demos & tutorials

Done-with: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Change-Id: I42c0afdb419cffe5637cd4f298e828d09e0fb15a
Reviewed-on: http://codereview.qt.nokia.com/840
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Daniel Molkentin
2010-11-11 16:49:17 +01:00
committed by Eike Ziller
parent b23aa10890
commit 497dd323ea
150 changed files with 10887 additions and 1761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,6 +256,19 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
am->actionContainer(M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
#endif
action = new QAction(tr("Technical Support"), this);
cmd = am->registerAction(action, Core::Id("Help.TechSupport"), globalcontext);
am->actionContainer(M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
connect(action, SIGNAL(triggered()), this, SLOT(slotOpenSupportPage()));
#ifndef Q_WS_MAC
action = new QAction(this);
action->setSeparator(true);
cmd = am->registerAction(action, Core::Id("Help.Separator2"), globalcontext);
am->actionContainer(M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
connect(action, SIGNAL(triggered()), this, SLOT(activateContext()));
#endif
action = new QAction(this);
am->registerAction(action, Core::Constants::PRINT, modecontext);
connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(print()));
@@ -1121,7 +1134,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url)
if (address.startsWith(HelpViewer::NsNokia)
|| address.startsWith(HelpViewer::NsTrolltech)) {
// local help not installed, resort to external web help
QString urlPrefix = QLatin1String("http://doc.trolltech.com/");
QString urlPrefix = QLatin1String("http://doc.qt.nokia.com/");
if (url.authority() == QLatin1String("com.nokia.qtcreator")) {
urlPrefix.append(QString::fromLatin1("qtcreator"));
} else {
@@ -1192,6 +1205,11 @@ void HelpPlugin::slotOpenActionUrl(QAction *action)
#endif
}
void HelpPlugin::slotOpenSupportPage()
{
switchToHelpMode(QUrl("qthelp://com.nokia.qtcreator/doc/technical-support.html"));
}
void HelpPlugin::openFindToolBar()
{
if (Find::FindPlugin::instance())