summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffeditorwidget.h
Commit message (Collapse)AuthorAgeFilesLines
* Rename DiffEditorWidget -> SideBySideDiffEditorWidgetJarek Kobus2014-01-301-139/+0
| | | | | | | It's the preparation for the new UnifiedDiffEditorWidget Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Refactor diff editor widget, fix whitespaces handlingjkobus2014-01-301-9/+4
| | | | | | | | | Prepare for ignoreNewLine handling Task-number: QTCREATORBUG-11002 Change-Id: I97fc0887ef27c821252283ccbad655ac0bc79f0a Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* DiffEditor: Fix warnings on clang/msvcTobias Hunger2014-01-171-3/+3
| | | | | | | | | 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>
* Add DiffEditorControllerjkobus2014-01-161-36/+14
| | | | | Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
| * Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Refactor source propertyjkobus2013-12-191-4/+0
|/ | | | | | | | Get rid of source property out of DiffEditorWidget, attach dynamic property when it's needed instead. Change-Id: I6641a7b55c42b4eceba78c2e28f5140b40fe0fa5 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditor: Preserve source for state recoveryOrgad Shaneh2013-09-131-0/+5
| | | | | | | Task-number: QTCREATORBUG-10126 Change-Id: I707e7cdac84c91d52c5661718ac48e3d79fc7c91 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Implement syntax highlighting in diff editorjkobus2013-08-291-3/+2
| | | | | | | | | | | | 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>
* Fix jumping to wrong line after double click in left viewjkobus2013-07-051-0/+4
| | | | | | | Task-number: QTCREATORBUG-9655 Change-Id: Ide2a68e4d49b0bb17d745e7f13f1c565b8629c03 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Take diff colors from color schemejkobus2013-06-121-0/+9
| | | | | | | 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>
* Fix wrong diff output with span linesjkobus2013-06-071-0/+4
| | | | | | | | Task-number: QTCREATORBUG-9494 Change-Id: Ica26e1448b1997e102648be58128f1be00c4905e Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Move "Sync Horiz Scroll Bars" corner widget to the toolbarjkobus2013-06-041-1/+1
| | | | | Change-Id: Ie97ae07b02499b4d8d80e006aa77ca3b802f39b3 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Add file list combobox to diff editorjkobus2013-05-241-0/+6
| | | | | | Change-Id: I2a40207ed3c4a5c07ba544d681aed6649a0b1a11 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Synchronize horizontal scroll bars in diff editorjkobus2013-05-231-2/+6
| | | | | | | | Synchronize horizontal scroll bars by default. Added corner widget to toggle synchronization off. Change-Id: I52316f1d9399b9ad21a346d65873b37ce0a9b98f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Basic integration of diff editor inside git pluginjkobus2013-05-151-49/+17
| | | | | | Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add file descriptions, enable file foldingjkobus2013-05-061-8/+22
| | | | | Change-Id: Ie90ac9fb74e9c4b8cfba16d065d1b8751125e83c Reviewed-by: David Schulz <david.schulz@digia.com>
* Refactor codejkobus2013-04-231-0/+4
| | | | | | | | Create a common method for a similar code. Simplify some logical operations. Change-Id: If25703c51ea96fe5a64698f6fa3ffd6f5cb1b2c5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove unused variablesjkobus2013-04-231-9/+3
| | | | | | | | | 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>
* Implement expanding / shrinking skipped linesjkobus2013-04-151-0/+5
| | | | | Change-Id: I6921b7a39288f6a9747574b1a8e75d571f4723ce Reviewed-by: hjk <hjk121@nokiamail.com>
* Get rid of QChar::LineSeparatorjkobus2013-04-121-7/+2
| | | | | | | | | | 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>
* Rename namespace DIFFEditor to DiffEditor.Friedemann Kleint2013-02-211-2/+2
| | | | | Change-Id: Ia87098de61f38530806e1cf87b69d0bfc66e250c Reviewed-by: hjk <hjk121@nokiamail.com>
* Experimental integration of DiffEditorjkobus2013-02-181-0/+159
After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
View Lorry Controller Status