Commit Graph

1086 Commits

Author SHA1 Message Date
Eike Ziller
090c106929 Fix Ctrl+M (bookmark) in editor when help mode is visible
For external windows we need to separate the contexts in which help
mode's "add bookmark" and editor's "toggle bookmark" are present.

Task-number: QTCREATORBUG-16286
Change-Id: I2a7a28c75dc53e1dd0b21c0a8833bd4594d5afad
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-28 07:52:03 +00:00
Eike Ziller
25120b2f59 Partially revert "OS X: Fix warnings in MacWebKitHelpViewer"
This partially reverts commit 729a7345f4.

The protocols only recently got formal protocols, at least 10.9 SDK
does not have it yet.

Change-Id: Ic3960d531683f88417bd1077cde69058fead3ded
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-02 12:25:27 +00:00
Alessandro Portale
a6683575c4 Icons: Move "next/prev", "[un]locked" and "zoom" from Core to Utils
They are needed in the timeline view.
The change in qtcreator-project.qdocconf makes sure
that qdoc still finds the referenced icons.

Change-Id: I812fba8e57d06d93efc00c295467c83c08cd1784
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-31 08:51:12 +00:00
Takumi ASAKI
cfd69678d2 Help: Fix translation context
Change-Id: I36f854eb56fed17b736af8390da08b01d72ee418
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-30 07:50:43 +00:00
Eike Ziller
729a7345f4 OS X: Fix warnings in MacWebKitHelpViewer
Change-Id: I8c8c385d9610f8e2a4ca0f1c921cc9d3b3de4267
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-30 06:30:55 +00:00
Vlad Seryakov
a4116259bc OS X: Avoid multiple slotLoadFinished calls
Seems like Web delegate is not consistent enough, we need to keep track
ourselves.

Change-Id: Icff1f6b5a642df73eb2e80dd74baf44257e3e28e
Reviewed-by: Vlad Seryakov <vseryakov@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-30 05:46:37 +00:00
Vlad Seryakov
a59ab991f2 OS X: Handle webview load error
Change-Id: Iabe841c6c8d03b667061521952ae4944bf425e62
Reviewed-by: Vlad Seryakov <vseryakov@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-17 08:00:42 +00:00
Eike Ziller
4a826ada04 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
2016-04-22 15:13:58 +02:00
Alessandro Portale
5e32183c9b Theme: Separate run/stop/interrupt icons in menus
And for that, we also need separate theme color roles.

Change-Id: I27bf4499acb516f7f824f5e57632797653b150ec
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-21 15:57:56 +00:00
Eike Ziller
ee8bf341c6 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/projectexplorer/session.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
2016-04-20 14:58:48 +02:00
Eike Ziller
a6aafe3c45 Add QTC_GUARD
Similar to QTC_CHECK, but has the boolean result of the condition as
value. Use it in the form

if (QTC_GUARD(condition)) { ... }

Replace some occurrences of

QTC_CHECK(condition)
if (condition) { .... }

Change-Id: I8eea02f869eb7a183dfbf4810dace48097880519
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-18 11:34:03 +00:00
Alessandro Portale
2b05793083 Help: Improved bookmark icon for non-toolbar
This change makes the bookmark icons in the bookmark list and locator
look better.

Change-Id: I9d8fab31ca945ad7d93deb82942ac0f3f972e993
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-15 10:01:21 +00:00
Tobias Hunger
95ac4edfd4 Projectexplorer: Modernize codebase
Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
2016-04-15 09:40:53 +00:00
Eike Ziller
8a77eacf8d Merge remote-tracking branch 'origin/4.0'
Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
2016-04-15 10:07:55 +02:00
Eskil Abrahamsen Blomfeldt
cb62258ee3 Help browser: Fix overlapping images in old docs
This works around an issue in Qt where line-height will be
interpreted as an absolute height, rather than the minimum,
so if images are larger than the specified size, they will
overlap the text.

The work around is just to change all instances of FixedHeight
to MinimumHeight until the default can be changed in Qt.

Task-number: QTBUG-51962
Change-Id: I343d30c539d434301866a7a659ef5fc300c364d6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-04-13 08:09:44 +00:00
Eike Ziller
9b7fa05bf3 Fix after changing ModeManager::currentModeChanged
Change-Id: Id71b0992fef9c0cb544d68078fb2b654777f0a2e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-13 07:48:33 +00:00
hjk
5e47d35fcd Use Core::Id in ModeManager interface
Makes it more uniform to use and allows placeholder widget
creation to be independent of mode creations.

Change-Id: I4021bc9db7f8c78f0374c0cc3b3331506959afe4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-04-08 10:38:49 +00:00
Oswald Buddenhagen
e426d08e54 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
2016-04-01 17:31:39 +02:00
Ulf Hermann
2ce3bf8ed4 Help: Disambiguate the HelpPage classes from QtWebKit and WebEngine
This way the help viewers can coexist and the building against a
version of Qt that has both webkit and webengine available doesn't
fail anymore.

Change-Id: I2de00b03fc7b127899cbf90b91fc2cfb090a47a5
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2016-03-31 12:04:43 +00:00
Alessandro Portale
0187dc493c Help: New "Bookmark" icon
Change-Id: I43af280196912b1b4fd09f2e7823f54b4b37ee45
Reviewed-by: Diana de Sousa <diana.desousa@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-31 10:39:45 +00:00
Alessandro Portale
4df4864b9b Help: New "Home" icon
Change-Id: I5d6e0ee20ecb76cb90106041f78b504a695ad94a
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-03-31 09:26:45 +00:00
hjk
39a38d5679 Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce

Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-30 15:20:19 +00:00
Nikita Baryshnikov
2cf72a628d TextBrowserHelpViewer: cleanup
removed  loadResource which was left from
96e8f0bb7b.

Change-Id: Ie1b00412104735b5f3e67939c99dc6cd68d85522
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-23 15:37:17 +00:00
Oswald Buddenhagen
3c2f0096ea Merge remote-tracking branch 'origin/4.0' 2016-03-22 15:23:12 +01:00
Eike Ziller
ac6a2bd899 Help: Set sensible fallback fonts
The default fallback font was arbitrary. So far this was not a big issue
because it was basically never used.

Set sensible fallback fonts on the different platforms.
Also make sure that we can see in the settings if the default fallback
font has been changed by the user, and also separate the setting for the
different font properties. Since we did not do this before, we now have
to reset the setting for all existing users, so they benefit from the
more sensible default.

Task-number: QTCREATORBUG-15887
Change-Id: I16419f54c300580d5c9a9b19722aacf790ef66fc
GPush-Base: 44820dae13
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2016-03-21 15:26:18 +00:00
Eike Ziller
368a718d3d Add QtWebEngine backed help viewer backend
Supports most features. Defined priority for help viewers:
"qtwebkit" > "qtwebengine" > "textbrowser".

Task-number: QTCREATORBUG-13910
Change-Id: I59b4231ef93fdf9df46436850ed3743b5916f9cd
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-18 15:32:04 +00:00
hjk
bcf7a11c24 Core: Apply 'static' pattern to Core::FindPlugin
Also, rename it to Core::Find. It hasn't been a plugin for a while.

Change-Id: I845885ccf18bdc1440258d523b033758d5583881
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-15 12:43:59 +00:00
Eike Ziller
727b918773 Help: Fix issues with scrolling to right position
The different viewer backends have different issues with scrolling to
the right position if the URL contains an anchor. In all combinations of
"viewer was visible/invisible when help was requested" and "viewer last
showed the same/a different page then the requested URL".

Move the special logic from help plugin to the viewer backends.

Task-number: QTCREATORBUG-15548
Change-Id: I962c90695ceaee48800a3590676e1d28343cf790
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-03 15:10:57 +00:00
Niels Weber
d71e513c96 Fix compile with Qt < 5.6
Change-Id: I633d9f85efa709c41ec439f12b8963f612755008
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-16 11:26:30 +00:00
Friedemann Kleint
c41abd2b54 DocSettingsPage: Add a filter line edit for the registered documentation.
Change the item view to a QListView and use a model derived from
QAbstractListModel keeping a QVector of entries. Use a QSortFilterProxyModel
for filtering.

This makes cleaning old documentation easier.

Change-Id: I3a0781e0ddff3d0c00126a1b4effe1e1c93e354b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-16 10:06:26 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:57:01 +00:00
Oswald Buddenhagen
5a7d3e78db Merge remote-tracking branch 'origin/3.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ifbe181e86c161e082cc9a69a4bc7bd399f34ff47
2016-01-04 14:11:07 +01:00
Eike Ziller
91ffe63e1a TextBrowserHelpViewer: Fix opening external links
External links were not opening at all. The logic for that was present
for TextBrowserHelpViewer::setSource, but clicking on links would
directly go through the text browsers loadResource method. Avoid that by
turning off openLinks and handling the anchorClicked signal instead.

Task-number: QTCREATORBUG-15491
Change-Id: I86017f14138b98738221c1aed42c37551feaf671
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-12-17 14:29:53 +00:00
Eike Ziller
55b0136923 TextBrowserHelpViewer: Don't use magic number.
Change-Id: I0902ed925f0dc4c5770fee0f02159cfc31e67b02
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-12-17 14:29:45 +00:00
Alessandro Portale
c546a67537 Updated Mode icons
Fresh icons from Diana.

Change-Id: I57f69b2f54474a32404020a50f15cd033664faa9
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-15 12:54:04 +00:00
Alessandro Portale
03c07b80fd Core: Unify the close icons
Use the same image file and recolor it as needed,

Change-Id: I914819a53ca05d83ca5b88adf44706b460b48ac0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-04 10:47:32 +00:00
Alessandro Portale
37c1823974 Flat and themeable side bar icons
This patch adds flat side bar icons according to
http://blog.qt.io/blog/author/didesous/

The flat icons are supposed to be opt-in, via the theme flag
"FlatSideBarIcons=true". It is false by default for the default
theme for now.

Change-Id: I1cbe69d4e138d5d23c0172a374933ac7a4ce8a5b
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-03 11:30:50 +00:00
Christian Kandeler
f82297b91a Fix qbs build.
Change-Id: I9cdaa1545018a002a85d8f5cebb51883bfee204f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-25 14:09:37 +00:00
Alessandro Portale
033862f305 Themed Icons: Introduce Utils::Icon
Instead of describing icons via file name or in the themed icons case
via
a string that is a list of mask/color pairs, we have now a class for it.

Icons are now listed in per-plugin *icons.h headers.

RunControl::m_icon was The only place left where an icon property was in
fact a string. This patch changes that member to be a Utils::Icon.

Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-25 12:30:52 +00:00
Eike Ziller
d13b22e6bc Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684
2015-11-12 13:43:17 +01:00
Eike Ziller
09417c56bd OS X: Use autoreleasepool blocks in Objective-C(++) code
And get rid of the helper class from utils.
All supported platforms support this.

Change-Id: Ic4307a42fc55ac4673438ea4325bca14ed33849b
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-12 09:09:31 +00:00
Alessandro Portale
b8bdc6f669 Icon refresh: First step towards the new Qt Creator themes
http://blog.qt.io/blog/author/didesous/ announced new designs/themes
for Qt Creator. This patch replaces many of the existing toolbar icons
with recolorizable masks for better theming support.

Change-Id: I557aa485205fe2624f33724226f698c303342b40
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-23 16:04:52 +00:00
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