feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
25,764 Commits 108 Branches 368 Tags
386ca7c8dd71047fb70fdcfeb78042d4eda30f17
Commit Graph

106 Commits

Author SHA1 Message Date
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor 
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
 2011-02-22 11:23:53 +01:00
Leandro Melo
ea313f3ec8 Text editor: Introduce per project settings 
With some refactorings to make the code look better.

Reviewed-by: con
 2011-02-21 17:22:24 +01:00
Friedemann Kleint
a9a5e3ea17 Exported header cleanup. 2011-01-20 14:03:07 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Tobias Hunger
8808f0fa2d VCS: Handle code folding in diff view 
Allow to do codefolding on files and hunks in the diff editor
 2010-11-22 12:03:08 +01:00
Tobias Hunger
f84c228568 Git: Add options to diff editor 2010-11-22 12:03:07 +01:00
dt
08ccda5862 EditorManager: Change openEditor/activateEditor to not do mode switching 
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.

That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
 2010-09-14 15:23:11 +02:00
dt
bde1ebaaea Remove EditorManager::ensureEditorManagerVisible() 
The function always switched to Edit Mode, which was the cause for
several bugs. Since openEditor() already does switch to the right mode,
the function is not really needed.

The following actions now respect the prefered mode of the editor:
"f file"-locator
The Open Documents list
Editor history navigation
 2010-09-06 13:56:53 +02:00
Friedemann Kleint
42b39023db VCS polishing: Change context menu entry for 'Blame parent'. 
... for git, hg as it is not obvious from the SHA1 displayed.
 2010-08-13 09:12:27 +02:00
Friedemann Kleint
36f5545f5a VCS[git]: Limit text size to be displayed. 
in VCSBaseEditor  and BaseTextEditor::createNew to the size
used for limiting file size.

Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Task-number: QTCREATORBUG-1847
 2010-07-12 14:15:38 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
con
7f733b1545 Merge remote branch 'origin/2.0' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
 2010-06-08 10:39:45 +02:00
Friedemann Kleint
c745155191 VCS/Diff editors: Set readonly attributes correctly. 
Make VCS-generated editors read-only, enable editing
when opening a patch.
Make VCS-Editor non-read-only by default, add setter
for "Forced read-only" that makes it a temporary,
read-only file.

Task-number: QTCREATORBUG-1528
Reviewed-by: Thorbjorn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-06-07 14:53:28 +02:00
Friedemann Kleint
7003b82e2b Version control: Improve detection. 
Merge managesDirectory() and findTopLevelForDirectory()
into one giving managesDirectory() an optional topLevel
parameter. This removes the need to go up the directory
hierarchy twice when checking for Merurial or git and also
saves some checks for CVS/Subversion.
VCSManager: Check cache in reverse order starting out with
the full path first to improve handling of nested repositories.
Rubber-stamped-by: con
Acked-by: dt
 2010-05-20 16:24:56 +02:00
con
212f18bebf Avoid messing up navigation history from the vcs editors. 
Reviewed-by: Friedemann Kleint
 2010-04-14 12:59:31 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3' 
Trailing whitespace removal re-applied manually.
 2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace 
doing it in 1.3 as well to avoid possible later conflicts
 2010-01-29 21:33:57 +01:00
con
a24738ffab Fixes: Diff editors don't get correct name. 
They were no longer showing e.g. the file name of the diffed file.
Also separate editor id and editor context a bit.
 2010-01-11 16:54:30 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers 
Reviewed-by: thorbjorn
 2010-01-11 10:26:12 +01:00
Tobias Hunger
cacdc6c736 Add display name to VCS plugin structs 
Reviewed-by: Friedemann Kleint
 2010-01-08 11:51:53 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
Friedemann Kleint
8bb87fcda4 VCS[Mercurial]: Single file log annotation. 
Task-number: QTCREATORBUG-503
 2010-01-07 17:29:58 +01:00
Friedemann Kleint
b4969672d3 VCS[Perforce/SVN/CVS]: Add "Annotate" to single file logs. 
...over change numbers. Add missing "Log project/repository"
actions and log count limits.
Task-number: QTCREATORBUG-503
 2010-01-07 11:33:30 +01:00
Friedemann Kleint
7c0f4e8f50 VCS[SVN, CVS, Perforce]: Implement "Annotate Previous" context menu. 
in annotation editor, including base infrastructure in
VCSBaseEditor. Pass signals of VCSBaseEditor to opaque
VCSBaseEditable (IEditor) for convenience.

Task-number: QTCREATORBUG-503
 2010-01-06 17:24:40 +01:00
Friedemann Kleint
7ce3683143 CVS: Use new VCSBasePlugin-class. 
Make the diff-base directory a property of VCSBaseEditor and use
everywhere.
 2009-12-09 12:41:10 +01:00
Friedemann Kleint
ff1054fc8d Subversion: Adapt to new VCSBasePlugin. 
Remove logic handling several repositories.
 2009-12-08 16:50:27 +01:00
Friedemann Kleint
8097879d6d VCS: Introduce Base class for VCS plugins, use in git. 
Fixes:
- Cannot diff a file that does not belong to a project
- Cannot commit when a temporary diff/log view is open
  due to the current file pointing to a temporary directory
- git's project-related actions not passing the correct
  relative path.

Implementation:
- Centralize code to listen for Qt Creator's relevant state changes
  in VCSBasePlugin, dispatching the changes to the instances affected.
  (avoiding multiple invocations of searches/QFileInfo on current).
- Do the same for the corelistener catching closing SubmitEditors.
- Introduce VCSBasePluginState representing the relevant state
  (current file/project).
- Call git with working directory set and relative arguments
- Remove setEnabled/isEnabled() logic of IVersionControl
- Pass toplevel from VCSManager to avoid duplicate searches.
 2009-12-08 14:26:41 +01:00
Friedemann Kleint
01877b2c86 VCS: perforce, cvs, subversion: Goto current line in blame. 2009-10-01 17:32:26 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory... 
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
 2009-09-25 11:35:44 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
baaf7b1d62 Less QToolBars in editor tool bar. 2009-07-16 18:06:38 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
dt
bb46ce3982 Fix memory leak in the diff editor. 
Reviewed-By: con
 2009-06-05 17:54:28 +02:00
con
4b9a3d5a46 API: temporaryEditor --> isTemporary 
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2009-06-04 12:08:49 +02:00
dt
1e865551e5 Fixes spelling of temporaryEditor 2009-05-25 15:12:37 +02:00
dt
41b3b3e3b4 Fixes showing temporary files 2009-05-25 13:42:13 +02:00
Thorbjørn Lindeijer
c08405fed4 Turn code into links when holding Ctrl 
Allows navigating the code using the mouse when pressing Ctrl. Suggested
a few times and also seen in other IDEs.
 2009-03-24 11:24:11 +01:00
con
f84c651428 Refactor navigation history again, put last edit position in history 
Task:     240811
 2009-03-19 16:37:05 +01:00
Friedemann Kleint
6ffdf7cf40 Fixes: Add a combo for diff file browsing, bring diff editors to front, exclude qconfig.pri from files examined by p4. 
Task: 234842
 2009-03-10 11:02:12 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Thorbjørn Lindeijer
6adecf3767 Avoid going through ICore when it's not necessary 
Many singletons have their own instance() method, in which case there is
no need to use ICore::instance() to get access to them.
 2009-01-21 15:55:33 +01:00
hjk
113b81e9db replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance() 2009-01-20 11:52:04 +01:00
hjk
cc5ff1ec74 Remove #include <extensionsystem/pluginmanager.h> from icore.h, a 
forward declaration is sufficient.
 2009-01-19 12:39:20 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
dt
3ba192af7e Merge branch '0.9.1-beta' 2008-12-17 14:21:03 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00