feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Implement unified diff editor

Browse Source 
Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
jkobus
2014-02-13 16:43:28 +01:00
committed by Jarek Kobus
parent 8cb25f9e3e
commit 8cad94534f
39 changed files with 4075 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/vcsbase/basevcseditorfactory.cpp
View File

@@ -33,6 +33,8 @@
#include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditorsettings.h>
#include <diffeditor/diffeditorconstants.h>
#include <QCoreApplication>
#include <QStringList>
@@ -67,7 +69,8 @@ BaseVcsEditorFactory::BaseVcsEditorFactory(const VcsBaseEditorParameters *t,
d->m_describeSlot = describeSlot;
setId(t->id);
setDisplayName(QCoreApplication::translate("VCS", t->displayName));
addMimeType(t->mimeType);
if (QLatin1String(t->mimeType) != QLatin1String(DiffEditor::Constants::DIFF_EDITOR_MIMETYPE))
addMimeType(t->mimeType);
new TextEditor::TextEditorActionHandler(this, t->context);
}
@@ -84,7 +87,8 @@ Core::IEditor *BaseVcsEditorFactory::createEditor()
if (d->m_describeReceiver)
connect(vcsEditor, SIGNAL(describeRequested(QString,QString)), d->m_describeReceiver, d->m_describeSlot);
vcsEditor->baseTextDocument()->setMimeType(mimeTypes().front());
if (!mimeTypes().isEmpty())
vcsEditor->baseTextDocument()->setMimeType(mimeTypes().front());
TextEditor::TextEditorSettings::initializeEditor(vcsEditor);
return vcsEditor->editor();