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

Replace old svn diff editor with the new one

Browse Source 
Change-Id: I4137b709be718603cdc221ac938e139326c88835
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-11-06 13:23:40 +01:00
committed by Jarek Kobus
parent 07e3a032ff
commit 8d1940a796
12 changed files with 347 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/diffeditor/diffeditorcontroller.h
View File

@@ -54,6 +54,7 @@ public:
QString description() const;
bool isDescriptionEnabled() const;
int contextLinesNumber() const;
bool isContextLinesNumberEnabled() const;
bool isIgnoreWhitespace() const;
QString makePatch(bool revert, bool addPrefix = false) const;
@@ -69,6 +70,7 @@ public slots:
void setDescription(const QString &description);
void setDescriptionEnabled(bool on);
void setContextLinesNumber(int lines);
void setContextLinesNumberEnabled(bool on);
void setIgnoreWhitespace(bool ignore);
void requestReload();
void requestChunkActions(QMenu *menu,
@@ -86,12 +88,13 @@ signals:
void descriptionChanged(const QString &description);
void descriptionEnablementChanged(bool on);
void contextLinesNumberChanged(int lines);
void contextLinesNumberEnablementChanged(bool on);
void ignoreWhitespaceChanged(bool ignore);
void chunkActionsRequested(QMenu *menu, bool isValid);
void saveStateRequested();
void restoreStateRequested();
void expandBranchesRequested(const QString &revision);
void reloaderChanged(DiffEditorReloader *reloader);
void reloaderChanged();
private:
QString prepareBranchesForCommit(const QString &output);
@@ -104,6 +107,7 @@ private:
QString m_description;
bool m_descriptionEnabled;
int m_contextLinesNumber;
bool m_contextLinesNumberEnabled;
bool m_ignoreWhitespace;
DiffEditorReloader *m_reloader;
};