Commit Graph

2268 Commits

Author SHA1 Message Date
hjk bfbf9443d6 Variables: Remove some outdated documentation
Change-Id: I63d6c0ec006c586729ec4352b56c1275456a8ad3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-24 18:43:06 +02:00
Alessandro Portale 503bd40199 CPaster: Move setting category icon from Core to CPaster
This image is used exclusively in the CPaster plugin,
thus belong into CPaster resources.

Change-Id: If2718c7a58bca389c0afe7ecf32feb251eb0c581
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-24 17:03:14 +02:00
hjk 2982a763ac Variables: Use lambdas as callbacks to resolve variables
Instead of broadcasting for each resolution we ask the code
that knows about a specific variable directly.

Change-Id: I2f0f4f2acceba85a236995d236980594a3166bd8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-24 15:25:56 +02:00
hjk 000fbe63bc Variables: Show current value of variable in chooser dialog
Helps to determine whether a specific variable is the right one
to use. At least structure can be more easily inferred than from
most available descriptions.

Change-Id: I401603934a99e3d3fe9a26c7cb617b9baa0d502c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-24 15:24:48 +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
Tobias Hunger 43735f28dd Core: Add method to get the tooltip for the showOptionsDialog
Change-Id: Icf473145f615f8ea80887f9620ca95af812d0c98
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-06-23 14:58:59 +02:00
Nikita Baryshnikov 12103e0f67 Reinvent deprecated qSort as Utils::sort
Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-19 14:00:32 +02:00
Alessandro Portale fe08cb8902 Centralize error/warning/info icons
There are multiple copies of these pngs in different plugins.
Let's have one version in core, also as @2x variant.

Change-Id: Iedff1a6190a72c1947dd202ae1ee46f59f9fb13c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-17 22:45:09 +02:00
Erik Verbruggen 4b3d8e8278 C++ tests: increase verbosity to simplify debugging.
Change-Id: Ib92418898d627b9b07b861a0255684c8f925f814
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-17 10:36:07 +02:00
Christian Stenger 3247028dee Core: Utils: Fix compile with Qt4
Change-Id: Ibe4b504b84e467b1450b63bbbc7b569558fd8733
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-17 08:49:18 +02:00
David Schulz 9acdb0bd35 Editor: Automatically adjust size of open editors window.
Task-number: QTCREATORBUG-10618
Change-Id: If17fbb85596c9ea4d6a42eb99566b843812bd7fc
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-16 14:39:11 +02:00
Daniel Teske 5a30007e45 ProjectExplorer: Use more algorithms
Make heavy use of lambdas

Change-Id: I53197d0ffb4ae8eec076f15335cc22b74e1def1d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-16 14:26:03 +02:00
Alessandro Portale 46df765740 MimeTypeSettings: Use QTreeView instead of QTableView
QTreeView is a better list view with columns than QTableView.
One special reason for this change is that QTreeView
finds a proper default row height regardless of the system
DPI.

Change-Id: I0a4091585d4745fd91179c82a55682f88f8d2549
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-16 11:57:36 +02:00
Eike Ziller 98ae1bf67b Make document model API more consistent with entry vs document
Change-Id: Iae2fe480d9fcb564d566f1dcca142c21c99c2d5b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-13 17:37:31 +02:00
Eike Ziller c1b20ade80 TreeViewFind: Fix endless loop if tree view has nothing selected
If the tree view has nothing selected, the search would wrap endlessly
because the current index is invalid, but wrapping restarted at the
first toplevel index.

Change-Id: I31badb2038c8752d2c91e6fcaff69138c846383e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-13 13:13:15 +02:00
Daniel Teske 0f518a7dfe TreeViewFind: Optimize speed by not creating a QTextDocument per index
Change-Id: I74027b051d85698d95f92cb212182281013d256c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-13 13:06:33 +02:00
Eike Ziller a16bab0e9d Fix escape logic for closing find tool bar in mode with editor view
E.g. open context help, press ctrl+f to search in help, press escape
(focus moves to help viewer), press escape: find tool bar should be
hidden, instead it was moving focus to the editor.

Change-Id: Ia5d8563458582e2871afd9e3107e49e71d03b3f5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-13 12:59:52 +02:00
Alessandro Portale 23d3ada73f Move reload icon from diff editor to core
It is a generic icon, and will for example also be used
in the Help plugin. Also make it more round and add a 2x variant
for HiDPI.

Change-Id: I2ad4fc1e2d2766042646a47483f129447c2c3c25
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-13 12:15:54 +02:00
Eike Ziller 2786250c17 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
2014-06-13 10:51:51 +02:00
Eike Ziller 7addeb00fe Make tree view find work with models that use (can)fetchMore
As opt-in functionality. Only works if fetching is synchronous.

Change-Id: Ie13d722e97188663e2a1fe992ef039dbac7fe2c6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-12 17:04:01 +02:00
Tobias Hunger 9ba8040254 Utils: Remove FileWizard class altogether
This fixes the regression where two Location pages were added
before.

Change-Id: Ic3241d707ad8dcf6fc3063bb4613dce49001e196
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-12 16:30:26 +02:00
Tobias Hunger 0888390b09 Remove IWizardFactory::Data
It makes the code more complicated in one place just to make it harder
to follow in another...

Remove CustomWizardParameters::toString() while at it: It would need some
extending to work with this change and I do not think it is worth it, considering
that it is only used when the CustomWizard is set to verbose.

Change-Id: Ice14b197ed2fe98c54bc9c1c55ece3ed2222fbbf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-12 16:29:39 +02:00
Tobias Hunger ce37f05297 BaseFileWizard: Get rid of applyExtensionPageShortTitle(...)
That method was used to set a title in the progress view of the wizard
that is different from the page title. That is used exactly once and
there it adds more confusion than it helps. So get rid of the whole
thing.

Consistently set the "shortTitle" property instead for all wizards
that want to have a separate short title.

Change-Id: Ia4881e9c00891058629491f9e9de4ac421c59727
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-12 16:10:03 +02:00
Eike Ziller 1fda462500 Avoid explicit checks for windows host when working with file paths
We have fileNameCaseSensitivity and withExecutableSuffix et al.

Change-Id: I79bd2cd57e258c3f15673a661a49bab597d7afa4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-12 14:33:34 +02:00
Eike Ziller d1c53b5a6d Find: Gracefully handle small size of find tool bar
Hide the labels and buttons if it gets too small.

Change-Id: Id6a3d695909e13be7160890ed04117c25929c7f7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-12 14:33:11 +02:00
hjk b969b05b31 Core: Code style
Change-Id: I0b1faa9f2216f1396c19373e9292c204b32f7314
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-12 12:04:59 +02:00
David Schulz 5dfbfd2af0 Editor: Remove unused code from open editors window.
Change-Id: I830786192e5087d6bfdef9ce33fc67f441915136
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-10 07:53:41 +02:00
jkobus 8cad94534f Implement unified diff editor
Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-06-06 12:33:59 +02:00
Eike Ziller 8cb25f9e3e VariableChooser: Add support for (plain) text edits
Task-number: QTCREATORBUG-4309
Change-Id: I3d81244fe380bdf79e108f41c2c06df88b116137
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-06 10:37:10 +02:00
Tobias Hunger c4ab83f5ce BaseFileWizardFactory: Remove ExtensionList type and extensions() method
Change-Id: Ia68924fac19739e26ddb1c660eb23d2df3e5b0c1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-06 09:35:31 +02:00
Tobias Hunger 55f625465d Introduce BaseFileWizard
Introduce BaseFileWizard and derive all File Wizards from that.

Change BaseFileWizardFactory::create(...) to return a BaseFileWizard.

Change-Id: Ic0cb9e9d0390045dab57cd1a75a0f839c1f90216
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-06 09:35:05 +02:00
Tobias Hunger 5b5bea0c14 BaseFileWizardFactory: rename createWizardDialog method to create
Unify name of parameters object that gets passed into the method while
at it anyway.

Change-Id: I9cfdfe3b7dcdbd5e083b3b91922053be3a63b081
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-06 09:34:52 +02:00
Alessandro Portale bf4bbf672a Core: button_close consistent with other toolbar icons
same color, line width and drop shadow

Change-Id: I6dfafb8182f900e02dc5eff4fd316e2490a1a837
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-05 22:03:10 +02:00
Alessandro Portale dc72d70ff7 Adding a few @2x icon variants
extension, splitbutton_vertical and unlocked. Also
some of the low-res pngs are replaced for consistency
and quality.

Change-Id: I2e7090efc75d4cb30f7759ab7b055b7026b47bd1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-05 18:06:27 +02:00
hjk bae8a5c7c1 Core: Code style
Change-Id: I1f3d27ab921d1a2274a7db2c3e71f5122de99917
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-05 14:01:22 +02:00
Tobias Hunger e7689ce967 IWizardFactory: Rename StandardFileWizard to StandardFileWizardFactory
Change-Id: I6594b79c025285c28542a39742fd80afecf80b73
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-05 10:56:56 +02:00
Tobias Hunger 9356432305 IWizardFactory: Rename BaseFileWizard to BaseFileWizardFactory
Change-Id: I92977422bf8088b53e920370737907d60cf8708b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-05 10:56:27 +02:00
hjk 82a0f55b1c Find: Add a convenience "factory" for searchable treeview wrappers
Change-Id: I19890dd13d597ca71c134db7b036fa1ade0d5b5a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-04 17:17:56 +02:00
Alessandro Portale 2e7702e6a6 ProjectExplorer: Move setting category icon out of Core
This image is used exclusively in the ProjectExplorer
plugin, thus belong into ProjectExplorer resources.

Change-Id: If210ae47a27b37882db43729e6a91e557b513c22
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-04 11:27:18 +02:00
Eike Ziller 6c473db097 Fix setting DocumentManager::currentFile when clicking into split
This broke when introducing delayed setting of the currentEditor when
the context changes. Simply move the logic from the document manager to
the editor manager, where it arguably belongs to anyway, and also set
the currentFile delayed in that case.

Task-number: QTCREATORBUG-12264
Change-Id: I67ee3f9a02e62cfa67671629c956a4290361cba8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-06-04 10:41:58 +02:00
Alessandro Portale 6facb4391a CppTools: Move setting category icon from Core to CppTools
This image is used exclusively in the CppTools plugin,
thus belong into CppTools resources.

Change-Id: I8bbc553fb16897b74487ad27a941776b83f14d77
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-03 10:50:01 +02:00
Alessandro Portale c889025812 Vcsbase: Moving vcs settings category icon into the vcs plugin
Change-Id: Ib4ae646a54d60a868f903d78e72cd7180e5078a4
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-03 10:30:19 +02:00
David Schulz e8e4df0ff9 Core: Fix locator file filter test.
Use forward slashes as separator in the test data.

Change-Id: Ib832f0c72dc1694b2b2e230e32a274b96956c44b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-03 10:01:17 +02:00
Alessandro Portale 3b9262ccbd QmlJsTools: Move category_qml from Core to QmlJsTools
It is qml specific, and only used in qml plugins.

Alsoe, SETTINGS_CATEGORY_QML_ICON was defined in
qmldesignerconstants.h and other plugins included that
header. This contradicts the plugin dependecies
too much.

Change-Id: I76f31cd01bc9c02faf914051cae8bac7d7bac659
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-06-02 17:18:07 +02:00
Alessandro Portale 2e37897de1 FakeVim: Move setting category icon from Core to FakeVim
This image is used exclusively in the FakeVim plugin,
thus belong into FakeVim resources.

Change-Id: I1fcfdb6892a22dd105af72e44e40c799fdf970fd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-02 15:58:02 +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
Andreas Pakulat cf6e4b8dcb Fix matching of partial paths on Windows
The paths against which the match is done always have forward slashes (i.e.
uniform separator on all platforms). However the needle passed in has
backward slashes on Windows usually, since this is how the paths are shown
to the users and what is natural on windows too. Even explicitly using
forward slash in the needle does not work here, since then the needle is
not detected as containing a path (hasPathSeparator is false since it uses
the native separator).

Since it seems that the code internally favors the 'uniform' separators
using slashes, simply convert the needle from native to uniform separators
and use the forward slash to decide whether the needle has a path in it.

Side effect of this is that it is now possible to use forward slashes when
typing into the locator UI on windows. The opposite does not work on Unix
though. That could be considered a feature though for cross-platform
developers.

Task-number: QTCREATORBUG-12007
Change-Id: I5064bd9c60936466dd04671ef42a578df26ea7b8
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-06-02 12:33:35 +02:00
Eike Ziller 37ab6e6d03 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/shared/qbs

Change-Id: Ie56c48d3bcd42e1a15832c5e7a10fe69c5410d90
2014-06-02 12:22:03 +02:00
Alessandro Portale 4a2ad3d670 ProjectExplorer: Move icons from Core to ProjectExplorer
These images were used exclusively in the ProjectExplorer
plugin, thus belong into ProjectExplorer resources.

Change-Id: Icb7dc881e24e4959952696af60f014446893f385
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-02 10:41:44 +02:00
Alessandro Portale 0b9a8edae8 Debugger: Move debugger icons from core to debugger
These three images are exclusively used in the Debugger
plugin, thus belong into the Debugger resources.

Change-Id: I327236c66f7424b8bec94630972844175b793fad
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-02 08:38:53 +02:00