Commit Graph

844 Commits

Author SHA1 Message Date
Eike Ziller
a892ae03de Help: Make some local constants static
Change-Id: I2b466c6fb883c2d7de264e32bb0bfe0a16c590bc
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-07-02 09:56:30 +02:00
Eike Ziller
f97784a98c Help: activateContext -> showContextHelp
Change-Id: I8f3864b2ee07b47accd4a8a426bfc18010ce1ac0
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-07-02 09:56:20 +02:00
Eike Ziller
cd09162547 Help: Fix selection behavior in documentation settings
Change-Id: Ie1cd5dac0b7964edb75c80c0fbc201818efae205
Task-number: QTCREATORBUG-12135
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-07-01 11:58:34 +02:00
Eike Ziller
0e0d70191f Help: Fix state of "Show Sidebar" action
It was enabled when the side bar was hidden.

Change-Id: I580071ab792396d727d6f712f603e1b7a12b4c24
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-25 18:04:51 +02:00
Eike Ziller
b89a208b8d Help: Close external window when opening page in help mode
Change-Id: I863e819c0e85185e74aa931b6f7eeb49766d3759
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-25 18:03:31 +02:00
Tobias Hunger
8da0742ae2 ProgressManager: Unify style of progress manager task descriptions
Change-Id: I6826e66f00f47997c644c24d1b20f4a1ea53a8a2
(cherry picked from commit 36d8ec4f47)
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-25 14:00:30 +02:00
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
d89ee73d1e Help: Always Start Full Help -> Always Show in Help Mode
Change-Id: I2beb9b4fe9153bad930b0acfa6dfbce62c0173c7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-06-20 14:08:06 +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
Christian Stenger
21983e080d Help: Fix Qt4 compile
Change-Id: Ic9027415d427f65c7012399ff4877a2a444814d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-18 16:06:49 +02:00
Eike Ziller
be68fe7f4a Help: Unify help content loading and error message.
Task-number: QTCREATORBUG-12352
Change-Id: If74453e75cc8eaf27c114d0976099388be778fa6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-06-18 12:09:12 +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
Alessandro Portale
3d42c2b739 Help: Move Help icons from Core to Help
These three images are only used in the Help plugin,
therefore they fit better into the Help resources.

Change-Id: I597494cc804e751d4f653bd7eb837a5f2f2e3b4b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-02 13:27:25 +02:00
Robert Loehning
07d3b6209d Help: Fix compilation with Qt4
Change-Id: I7373f0ae8d576ecd0a55b93e6736ca9cddc4e973
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-30 16:38:35 +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
Orgad Shaneh
b76ea82290 Help: Pass const list by reference
Change-Id: I00ece6d5c41a9067bd12b388bf9ca5f80e981ed6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-20 07:42:55 +02:00
Eike Ziller
1228ffcd6c Help: Implement history menus for text browser backend
Change-Id: Idbdb3f9807c8282f8c9050ba28c1e28a7e3865e7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 09:00:18 +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
Eike Ziller
063b95d970 Use more descriptive progress bar titles
Change-Id: I70450a2aa675d69f820de48dd75909f36051efe0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-28 14:32:25 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines.
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-22 10:06:40 +02:00
Daniel Teske
18e585b7a7 Remove unnecessary QTreeView includes
Change-Id: I979e4387d8860a9541ad1797bdeeb6adc04ab68e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-07 11:57:51 +02:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
Orgad Shaneh
9b55bd3f7a Help: Another compilation fix...
Change-Id: I19b05e26ac05be3d1fcd2eb347e5a22ee492ee42
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-25 19:46:57 +01:00
Orgad Shaneh
cbf9651efc Help: Fix compilation
Change-Id: I2aa1c4d32cc4281da5d4f5374d0a189a1465247c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-25 19:43:22 +01:00
Tobias Hunger
b0228f0833 Help: Use https to access external search engines
Change-Id: I72c1a8de4066cb7532bc6dab64ca70252f0bd05b
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-25 17:24:04 +01: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
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
Jarek Kobus
96a3fd53e8 Fix tooltips, add lacking dots
Change-Id: Id54a11b6868d5033fd1ecfd6324b7e50b94e305c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-13 12:06:27 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +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
Robert Loehning
03ead7f432 Add "..." to buttons which open a dialog
Change-Id: I70974a223b68b9823ac0f1346a9ecc504355955f
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-25 11:20:32 +01:00
Christian Kandeler
28656de664 Help: Allow building without Webkit with qbs.
Change-Id: I03cbfcef594e072c4360be0f13f220ec83c1fc1d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-21 16:15:03 +01:00
Orgad Shaneh
7ed1576083 Clean up single namespace forward-declarations
Done using the following ruby script:

Dir.glob('**/*.h').each { |file|
  if File.file?(file)
    s = File.read(file)
    t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  end
}

Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-12 09:30:37 +01:00
Tobias Hunger
8c1c284789 Qbs/qmake: Fix dependencies of plugins
... based on output from dependencyinfo.py script

Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-11 13:23:26 +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
Robert Loehning
50d93a6567 Provide parent to getOpenFileName() and getSaveFileName()
Change-Id: I839de363f426a57a522700df39e4f3b4ebfbb7ea
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-31 11:15:30 +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