feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,449 Commits 108 Branches 368 Tags
cb406bfcd5378bf30b34b4fb1048d9ec6cae3736
Commit Graph

97 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
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +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
dt
4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
 2010-11-10 17:02:40 +01:00
Leandro Melo
fb46c31934 Plain text editor: Make sure user setting about folding markers is used 
It was being reset based on the highlighter definitions.

Consider some refactoring with the related options as well to avoid
overriding user's settings.

Done-with: Thorbjorn Lindeijer
 2010-11-10 16:05:10 +01:00
Leandro Melo
3a684586fa Editors: Refactor indenters out of the editors for better reusability. 
Reviewed-by: ckamm
 2010-11-05 14:28:38 +01:00
Leandro Melo
44cefd73b1 Text editor: Fix potential crash in the plain text editor. 
Example situation: The plain text editor is displaying in-memory content and
has not been explicitly "configured". If there's an attempt to indent the text
it crashes since the indenter is invalid. This can happen if one clicks on 'Show
View Contents in Editor' within a debug session and press enter in the editor.

Reviewed-by: con
 2010-10-13 16:37:05 +02:00
Leandro Melo
25e4655d90 Generic highlighter: Apply format only if it's a configured one; Remove hard-coded colors. 
Reviewed-by: con
 2010-10-12 13:13:08 +02:00
Leandro Melo
8d48b3a03e Generic highlighter: Don't nag about the missing definition if info bar was once closed. 
Reviewed-by: con
 2010-10-11 13:13:52 +02:00
Leandro Melo
cfe61f6431 Generic highlighter: Make the editor more flexible concerning highlighting. 
Now the plain text editor only tries to apply a highlight configuration
if the MIME type passed is valid. Otherwise, it should behave as an ordinary
trivial editor and should not miss a highlight definition.
 2010-09-29 09:18:42 +02:00
Leandro Melo
4d0176cd74 Generic highlighter: Show/hide info bar whenever the editor is configured. 2010-09-20 11:48:46 +02:00
Leandro Melo
bc011481a0 Prevent dereferencing an invalid file pointer in the plain text editor. 2010-08-19 09:22:04 +02:00
Leandro Melo
1fc7151909 Generic highlighter: Notify editors when mime type registration is done. 
Now it is no longer necessary to close the editor for the highlighting to take effect.
 2010-08-18 17:49:43 +02:00
Leandro Melo
470a54992f Generic highlighter: Once there is an id the definition is considered found. 2010-08-06 13:19:18 +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
Leandro Melo
15faf23e07 Generic highlighter: Indentation based code folding. 2010-06-21 16:10:42 +02:00
Leandro Melo
20eeca15ce Generic highlighter: Code folding support. 2010-06-18 16:31:42 +02:00
Leandro Melo
0894033f93 Coloring white spaces even if there's no highlight syntax definition set. 
Relative to QTCREATORBUG-1225.
 2010-06-15 10:44:15 +02:00
Leandro Melo
ce80ee4f5e Generic highlighter: Interface for automatic download of available definitions. Refactorings and changes in related parts of the code. 2010-06-11 13:02:53 +02:00
Leandro Melo
31748e7377 Generic highlighter: New option to specify ignored file patterns so the highlight popup does not show up. 2010-06-04 10:14:49 +02:00
Leandro Melo
823064d90a Generic highlighter: Changed interface of the definition and adaptated relevant code. 2010-06-03 12:29:09 +02:00
Leandro Melo
c2f2d13111 Generic highlighter: Refactored how format configuration is done. 
Now the highlighter engine does not directly depend on TextEditor::FontSettings. This also makes things easier for unit testing.
 2010-05-31 15:00:03 +02:00
Leandro Melo
2dc7a6a1eb More functionality for the generic highlighter options. Other small changes. 2010-05-28 15:04:44 +02:00
Leandro Melo
f0af012226 Generic highlighter: Mime type aliases and parents are now considered when searching for a definition. 2010-05-21 15:54:35 +02:00
Leandro Melo
55b26868e6 Generic highlighter is now part of the text editor plugin. 2010-05-20 14:10:34 +02:00
Leandro Melo
06fc31d4c0 Indenter is now a separate class which can be reused through composition. Added it to the generic editor. 2010-05-14 10:12:25 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +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
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
2986ccafd2 PLain Text Editor: Remove list indentation 
As it causes dashed lists to be formatted as
- i1
  - i2
Just do paragraph formatting.

Task-number: QTCREATORBUG-538
Initial-patch-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-01-06 13:53:50 +01:00
Thorbjørn Lindeijer
a248406644 A bit of include cleanup 2009-12-08 18:22:52 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Alessandro Portale
5438a3f72f Missed some unused ';' after Q_UNUSED 2009-07-13 18:55:11 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
hjk
592560b578 Fixes: rempve unnneded icore.h #include 
Task:     180315
    RevBy:
    Details:
 2009-01-21 18:30:45 +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
897c05f57c replace Core::ICore::instance()->pluginManager() by ExtensionSystem::PluginManager::instance() 2009-01-20 15:31:33 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
cf11b69643 more code cosmetics 2008-12-02 16:19:05 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00