2013-02-15 12:49:50 +01:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
2014-01-07 13:27:11 +01:00
|
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
2013-02-15 12:49:50 +01:00
|
|
|
** 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 "diffeditorplugin.h"
|
2013-05-30 12:15:22 +02:00
|
|
|
#include "diffeditor.h"
|
2013-02-15 12:49:50 +01:00
|
|
|
#include "diffeditorconstants.h"
|
2013-06-17 13:55:31 +02:00
|
|
|
#include "diffeditorfactory.h"
|
|
|
|
|
#include "diffeditorwidget.h"
|
|
|
|
|
#include "diffshoweditor.h"
|
|
|
|
|
#include "diffshoweditorfactory.h"
|
2013-02-15 12:49:50 +01:00
|
|
|
|
|
|
|
|
#include <QFileDialog>
|
|
|
|
|
#include <QTextCodec>
|
2013-05-07 14:02:08 +02:00
|
|
|
#include <QtPlugin>
|
2013-02-15 12:49:50 +01:00
|
|
|
|
|
|
|
|
#include <coreplugin/actionmanager/actioncontainer.h>
|
|
|
|
|
#include <coreplugin/actionmanager/actionmanager.h>
|
|
|
|
|
#include <coreplugin/coreconstants.h>
|
|
|
|
|
#include <coreplugin/editormanager/editormanager.h>
|
|
|
|
|
|
2013-02-21 17:03:00 +01:00
|
|
|
namespace DiffEditor {
|
2013-05-07 14:02:08 +02:00
|
|
|
namespace Internal {
|
|
|
|
|
|
2013-02-15 12:49:50 +01:00
|
|
|
DiffEditorPlugin::DiffEditorPlugin()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DiffEditorPlugin::~DiffEditorPlugin()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool DiffEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage)
|
|
|
|
|
{
|
|
|
|
|
Q_UNUSED(arguments)
|
|
|
|
|
Q_UNUSED(errorMessage)
|
|
|
|
|
|
|
|
|
|
//register actions
|
|
|
|
|
Core::ActionContainer *toolsContainer =
|
|
|
|
|
Core::ActionManager::actionContainer(Core::Constants::M_TOOLS);
|
|
|
|
|
toolsContainer->insertGroup(Core::Constants::G_TOOLS_OPTIONS, Constants::G_TOOLS_DIFF);
|
|
|
|
|
|
|
|
|
|
Core::Context globalcontext(Core::Constants::C_GLOBAL);
|
|
|
|
|
|
|
|
|
|
QAction *diffAction = new QAction(tr("Diff..."), this);
|
|
|
|
|
Core::Command *diffCommand = Core::ActionManager::registerAction(diffAction,
|
|
|
|
|
"DiffEditor.Diff", globalcontext);
|
|
|
|
|
connect(diffAction, SIGNAL(triggered()), this, SLOT(diff()));
|
|
|
|
|
toolsContainer->addAction(diffCommand, Constants::G_TOOLS_DIFF);
|
|
|
|
|
|
|
|
|
|
addAutoReleasedObject(new DiffEditorFactory(this));
|
2013-06-17 13:55:31 +02:00
|
|
|
addAutoReleasedObject(new DiffShowEditorFactory(this));
|
2013-02-15 12:49:50 +01:00
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void DiffEditorPlugin::extensionsInitialized()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void DiffEditorPlugin::diff()
|
|
|
|
|
{
|
|
|
|
|
QString fileName1 = QFileDialog::getOpenFileName(0,
|
2013-02-20 08:51:36 +01:00
|
|
|
tr("Select First File for Diff"),
|
2013-02-15 12:49:50 +01:00
|
|
|
QString());
|
|
|
|
|
if (fileName1.isNull())
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
QString fileName2 = QFileDialog::getOpenFileName(0,
|
2013-02-20 08:51:36 +01:00
|
|
|
tr("Select Second File for Diff"),
|
2013-02-15 12:49:50 +01:00
|
|
|
QString());
|
|
|
|
|
if (fileName2.isNull())
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const Core::Id editorId = Constants::DIFF_EDITOR_ID;
|
2013-02-20 08:51:36 +01:00
|
|
|
//: Editor title
|
2013-02-15 12:49:50 +01:00
|
|
|
QString title = tr("Diff \"%1\", \"%2\"").arg(fileName1).arg(fileName2);
|
2013-05-30 12:15:22 +02:00
|
|
|
DiffEditor *editor = qobject_cast<DiffEditor *>
|
2013-07-15 15:14:10 +02:00
|
|
|
(Core::EditorManager::openEditorWithContents(editorId, &title));
|
2013-02-15 12:49:50 +01:00
|
|
|
|
2013-05-30 12:15:22 +02:00
|
|
|
if (!editor)
|
2013-05-23 13:36:27 +02:00
|
|
|
return;
|
|
|
|
|
|
2013-05-31 12:52:53 +02:00
|
|
|
Core::EditorManager::activateEditor(editor);
|
2013-05-23 13:36:27 +02:00
|
|
|
|
2013-12-19 11:46:52 +01:00
|
|
|
QTextCodec *codec = editor->codec();
|
2013-05-23 13:36:27 +02:00
|
|
|
|
2013-12-19 11:46:52 +01:00
|
|
|
const QString text1 = getFileContents(fileName1, codec);
|
|
|
|
|
const QString text2 = getFileContents(fileName2, codec);
|
2013-05-23 13:36:27 +02:00
|
|
|
|
2013-12-16 16:19:40 +01:00
|
|
|
DiffEditorController::DiffFilesContents dfc;
|
2013-05-23 13:36:27 +02:00
|
|
|
dfc.leftFileInfo = fileName1;
|
|
|
|
|
dfc.leftText = text1;
|
|
|
|
|
dfc.rightFileInfo = fileName2;
|
|
|
|
|
dfc.rightText = text2;
|
2013-12-16 16:19:40 +01:00
|
|
|
QList<DiffEditorController::DiffFilesContents> list;
|
2013-05-23 13:36:27 +02:00
|
|
|
list.append(dfc);
|
|
|
|
|
|
2013-05-30 12:15:22 +02:00
|
|
|
editor->setDiff(list);
|
2013-02-15 12:49:50 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString DiffEditorPlugin::getFileContents(const QString &fileName, QTextCodec *codec) const
|
|
|
|
|
{
|
|
|
|
|
QFile file(fileName);
|
2013-11-11 22:20:47 +02:00
|
|
|
if (file.open(QIODevice::ReadOnly | QIODevice::Text))
|
2013-02-15 12:49:50 +01:00
|
|
|
return codec->toUnicode(file.readAll());
|
|
|
|
|
return QString();
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-21 17:03:00 +01:00
|
|
|
} // namespace Internal
|
|
|
|
|
} // namespace DiffEditor
|
2013-02-15 12:49:50 +01:00
|
|
|
|
2013-06-07 15:23:12 +02:00
|
|
|
#ifdef WITH_TESTS
|
|
|
|
|
|
|
|
|
|
void DiffEditor::Internal::DiffEditorPlugin::testAssemblyRows()
|
|
|
|
|
{
|
|
|
|
|
DiffEditorWidget widget;
|
|
|
|
|
widget.testAssemblyRows();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif // WITH_TESTS
|
|
|
|
|
|
2013-02-21 17:03:00 +01:00
|
|
|
Q_EXPORT_PLUGIN(DiffEditor::Internal::DiffEditorPlugin)
|