diff options
author | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2014-01-30 17:04:54 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-01-30 19:13:48 +0100 |
commit | edac8f082d5f15fc293425311e6ab24db7252969 (patch) | |
tree | a2d45e58e35f383e9848914cb99a14dec55ecb91 /src/plugins/diffeditor/diffeditorcontroller.cpp | |
parent | 3798552beb148b87d8124d80ede15adc8933b817 (diff) | |
download | qt-creator-edac8f082d5f15fc293425311e6ab24db7252969.tar.gz |
Get rid of DiffShowEditor.
Made DiffEditor customizable instead
Change-Id: If92799d47c7e731febb45197384c082eb3af55df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorcontroller.cpp')
-rw-r--r-- | src/plugins/diffeditor/diffeditorcontroller.cpp | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/src/plugins/diffeditor/diffeditorcontroller.cpp b/src/plugins/diffeditor/diffeditorcontroller.cpp index 5aa790e5a6..4f2e749d89 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.cpp +++ b/src/plugins/diffeditor/diffeditorcontroller.cpp @@ -33,9 +33,12 @@ namespace DiffEditor { DiffEditorController::DiffEditorController(QObject *parent) : QObject(parent), + m_descriptionEnabled(false), + m_descriptionVisible(true), m_contextLinesNumber(3), m_ignoreWhitespaces(true), - m_syncScrollBars(true) + m_syncScrollBars(true), + m_currentDiffFileIndex(-1) { clear(); } @@ -60,6 +63,21 @@ QString DiffEditorController::workingDirectory() const return m_workingDirectory; } +QString DiffEditorController::description() const +{ + return m_description; +} + +bool DiffEditorController::isDescriptionEnabled() const +{ + return m_descriptionEnabled; +} + +bool DiffEditorController::isDescriptionVisible() const +{ + return m_descriptionVisible; +} + int DiffEditorController::contextLinesNumber() const { return m_contextLinesNumber; @@ -100,6 +118,33 @@ void DiffEditorController::setDiffContents(const QList<DiffFilesContents> &diffF emit diffContentsChanged(diffFileList, workingDirectory); } +void DiffEditorController::setDescription(const QString &description) +{ + if (m_description == description) + return; + + m_description = description; + emit descriptionChanged(description); +} + +void DiffEditorController::setDescriptionEnabled(bool on) +{ + if (m_descriptionEnabled == on) + return; + + m_descriptionEnabled = on; + emit descriptionEnablementChanged(on); +} + +void DiffEditorController::setDescriptionVisible(bool on) +{ + if (m_descriptionVisible == on) + return; + + m_descriptionVisible = on; + emit descriptionVisibilityChanged(on); +} + void DiffEditorController::setContextLinesNumber(int lines) { const int l = qMax(lines, -1); |