diff options
| author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2016-10-19 16:44:25 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2016-10-21 09:49:08 +0000 |
| commit | 8224c1c95df481ad34fad3f699e67db42bc8b6ea (patch) | |
| tree | 408d3f25fa59cd4e8508a51fdb8213e9a4cebeac /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | 344f255fa9e0defd1613a2692075f2423b560aad (diff) | |
| download | qt-creator-8224c1c95df481ad34fad3f699e67db42bc8b6ea.tar.gz | |
DiffEditor: fix revert chunk for diffs of modified files
Apply chunk action doesn't make sense for that case,
will stay disabled.
Task-number: QTCREATORBUG-17136
Change-Id: Idce31b3aa9d354536a01607c10b20273158961d5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index ac69705500..4eb0a07878 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -143,6 +143,7 @@ void DiffCurrentFileController::reload() fileData.rightFileInfo.fileName = m_fileName; fileData.leftFileInfo.typeInfo = tr("Saved"); fileData.rightFileInfo.typeInfo = tr("Modified"); + fileData.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor; if (!leftFileExists) fileData.fileOperation = FileData::NewFile; @@ -201,6 +202,7 @@ void DiffOpenFilesController::reload() fileData.rightFileInfo.fileName = fileName; fileData.leftFileInfo.typeInfo = tr("Saved"); fileData.rightFileInfo.typeInfo = tr("Modified"); + fileData.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor; if (!leftFileExists) fileData.fileOperation = FileData::NewFile; @@ -261,6 +263,7 @@ void DiffModifiedFilesController::reload() fileData.rightFileInfo.fileName = fileName; fileData.leftFileInfo.typeInfo = tr("Saved"); fileData.rightFileInfo.typeInfo = tr("Modified"); + fileData.rightFileInfo.patchBehaviour = DiffFileInfo::PatchEditor; if (!leftFileExists) fileData.fileOperation = FileData::NewFile; |