Commit Graph

282 Commits

Author SHA1 Message Date
Eike Ziller 8fc7035b18 Help: Open example documentation in extra window
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>
2014-06-24 11:22:20 +02:00
Eike Ziller 97bfe3a53e Help: Remove hack for example documentation
The code for opening examples nowadays explicitly changes to edit mode
before opening the example documentation, so we do not need to do that
hack here anymore.

Change-Id: I536784fdc0def8916c14f6df1bb7e50d11aff164
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-23 09:28:41 +02:00
Eike Ziller e7ac9facd3 Help: Implement a real external help window
With this patch it is just used with the context help "always show in
external window" option.

Change-Id: I4bc6ba8e0e241500f6970d4cb72f66ba02075ef5
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-20 14:01:28 +02:00
Eike Ziller b2a2a89358 Help: Create separate help widget class
That contains the tool bar together with a help viewer,
which can also be used for an external help window, and later be
extended to also replace the extra "central widget".

Change-Id: I73fac4c135b985cbe47062b90783f156b5062005
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-20 14:01:18 +02:00
Eike Ziller 46cdd91024 Help: Get rid of separate find support for central widget
There is no reason to not just add the support to the individual pages
when they are created.

Change-Id: I0e45577d054a420f406c44cdcbb4968ff05fcc7c
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-18 11:18:53 +02:00
Alessandro Portale 9cca576703 Help: Provide a button for re-indexing the documentation
It sometimes just breaks, so having a simple way for re-indexing seems
appropriate.

Task-number: QTCREATORBUG-11484
Change-Id: I4010d31cbe04f9ef57ebe772610118d8aa7a2ea2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-16 15:10:34 +02:00
Eike Ziller ca920be240 Help: Remove qDebug
Change-Id: I02576a9dbef9ce56df74c06a773df39a3b3fc6f2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-16 12:54:28 +02:00
Nikolai Kosjar ac930e4ff0 Help: Fix compilation with Qt4
Change-Id: I4fad0d14eae7721272dd45dd0db99ea5f18fb148
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-04 16:54:07 +02:00
Eike Ziller 43895b038f Help: Fix finding latest Qt documentation link for Qt5
The identifiers changed to use org.qt-project.
Also simplify the logic the does the id highlighting.

Task-number: QTCREATORBUG-10331
Change-Id: I3b6eb80138d8fafeb84772b95435acd68818ada1
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-04 15:10:59 +02:00
Eike Ziller 94ca9e563c Help: Avoid trying to open "Foo::bar" as a url in a browser.
Technically it is a valid URL with scheme "Foo" and path ":bar". With
this patch we only try to open URLs with very specific schemes like
"qthelp", "file", "http(s)", "about".

Task-number: QTCREATORBUG-7547
Change-Id: I6908ff554c12ca0f4cfc5bd0fb30dd659d780a23
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-04 15:08:33 +02:00
Eike Ziller 212836d56b Help: Fix check if help viewer currently has focus.
Fixes a little issue that after opening context help, clicking into the
context help viewer, and pressing F1, the help viewer would show "No
documentation available" instead of opening help mode.

Change-Id: I071c92946214680e82b1f2982b62cc909a272ad5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-30 15:39:47 +02:00
Eike Ziller c5be32fae7 Help: Provide native WebView backend on Mac
Run Qt Creator with environment variable QTC_HELPVIEWER_BACKEND to
* 'native' to get the WebView based one on Mac
* 'textbrowser' to get the QTextBrowser based one

Defaults to use QWebView if QtWebKit is available, or QTextBrowser if
not, like before.

Change-Id: If0660782b18ff3d89301fa7bcaf4e2e2fb69627d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-30 09:37:04 +02:00
Orgad Shaneh 3251d0dcb6 Help: Fix condition
Change-Id: I5e1f92c846166d979f24cda915050f86eb7b659a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-20 07:44:51 +02:00
Eike Ziller 96e8f0bb7b Help: Cleanly separate different viewer backends
Removes the conditional compilation of the text browser vs web kit,
cleans up the code, and enables us to provide and test other backends
(WebEngine? Native?)
Adds runtime switch for testing the text browser variant by setting
environment variable QTC_FORCE_TEXTBROWSER (for now)

Change-Id: I8cc9bb373438d37c8194e433224314caa0b617bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 08:57:47 +02:00
Orgad Shaneh 568841cc2e Help: Add "Get Help Online" action for tasks
Useful for looking up compiler warnings on the web.

Change-Id: I1e77c3b97f7907880e2caa6d7e6070b03d846420
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-25 17:04:52 +01:00
Eike Ziller 3ba9db48ed Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
2014-03-04 14:04:07 +01:00
Eike Ziller e4feb5e326 Fix F1 sometimes opening explorer/finder if documentation is not found
It's not sufficient to try to create a QUrl on a string to find out if
it is an url, because that automatically treats strings without any
special characters as "local file urls".

Task-number: QTCREATORBUG-11570
Change-Id: I18071aed5b3fbdd717b045c2f6e3e90385be8584
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-03 17:08:09 +01:00
Eike Ziller e58c1ab06e ActionManager: Remove QShortcut registration API
Registering QShortcuts doesn't solve any problem that is not already
solved by registering QActions, and shortcuts are in fact much more
limited (not being able to register multiple shortcuts for different
contexts).

Change-Id: I9478e601b2cbc3c5e12fb5baee43cacc20d0fb9c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-03 13:07:28 +01:00
Eike Ziller b03a981a41 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
2014-02-11 09:14:22 +01:00
Eike Ziller 1f0665a3e2 Help: Update fallback online documentation URL
Documentation is now on qt-project.org instead of doc.qt.digia.com.

Change-Id: I5e90a41cc908b0daf7fd7beca594c10d87f3c694
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-02-11 09:09:55 +01:00
Kai Koehne fd75b0888a Put "Technical Support", "Report Bug..." in a separate menu group
This allows other plugins to add actions here.

Change-Id: Id5b751bf719533842ba426ecdb4f98c43a73755b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-24 14:19:46 +01:00
Eike Ziller ad4b589231 Fix pressing escape in help viewers find tool bar (in Help mode)
The tool bar should not be a direct child of the widget that is searched
(i.e. that has the FindSupport attached).

Change-Id: Ib6b17c4d2df39798086ae41d1b3a0e394e7afa75
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-14 08:01:13 +01:00
hjk 4d96fa7aba Core: Merge Find and Locator into Core plugin
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-14 07:43:00 +01:00
Robert Loehning 746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Jarek Kobus 8cfa1fdd7b Remove unneeded texts.
Change-Id: Ibf18eb165b9e052c9a77b1b917b2746d56f81646
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-12-09 08:26:13 +01:00
Christian Kandeler 15d1048ef2 Fix some include statements.
In several places, it says '#include "..."' for headers
from different libraries/plugins.

Change-Id: I96cd74fef9b30163adefe3e1720e0847bed9553a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-04 15:51:36 +02:00
Tobias Hunger f20a276182 Find: Remove some Find namespace usages
Change-Id: I3caf03474c7e080766b85c6a3042f6a29f13cd40
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-04 14:46:55 +02:00
Tobias Hunger d18b61b85d Core::Id: Remove some explicit casts to Core::Id
Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 11:57:23 +02:00
hjk d66369e21d Core/Help: Clean up HelpManager interface and users
Change-Id: Ia6edf583f2a002d7c6f4878df670a78614ea087d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 11:34:39 +02:00
Eike Ziller 7a7efd3e2e Fix path to qt creator documentation.
broke with the introduction of ICore::documentationPath in
60f7f00e41

Change-Id: Ic63ded85bcbe27f64ad2a9436683472cc8bf01b8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-18 09:47:28 +02:00
Eike Ziller 60f7f00e41 Provide ICore::documentationPath()
Change-Id: I74e4ad7650296e897edc3313904168a720c8d360
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-13 16:21:11 +02:00
hjk d0db6b2013 Help: Un-break build
Change-Id: I7911f57d7a9ba53b6055149eef3a48c2a0a5697d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 19:07:07 +02:00
Kai Koehne 9d0965b6de Help: Remove outdated loading of qml.qch
This still stems from times where we bundled qmlviewer with Qt Creator.

Change-Id: I741ef9c098ed413b473560f5e60c8d35415f8d7c
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-14 17:18:40 +02:00
Eike Ziller 65ce453c4e Add split in new window action for editor views.
A few details are still to be done:
- extra windows are not restored yet
- window title of extra windows should show information about current
  editor
- the "raise main window" hack for Linux doesn't work with Qt 5

But it should already now be quite usable.

Change-Id: I638583ee4b2abe32e95c261bdf31b4a10b472748
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-08 13:07:05 +02:00
Christian Kandeler d2e36ac8ff Help: Remove unneeded #ifdef.
Replace compile-time check for Host OS with runtime check.

Change-Id: I149dc6dd8539e6598c84ae223df3cb76cc8ca675
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-03-14 12:40:57 +01:00
Sergio Ahumada fb3b01d888 Replace com.nokia.qtcreator with org.qt-project.qtcreator
Task-number: QTCREATORBUG-8189
Change-Id: I1c882f55eed901620ef4944bf1789645b7cff34a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-07 12:40:37 +01:00
Oswald Buddenhagen 1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning 298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
hjk c0e7b65db3 Help: move global constants
Global constants that are used only in one place could live
just there.

Change-Id: Ibee751b6ccc4fb0d35a8e708995730991becd749
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-01-11 12:19:41 +01:00
Orgad Shaneh 29a93998df Remove braces for single lines of conditions
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 10:48:18 +01:00
Orgad Shaneh c37420eeb3 Help: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: Iba24d4f2d02de790f31d9606c7f9b85faf4670ce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-11-27 13:18:22 +01:00
Eike Ziller 6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
Eike Ziller 68c796e244 Merge origin/2.6
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
2012-10-05 20:51:31 +02:00
hjk 386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Eike Ziller c29123158a Adapt to moved online documentation.
Change-Id: I4186502f0615ee16340a6cabc9c61d7a9ff4836c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-04 16:12:54 +02:00
Christian Kandeler 1b3d637c1b Replace qVariantValue() with qvariant_cast().
qVariantvalue() is deprecated in Qt 5. qvariant_cast() does
the same thing and works in Qt 4 and Qt 5.

Change-Id: I922329d3a47fe394669f5d97a25f0825d3d2dea5
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-20 09:41:37 +02:00
Eike Ziller b947861c59 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
2012-09-19 18:02:46 +02:00
Eike Ziller a5e4c2925a Fixes: Qt Creator documentation is accumulated
Deregistering the old documentation must be delayed till the help engine
is set up, because otherwise the list of registered namespaces is empty.

Task-number: QTCREATORBUG-4605
Change-Id: I08288129fe24a80b7af090c3aa5dd13395bc6093
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-09-18 10:25:01 +02:00
Christian Kandeler e669f05406 Utils: Introduce HostOsInfo class.
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 17:00:03 +02:00
Friedemann Kleint 455b677f8e tr()-fixes for 2.6
- 'profile' -> 'target'.
- 'qt version' -> 'Qt version'. Fix occurrences in comments as
  well to make grepping easier.
- Placeholders.

Change-Id: I451eae2f0571bccf1e75cf0def425a09fa80855b
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 16:14:42 +02:00