feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
93bb48893fa2eaaeae8347ab0b19ea337bc889ce
qt-creator/src/plugins/diffeditor/diffeditor.pro

37 lines
1.0 KiB
Prolog
Raw Normal View History

Experimental integration of DiffEditor After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-15 12:49:50 +01:00
DEFINES += DIFFEDITOR_LIBRARY
include(../../qtcreatorplugin.pri)
Basic integration of diff editor inside git plugin Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-07 14:02:08 +02:00
HEADERS += diffeditor_global.h \
DiffEditor: Rename DiffEditorEditable to DiffEditor More in line with current naming conventions. Change-Id: I63f6677bd12d82f6749032996585d761f1a74fb7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-30 12:15:22 +02:00
diffeditor.h \
Add DiffEditorController Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-12-16 16:19:40 +01:00
diffeditorconstants.h \
diffeditorcontroller.h \
Rename DiffEditorFile -> DiffEditorDocument The old name had nothing to do with a file in fact. The new name will be more appropriate for the new stuff, which will come soon. Change-Id: I17ad03dab5c643ff26e313a434ba86929a0f00c3 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-30 13:31:11 +01:00
diffeditordocument.h \
Add a DiffShowEditor showing an additional info Task-number: QTCREATORBUG-9489 Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-17 13:55:31 +02:00
diffeditorfactory.h \
Move Gui stuff out of DiffEditorController Place it in DiffEditorGuiController, will be needed for sharing gui settings between unified and sidebyside versions. Change-Id: I8a858d0549ff84e21f7c909288ca07c5a2ef4e5b Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-24 11:10:17 +01:00
diffeditorguicontroller.h \
Add DiffEditorManager, refactoring. GitDiffSwitcher operates now on IDocument. GitDiffHandler operates now on DiffEditorController. "source" property now attached to editor's document (VcsBasePlugin). Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-11 13:00:35 +01:00
diffeditormanager.h \
Basic integration of diff editor inside git plugin Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-07 14:02:08 +02:00
diffeditorplugin.h \
Implement unified diff editor Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-13 16:43:28 +01:00
diffeditorreloader.h \
Add a DiffShowEditor showing an additional info Task-number: QTCREATORBUG-9489 Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-17 13:55:31 +02:00
differ.h \
Move internal structures and some functions into diffutils.h Change-Id: Ia55e556fdb8de3a2aeebf768ad9db66d840766f2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-28 10:40:20 +01:00
diffutils.h \
DiffEditor: Introduce a base class for the different views ... of the diff. Currently that is side-by-side and unified, just as before. Change-Id: I62a5462344c4b4ae652899f9d5b2936aa5a692b8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-01-30 16:10:04 +01:00
diffview.h \
Implement unified diff editor Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-13 16:43:28 +01:00
selectabletexteditorwidget.h \
sidebysidediffeditorwidget.h \
unifieddiffeditorwidget.h
Experimental integration of DiffEditor After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-15 12:49:50 +01:00
DiffEditor: Rename DiffEditorEditable to DiffEditor More in line with current naming conventions. Change-Id: I63f6677bd12d82f6749032996585d761f1a74fb7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-30 12:15:22 +02:00
SOURCES += diffeditor.cpp \
Add DiffEditorController Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-12-16 16:19:40 +01:00
diffeditorcontroller.cpp \
Rename DiffEditorFile -> DiffEditorDocument The old name had nothing to do with a file in fact. The new name will be more appropriate for the new stuff, which will come soon. Change-Id: I17ad03dab5c643ff26e313a434ba86929a0f00c3 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-30 13:31:11 +01:00
diffeditordocument.cpp \
Add a DiffShowEditor showing an additional info Task-number: QTCREATORBUG-9489 Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-17 13:55:31 +02:00
diffeditorfactory.cpp \
Move Gui stuff out of DiffEditorController Place it in DiffEditorGuiController, will be needed for sharing gui settings between unified and sidebyside versions. Change-Id: I8a858d0549ff84e21f7c909288ca07c5a2ef4e5b Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-24 11:10:17 +01:00
diffeditorguicontroller.cpp \
Add DiffEditorManager, refactoring. GitDiffSwitcher operates now on IDocument. GitDiffHandler operates now on DiffEditorController. "source" property now attached to editor's document (VcsBasePlugin). Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-11 13:00:35 +01:00
diffeditormanager.cpp \
Basic integration of diff editor inside git plugin Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-07 14:02:08 +02:00
diffeditorplugin.cpp \
Implement unified diff editor Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-13 16:43:28 +01:00
diffeditorreloader.cpp \
Add a DiffShowEditor showing an additional info Task-number: QTCREATORBUG-9489 Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-17 13:55:31 +02:00
differ.cpp \
Move internal structures and some functions into diffutils.h Change-Id: Ia55e556fdb8de3a2aeebf768ad9db66d840766f2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-28 10:40:20 +01:00
diffutils.cpp \
DiffEditor: Introduce a base class for the different views ... of the diff. Currently that is side-by-side and unified, just as before. Change-Id: I62a5462344c4b4ae652899f9d5b2936aa5a692b8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-01-30 16:10:04 +01:00
diffview.cpp \
Implement unified diff editor Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-13 16:43:28 +01:00
selectabletexteditorwidget.cpp \
sidebysidediffeditorwidget.cpp \
unifieddiffeditorwidget.cpp
Experimental integration of DiffEditor After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-15 12:49:50 +01:00
Implement unified diff editor Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-13 16:43:28 +01:00
RESOURCES += diffeditor.qrc
Copy Permalink