Commit 97a86c50 authored by jkobus's avatar jkobus Committed by Tobias Hunger

Basic integration of diff editor inside git plugin

Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: default avatarDavid Schulz <david.schulz@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 60b1aaea
DEFINES += DIFFEDITOR_LIBRARY
include(../../qtcreatorplugin.pri)
HEADERS += diffeditorplugin.h \
diffeditorwidget.h \
HEADERS += diffeditor_global.h \
diffeditorconstants.h \
diffeditor_global.h \
diffeditoreditable.h \
diffeditorfile.h \
diffeditorplugin.h \
diffeditorwidget.h \
differ.h
SOURCES += diffeditorplugin.cpp \
SOURCES += diffeditoreditable.cpp \
diffeditorfile.cpp \
diffeditorplugin.cpp \
diffeditorwidget.cpp \
differ.cpp
......
......@@ -13,14 +13,18 @@ QtcPlugin {
Depends { name: "cpp" }
files: [
"diffeditor_global.h",
"diffeditorconstants.h",
"diffeditoreditable.cpp",
"diffeditoreditable.h",
"diffeditorfile.cpp",
"diffeditorfile.h",
"diffeditorplugin.cpp",
"diffeditorplugin.h",
"differ.cpp",
"differ.h",
"diffeditorwidget.cpp",
"diffeditorwidget.h",
"diffeditorconstants.h",
"diffeditor_global.h",
"differ.cpp",
"differ.h",
]
}
/****************************************************************************
**
** 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.
**
****************************************************************************/
#include "diffeditoreditable.h"
#include "diffeditorfile.h"
#include "diffeditorwidget.h"
#include "diffeditorconstants.h"
#include <coreplugin/icore.h>
#include <QCoreApplication>
#include <QToolButton>
#include <QSpinBox>
#include <QStyle>
#include <QLabel>
namespace DiffEditor {
///////////////////////////////// DiffEditorEditable //////////////////////////////////
DiffEditorEditable::DiffEditorEditable(DiffEditorWidget *editorWidget)
: IEditor(0),
m_file(new Internal::DiffEditorFile(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE), this)),
m_editorWidget(editorWidget),
m_toolWidget(0)
{
setWidget(editorWidget);
}
DiffEditorEditable::~DiffEditorEditable()
{
delete m_toolWidget;
if (m_widget)
delete m_widget;
}
bool DiffEditorEditable::createNew(const QString &contents)
{
Q_UNUSED(contents)
return true;
}
bool DiffEditorEditable::open(QString *errorString, const QString &fileName, const QString &realFileName)
{
Q_UNUSED(errorString)
Q_UNUSED(fileName)
Q_UNUSED(realFileName)
return true;
}
Core::IDocument *DiffEditorEditable::document()
{
return m_file;
}
QString DiffEditorEditable::displayName() const
{
if (m_displayName.isEmpty())
m_displayName = QCoreApplication::translate("DiffEditor", Constants::DIFF_EDITOR_DISPLAY_NAME);
return m_displayName;
}
void DiffEditorEditable::setDisplayName(const QString &title)
{
m_displayName = title;
emit changed();
}
bool DiffEditorEditable::duplicateSupported() const
{
return false;
}
Core::IEditor *DiffEditorEditable::duplicate(QWidget *parent)
{
Q_UNUSED(parent)
return 0;
}
Core::Id DiffEditorEditable::id() const
{
return Constants::DIFF_EDITOR_ID;
}
static QToolBar *createToolBar(const QWidget *someWidget)
{
// Create
QToolBar *toolBar = new QToolBar;
toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
const int size = someWidget->style()->pixelMetric(QStyle::PM_SmallIconSize);
toolBar->setIconSize(QSize(size, size));
toolBar->addSeparator();
return toolBar;
}
QWidget *DiffEditorEditable::toolBar()
{
if (m_toolWidget)
return m_toolWidget;
// Create
m_toolWidget = createToolBar(m_editorWidget);
QToolButton *whitespaceButton = new QToolButton(m_toolWidget);
whitespaceButton->setText(tr("Ignore Whitespaces"));
whitespaceButton->setCheckable(true);
whitespaceButton->setChecked(true);
connect(whitespaceButton, SIGNAL(clicked(bool)),
m_editorWidget, SLOT(setIgnoreWhitespaces(bool)));
m_toolWidget->addWidget(whitespaceButton);
QLabel *contextLabel = new QLabel(tr("Context Lines:"), m_toolWidget);
m_toolWidget->addWidget(contextLabel);
QSpinBox *contextSpinBox = new QSpinBox(m_toolWidget);
contextSpinBox->setRange(-1, 100);
contextSpinBox->setValue(3);
connect(contextSpinBox, SIGNAL(valueChanged(int)),
m_editorWidget, SLOT(setContextLinesNumber(int)));
m_toolWidget->addWidget(contextSpinBox);
return m_toolWidget;
}
QByteArray DiffEditorEditable::saveState() const
{
return QByteArray();
}
bool DiffEditorEditable::restoreState(const QByteArray &state)
{
Q_UNUSED(state)
return true;
}
} // namespace DiffEditor
/****************************************************************************
**
** 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 DIFFEDITOREDITABLE_H
#define DIFFEDITOREDITABLE_H
#include "diffeditor_global.h"
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/idocument.h>
#include <QToolBar>
namespace DiffEditor {
class DiffEditorWidget;
namespace Internal {
class DiffEditorFile;
}
class DIFFEDITOR_EXPORT DiffEditorEditable : public Core::IEditor
{
Q_OBJECT
public:
explicit DiffEditorEditable(DiffEditorWidget *editorWidget);
virtual ~DiffEditorEditable();
public:
// Core::IEditor
bool createNew(const QString &contents);
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
Core::IDocument *document();
QString displayName() const;
void setDisplayName(const QString &title);
bool duplicateSupported() const;
Core::IEditor *duplicate(QWidget *parent);
Core::Id id() const;
bool isTemporary() const { return true; }
DiffEditorWidget *editorWidget() const { return m_editorWidget; }
QWidget *toolBar();
QByteArray saveState() const;
bool restoreState(const QByteArray &state);
private:
Internal::DiffEditorFile *m_file;
DiffEditorWidget *m_editorWidget;
QToolBar *m_toolWidget;
mutable QString m_displayName;
};
} // namespace DiffEditor
#endif // DIFFEDITOREDITABLE_H
/****************************************************************************
**
** 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.
**
****************************************************************************/
#include "diffeditorfile.h"
namespace DiffEditor {
namespace Internal {
///////////////////////////////// DiffFile //////////////////////////////////
DiffEditorFile::DiffEditorFile(const QString &mimeType, QObject *parent) :
Core::IDocument(parent),
m_mimeType(mimeType),
m_modified(false)
{
}
void DiffEditorFile::rename(const QString &newName)
{
Q_UNUSED(newName);
return;
}
void DiffEditorFile::setFileName(const QString &name)
{
if (m_fileName == name)
return;
m_fileName = name;
emit changed();
}
void DiffEditorFile::setModified(bool modified)
{
if (m_modified == modified)
return;
m_modified = modified;
emit changed();
}
bool DiffEditorFile::save(QString *errorString, const QString &fileName, bool autoSave)
{
emit saveMe(errorString, fileName, autoSave);
if (!errorString->isEmpty())
return false;
emit changed();
return true;
}
QString DiffEditorFile::mimeType() const
{
return m_mimeType;
}
Core::IDocument::ReloadBehavior DiffEditorFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
Q_UNUSED(state)
Q_UNUSED(type)
return BehaviorSilent;
}
bool DiffEditorFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
{
Q_UNUSED(errorString)
Q_UNUSED(flag)
Q_UNUSED(type)
return true;
}
} // namespace Internal
} // namespace DiffEditor
/****************************************************************************
**
** 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 DIFFEDITORFILE_H
#define DIFFEDITORFILE_H
#include "diffeditor_global.h"
#include <coreplugin/idocument.h>
namespace DiffEditor {
class DiffEditorWidget;
class DiffEditorFile;
namespace Internal {
class DiffEditorFile : public Core::IDocument
{
Q_OBJECT
public:
explicit DiffEditorFile(const QString &mimeType,
QObject *parent = 0);
QString fileName() const { return m_fileName; }
QString defaultPath() const { return QString(); }
QString suggestedFileName() const { return QString(); }
bool isModified() const { return m_modified; }
QString mimeType() const;
bool isSaveAsAllowed() const { return false; }
bool save(QString *errorString, const QString &fileName, bool autoSave);
ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
void rename(const QString &newName);
void setFileName(const QString &name);
void setModified(bool modified = true);
signals:
void saveMe(QString *errorString, const QString &fileName, bool autoSave);
private:
const QString m_mimeType;
bool m_modified;
QString m_fileName;
};
} // namespace Internal
} // namespace DiffEditor
#endif // DIFFEDITOREDITABLE_H
......@@ -28,17 +28,14 @@
****************************************************************************/
#include "diffeditorplugin.h"
#include "diffeditoreditable.h"
#include "diffeditorwidget.h"
#include "diffeditorconstants.h"
#include <coreplugin/icore.h>
#include <QCoreApplication>
#include <QToolButton>
#include <QSpinBox>
#include <QStyle>
#include <QLabel>
#include <QFileDialog>
#include <QTextCodec>
#include <QtPlugin>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
......@@ -46,195 +43,14 @@
#include <coreplugin/editormanager/editormanager.h>
namespace DiffEditor {
namespace Internal {
///////////////////////////////// DiffEditor //////////////////////////////////
DiffEditorEditable::DiffEditorEditable(DiffEditorWidget *editorWidget)
:
IEditor(0),
m_file(new DiffFile(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE), this)),
m_editorWidget(editorWidget),
m_toolWidget(0)
{
setWidget(editorWidget);
}
DiffEditorEditable::~DiffEditorEditable()
{
delete m_toolWidget;
if (m_widget)
delete m_widget;
}
bool DiffEditorEditable::createNew(const QString &contents)
{
Q_UNUSED(contents)
// setFileContents(contents);
return true;
}
bool DiffEditorEditable::open(QString *errorString, const QString &fileName, const QString &realFileName)
{
Q_UNUSED(errorString)
Q_UNUSED(fileName)
Q_UNUSED(realFileName)
const QString text = QLatin1String("Open");
if (!createNew(text))
return false;
return true;
}
Core::IDocument *DiffEditorEditable::document()
{
return m_file;
}
QString DiffEditorEditable::displayName() const
{
if (m_displayName.isEmpty())
m_displayName = QCoreApplication::translate("DiffEditor", Constants::DIFF_EDITOR_DISPLAY_NAME);
return m_displayName;
}
void DiffEditorEditable::setDisplayName(const QString &title)
{
m_displayName = title;
emit changed();
}
bool DiffEditorEditable::duplicateSupported() const
{
return false;
}
Core::IEditor *DiffEditorEditable::duplicate(QWidget * /*parent*/)
{
return 0;
}
Core::Id DiffEditorEditable::id() const
{
return Constants::DIFF_EDITOR_ID;
}
static QToolBar *createToolBar(const QWidget *someWidget)
{
// Create
QToolBar *toolBar = new QToolBar;
toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
const int size = someWidget->style()->pixelMetric(QStyle::PM_SmallIconSize);
toolBar->setIconSize(QSize(size, size));
toolBar->addSeparator();
return toolBar;
}
QWidget *DiffEditorEditable::toolBar()
{
if (m_toolWidget)
return m_toolWidget;
// Create
m_toolWidget = createToolBar(m_editorWidget);
QToolButton *whitespaceButton = new QToolButton(m_toolWidget);
whitespaceButton->setText(tr("Ignore Whitespaces"));
whitespaceButton->setCheckable(true);
whitespaceButton->setChecked(true);
connect(whitespaceButton, SIGNAL(clicked(bool)),
m_editorWidget, SLOT(setIgnoreWhitespaces(bool)));
m_toolWidget->addWidget(whitespaceButton);
QLabel *contextLabel = new QLabel(tr("Context Lines:"), m_toolWidget);
m_toolWidget->addWidget(contextLabel);
QSpinBox *contextSpinBox = new QSpinBox(m_toolWidget);
contextSpinBox->setRange(-1, 100);
contextSpinBox->setValue(1);
connect(contextSpinBox, SIGNAL(valueChanged(int)),
m_editorWidget, SLOT(setContextLinesNumber(int)));
m_toolWidget->addWidget(contextSpinBox);
return m_toolWidget;
}
QByteArray DiffEditorEditable::saveState() const
{
return QByteArray();
}
bool DiffEditorEditable::restoreState(const QByteArray &/*state*/)
{
return true;
}
///////////////////////////////// DiffFile //////////////////////////////////
DiffFile::DiffFile(const QString &mimeType, QObject *parent) :
Core::IDocument(parent),
m_mimeType(mimeType),
m_modified(false)
{
}
void DiffFile::rename(const QString &newName)
{
Q_UNUSED(newName);
return;
}
void DiffFile::setFileName(const QString &name)
{
if (m_fileName == name)
return;
m_fileName = name;
emit changed();
}
void DiffFile::setModified(bool modified)
{
if (m_modified == modified)
return;
m_modified = modified;
emit changed();
}
bool DiffFile::save(QString *errorString, const QString &fileName, bool autoSave)
{
emit saveMe(errorString, fileName, autoSave);
if (!errorString->isEmpty())
return false;
emit changed();
return true;
}
QString DiffFile::mimeType() const
{
return m_mimeType;
}
Core::IDocument::ReloadBehavior DiffFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
{
Q_UNUSED(state)
Q_UNUSED(type)
return BehaviorSilent;
}
bool DiffFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
{
Q_UNUSED(errorString)
Q_UNUSED(flag)
Q_UNUSED(type)
return true;
}