feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,687 Commits 108 Branches 368 Tags
ecacea18cbf9fe24dbe1b559811da68cb0dfb3dc
Commit Graph

74 Commits

Author SHA1 Message Date
Jarek Kobus
8b67458a95 Prefix editor's uniqueId with plugin name 
In this way we minimize the chance of
generating non-unique id.

Change-Id: Idd177c5a4b44b17a58c2a944ec77b9517e91964e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-01-10 15:14:19 +00:00
Orgad Shaneh
7b3642cce4 Merge remote-tracking branch 'origin/4.2' 
Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
 2016-11-28 15:27:51 +02:00
Jarek Kobus
78c3590705 Make skipOpeningBigTextFile() public and use it in Diff Editor 
Change-Id: I5e98d1ab93ac442c1f1a132a51ab838567a735a0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-23 14:08:38 +00:00
Jarek Kobus
2144fb5949 Move diff calculation to the separate thread 
It doesn't freeze creator anymore.

Task-number: QTCREATORBUG-14255
Change-Id: I3d06ea7a848e321c6072e00a73b96e9ea9770b6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-21 15:43:03 +00:00
Jarek Kobus
fd460a11dc Add some missing consts 
Change-Id: I1c5122b893e7255237310562fcad16bc53f15fd7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-17 10:31:27 +00:00
Jarek Kobus
8c36249ffa Add missing overrides 
Change-Id: I7e27a273044542537423c8f4b9ab5235c3fabc22
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-17 10:31:18 +00:00
Jarek Kobus
8224c1c95d DiffEditor: fix revert chunk for diffs of modified files 
Apply chunk action doesn't make sense for that case,
will stay disabled.

Task-number: QTCREATORBUG-17136
Change-Id: Idce31b3aa9d354536a01607c10b20273158961d5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-10-21 09:49:08 +00:00
Jarek Kobus
d3a743d77e Use namespace Core in diff editor plugin 
Change-Id: I2409a6186d590a83ccde064c855e0261d600014e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-10-21 09:20:35 +00:00
Jarek Kobus
4ae306a5e1 Handle "Diff All Modified Files" action enablement 
Also rename it to "Diff Open Files".

Task-number: QTCREATORBUG-17094
Change-Id: I370c32497fcb56cb2bd84700ef7cb4aa7ba0a573
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-10-21 09:20:29 +00:00
Jarek Kobus
1414826183 Implement diff on close, on revert and on external modification 
Task-number: QTCREATORBUG-1531
Change-Id: I8c9a740d66eb7836b3df6850ac243260fd282b32
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-10-21 09:20:20 +00:00
Christian Stenger
ad615ece16 DiffEditor: Fix compile with gcc 4.8 / Qt5.6 
Broke with ee095ef5d5.

Change-Id: Ib8cc5a0b8d79cf6ca542eb2fc9c0a4f06e885d88
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-10-07 05:31:58 +00:00
Jarek Kobus
ee095ef5d5 Implement diff for unsaved changes 
Task-number: QTCREATORBUG-9732
Change-Id: I7e0f1d18046451ac1bc84b8c28113d72f63642a8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-10-06 14:14:03 +00:00
Jarek Kobus
adbc3f611f Show proper diff when one of diff files is missing 
Task-number: QTCREATORBUG-16540
Change-Id: I185ac8e7c8be364c1e2f74bfe0af6f9e393c89be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-07-25 13:29:10 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Nikita Baryshnikov
5398f4f5b1 fix metatype declaration in a few places 
Change-Id: I76a12a278db8e74d935e76a5e832daf8e34df2a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-09-02 08:48:20 +00:00
Orgad Shaneh
d618c05e3a DiffEditor: Support mode change in Git diff 
Task-number: QTCREATORBUG-14963
Change-Id: I5d26ae810add657a94fb40a5d4437e2d17a1625a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-08-25 06:48:49 +00:00
Christian Kandeler
ccbc7f9ec1 DiffEditor: Silence warning about unused variable. 
Change-Id: I18a6dd021bb29ca5eaa7727213c80458d903ee6c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-06-10 12:59:53 +00:00
Nikita Baryshnikov
147dad8944 DiffEditorManager simplify 
by using EditorManager::openEditorWithContents

Change-Id: I2850648bff0f5b8f01254b9c7ce9539c1262f576
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-13 12:33:01 +00:00
Tobias Hunger
b2b8b867d6 DiffEditor: Refactor the user-facing parts 
* Move all data handling into DiffEditorDocument
* Move much of the logic of how to update views into the
  DiffEditor.
* Introduce a base class for the different views on the diff
  to implement.
* Remove DiffEditorGuiController
* Make DiffEditorController smaller and merge the DiffEditorReloader
  into the class
* Simplify communication between the classes involved
* Make much of the implementation private to the plugin

Change-Id: I7ccb9df6061923bcb34cf3090d6d8331895e83c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-03-10 10:25:52 +00:00
Friedemann Kleint
54da18eaaa Clean exported headers of the Core plugin. 
Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-05 07:18:14 +00:00
hjk
7f001dab1b Core: Make Context parameter to registerAction optional 
... and default to C_GLOBAL. A rather common case.
Similar for ActionContainer::addSeparator().

Change-Id: I7f9ba573af201c0a472132d5a494ad17cc4175b7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-26 10:09:03 +00:00
Tobias Hunger
956abd2803 DiffEditor: Make DiffEditorDocument internal 
Only expose Core::IDocument and keep DiffEditorDocument internal
to the DiffEditor plugin.

Change-Id: If39b82e2f20d40a65284503b4d4fd8dad919ad3a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-16 15:50:16 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Montel Laurent
c001e98da8 Port to new connect api 
Change-Id: I603fc2e3fda624c913e432d5059c86d96c3e2c3b
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-01-29 13:00:02 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
a47fbb8309 Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
 2014-11-24 15:43:48 +01:00
jkobus
8d1940a796 Replace old svn diff editor with the new one 
Change-Id: I4137b709be718603cdc221ac938e139326c88835
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-11-21 10:08:36 +01:00
Christian Kandeler
e3ae038387 DiffEditor: Remove pointless assignment. 
Change-Id: I0d2f1f4cd29334a42f2099cbb1b65628e58e1a64
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-11-19 11:22:24 +01:00
jkobus
2a9c9f2d70 Hide some diff editor controls when diff editor is bound to a file. 
Remove unnecessary anymore "ignoreWhitespace" argument
from functions which read a patch file.

Transfer the ownership of reloader into controller.

Task-number: QTCREATORBUG-13250
Change-Id: I68183005b845d6ece9ea2be9888abc8597310426
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-11-05 14:38:51 +01:00
Orgad Shaneh
9dbc785a80 DiffEditor: Fix parsing of dirty submodule diff 
It has no index.

Change-Id: Ifbc06045f3b39245288d15bdf44f8053fe443bc8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-11-03 09:23:57 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Orgad Shaneh
0b1b080cb3 DiffEditor: Fix detection of subsequent renames 
Change-Id: Ie47c5a7ca91752b0da40b46f780ee5e0b3b6ce29
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-10-06 10:46:13 +02:00
Eike Ziller
aa6495a261 ExtensionSystem: Remove Qt4 support 
Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5.

Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-27 08:44:34 +02:00
jkobus
87b5db5562 Save / restore state in diff editor when reloading 
Task-number: QTCREATORBUG-12650
Change-Id: I0bb25ed39f8a15dd5da798ebf0ce72898a2e3b3d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-08-13 15:44:36 +02:00
Orgad Shaneh
d03927f373 DiffEditor: Fix no newline handling 
Change-Id: I3278ae80d7ee010942122723b3e8bb8c729e7182
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-08-11 20:20:20 +02:00
Jarek Kobus
4c7f1c5ea9 DiffEditor: Fix newline handling for not the last chunk 
Task-number: QTCREATORBUG-12665
Change-Id: I7a54fa5502d3e06c6e1ccd99dec800f80e217333
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-28 11:21:44 +02:00
Orgad Shaneh
7d3d80a6d5 DiffEditor: Add a failing test for regression 
Task-number: QTCREATORBUG-12665
Change-Id: I02f4a9d3444e775049e1712a1dd985b95dc874f3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-07-28 11:21:01 +02:00
Orgad Shaneh
b117efc594 DiffEditor: Tests cleanup 
Change-Id: Iddabf11692a192874096bb5f030d8575fc5cefd6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-07-28 11:20:41 +02:00
jkobus
c9c4f05fee Fix newline handling in diff editor 
Task-number: QTCREATORBUG-12618
Change-Id: If2a30ff4efdc106f43e2ea77d2783ea797e92722
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-09 16:19:51 +02:00
jkobus
e4ff24ea31 Handle similarity index in git commits 
Task-number: QTCREATORBUG-12619
Change-Id: I5af39f18bc02ce1f06bf72f155bf0aaabe8b228d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-07 15:49:43 +02:00
jkobus
5ebd59d12b Rename some methods and variables in DiffEditor 
Change-Id: Ic6db2882c9468b9451a785e4657e4255b40fca4c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-07 10:34:17 +02:00
jkobus
91e4271069 Hide reload button for diff editor when there is no reloader 
Refactor code a bit. Now DiffEditorController has a pointer
to DiffEditorReloader.

Change-Id: I224579127f112923bc665cd59717b0c4d833981b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-07 10:34:11 +02:00
jkobus
656c3343ee Make it possible to save diff editor contents 
Task-number: QTCREATORBUG-12548
Task-number: QTCREATORBUG-12549
Change-Id: Ia27080cc689da48fc5401010e2277edaf0a01f4d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-04 14:31:01 +02:00
Orgad Shaneh
b8df1a9b55 DiffEditor: Support patch with empty new/deleted file 
Change-Id: Ic0341239309be3eae1ab2faf296bc6a698acebb0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-16 10:44:07 +02:00
Orgad Shaneh
5e883e5b4d DiffEditor: Support patch with new/deleted file 
Change-Id: I669564355e27dc06464fc8d8641b2f4255c8965e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-11 15:42:05 +02:00
Orgad Shaneh
67561efd29 DiffEditor: Fix test 
* Add trailing newline
* Fix offset by 1 for line numbers
* Swap expected and actual result
* Join short lines

Change-Id: Ia1c618e5fc86dc16956176241205a2108a1ba3e4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-11 14:34:36 +02:00
jkobus
8cad94534f Implement unified diff editor 
Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-06 12:33:59 +02:00
jkobus
9c2cdc8965 DiffEditor: refactor internal structures. 
Simplify the implementation a lot.

Change-Id: I3f5daa3d2ce14c28d48c2e1e996ec4935d1dae3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-03-11 15:34:10 +01:00
Tobias Hunger
02b3a79c5f VCS: Open diff/blame editors in other split 
... if there are other splits that is.

Task-number: QTCREATORBUG-11623
Change-Id: Icb3b1c86c39d88e90916079e8ab347574ae9a361
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-03-07 16:02:14 +01:00