feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,019 Commits 108 Branches 368 Tags
12c58839c3d7a23bf0b670c552924b4965e9599f
Commit Graph

61 Commits

Author SHA1 Message Date
Jarek Kobus
2244911826 Implement Code Style schemes 
Task-number: QTCREATORBUG-5092

Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-23 10:23:15 +02:00
Christian Kamm
1a0fb751cd QmlJS highlighting: Use semantics for types and binding names. 
This fixes some problems with highlighting like anchors {}, allows us
to only highlight correct types and to make the binding name formatting
customizable.

Change-Id: I7ab0c0ed384108b74a2998796d868d5ced4a5310
Reviewed-on: http://codereview.qt-project.org/4669
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-14 11:51:35 +02:00
Christian Kamm
90a7786dde QmlJS: Change default semantic highlighting colors. 
Done-with: Carsten Owerfeldt

Change-Id: I4705a4e35bd0bbd73200332d86854dbd34cb70c4
Reviewed-on: http://codereview.qt.nokia.com/3877
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-08-30 14:52:52 +02:00
Christian Kamm
c105ae47c1 QmlJS: Add semantic highlighting. 
Change-Id: If9293244075cff1a52801b50cdbb77248ecd21ea
Reviewed-on: http://codereview.qt.nokia.com/3310
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-24 11:30:20 +02:00
Jarek Kobus
be40d9ca93 Apply code style settings to templates 
Task-number: QTCREATORBUG-169

Change-Id: I380c956d3256c186ff9497463ab845228017ff87
Reviewed-on: http://codereview.qt.nokia.com/2671
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-09 12:01:06 +02:00
Christian Kamm
779fafcbfe Make C++ code style configurable. 
Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b
Done-with: Jarek Kobus
Task-number: QTCREATORBUG-2670
Task-number: QTCREATORBUG-4310
Task-number: QTCREATORBUG-2763
Task-number: QTCREATORBUG-3623
Task-number: QTCREATORBUG-567
Reviewed-on: http://codereview.qt.nokia.com/74
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-24 12:45:07 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
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
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
Leandro Melo
7528c6d617 Snippets: Feature enhancement start... 
Provide an interface so users can create/edit/remove snippets.
 2010-12-08 17:22:07 +01:00
Roberto Raggi
254aff3978 Highlight the enumerators using the Static `char format'. 
The new `Static' format will be used to mark all the static members, e.g. enumerators,
static functions, and static class members, but right now, it is used only for enumerators.
 2010-08-09 18:07:09 +02:00
Roberto Raggi
3ab927ed74 Made the highlighting for virtual methods configurable 2010-08-09 14:34:57 +02:00
Thorbjørn Lindeijer
3a5ebf2b4a Removed the highlighting of locals from the default style 
It gets a little too colorful.
 2010-08-03 11:42:42 +02:00
Thorbjørn Lindeijer
15e655b718 Made the highlighting for locals and fields configurable 
Reviewed-by: mae
 2010-07-15 17:11:16 +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
125aaf8615 Settings page for the generic highlighter. 2010-05-27 09:54:59 +02:00
Thorbjørn Lindeijer
7767786cc8 Disable bracket matching when automatic insertion is disabled 
When automatic insertion of brackets is disabled in the completion
settings, it is reasonable to expect the automatic matching of brackets
is also disabled.

Task-number: QTCREATORBUG-454
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2010-05-11 15:11:12 +02:00
Thorbjørn Lindeijer
e53b5bc9a1 Fixed completion settings to also apply to the QML code completion 
By moving the completion settings into the TextEditor plugin, so that
both the CppTools and the QmlJSEditor plugins can access the settings.

The user-interface to edit the settings is still in the CppTools plugin,
since we're in string freeze at the moment. It should be moved to the
TextEditor plugin later.

For now the QML completion only supports the case-sensitivity and
partial completion options, since there is no automatic insertion of
brackets.

Task-number: QTCREATORBUG-1327
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2010-05-11 15:11:12 +02:00
Thorbjørn Lindeijer
9454fe5689 Create a single parent options page for the Text Editor category 
Trying to clean up a little.
 2010-04-12 18:54:05 +02:00
Thorbjørn Lindeijer
2d21060bc9 Added icons to options dialog categories 
Some categories do not have icons yet, unfortunately.
 2010-03-26 17:47:31 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Thorbjørn Lindeijer
545c9b9190 Text editor settings cleanup to avoid some copying 2010-01-20 12:54:45 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers 
Reviewed-by: thorbjorn
 2010-01-11 10:26:12 +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
Thorbjørn Lindeijer
3d2d122472 Moved the mouse navigation option to the Behaviour settings page 
It used to be hidden on the Display settings page.

Task-number: QTCREATORBUG-135
 2009-12-08 18:22:52 +01:00
mae
d6e4a787d5 separate font zoom from font size 
Introduce "Reset Font Size" action, bound to Ctrl+0
 2009-11-30 19:01:04 +01:00
Friedemann Kleint
a8ac34c347 Options: Sort by category, id. 
Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name.
 2009-11-27 16:12:12 +01:00
Roberto Raggi
1bb9a24517 Fixed syntax highlight of ifdefed-out code. 
Done with mae
 2009-10-08 13:02:25 +02:00
mae
3a2974b3f9 some action cleanup for the qml editor 
done with Erik Verbruggen
 2009-10-01 13:34:02 +02:00
Roberto Raggi
7cf7683052 Mark unused symbols. 2009-09-23 18:07:17 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Thorbjørn Lindeijer
8cc916a0ca Added categories for occurrences and for renaming occurrences 
So they can be adapted in the color schemes.
 2009-07-14 10:38:41 +02:00
Thorbjørn Lindeijer
12911cda5c Prefer append over push_back 2009-07-14 10:38:41 +02:00
mae
c3c98cca78 make zoom-in store the new size permanently in the settings. 2009-06-18 16:13:20 +02:00
mae
aa630932b1 make zoom-in/-out apply to all editors 2009-06-17 19:12:57 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Thorbjørn Lindeijer
992a178be3 Apply bold to the current line number by default 2009-06-12 15:45:35 +02:00
Thorbjørn Lindeijer
968a3c0f9f Added 'current line number' to color theme settings 
Recently it was made to highlight black or write, which isn't nice for
everybody. Now it is dark gray by default, and can be customized. Bold
and italic are also supported.
 2009-04-27 14:10:54 +02:00
Thorbjørn Lindeijer
f36ea6785c Allow configuring the color for the hover links 
Cause blue doesn't fit nicely in all color schemes.
 2009-03-24 17:06:01 +01:00
Thorbjørn Lindeijer
0a48bd8731 Unduplicated the code that initializes editor settings 
This stuff was all over the place, a relic from before the editor
settings were unified. Now the initialization is only done in
TextEditorSettings.

Fixes the .pro file editor and the generic project files editor, which
before only used the font settings.
 2009-03-17 18:25:45 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Roberto Raggi
8002b1a94c Customizable doxy formats. 2009-02-20 12:08:34 +01:00
Thorbjørn Lindeijer
5dbcc615c2 Split up general text editor settings 
The page had grown too large so now the display settings have been split
off onto their own page.
 2009-01-27 15:23:19 +01:00
hjk
292d4bc3d5 Fixes: fakevim: provide an option in the text editor settings 2009-01-23 19:13:00 +01:00
hjk
897c05f57c replace Core::ICore::instance()->pluginManager() by ExtensionSystem::PluginManager::instance() 2009-01-20 15:31:33 +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