feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
81,106 Commits 108 Branches 368 Tags
002d84cb15e314a207346fdfd6cf78055d1b8b92
Commit Graph

530 Commits

Author SHA1 Message Date
Orgad Shaneh
67561efd29 DiffEditor: Fix test 
* Add trailing newline
* Fix offset by 1 for line numbers
* Swap expected and actual result
* Join short lines

Change-Id: Ia1c618e5fc86dc16956176241205a2108a1ba3e4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-11 14:34:36 +02:00
Orgad Shaneh
fb48205e98 DiffEditor: Cleanup regexps 
* Remove escape where not needed ('-', ',')
* Remove brackets for single symbols (\d, \w)

Change-Id: I2595bfc775f93aeddc367d8889cd78fb5a3fac83
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-11 12:47:18 +02:00
jkobus
dcedc45474 Compile fix 
Change-Id: I0b586bd1b024c3d1f0eaebfc057e85fbedfe72cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-06-06 14:43:58 +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
hjk
3462c5ef42 IEditor: Make duplicatesSupported a value member 
Change-Id: Iee75dd4155d5074bb319df79d006b6d5e2989e14
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-21 14:29:00 +02:00
Orgad Shaneh
e7a7c02b4d DiffEditor: Pass const lists and string by reference 
Change-Id: I6acdc4db61aeed1353bed2207736268dfabf3f17
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-05-20 12:36:19 +02:00
hjk
6e584b5b49 DocumentModel: Make interface static 
Move item model implementation to private, adjust user code.

Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-13 11:48:30 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
 2014-05-02 10:00:20 +02:00
Robert Loehning
70e47527bc Compile fix for Qt4 
Change-Id: I16cc2f6f9cc7ace7aa7fb34a340ea714b6ac9c3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-04-16 14:29:12 +02:00
jkobus
18fc5e3f91 DiffEditor: replace carriage return chars with spaces. 
Make sure text block is valid before using its layout.

Task-number: QTCREATORBUG-12056
Change-Id: I618edfcf549b675282587aed577810b806692bd4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-04-16 10:35:14 +02: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
jkobus
f4db27a65c Reorder coloring inside diff editor 
Display properly separators in differences

Change-Id: Ia7aa1f1ee96a07e0ed96773e8363e68f3d3a5638
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-03-12 11:55:19 +01:00
Friedemann Kleint
35eb3b1560 Diff Editor: Fix compilation with Qt < 5.2. 
Change-Id: I95401ed010e41341eb25bba032b924765b2c1be5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-12 09:22:44 +01:00
jkobus
9c2cdc8965 DiffEditor: refactor internal structures. 
Simplify the implementation a lot.

Change-Id: I3f5daa3d2ce14c28d48c2e1e996ec4935d1dae3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-03-11 15:34:10 +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
Oswald Buddenhagen
52bf71fbdf Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
 2014-03-11 13:39:55 +01:00
jkobus
b8046e603d Don't register mimetype for diff editor 
Task-number: QTCREATORBUG-11624

Change-Id: I9eeeeeb862e335c1a4d5cbd80d0908297ad6d1db
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-03-10 14:35:51 +01:00
jkobus
b846840c52 Move more function into diffutils, fix calculateOriginalData. 
Change-Id: Id7bbdbf7778d21cb9aa15148876db95e9228fab3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-03-10 13:01:29 +01:00
Tobias Hunger
02b3a79c5f VCS: Open diff/blame editors in other split 
... if there are other splits that is.

Task-number: QTCREATORBUG-11623
Change-Id: Icb3b1c86c39d88e90916079e8ab347574ae9a361
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-03-07 16:02:14 +01:00
Tobias Hunger
c9b6897e78 EditorManager: Add OpenEditorFlags to openEditorWithContents 
This requires moving the activateEditor call into openEditorWithContents.

Remove that line elsewhere when editors are constructed. Keep it when
reusing an existing editor though.

Change-Id: I872f03e16fde42f3b8adec2cf2344b7cc495cd08
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-03-07 15:56:43 +01:00
Eike Ziller
5dd8d7cd9c Editors: Move id() from editor to document. 
Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-03-05 16:27:52 +01:00
jkobus
a746f6fb27 Move internal structures and some functions into diffutils.h 
Change-Id: Ia55e556fdb8de3a2aeebf768ad9db66d840766f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-28 10:42:50 +01:00
jkobus
0ba55199b2 Prepare for patch generation, fix internals. 
Change-Id: Ib3b7c5c433f9f9230eb14d23a3029681841e2e68
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-27 16:19:00 +01:00
jkobus
9f10e8daac Refactor internal structures inside diff editor 
Move "changed" property out of TextLineData into
RowData as "equal".

Change-Id: Id9cb87d099cecb61a2774e7a4fffcc162dece604
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-27 12:26:06 +01:00
jkobus
ab9db1433a Small refactor. 
Change-Id: I8bdf3830e230b5db3d6041fae0d22c05cfc047d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-26 12:35:26 +01:00
hjk
27ae878040 DiffEditor: Remove DescriptionEditor helper class. 
With value-based ids it's just a normal BaseTextEditor.

Change-Id: Ie9d28a92c48cb222eb9173bd432f08f4fe628bed
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-25 15:56:54 +01:00
hjk
6c6f47f86c Core: Make IEditor::id a value member and adjust users 
Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-25 10:36:25 +01:00
jkobus
52e166c5ae Move Gui stuff out of DiffEditorController 
Place it in DiffEditorGuiController, will be needed for
sharing gui settings between unified and sidebyside versions.

Change-Id: I8a858d0549ff84e21f7c909288ca07c5a2ef4e5b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-24 11:43:25 +01:00
jkobus
73cf43f323 Add DiffEditorManager, refactoring. 
GitDiffSwitcher operates now on IDocument.
GitDiffHandler operates now on DiffEditorController.
"source" property now attached to editor's document (VcsBasePlugin).

Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-18 13:46:49 +01:00
hjk
e47acb151b Compile fix with Qt 4 
Change-Id: I28b9a63a066521cdbe67ad9b51d795450b6d070a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-14 16:36:50 +01:00
Jarek Kobus
1c76e25fdc Move some functions to Differ, add unified diff 
Change-Id: Id8178fb84f25a18fda42e02954f28359d0ef4623
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-14 14:37:55 +01:00
Jarek Kobus
e8482f3e49 Fix comment 
Change-Id: I0750ecae4d103d93ca20bef657b98a468bb355fc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-14 11:09:52 +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
Jarek Kobus
f156c3e013 Move DiffEditorController into DiffEditorDocument. 
Prepare for making diff editor splittable.

Change-Id: I285ad46d095a98f2707d385558dfda0b10b77c1f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-10 10:33:39 +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
Jarek Kobus
06950359f9 Remove obsolete commented code 
Change-Id: Id7f3929407acbaf641ed25db917b37d15f268e1e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-31 06:58:02 +01:00
Jarek Kobus
edac8f082d Get rid of DiffShowEditor. 
Made DiffEditor customizable instead

Change-Id: If92799d47c7e731febb45197384c082eb3af55df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 19:13:48 +01:00
Jarek Kobus
90e9799f14 Fix a warning about no setFontSettings() slot 
Caused by change 3fa6b6737c

Change-Id: I4b1244423dfea83b1a23f6ecb03026956f14f35d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-30 17:13:26 +01:00
Jarek Kobus
c18fa9112b Rename DiffEditorWidget -> SideBySideDiffEditorWidget 
It's the preparation for the new UnifiedDiffEditorWidget

Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 17:13:14 +01:00
Jarek Kobus
65087004de Rename DiffEditorFile -> DiffEditorDocument 
The old name had nothing to do with a file in fact.
The new name will be more appropriate for the new stuff,
which will come soon.

Change-Id: I17ad03dab5c643ff26e313a434ba86929a0f00c3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-30 14:50:31 +01:00
jkobus
a4b00160bb Refactor diff editor widget, fix whitespaces handling 
Prepare for ignoreNewLine handling

Task-number: QTCREATORBUG-11002

Change-Id: I97fc0887ef27c821252283ccbad655ac0bc79f0a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 13:43:09 +01:00
Jarek Kobus
66f8437b0e Remove unneeded stuff 
Change-Id: I2771765bd331e81e09141a2f3088fb364d4bf90d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-30 13:33:27 +01:00
Eike Ziller
3fa6b6737c TextEditors: Move font settings to document 
Change-Id: I325764cbaa9684fa2758b0ea6c6ea58de142cb73
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-24 08:00:07 +01:00
Jarek Kobus
4e320e8671 Fix empty contents in git show editor 
Task-number: QTCREATORBUG-11314

Change-Id: I8a74c174be4436797bf04904e708e26e9463ddcf
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-22 04:17:23 +01:00
Tobias Hunger
f531f16dbf DiffEditor: Fix warnings on clang/msvc 
The recent move to use classes in favor of structs missed the forward
declarations, so the build produces warnings about the mismatch when
using clang (and MSVC as far as I can tell).

Change-Id: I235f7410a5b43b14c318843c9ee4dfcb9ea88e63
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-17 11:24:32 +01:00
jkobus
242ae4ce37 Fix return arg of Diff class getter 
Change-Id: I25dc6d2992831d79077e4d06f52018d6191e0bfb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 15:15:03 +01:00
jkobus
096bc3b0e1 Add default arg to Diff ctor 
Change-Id: I97d4b99250d55216ef866f7529ca423e2133db09
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 15:14:51 +01:00
jkobus
a74b59ffd6 Add DiffEditorController 
Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 14:36:53 +01:00
jkobus
3b2cb038cd Fix display of inserted lines by the end of file 
Task-number: QTCREATORBUG-11281

Change-Id: I2d84584a850cf159dd0724f79bbc967848b3047b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-16 10:21:55 +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