summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffeditorwidget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename DiffEditorWidget -> SideBySideDiffEditorWidgetJarek Kobus2014-01-301-2440/+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-294/+867
| | | | | | | | | Prepare for ignoreNewLine handling Task-number: QTCREATORBUG-11002 Change-Id: I97fc0887ef27c821252283ccbad655ac0bc79f0a Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* TextEditors: Move font settings to documentEike Ziller2014-01-241-5/+6
| | | | | Change-Id: I325764cbaa9684fa2758b0ea6c6ea58de142cb73 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Add DiffEditorControllerjkobus2014-01-161-77/+97
| | | | | Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix display of inserted lines by the end of filejkobus2014-01-161-9/+14
| | | | | | | Task-number: QTCREATORBUG-11281 Change-Id: I2d84584a850cf159dd0724f79bbc967848b3047b Reviewed-by: Jarek Kobus <jaroslaw.kobus@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-10/+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>
* Braces cleanupOrgad Shaneh2013-11-141-3/+2
| | | | | Change-Id: I8413252c90a1487d291f15d92837c30ab697b245 Reviewed-by: hjk <hjk121@nokiamail.com>
* Normalize connect()sRobert Loehning2013-10-101-1/+1
| | | | | Change-Id: I1305abd51cb6ae856215af63807e66c433982c26 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Apply static pattern to TextEditorSettinghjk2013-09-201-10/+11
| | | | | Change-Id: I4e6f573d893c0aa2bb4ca9812fc8db2961dac172 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix compilation of generichighlighter test on Windowsjkobus2013-09-181-5/+2
| | | | | | Change-Id: I25c2f68528ede12fa900ea86973c6df39667c421 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* DiffEditor: Preserve source for state recoveryOrgad Shaneh2013-09-131-0/+10
| | | | | | | Task-number: QTCREATORBUG-10126 Change-Id: I707e7cdac84c91d52c5661718ac48e3d79fc7c91 Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Utils: Cleanup of Tooltip interfacehjk2013-09-131-3/+2
| | | | | Change-Id: If4908e7a5d5ce749ff1e2efc7a026604821737be Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* DiffEditor: Remove dead codeTobias Hunger2013-09-121-1/+0
| | | | | Change-Id: I57c61b7c5adb80ab6ffecd699cd78e1351509b07 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Apply 'static' pattern to MimeDatabasehjk2013-09-031-3/+1
| | | | | | | | Also adjust and streamline using and surrounding code. Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix generic highlighter autotestjkobus2013-08-301-1/+2
| | | | | | Change-Id: I35994a8c29374edfeb8a230af10c2a3277232f22 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Implement syntax highlighting in diff editorjkobus2013-08-291-27/+169
| | | | | | | | | | | | 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 coding style for else statementsOrgad Shaneh2013-07-171-4/+2
| | | | | Change-Id: I1309db70e98d678e150388c76ce665e988fdf081 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Move IEditor::isTemporary to IDocumentEike Ziller2013-07-121-1/+0
| | | | | | | | | It's a property of the document implementation, not of the specific editor instance working on it. Change-Id: I5c3dd054e21b646e2d94b891916a096d045923f8 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix jumping to wrong line after double click in left viewjkobus2013-07-051-14/+70
| | | | | | | Task-number: QTCREATORBUG-9655 Change-Id: Ide2a68e4d49b0bb17d745e7f13f1c565b8629c03 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* DiffEditor: double click doesn't select the current wordjkobus2013-07-011-0/+2
| | | | | | | Task-number: QTCREATORBUG-9381 Change-Id: Icc96c31b029d978c23a44fca59bcc28891fd92c6 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditor: Show tooltips with filenamesjkobus2013-06-191-1/+32
| | | | | Change-Id: I32af3b310deb4c96bf1dc798392029cc361ced97 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Take diff colors from color schemejkobus2013-06-121-51/+79
| | | | | | | 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-1/+39
| | | | | | | | Task-number: QTCREATORBUG-9494 Change-Id: Ica26e1448b1997e102648be58128f1be00c4905e Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Switch less often to edit modeEike Ziller2013-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This change * Removes IMode::type, ModeManager::activateModeType, and IEditor::preferredModeType, and adds IEditor::isDesignModePreferred instead * Adapts the mode switching code in EditorManager to handle multiple windows, for example switching to edit mode should only happen if the editor/view is in the main window. Otherwise the editor window should be raised and focused * Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor * Reverts the EditorManager::ModeSwitch logic to switch mode or make the current editor visible by default, introducing DoNotMakeVisible flag instead * Fixes a few instances where EditorManager::ModeSwitch should have been used One non-trivial problem left: If you open a .ui file and switch to an external editor window, edit mode is activated, because the current editor no longer is a .ui file, which means that the design mode gets deactivated. Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41 Reviewed-by: David Schulz <david.schulz@digia.com>
* Move "Sync Horiz Scroll Bars" corner widget to the toolbarjkobus2013-06-041-11/+1
| | | | | Change-Id: Ie97ae07b02499b4d8d80e006aa77ca3b802f39b3 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* DiffEditor: Apply visualize whitespaces according to optionsjkobus2013-06-041-5/+26
| | | | | | Change-Id: I5f7c57479d5342f5457159b14fb6afa087cb988f Reviewed-by: Marcel Krems <m.krems@software-vision.eu> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Editors: Provide a base implementation for duplicate{,Supported}hjk2013-05-271-4/+2
| | | | | | | Helps avoiding trivial re-implementations. Change-Id: Iaa2e6b92503a2b9553432568c2047c28899c7ea6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Use minisplitter inside diff editorjkobus2013-05-261-2/+3
| | | | | | | Change-Id: Ia2388e8c50185f80111fcf96aedb8143088e9a1c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* React to fontSettingsChanged inside diff editorjkobus2013-05-261-0/+4
| | | | | Change-Id: I72e5cd61ea67d87a3f82843ee1f3b42d13142dff Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add file list combobox to diff editorjkobus2013-05-241-8/+68
| | | | | | 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-8/+55
| | | | | | | | Synchronize horizontal scroll bars by default. Added corner widget to toggle synchronization off. Change-Id: I52316f1d9399b9ad21a346d65873b37ce0a9b98f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix highlight artifacts in diff editorjkobus2013-05-221-1/+4
| | | | | | | Which appeared after pressing "..." mark and scrolling right. Change-Id: I779d4a7e76ebb01857d7313b5099a5482c455136 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Respect tab settings in diff editorjkobus2013-05-221-0/+2
| | | | | | | | | | Currently it's not possible to respect language specific tab settings in diff editor. It can happen that one view contains C++/Qt Quick files, while tab settings are common for the whole view. Change-Id: I45c6113afd7d41667b68a4daba0ac0fa4472b4e9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Basic integration of diff editor inside git pluginjkobus2013-05-151-50/+110
| | | | | | Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Implement jumping to original file on double clickjkobus2013-05-071-7/+42
| | | | | Change-Id: I25f2624df65826b93604ff7df2485162691498d0 Reviewed-by: David Schulz <david.schulz@digia.com>
* Add file descriptions, enable file foldingjkobus2013-05-061-198/+430
| | | | | Change-Id: Ie90ac9fb74e9c4b8cfba16d065d1b8751125e83c Reviewed-by: David Schulz <david.schulz@digia.com>
* Fix a crash on changing context lines with block selectionjkobus2013-04-241-0/+2
| | | | | | | | | | | | | | Crash occurs in diff editor when there is a block selection and you are changing context lines number. This workarounds the crash, but it seems that when BaseTextEditorWidget has a blockSelection calling "clear()" and "setPlainText()" causes the crash. When I turn off the blockSelection before calling "clear()" it helps. Change-Id: I0133862a2d7e2914c16368b7efa9986b4d56ff39 Reviewed-by: David Schulz <david.schulz@digia.com>
* Omit separator lines when copying selected textjkobus2013-04-241-0/+36
| | | | | | | | | | In addition rename int start -> startPosition and int end -> endPosition to avoid a name clash with QTextBlock start inside BaseTextEditorWidget::createMimeDataFromSelection(). Change-Id: I7f54e4046913b5d5d9ddd3c07fd2747b4ca6f3fb Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Refactor codejkobus2013-04-231-67/+47
| | | | | | | | 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-8/+6
| | | | | | | | | 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-7/+125
| | | | | Change-Id: I6921b7a39288f6a9747574b1a8e75d571f4723ce Reviewed-by: hjk <hjk121@nokiamail.com>
* Get rid of QChar::LineSeparatorjkobus2013-04-121-163/+127
| | | | | | | | | | 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>
* Add cleanupSemantics method, produce nicer diff outputjkobus2013-03-141-2/+2
| | | | | Change-Id: I877e06c930c219ad23af4b7c6078d8c8db3706e9 Reviewed-by: hjk <hjk121@nokiamail.com>
* Optimize painting of skipped lines, don't paint "..."jkobus2013-03-071-106/+81
| | | | | Change-Id: I4a803ca899438ea0067c9a6244dffc77bc7109dd Reviewed-by: hjk <hjk121@nokiamail.com>
* Standardize IEditor subclass names, don't capitalize namespacesjkobus2013-02-221-3/+3
| | | | | Change-Id: I13ac8d4286b292c03019a7a564feee2c36475bf9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.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/+1027
After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
View Lorry Controller Status