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

316 Commits

Author SHA1 Message Date
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
Orgad Shaneh
8b5dcc13c5 Replace QFileInfo::fileName() with FileName::fileName() 
Change-Id: I4852ff215abf25649fc5eac1e922ae901839ca3d
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-01-29 11:15:43 +00:00
Christian Stenger
401d66764c DiffEditor: Compile fix for Qt version less than 5.4 
Introduced with ae6730d76d.

Change-Id: Ie12606ed18397d5b296d9c89ef8ce0c31e3991f3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-01-29 08:25:33 +00:00
Tobias Hunger
ae6730d76d DiffEditor: Convert more connects to Qt5 style 
Change-Id: Ie1da8e093bd28f0a2ad0fe34b860008a7484ed5f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-01-28 15:22:15 +00:00
Tobias Hunger
bdae49c474 DiffEditor: Use Qt5 style connects 
Change-Id: I051b2128620bf0317b359852007463c6601ceaca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-01-28 13:35:05 +00:00
Tobias Hunger
d527b11daa DiffEditor: Save a little space by reordering members in Controller 
Change-Id: I3051979a2ada5650021370667e8979eb25d0467f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
 2015-01-28 13:35: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
Orgad Shaneh
c6a983d271 Core: Use FileName for file path in IDocument 
Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-01-12 10:23:37 +01:00
hjk
e8396f4c8d Utils: Simplify tooltip architecture and cleanup 
This mainly merges TipContents into the the actual
tooltip labels.

Change-Id: I64b576c987bce034842f7e3f324b81595dae0713
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-15 08:24:31 +01:00
hjk
50ad32a25b Utils: Start simplification of tooltip handling 
There's a bit too much unneeded flexibility in there, requiring extra
boiler-plate code on the user side.

Change-Id: I34d03838fb1cd3182fcbb93bf65158ebfc7e2bce
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-08 12:56:12 +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
Friedemann Kleint
f268d0f8e1 DiffEditor: Make it possible to paste snippets. 
Add property "plainText" to DiffEditorDocument which
is queried as last resort by the code paster.

Task-number: QTCREATORBUG-12546
Task-number: QTCREATORBUG-9669
Change-Id: Iea9cd0d296bcc8e8a7300072c1a4a9068c2ab102
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2014-11-13 11:14:18 +01:00
Friedemann Kleint
9605244f6d DiffEditor: Save description along with diff. 
Save complete, git-applicable patch when saving the result of
for example 'git show'. Strips some Creator-specific tags
off the description and reformats the description such
that it is accepted by git.

Change-Id: I739d85a7263f97e2149a2794974ba026f2eca067
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-11-13 09:10:22 +01:00
Friedemann Kleint
e123f5a4d9 Limit length of file names in DiffEditorDocument::suggestedFileName(). 
Change-Id: I168831b24bcece5ef825825c448edf684f4f536d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-11-13 08:33:38 +01:00
Friedemann Kleint
e01496122d Implement DiffEditorDocument::suggestedFileName(). 
Try to derive a git-format-patch type file name from
the description.

Change-Id: I581f4ba87a5ac4b82ca6519be8aa13fb4b4ebe43
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-11-12 16:21:02 +01:00
Christian Kandeler
9d677e3302 qbs build: Remove unneeded import statements. 
The respective items are available without it.

Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2014-11-10 15:45:14 +01:00
jkobus
1ce60cb31d DiffEditor: remove description when the diff is saved. 
The description itself isn't saved so no need to
keep it anymore.

Change-Id: I8e521ce261261eb91a1f218f4e65092fc3fb44e8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-11-07 14:19:08 +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
jkobus
2e364c1506 Fix reloading of patch files 
(cherry picked from commit 37ddb4e9eb)
Change-Id: I06c41eb802b0a3318da3ddfa72bd3575c02867fa
Task-number: QTCREATORBUG-13241
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-10-24 11:41:16 +02:00
Eike Ziller
9c7019f0b2 License update. 
Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-15 15:19:55 +02: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
jkobus
656bcc4cf0 DiffEditor: Use lambda for the common initialization 
Change-Id: I834754f7d52f29257e822464132d5fe24dbf5ec7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-10-06 11:36:34 +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
jkobus
c3c19aaab6 DiffEditor: remove unneeded local variables 
Change-Id: Ibfe35171525f136d0a40707e0531b72d36a62349
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-10-06 10:44:27 +02:00
hjk
7dfbb1b199 TextEditor: Remove HighLighterFactory 
Unused.

Change-Id: Idd9805756c51e025e99842fa6fc8707b10927c4d
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-10-02 10:42:50 +02:00
Orgad Shaneh
0c84f2d3e2 DiffEditor: Cleanup 
Change-Id: I427c3272027a516f8271fc3ccc7ecc6a7cca40fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-09-29 22:20:01 +02:00
hjk
10c8d5f0ca TextEditor: Rename BaseTextEditorWidget to TextEditorWidget 
... and some of the related implementation details

Change-Id: I1f03aa5acf2d3fb2cfc2a6a7845f3d3578b0408d
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-09-29 14:54:32 +02:00
jkobus
5c6b1373c4 DiffEditor: Use settings' foreground color for highlights 
Simplify drawing highlights by passing selections
into a drawing function.
Reduce selections which are covered completely by
other selections.

Task-number: QTCREATORBUG-12844
Change-Id: If282d5c881d25cac1b8db4ac8dfc45d47b0b8580
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-09-29 08:21:34 +02:00
jkobus
8a3a219b49 Remove unneeded code. 
Looks like this is not needed anymore, since
now BaseTextEditor has its own automatic
font settings application mechanism implemented.

Change-Id: I61c8dafdb76e9e5d04207d0762d4ede4707531e9
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-26 11:18:10 +02:00
hjk
953cdb971f TextEditor: More BaseText* -> Text* renamings 
*Document* and *Layout* classes, all basetext* files

Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-09-26 10:12:51 +02:00
hjk
d066e3ca14 Remove some unneeded TextEditor:: qualifications 
Change-Id: I9bf7df2f30001440af013b0dd4040a845df80300
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-09-26 08:49:48 +02:00
hjk
0fcca946ad Rename {Core,TextEditor},{Base,}TextDocument classes 
First step of some more 'Base' removal in TextEditor.
s/Core::TextDocument/Core::BaseTextDocument/
s/TextEditor::BaseTextDocument/TextEditor::TextDocument/

Change-Id: I71ba325a2f0ad72ec9dae0d96846cbae72d326f7
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-25 18:00:51 +02:00
hjk
99aa9955fd DiffEditor: Fix summary view appearance 
After the settings centralization it got visible margins which
are unwanted in this particular case.

Change-Id: I7c394e167035d3292a3a45e98fe711d3959ad353
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-09-24 21:21:39 +02:00
hjk
209f008662 TextEditor: Draw background first. 
Task-number: QTCREATORBUG-13028
Change-Id: I14ae1794c920b3877f9eca468e1180042b51fb3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-09-24 21:21:25 +02:00
Robert Loehning
758e189dca Fix typos 
Change-Id: I4d1be4f380c37589dbc5a2bbd0fd3230ebbfee47
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-09-09 14:59:47 +02:00
Orgad Shaneh
20b836f59c DiffEditor: Simplify makePatch 
Store indices in controller and avoid passing them around.

Change-Id: I49c80cb6cf6734a18f80ad5c7c441973d246708f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-09-09 08:40:05 +02:00
Orgad Shaneh
ee2023ef65 Git: Deduplicate diff editor creation sequence 
Change-Id: I9d0751726f0acb340f9b19be62c6bbe23ec460f7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-09-08 15:09:02 +02:00
Orgad Shaneh
bca988d81a DiffEditor: Some more regexp cleanup 
Change-Id: I3a423d71c03c624d7ba1bde8b8e7d02e3109f8e8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-09-08 09:31:58 +02:00
hjk
4d93bb8216 TextEditor: Flip default to 'duplicatedSupported' 
opt-out now, for all editors created by BaseTextEditorFactories.

Change-Id: I01d0a9ff26320fcd0b84ff90ff22c747cf84b84c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-03 14:10:47 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files 
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-02 15:11:24 +02:00
hjk
747b34c322 DiffEditor: Use new *EditorWidget signals for more direct connection 
Change-Id: I664bb99d6c3aac870b3663069d4ca7379e1b9b63
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-02 10:25:58 +02:00
hjk
a59fdc8096 TextEditor: Fix crash due to setting up fall back editor twice 
Change-Id: Id1287a1b1b33924c490b664d81c661b1481a3e4f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-01 11:33:34 +02:00
hjk
ec5ea375e0 TextEditor: Use more direct approach for fallback IEditor construction 
There are still a few places where the EditorWidget is the primary
object, or several of them per "visible" IEditor (e.g. Diff).
Provide a means to streamline setup there, too.

Change-Id: I14cfbd68e555ebc539e707032a0e5bef563e0a36
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-08-29 15:51:09 +02:00
hjk
761f8de751 TextEditor: Fix regression introduced by recent c094592f8a 
Change-Id: I9fe2bc726454c8c44f59bf4c720a11765d1bb744
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-28 17:36:25 +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
hjk
a13ef73db5 DiffEditor: Merge the two construction paths 
Change-Id: I3c0c750517c9000dffe13de724b063008fd426b7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-22 13:04:40 +02:00