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

DiffEditor: Apply visualize whitespaces according to options

Browse Source 
Change-Id: I5f7c57479d5342f5457159b14fb6afa087cb988f
Reviewed-by: Marcel Krems <m.krems@software-vision.eu>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
jkobus
2013-06-03 15:17:34 +02:00
committed by Jarek Kobus
parent 1f447715b0
commit 26142b849b
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/diffeditor/diffeditorwidget.cpp
View File

@@ -43,6 +43,7 @@
#include <texteditor/syntaxhighlighter.h> #include <texteditor/syntaxhighlighter.h>
#include <texteditor/basetextdocument.h> #include <texteditor/basetextdocument.h>
#include <texteditor/texteditorsettings.h> #include <texteditor/texteditorsettings.h>
#include <texteditor/displaysettings.h>
#include <coreplugin/minisplitter.h> #include <coreplugin/minisplitter.h>
@@ -138,6 +139,9 @@ public:
void clearAllData(); void clearAllData();
QTextBlock firstVisibleBlock() const { return SnippetEditorWidget::firstVisibleBlock(); } QTextBlock firstVisibleBlock() const { return SnippetEditorWidget::firstVisibleBlock(); }
public slots:
void setDisplaySettings(const DisplaySettings &ds);
protected: protected:
virtual int extraAreaWidth(int *markWidthPtr = 0) const { return BaseTextEditorWidget::extraAreaWidth(markWidthPtr); } virtual int extraAreaWidth(int *markWidthPtr = 0) const { return BaseTextEditorWidget::extraAreaWidth(markWidthPtr); }
BaseTextEditor *createEditor() { return new DiffViewEditorEditable(this); } BaseTextEditor *createEditor() { return new DiffViewEditorEditable(this); }
@@ -174,11 +178,26 @@ private:
DiffViewEditorWidget::DiffViewEditorWidget(QWidget *parent) DiffViewEditorWidget::DiffViewEditorWidget(QWidget *parent)
: SnippetEditorWidget(parent), m_lineNumberDigits(1), m_inPaintEvent(false) : SnippetEditorWidget(parent), m_lineNumberDigits(1), m_inPaintEvent(false)
{ {
setLineNumbersVisible(true); DisplaySettings settings = displaySettings();
settings.m_textWrapping = false;
settings.m_displayLineNumbers = true;
settings.m_highlightCurrentLine = false;
settings.m_displayFoldingMarkers = true;
settings.m_markTextChanges = false;
settings.m_highlightBlocks = false;
SnippetEditorWidget::setDisplaySettings(settings);
setCodeFoldingSupported(true); setCodeFoldingSupported(true);
setFrameStyle(QFrame::NoFrame); setFrameStyle(QFrame::NoFrame);
} }
void DiffViewEditorWidget::setDisplaySettings(const DisplaySettings &ds)
{
DisplaySettings settings = displaySettings();
settings.m_visualizeWhitespace = ds.m_visualizeWhitespace;
SnippetEditorWidget::setDisplaySettings(settings);
}
QString DiffViewEditorWidget::lineNumber(int blockNumber) const QString DiffViewEditorWidget::lineNumber(int blockNumber) const
{ {
if (m_lineNumbers.contains(blockNumber)) if (m_lineNumbers.contains(blockNumber))
@@ -526,21 +545,23 @@ DiffEditorWidget::DiffEditorWidget(QWidget *parent)
m_leftEditor = new DiffViewEditorWidget(this); m_leftEditor = new DiffViewEditorWidget(this);
m_leftEditor->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_leftEditor->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_leftEditor->setReadOnly(true); m_leftEditor->setReadOnly(true);
m_leftEditor->setHighlightCurrentLine(false);
m_leftEditor->setWordWrapMode(QTextOption::NoWrap);
connect(settings, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)), connect(settings, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
m_leftEditor, SLOT(setFontSettings(TextEditor::FontSettings))); m_leftEditor, SLOT(setFontSettings(TextEditor::FontSettings)));
m_leftEditor->setFontSettings(settings->fontSettings()); m_leftEditor->setFontSettings(settings->fontSettings());
connect(settings, SIGNAL(displaySettingsChanged(TextEditor::DisplaySettings)),
m_leftEditor, SLOT(setDisplaySettings(TextEditor::DisplaySettings)));
m_leftEditor->setDisplaySettings(settings->displaySettings());
m_leftEditor->setCodeStyle(settings->codeStyle()); m_leftEditor->setCodeStyle(settings->codeStyle());
m_rightEditor = new DiffViewEditorWidget(this); m_rightEditor = new DiffViewEditorWidget(this);
m_rightEditor->setCornerWidget(toggleSync); m_rightEditor->setCornerWidget(toggleSync);
m_rightEditor->setReadOnly(true); m_rightEditor->setReadOnly(true);
m_rightEditor->setHighlightCurrentLine(false);
m_rightEditor->setWordWrapMode(QTextOption::NoWrap);
connect(settings, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)), connect(settings, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
m_rightEditor, SLOT(setFontSettings(TextEditor::FontSettings))); m_rightEditor, SLOT(setFontSettings(TextEditor::FontSettings)));
m_rightEditor->setFontSettings(settings->fontSettings()); m_rightEditor->setFontSettings(settings->fontSettings());
connect(settings, SIGNAL(displaySettingsChanged(TextEditor::DisplaySettings)),
m_rightEditor, SLOT(setDisplaySettings(TextEditor::DisplaySettings)));
m_rightEditor->setDisplaySettings(settings->displaySettings());
m_rightEditor->setCodeStyle(settings->codeStyle()); m_rightEditor->setCodeStyle(settings->codeStyle());
connect(m_leftEditor->verticalScrollBar(), SIGNAL(valueChanged(int)), connect(m_leftEditor->verticalScrollBar(), SIGNAL(valueChanged(int)),