'git diff' marks merge conflicts different to changes.
With this fix it is possible to jump to the merge conflicts
also by a double click.
Task-number: QTCREATORBUG-6424
Change-Id: I355274e1ded4a05b3c7db718cbe9f48453070f82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Use it in BaseTextEditor and Designer to preserve CRLF
of the files.
Task-number: QTCREATORBUG-5901
Change-Id: I7599ce78649a3b09f2e5118d02f8cbf3db27ed31
Reviewed-on: http://codereview.qt.nokia.com/3591
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Use settings for generic files that do not belong to any project for
e.g. git diff. That way a user can actually override the tab width
which used to be hardcoded to 8.
This is not perfect: Actually we should use the tab width defined for
the file type in the project it belongs to. That does require
significantly more work though.
Task-number: QTCREATORBUG-5178
Change-Id: I509b030e09c33a74ecd529294bf08afec21b2121
Reviewed-on: http://codereview.qt.nokia.com/768
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
QFileInfo::absoluteFilePath() uses the current working directory to
make a file absolute. This is often not what you want (say you're
developing another qtcreator version in another directory).
Reviewed-by: Friedemann Kleint
In a log editor, releasing the mouse over a chunk of text
while selecting would trigger the opening of the description.
Prevent that by adding a flag indicating button drag,
ensuring it works only when no button is pressed.
Task-number: QTCREATORBUG-4385
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Introduce convenience to determine editor tags to avoid
crashes on empty files arguments, etc (VCSBaseEditor).
Add diff-whitespace handling and 'Revert chunk' to Perforce.
Task-number: QTCREATORBUG-4305
Add toolbar controls for ignore-whitespace to editors
and wire 'Revert Chunk' context menus.
Fix Bazaar diff interaction (find the file on doubleclick).
Introduce initializeDiffEditor to BaseClient and wire the editors
there.
Implement in git. Add infrastructure to revert single chhunks
by using patch -R. Currently only implemented in git since
only that has functionality to re-run diff.
Rubber-stamped-by: hunger <tobias.hunger@nokia.com>
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.
That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
The function always switched to Edit Mode, which was the cause for
several bugs. Since openEditor() already does switch to the right mode,
the function is not really needed.
The following actions now respect the prefered mode of the editor:
"f file"-locator
The Open Documents list
Editor history navigation
in VCSBaseEditor and BaseTextEditor::createNew to the size
used for limiting file size.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Task-number: QTCREATORBUG-1847
Make VCS-generated editors read-only, enable editing
when opening a patch.
Make VCS-Editor non-read-only by default, add setter
for "Forced read-only" that makes it a temporary,
read-only file.
Task-number: QTCREATORBUG-1528
Reviewed-by: Thorbjorn Lindeijer <thorbjorn.lindeijer@nokia.com>
Merge managesDirectory() and findTopLevelForDirectory()
into one giving managesDirectory() an optional topLevel
parameter. This removes the need to go up the directory
hierarchy twice when checking for Merurial or git and also
saves some checks for CVS/Subversion.
VCSManager: Check cache in reverse order starting out with
the full path first to improve handling of nested repositories.
Rubber-stamped-by: con
Acked-by: dt
* Use id() for methods returning a string used to represent
some type of object.
* Use displayName() for strings that are meant to be user
visible.
* Quieten some warnings while touching the files anyway.
* Move Factories to their products in the plugins where that
was not done before.
Reviewed-by: dt
