summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* DiffEditor: Fix jumping to context line immediately on git showJarek Kobus2023-04-241-12/+15
| | | | | | Fixes: QTCREATORBUG-29081 Change-Id: I7a4658209f95e98cb485e725dee07074dae5c163 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditor: Tr::trAlessandro Portale2023-01-191-12/+12
| | | | | Change-Id: I71b9908ea332256044120b42ff6af2fc57a89a5e Reviewed-by: hjk <hjk@qt.io>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SideBySideDiffEditor: Avoid code repetitionJarek Kobus2022-09-291-8/+2
| | | | | Change-Id: Ie49834a4896dbf32a87329345e52dc99ca2f86bd Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* DiffEditor: Remove workingDir parameter from setDiff()hjk2021-08-171-4/+4
| | | | | | | It was not used. Change-Id: I33a77f4d8238218b90171a98aa25af5b31b17eb3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Core/Utils: Migrate further to Utils::Idhjk2020-07-061-2/+2
| | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Avoid warning on empty expressionshjk2019-07-231-1/+1
| | | | | | | | For some reason, Q_UNUSED includes already a semicolon, adding one on the user side creates an additional empty statement. Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* DiffEditor: fix various warningsJarek Kobus2018-05-031-1/+2
| | | | | Change-Id: I555aa30c8925ba8eeb314dd836f1544b93d7a66f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditor: ModernizeAndre Hartmann2017-12-091-1/+1
| | | | | | | | | | | * Use member init * Use nullptr * Use range-for * omit QLatin1{String|Char} where possible Change-Id: Ib231b747cdd9073b3d4fc6779b8e0afb2b404a31 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* DiffEditor: Share "failed" state among multiple viewsJarek Kobus2017-07-051-6/+28
| | | | | Change-Id: Id049ce8eafcb21d5e60fae17c47df8657c0e5779 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* DiffEditor: Fix editor actionsEike Ziller2017-05-181-3/+21
| | | | | | | | | | | | The text editor widgets all need a TextEditorActionHandler that takes care of the editor actions for them. Each text editor needs its own context, so the editor with focus receives the actions. This does not happen automatically for these text editors, since the diff editor manages these itself. Task-number: QTCREATORBUG-9445 Change-Id: Ib42f095ec23550e401e8ee9b36f3f49517a22877 Reviewed-by: David Schulz <david.schulz@qt.io>
* Display "Waiting for data" properlyJarek Kobus2017-01-091-2/+11
| | | | | | | | | Display "Waiting for data" instead of "No differences" when creating new instance of an editor for the same document (e.g. by splitting the view) during document reload. Change-Id: If254006de3914ad4416c7405874e8cbea57ddd8d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix SideBySide diff editor iconJarek Kobus2016-11-241-1/+1
| | | | | | | Broken in 033862f3057818df3123d07fc6cb34e193250c53. Change-Id: I8930de03b02dcf2859b11218b25fa0099e957791 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Themed Icons: Introduce Utils::IconAlessandro Portale2015-11-251-5/+3
| | | | | | | | | | | | | | Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Icon refresh: First step towards the new Qt Creator themesAlessandro Portale2015-10-231-2/+5
| | | | | | | | | | http://blog.qt.io/blog/author/didesous/ announced new designs/themes for Qt Creator. This patch replaces many of the existing toolbar icons with recolorizable masks for better theming support. Change-Id: I557aa485205fe2624f33724226f698c303342b40 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* DiffEditor: Add indication on failureOrgad Shaneh2015-09-151-4/+8
| | | | | | Task-number: QTCREATORBUG-15051 Change-Id: If8beef268fa6390f2ff8f36996354f9685b70d80 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* DiffEditor: Refactor the user-facing partsTobias Hunger2015-03-101-6/+100
| | | | | | | | | | | | | | | | | * Move all data handling into DiffEditorDocument * Move much of the logic of how to update views into the DiffEditor. * Introduce a base class for the different views on the diff to implement. * Remove DiffEditorGuiController * Make DiffEditorController smaller and merge the DiffEditorReloader into the class * Simplify communication between the classes involved * Make much of the implementation private to the plugin Change-Id: I7ccb9df6061923bcb34cf3090d6d8331895e83c7 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Clean exported headers of the TextEditor plugin.Friedemann Kleint2015-02-261-0/+2
| | | | | Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* DiffEditor: Introduce a base class for the different viewsTobias Hunger2015-02-231-0/+113
... of the diff. Currently that is side-by-side and unified, just as before. Change-Id: I62a5462344c4b4ae652899f9d5b2936aa5a692b8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
View Lorry Controller Status