jkobus
33a7952745
Implement syntax highlighting in diff editor
...
All Qt Creator's main highlighters are used in the first place,
for other mimetypes generic highlighter is used as a fallback.
Task-number: QTCREATORBUG-9580
Change-Id: I863b9085520e5bdda142ce88f2074afeacee0531
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Petar Perisin <petar.perisin@gmail.com >
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com >
2013-08-29 08:54:04 +02:00
jkobus
c59c1661d1
Fix jumping to wrong line after double click in left view
...
Task-number: QTCREATORBUG-9655
Change-Id: Ide2a68e4d49b0bb17d745e7f13f1c565b8629c03
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-07-05 09:43:08 +02:00
jkobus
abe3951d67
Take diff colors from color scheme
...
Change-Id: I706612a8f89917cb57b7d1e9ecebd86b3f4bcc8d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
Reviewed-by: David Schulz <david.schulz@digia.com >
2013-06-12 09:23:50 +02:00
jkobus
2ddcc0c386
Fix wrong diff output with span lines
...
Task-number: QTCREATORBUG-9494
Change-Id: Ica26e1448b1997e102648be58128f1be00c4905e
Reviewed-by: hjk <hjk121@nokiamail.com >
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2013-06-07 15:36:55 +02:00
jkobus
aa0533c969
Move "Sync Horiz Scroll Bars" corner widget to the toolbar
...
Change-Id: Ie97ae07b02499b4d8d80e006aa77ca3b802f39b3
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2013-06-04 11:14:06 +02:00
jkobus
2ddb726dd5
Add file list combobox to diff editor
...
Change-Id: I2a40207ed3c4a5c07ba544d681aed6649a0b1a11
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-05-24 14:14:06 +02:00
jkobus
b8acf23ec4
Synchronize horizontal scroll bars in diff editor
...
Synchronize horizontal scroll bars by default.
Added corner widget to toggle synchronization off.
Change-Id: I52316f1d9399b9ad21a346d65873b37ce0a9b98f
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2013-05-23 11:53:23 +02:00
jkobus
97a86c50dc
Basic integration of diff editor inside git plugin
...
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-05-15 16:24:38 +02:00
jkobus
e844bee1da
Add file descriptions, enable file folding
...
Change-Id: Ie90ac9fb74e9c4b8cfba16d065d1b8751125e83c
Reviewed-by: David Schulz <david.schulz@digia.com >
2013-05-06 10:31:54 +02:00
jkobus
5219faf0e2
Refactor code
...
Create a common method for a similar code.
Simplify some logical operations.
Change-Id: If25703c51ea96fe5a64698f6fa3ffd6f5cb1b2c5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2013-04-23 16:35:22 +02:00
jkobus
5f5b7fa4c1
Remove unused variables
...
Remove unused fields and one virtual method,
rename alwaysShows -> contextChunk and revert
its logical value.
Change-Id: I11fd60202aa5b7978b772764a40c99029cac82a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
2013-04-23 14:33:33 +02:00
jkobus
186c457d6c
Implement expanding / shrinking skipped lines
...
Change-Id: I6921b7a39288f6a9747574b1a8e75d571f4723ce
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-04-15 18:09:35 +02:00
jkobus
77abd02787
Get rid of QChar::LineSeparator
...
It was causing troubles while scrolling. Replace it with
\n and hack selection. Simplify the code. Now every line
is a separate block. Prepare for expanding skipped lines.
Change-Id: I8d305681c575abdaaf9cdbf26de864dd3a906d3a
Reviewed-by: David Schulz <david.schulz@digia.com >
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-04-12 14:55:08 +02:00
Friedemann Kleint
6d3c271d53
Rename namespace DIFFEditor to DiffEditor.
...
Change-Id: Ia87098de61f38530806e1cf87b69d0bfc66e250c
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-02-21 17:13:06 +01:00
jkobus
0e91d10878
Experimental integration of DiffEditor
...
After enabling the plugin go to Tools|Diff...
Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-02-18 18:15:51 +01:00
