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

Move Gui stuff out of DiffEditorController

Browse Source 
Place it in DiffEditorGuiController, will be needed for
sharing gui settings between unified and sidebyside versions.

Change-Id: I8a858d0549ff84e21f7c909288ca07c5a2ef4e5b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
jkobus
2014-02-24 11:10:17 +01:00
committed by Jarek Kobus
parent 167206f8fb
commit 52e166c5ae
10 changed files with 290 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,12 +67,6 @@ public:
QString description() const;
bool isDescriptionEnabled() const;
bool isDescriptionVisible() const;
int contextLinesNumber() const;
bool isIgnoreWhitespaces() const;
bool horizontalScrollBarSynchronization() const;
int currentDiffFileIndex() const;
public slots:
void clear();
void clear(const QString &message);
@@ -81,26 +75,12 @@ public slots:
void setDescription(const QString &description);
void setDescriptionEnabled(bool on);
void setDescriptionVisible(bool on);
void setContextLinesNumber(int lines);
void setIgnoreWhitespaces(bool ignore);
void setHorizontalScrollBarSynchronization(bool on);
void setCurrentDiffFileIndex(int diffFileIndex);
signals:
// This sets the current diff file index to -1
void cleared(const QString &message);
// This sets the current diff file index to 0 (unless diffFileList is empty)
void diffContentsChanged(const QList<DiffEditorController::DiffFilesContents> &diffFileList, const QString &workingDirectory);
void descriptionChanged(const QString &description);
void descriptionEnablementChanged(bool on);
void descriptionVisibilityChanged(bool on);
void contextLinesNumberChanged(int lines);
void ignoreWhitespacesChanged(bool ignore);
void horizontalScrollBarSynchronizationChanged(bool on);
void currentDiffFileIndexChanged(int diffFileIndex);
private:
QString m_clearMessage;
@@ -108,12 +88,6 @@ private:
QString m_workingDirectory;
QString m_description;
bool m_descriptionEnabled;
bool m_descriptionVisible;
int m_contextLinesNumber;
bool m_ignoreWhitespaces;
bool m_syncScrollBars;
int m_currentDiffFileIndex;
};
} // namespace DiffEditor