2013-02-15 12:49:50 +01:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
|
|
|
|
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
|
|
|
|
** Contact: http://www.qt-project.org/legal
|
|
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator.
|
|
|
|
|
**
|
|
|
|
|
** Commercial License Usage
|
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
|
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
|
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
|
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
|
|
|
|
**
|
|
|
|
|
** GNU Lesser General Public License Usage
|
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
|
|
|
** General Public License version 2.1 as published by the Free Software
|
|
|
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
|
|
|
** packaging of this file. Please review the following information to
|
|
|
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
|
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
|
|
|
**
|
|
|
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
|
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
#ifndef DIFFEDITORWIDGET_H
|
|
|
|
|
#define DIFFEDITORWIDGET_H
|
|
|
|
|
|
|
|
|
|
#include "diffeditor_global.h"
|
|
|
|
|
#include "differ.h"
|
|
|
|
|
|
|
|
|
|
#include <QTextEdit>
|
|
|
|
|
|
|
|
|
|
namespace TextEditor {
|
|
|
|
|
class BaseTextEditorWidget;
|
|
|
|
|
class SnippetEditorWidget;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
|
class QPlainTextEdit;
|
|
|
|
|
class QSplitter;
|
|
|
|
|
class QSyntaxHighlighter;
|
|
|
|
|
class QTextCharFormat;
|
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-02-21 17:03:00 +01:00
|
|
|
namespace DiffEditor {
|
2013-02-15 12:49:50 +01:00
|
|
|
|
|
|
|
|
class DiffViewEditorWidget;
|
2013-05-07 14:02:08 +02:00
|
|
|
struct TextLineData;
|
|
|
|
|
struct ChunkData;
|
|
|
|
|
struct FileData;
|
2013-02-15 12:49:50 +01:00
|
|
|
|
|
|
|
|
class DIFFEDITOR_EXPORT DiffEditorWidget : public QWidget
|
|
|
|
|
{
|
|
|
|
|
Q_OBJECT
|
|
|
|
|
public:
|
2013-05-07 14:02:08 +02:00
|
|
|
struct DiffFileInfo {
|
|
|
|
|
DiffFileInfo() {}
|
|
|
|
|
DiffFileInfo(const QString &file) : fileName(file) {}
|
|
|
|
|
DiffFileInfo(const QString &file, const QString &type) : fileName(file), typeInfo(type) {}
|
|
|
|
|
QString fileName;
|
|
|
|
|
QString typeInfo;
|
|
|
|
|
};
|
|
|
|
|
|
2013-04-25 17:37:20 +02:00
|
|
|
struct DiffFilesContents {
|
2013-05-07 14:02:08 +02:00
|
|
|
DiffFileInfo leftFileInfo;
|
2013-04-25 17:37:20 +02:00
|
|
|
QString leftText;
|
2013-05-07 14:02:08 +02:00
|
|
|
DiffFileInfo rightFileInfo;
|
2013-04-25 17:37:20 +02:00
|
|
|
QString rightText;
|
|
|
|
|
};
|
|
|
|
|
|
2013-02-15 12:49:50 +01:00
|
|
|
DiffEditorWidget(QWidget *parent = 0);
|
|
|
|
|
~DiffEditorWidget();
|
|
|
|
|
|
2013-04-25 17:37:20 +02:00
|
|
|
void clear();
|
2013-05-07 14:02:08 +02:00
|
|
|
void clear(const QString &message);
|
|
|
|
|
void setDiff(const QList<DiffFilesContents> &diffFileList, const QString &workingDirectory = QString());
|
2013-02-15 12:49:50 +01:00
|
|
|
QTextCodec *codec() const;
|
|
|
|
|
|
|
|
|
|
public slots:
|
|
|
|
|
void setContextLinesNumber(int lines);
|
|
|
|
|
void setIgnoreWhitespaces(bool ignore);
|
|
|
|
|
|
|
|
|
|
protected:
|
|
|
|
|
TextEditor::SnippetEditorWidget *leftEditor() const;
|
|
|
|
|
TextEditor::SnippetEditorWidget *rightEditor() const;
|
|
|
|
|
|
|
|
|
|
private slots:
|
|
|
|
|
void leftSliderChanged();
|
|
|
|
|
void rightSliderChanged();
|
2013-04-10 13:51:04 +02:00
|
|
|
void leftDocumentSizeChanged();
|
|
|
|
|
void rightDocumentSizeChanged();
|
2013-02-15 12:49:50 +01:00
|
|
|
|
|
|
|
|
private:
|
2013-04-25 17:37:20 +02:00
|
|
|
struct DiffList {
|
2013-05-07 14:02:08 +02:00
|
|
|
DiffFileInfo leftFileInfo;
|
|
|
|
|
DiffFileInfo rightFileInfo;
|
2013-04-25 17:37:20 +02:00
|
|
|
QList<Diff> diffList;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void setDiff(const QList<DiffList> &diffList);
|
2013-02-15 12:49:50 +01:00
|
|
|
bool isWhitespace(const QChar &c) const;
|
|
|
|
|
bool isWhitespace(const Diff &diff) const;
|
|
|
|
|
bool isEqual(const QList<Diff> &diffList, int diffNumber) const;
|
|
|
|
|
QList<QTextEdit::ExtraSelection> colorPositions(const QTextCharFormat &format,
|
|
|
|
|
QTextCursor &cursor,
|
|
|
|
|
const QMap<int, int> &positions) const;
|
2013-04-25 17:37:20 +02:00
|
|
|
void colorDiff(const QList<FileData> &fileDataList);
|
2013-04-23 14:35:49 +02:00
|
|
|
QList<TextLineData> assemblyRows(const QStringList &lines,
|
|
|
|
|
const QMap<int, int> &lineSpans,
|
|
|
|
|
const QMap<int, int> &changedPositions,
|
|
|
|
|
QMap<int, int> *outputChangedPositions) const;
|
2013-02-15 12:49:50 +01:00
|
|
|
ChunkData calculateOriginalData(const QList<Diff> &diffList) const;
|
|
|
|
|
FileData calculateContextData(const ChunkData &originalData) const;
|
|
|
|
|
void showDiff();
|
2013-04-10 13:51:04 +02:00
|
|
|
void synchronizeFoldings(DiffViewEditorWidget *source, DiffViewEditorWidget *destination);
|
2013-02-15 12:49:50 +01:00
|
|
|
|
|
|
|
|
DiffViewEditorWidget *m_leftEditor;
|
|
|
|
|
DiffViewEditorWidget *m_rightEditor;
|
|
|
|
|
QSplitter *m_splitter;
|
|
|
|
|
|
2013-04-25 17:37:20 +02:00
|
|
|
QList<DiffList> m_diffList; // list of original outputs from differ
|
|
|
|
|
QList<ChunkData> m_originalChunkData; // one big chunk for every file, ignoreWhitespaces taken into account
|
|
|
|
|
QList<FileData> m_contextFileData; // ultimate data to be shown, contextLinesNumber taken into account
|
2013-02-15 12:49:50 +01:00
|
|
|
int m_contextLinesNumber;
|
|
|
|
|
bool m_ignoreWhitespaces;
|
|
|
|
|
|
2013-04-10 13:51:04 +02:00
|
|
|
bool m_foldingBlocker;
|
2013-02-15 12:49:50 +01:00
|
|
|
};
|
|
|
|
|
|
2013-02-21 17:03:00 +01:00
|
|
|
} // namespace DiffEditor
|
2013-02-15 12:49:50 +01:00
|
|
|
|
|
|
|
|
#endif // DIFFEDITORWIDGET_H
|