2015-01-30 16:10:04 +01:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
|
|
|
|
** Copyright (C) 2014 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://www.qt.io/licensing. For further information
|
|
|
|
|
** use the contact form at http://www.qt.io/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 or version 3 as published by the Free
|
|
|
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
|
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
|
|
|
** following information to ensure the GNU Lesser General Public License
|
|
|
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
|
|
|
** 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.
|
|
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "diffview.h"
|
|
|
|
|
|
2015-11-23 16:41:54 +01:00
|
|
|
#include "diffeditoricons.h"
|
2015-01-30 16:10:04 +01:00
|
|
|
#include "unifieddiffeditorwidget.h"
|
|
|
|
|
#include "sidebysidediffeditorwidget.h"
|
|
|
|
|
|
|
|
|
|
#include <utils/qtcassert.h>
|
|
|
|
|
|
2015-02-26 13:22:35 +01:00
|
|
|
#include <QCoreApplication>
|
|
|
|
|
|
2015-01-30 16:10:04 +01:00
|
|
|
namespace DiffEditor {
|
|
|
|
|
namespace Internal {
|
|
|
|
|
|
2015-01-30 16:59:25 +01:00
|
|
|
IDiffView::IDiffView(QObject *parent) : QObject(parent), m_supportsSync(false)
|
|
|
|
|
{ }
|
|
|
|
|
|
2015-01-30 16:10:04 +01:00
|
|
|
QIcon IDiffView::icon() const
|
|
|
|
|
{
|
|
|
|
|
return m_icon;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString IDiffView::toolTip() const
|
|
|
|
|
{
|
|
|
|
|
return m_toolTip;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-30 16:59:25 +01:00
|
|
|
bool IDiffView::supportsSync() const
|
|
|
|
|
{
|
|
|
|
|
return m_supportsSync;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString IDiffView::syncToolTip() const
|
|
|
|
|
{
|
|
|
|
|
return m_syncToolTip;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-30 16:10:04 +01:00
|
|
|
Core::Id IDiffView::id() const
|
|
|
|
|
{
|
|
|
|
|
return m_id;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void IDiffView::setIcon(const QIcon &icon)
|
|
|
|
|
{
|
|
|
|
|
m_icon = icon;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void IDiffView::setToolTip(const QString &toolTip)
|
|
|
|
|
{
|
|
|
|
|
m_toolTip = toolTip;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void IDiffView::setId(const Core::Id &id)
|
|
|
|
|
{
|
|
|
|
|
m_id = id;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-30 16:59:25 +01:00
|
|
|
void IDiffView::setSupportsSync(bool sync)
|
|
|
|
|
{
|
|
|
|
|
m_supportsSync = sync;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void IDiffView::setSyncToolTip(const QString &text)
|
|
|
|
|
{
|
|
|
|
|
m_syncToolTip = text;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-30 16:10:04 +01:00
|
|
|
UnifiedView::UnifiedView() : m_widget(0)
|
|
|
|
|
{
|
|
|
|
|
setId(UNIFIED_VIEW_ID);
|
2015-11-23 16:41:54 +01:00
|
|
|
setIcon(Icons::UNIFIED_DIFF.icon());
|
2015-01-30 16:10:04 +01:00
|
|
|
setToolTip(QCoreApplication::translate("DiffEditor::UnifiedView", "Switch to Unified Diff Editor"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QWidget *UnifiedView::widget()
|
|
|
|
|
{
|
2015-01-30 16:59:25 +01:00
|
|
|
if (!m_widget) {
|
2015-01-30 16:10:04 +01:00
|
|
|
m_widget = new UnifiedDiffEditorWidget;
|
2015-01-30 16:59:25 +01:00
|
|
|
connect(m_widget, &UnifiedDiffEditorWidget::currentDiffFileIndexChanged,
|
|
|
|
|
this, &UnifiedView::currentDiffFileIndexChanged);
|
|
|
|
|
}
|
2015-01-30 16:10:04 +01:00
|
|
|
return m_widget;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-30 16:59:25 +01:00
|
|
|
void UnifiedView::setDocument(DiffEditorDocument *document)
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
|
|
|
|
m_widget->setDocument(document);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void UnifiedView::beginOperation()
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
|
|
|
|
m_widget->saveState();
|
|
|
|
|
m_widget->clear(tr("Waiting for data..."));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void UnifiedView::setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory)
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
|
|
|
|
m_widget->setDiff(diffFileList, workingDirectory);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void UnifiedView::endOperation(bool success)
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
2015-09-09 22:12:19 +03:00
|
|
|
if (success)
|
|
|
|
|
m_widget->restoreState();
|
|
|
|
|
else
|
|
|
|
|
m_widget->clear(tr("Failed"));
|
2015-01-30 16:59:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void UnifiedView::setCurrentDiffFileIndex(int index)
|
2015-01-30 16:10:04 +01:00
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
2015-01-30 16:59:25 +01:00
|
|
|
m_widget->setCurrentDiffFileIndex(index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void UnifiedView::setSync(bool sync)
|
|
|
|
|
{
|
|
|
|
|
Q_UNUSED(sync);
|
2015-01-30 16:10:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SideBySideView::SideBySideView() : m_widget(0)
|
|
|
|
|
{
|
|
|
|
|
setId(SIDE_BY_SIDE_VIEW_ID);
|
2015-11-23 16:41:54 +01:00
|
|
|
setIcon(Icons::UNIFIED_DIFF.icon());
|
2015-01-30 16:10:04 +01:00
|
|
|
setToolTip(QCoreApplication::translate("DiffEditor::SideBySideView",
|
|
|
|
|
"Switch to Side By Side Diff Editor"));
|
2015-01-30 16:59:25 +01:00
|
|
|
setSupportsSync(true);
|
|
|
|
|
setSyncToolTip(tr("Synchronize Horizontal Scroll Bars"));
|
2015-01-30 16:10:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QWidget *SideBySideView::widget()
|
|
|
|
|
{
|
2015-01-30 16:59:25 +01:00
|
|
|
if (!m_widget) {
|
2015-01-30 16:10:04 +01:00
|
|
|
m_widget = new SideBySideDiffEditorWidget;
|
2015-01-30 16:59:25 +01:00
|
|
|
connect(m_widget, &SideBySideDiffEditorWidget::currentDiffFileIndexChanged,
|
|
|
|
|
this, &SideBySideView::currentDiffFileIndexChanged);
|
|
|
|
|
}
|
2015-01-30 16:10:04 +01:00
|
|
|
return m_widget;
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-30 16:59:25 +01:00
|
|
|
void SideBySideView::setDocument(DiffEditorDocument *document)
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
|
|
|
|
m_widget->setDocument(document);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SideBySideView::beginOperation()
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
|
|
|
|
m_widget->saveState();
|
|
|
|
|
m_widget->clear(tr("Waiting for data..."));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SideBySideView::setCurrentDiffFileIndex(int index)
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
|
|
|
|
m_widget->setCurrentDiffFileIndex(index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SideBySideView::setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory)
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
|
|
|
|
m_widget->setDiff(diffFileList, workingDirectory);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SideBySideView::endOperation(bool success)
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
2015-09-09 22:12:19 +03:00
|
|
|
if (success)
|
|
|
|
|
m_widget->restoreState();
|
|
|
|
|
else
|
|
|
|
|
m_widget->clear(tr("Failed"));
|
2015-01-30 16:59:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SideBySideView::setSync(bool sync)
|
2015-01-30 16:10:04 +01:00
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_widget, return);
|
2015-01-30 16:59:25 +01:00
|
|
|
m_widget->setHorizontalSync(sync);
|
2015-01-30 16:10:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace Internal
|
|
|
|
|
} // namespace DiffEditor
|