forked from qt-creator/qt-creator
b29513aa5b
Display "Waiting for data" instead of "No differences" when creating new instance of an editor for the same document (e.g. by splitting the view) during document reload. Change-Id: If254006de3914ad4416c7405874e8cbea57ddd8d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
97 lines
3.1 KiB
C++
97 lines
3.1 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** 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 The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#pragma once
|
|
|
|
#include "diffutils.h"
|
|
|
|
#include <QObject>
|
|
#include <QTextCharFormat>
|
|
#include <QTimer>
|
|
|
|
QT_FORWARD_DECLARE_CLASS(QMenu)
|
|
|
|
namespace Core { class IDocument; }
|
|
namespace TextEditor { class FontSettings; }
|
|
namespace Utils { class ProgressIndicator; }
|
|
|
|
namespace DiffEditor {
|
|
|
|
namespace Internal {
|
|
|
|
class DiffEditorDocument;
|
|
|
|
class DiffEditorWidgetController : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit DiffEditorWidgetController(QWidget *diffEditorWidget);
|
|
|
|
void setDocument(DiffEditorDocument *document);
|
|
DiffEditorDocument *document() const;
|
|
|
|
void patch(bool revert);
|
|
void jumpToOriginalFile(const QString &fileName, int lineNumber,
|
|
int columnNumber);
|
|
void setFontSettings(const TextEditor::FontSettings &fontSettings);
|
|
void addCodePasterAction(QMenu *menu);
|
|
void addApplyAction(QMenu *menu, int diffFileIndex, int chunkIndex);
|
|
void addRevertAction(QMenu *menu, int diffFileIndex, int chunkIndex);
|
|
|
|
bool m_ignoreCurrentIndexChange = false;
|
|
QList<FileData> m_contextFileData; // ultimate data to be shown
|
|
// contextLineCount taken into account
|
|
QTextCharFormat m_fileLineFormat;
|
|
QTextCharFormat m_chunkLineFormat;
|
|
QTextCharFormat m_leftLineFormat;
|
|
QTextCharFormat m_rightLineFormat;
|
|
QTextCharFormat m_leftCharFormat;
|
|
QTextCharFormat m_rightCharFormat;
|
|
|
|
private:
|
|
void slotSendChunkToCodePaster();
|
|
void slotApplyChunk();
|
|
void slotRevertChunk();
|
|
bool setAndVerifyIndexes(QMenu *menu, int diffFileIndex, int chunkIndex);
|
|
bool fileNamesAreDifferent() const;
|
|
|
|
void scheduleShowProgress();
|
|
void showProgress();
|
|
void hideProgress();
|
|
|
|
QWidget *m_diffEditorWidget;
|
|
|
|
DiffEditorDocument *m_document = nullptr;
|
|
|
|
int m_contextMenuFileIndex = -1;
|
|
int m_contextMenuChunkIndex = -1;
|
|
|
|
Utils::ProgressIndicator *m_progressIndicator = nullptr;
|
|
QTimer m_timer;
|
|
};
|
|
|
|
} // namespace Internal
|
|
} // namespace DiffEditor
|