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

36 lines
990 B
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)
Move git specific stuff out of diff editor plugin Move it to the git plugin. Change-Id: I8151573ed50df70776f7ebf0475dd41fb84fae83 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-16 12:53:35 +01:00
HEADERS += \
descriptionwidgetwatcher.h \
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 \
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 \
Refactor DiffEditorWidgets, introduce common widget controller Reduce code repetition. Change-Id: I416555dd83ce888088a6a259777c294a6feb35f4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-13 15:55:18 +02:00
diffeditorwidgetcontroller.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 \
Themed Icons: Introduce Utils::Icon Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-23 16:41:54 +01:00
unifieddiffeditorwidget.h \
diffeditoricons.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
Move git specific stuff out of diff editor plugin Move it to the git plugin. Change-Id: I8151573ed50df70776f7ebf0475dd41fb84fae83 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-16 12:53:35 +01:00
SOURCES += \
descriptionwidgetwatcher.cpp \
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 \
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 \
Refactor DiffEditorWidgets, introduce common widget controller Reduce code repetition. Change-Id: I416555dd83ce888088a6a259777c294a6feb35f4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-13 15:55:18 +02:00
diffeditorwidgetcontroller.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