feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DiffEditor: Stage and unstage selected lines for Git

Browse Source 
Fixes: QTCREATORBUG-19071
Change-Id: I560ba208e68e477ea865e499847d819cfdfeb6f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Andre Hartmann
2017-11-29 21:36:30 +01:00
committed by Jarek Kobus
parent 2758682723
commit 1766832918
15 changed files with 422 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/diffeditor/unifieddiffeditorwidget.h
View File

@@ -39,6 +39,7 @@ namespace DiffEditor {
class ChunkData;
class FileData;
class ChunkSelection;
namespace Internal {
@@ -79,8 +80,8 @@ private:
void slotCursorPositionChangedInEditor();
void setLeftLineNumber(int blockNumber, int lineNumber);
void setRightLineNumber(int blockNumber, int lineNumber);
void setLeftLineNumber(int blockNumber, int lineNumber, int rowNumberInChunk);
void setRightLineNumber(int blockNumber, int lineNumber, int rowNumberInChunk);
void setFileInfo(int blockNumber,
const DiffFileInfo &leftFileInfo,
const DiffFileInfo &rightFileInfo);
@@ -97,11 +98,12 @@ private:
void jumpToOriginalFile(const QTextCursor &cursor);
void addContextMenuActions(QMenu *menu,
int fileIndex,
int chunkIndex);
int chunkIndex,
const ChunkSelection &selection);
// block number, visual line number.
QMap<int, int> m_leftLineNumbers;
QMap<int, int> m_rightLineNumbers;
// block number, visual line number, chunk row number
QMap<int, QPair<int, int> > m_leftLineNumbers;
QMap<int, QPair<int, int> > m_rightLineNumbers;
DiffEditorWidgetController m_controller;