Commit Graph

844 Commits

Author SHA1 Message Date
Eike Ziller
6ed775f56a Fix wrong context help if tool tip was not shown for focus widget
The tool tip never has focus, so it cannot become the IContext that is
checked for context help. So, integrate the help id into Utils::ToolTip
and check the tool tip first when checking for context help.
As a side effect the [F1] button and help id for the tool tip is now also
available for use outside of the text editors.

Task-number: QTCREATORBUG-5345
Change-Id: Id975703caf161d1183c247e8ad8bb693b90fd306
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-09-30 08:25:18 +00:00
Montel Laurent
54eabfb0c1 Port to new connect api
Change-Id: If9948ced45095546f37f9f397b65f922dc925b6a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-22 05:54:01 +00:00
Nikita Baryshnikov
5398f4f5b1 fix metatype declaration in a few places
Change-Id: I76a12a278db8e74d935e76a5e832daf8e34df2a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-02 08:48:20 +00:00
Eike Ziller
d0e510f362 Help: Remove funny restriction
There is no reason why some part of the help mode couldn't provide
help.

Change-Id: I9c28dc1dacf122e5f3828144a0e386a9f7e2b6c2
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-08-21 08:49:52 +00:00
Eike Ziller
ee488785bf Improved locator settings
* Added columns for name, prefix and default
* Made sortable
* Added filter input field
* Added inline editing of prefix and default state
* Changed "Limit to prefix" to "Include by default"
* Added some tool tips

Change-Id: I9ddfaf1bc9ff62e3fbe84c1b66bdd795aaa274fd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-06-12 09:49:58 +00:00
Eike Ziller
19f63a5d8a Merge remote-tracking branch 'origin/3.4' 2015-06-03 08:39:25 +02:00
Eike Ziller
cdc76fccaf Help: Fix that user registered documentation was auto-removed on windows
We may not use native path separators for internal data.

Task-number: QTCREATORBUG-14249
Change-Id: I0f00db235608e81cfefdd2359378020c7376768f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 09:22:08 +00:00
Eike Ziller
3858c33d74 Merge remote-tracking branch 'origin/3.4'
Change-Id: I35ba4cc7f7052699c3006545514c866be3cb5fdd
2015-05-26 15:12:42 +02:00
Eike Ziller
a34736f330 QtWebKit HelpViewer: Fix that "Open in New Page" was visible where it shouldn't
Change-Id: I707f348965cb66085e9e9b7b47613c65974a5f55
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
2015-05-26 06:13:15 +00:00
Sergey Belyashov
31eaf32ab4 Fix untranslated messages
Change-Id: I21ff7f3f70116944ba08ea18bdeeb258c0984f09
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-19 12:17:18 +00:00
Eike Ziller
19dca2adc4 Help: Fix QDesktopServices url handler for qthelp urls
Change-Id: If55a35fcd0960bd7ac215493ccc7e4118a8c3187
Task-number: QTCREATORBUG-14459
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-18 11:38:20 +00:00
Eike Ziller
9724cf6891 Help: Work around issue with Visual Studio < 2013
Visual Studio before 2013 had bugs in bool conversion of std::function,
leading to "true" in some cases where it shouldn't.

Task-number: QTCREATORBUG-14399
Change-Id: I8a1ad2f952247049355e11337ddf99f380ebde98
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-12 05:08:18 +00:00
hjk
1d3b4abbfc Help: Allow use of stripped down WebKit as help browser
Change-Id: I9571b70b6eb3c6e27adf482ea24049d66244bbc7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-30 14:13:06 +00:00
Eike Ziller
5e0f0268ae Help: Do not save settings in help database
Using the help database is not necessary, does not follow our style,
and is less reliable (with all the setupEngine mess).

Change-Id: Icb7f63a6b349458011e1b068bdf0954b78d3281f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-24 08:32:38 +00:00
Eike Ziller
6c2c505228 Merge remote-tracking branch 'origin/3.4' 2015-04-23 09:39:09 +02:00
Eike Ziller
6302a28c97 Fix translation of help navigation panes
Change-Id: Ia82609d55311698ca675943cdfe7b2b91d6f59c2
Task-number: QTCREATORBUG-14241
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-21 15:56:56 +00:00
Eike Ziller
50fe3585a8 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/timeline/qml/MainView.qml
	src/plugins/git/gitclient.cpp

Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
2015-04-15 17:45:47 +02:00
Ulf Hermann
05edc86cad Help: Remove extra event processing
It's not clear why we need it there, it's generally not advisable to do
qApp->processEvents() and in this case it clearly creates problems.

Change-Id: I2707ef0ec98ee761078283ee3ce3f76f9da95f31
Task-number: QTCREATORBUG-14215
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-15 10:35:15 +00:00
Eike Ziller
11590a8c5f Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7
2015-04-13 10:53:03 +02:00
Eike Ziller
7b8d670bd8 Help: Fix that bookmarks were not restored
We have to make sure that the help engine is properly set up before
trying to read the bookmark data.

Change-Id: Id57cce5f538472eeac17b39a3640bf2ed77fa56a
Task-number: QTCREATORBUG-14106
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-13 07:19:38 +00:00
Eike Ziller
7a59dbc988 OS X: Create a help AutoreleasePool class
That wraps NSAutoreleasePool and releases it at destruction.

Change-Id: Ie7049450da46458f02c02d38439e20e43609ca83
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-03-31 13:27:33 +00:00
Alessandro Portale
57d2d6eb53 Help: Change OSX shortcut for bookmarks to Alt+Meta+M
The default shortcut for Help bookmarks Meta+B overrode the shortcut for
"cursor back". This patch changes it to Alt+Meta+M, which not only
removes the conflict but also makes it the same shortcut as the one for
the editor sidebar bookmarks.

Task-number: QTCREATORBUG-13093
Change-Id: I6f4f6c4891c34a3a00c39632bb0dae119d73cb99
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-12 12:23:03 +00:00
Friedemann Kleint
54da18eaaa Clean exported headers of the Core plugin.
Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-05 07:18:14 +00:00
hjk
7f001dab1b Core: Make Context parameter to registerAction optional
... and default to C_GLOBAL. A rather common case.
Similar for ActionContainer::addSeparator().

Change-Id: I7f9ba573af201c0a472132d5a494ad17cc4175b7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-26 10:09:03 +00:00
Eike Ziller
767f0ef58b Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb
2015-02-25 10:15:28 +01:00
Christian Kandeler
05f8a2c813 qbs build: Introduce convenience project property sharedSourcesDir.
Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-18 14:49:06 +00:00
Sergio Ahumada
e84770b794 Adapt documentation URL
Change-Id: I74963a9d4a729450341f4f7a4ae5b3583654ffb8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-18 12:38:23 +00:00
Eike Ziller
56aadc407d Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
2015-02-12 17:36:29 +01:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
2015-02-12 17:29:21 +01:00
Orgad Shaneh
74ed591db3 Misc: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I919da493d0629b719d328e5e71c96a29d230dfd1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-06 12:20:28 +00:00
Montel Laurent
0d0a6d119a Use new qt5 connect api
Change-Id: I6c0d4ec60759b3c2fedac3e6649b7ec5102a6487
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-29 14:29:30 +00:00
Thomas Hartmann
a6d4d50172 Use always black as the foreground color in HelpViewer
Our css styling assumes black as the background color.
Task-number: QTCREATORBUG-13660
Change-Id: Ia8d76c39c970b436a0ae038191d8d0f8f8728ded
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-19 12:21:54 +01:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Eike Ziller
ac18f9f1d8 Fix Help index filter after recent refactoring
It was incorrectly updating cached results, so e.g. shortening the
search string was not forcing a new search.

Change-Id: Ie55fce72b7363258195423f5686f013aeafc7d57
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-12 13:13:02 +01:00
Christian Kandeler
c5c7b79b65 Help: Fix qbs build.
Change-Id: I9ec359d6c2c38ad832fa0215bd41a92a33109bb5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-09 09:22:49 +01:00
Eike Ziller
9007d2cb33 Help index filter optimizations
Move retrieval away from prepare search, and do some caching. Also split
the keyword search into individual chunks per help database that are
executed on the UI thread individually.

Change-Id: I0b8fe4abfc3cba46620985752d3d90638e10512f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-08 11:27:10 +01:00
Eike Ziller
b5b47f7df2 Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
2015-01-08 10:38:20 +01:00
Nikita Baryshnikov
67788b6f0a Help: show ToolTips on links hovers
Change-Id: Icce21b848f38b4f45b58ccff626b2e23a7e8ef98
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-06 10:32:25 +01:00
Eike Ziller
7270636cb1 Help/OS X: Use native viewer by default if welcome uses QQuickWidget
Since using window container breaks the native view hierarchy
(QTBUG-39363), we can use the native viewer only if we use QQuickWidget
for the welcome screen.

Task-number: QTBUG-39363
Change-Id: I26407a5c1db558d9a8ac6d79c37e3ffa0e009ed6
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-12-19 10:41:35 +01:00
Eike Ziller
ee63594182 Help: Do not pass zoom factor to constructor
Introduce HelpViewer::setScale instead

Change-Id: I9d50483bc1fa4de89de53db40eda348379bd0ae9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-19 10:40:50 +01:00
Eike Ziller
487b05dba8 Adapt bugtracker URL
Change-Id: I93a256f18e720edb0bcfc2b409c119abfdcf2a2b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2014-12-19 10:18:23 +01:00
Eike Ziller
fd6ba0e2a6 OS X: Welcome/QQuickWidget fixes
The rendered text is still ugly, but the fuzzy text is better than the
alternative currently.

Change-Id: Id9e54fb406ee964e0b9b5c40b7a8108b45c15f85
Task-number: QTBUG-42861
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-18 15:39:18 +01:00
Nikita Baryshnikov
5a40c071a4 HelpPlugin: simplify createHelpViewer
and remove stale define

Change-Id: I8f47c539457577faee13320f88709b60deee90ea
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-18 09:31:19 +01:00
Eike Ziller
beb0797008 LocalHelpManager: Make last methods static
Change-Id: I1b4a72437b76cefb1c457033692f20efc41c089c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-17 16:46:41 +01:00
Eike Ziller
3c3e62dfd0 MacWebKitHelpViewer: Restore override cursor also on error
Change-Id: I7b5fe179e567c360a45aab57748696cb60f07e3b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-16 14:18:02 +01:00
Eike Ziller
877d482c85 Help: Clean up automatically registered documentation
It would keep documentation registered as long as the files are still
there, but that is actually not what is wanted. If you remove a Qt
version from Qt Creator, or switch between different Qt Creator
installations with different auto-detected Qt versions, the registered
documentation should be updated.
This also reduces the number of open files in these cases.

We keep a list of manually added documentation in the settings and treat
all other documentation as automatically managed.

Change-Id: I542f9aee0e62cab70db5afc5c6d6764d84cb253d
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-12-08 08:31:59 +01:00
Christian Kandeler
9d677e3302 qbs build: Remove unneeded import statements.
The respective items are available without it.

Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-11-10 15:45:14 +01:00
Thomas Hartmann
300f54260c Use always white as the background color in HelpViewer
Our css styling assumes white as the background color.

Change-Id: Ieeddf1eba5bb29cadf0f4da7c8ee6b14c5d1387e
Task-number: QTCREATORBUG-13300
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-06 12:07:26 +01:00
Eike Ziller
cd5e00034d Help: Fix highlighting of search terms.
It was using the wrong search help engine to get the search terms.
Instead let the search widget itself figure out the search terms, and
pass it directly on to the help widget when activating links.

Change-Id: Ib72220eafca69e92894fe7584b1e4dfd9a42cc7e
Task-number: QTCREATORBUG-13239
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-04 07:57:08 +01:00
Eike Ziller
7e72b47728 Help: Remove some unnecessary direct accesses to central widget
Change-Id: I04046b792f5b5264534e2654db28fcb18638869b
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-10-30 12:44:19 +01:00