feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
34,016 Commits 108 Branches 368 Tags
deb1a742e1954f842ee6efeae88b9005be2c53a9
Commit Graph

136 Commits

Author SHA1 Message Date
Christian Kamm
36ed6bce1d QmlJS: Move Context to its own file. 
Change-Id: I91331b7039e27e2f57cc19b985c8ed86c955ec9e
Reviewed-on: http://codereview.qt.nokia.com/1042
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-07-05 11:52:20 +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
Leandro Melo
bec4f02495 New code assist API 
This is a re-work of our completion engine. Primary goals are:

- Allow the computation to run in a separate thread so the GUI is not locked.
- Support a model-based approach. QStrings are still needed (filtering, etc), but
internal structures are free to use more efficient representations.
- Unifiy all kinds of *assist* into a more reusable and extensible framework.
- Remove unnecessary dependencies on the text editor so we have more generic
and easily "plugable" components (still things to be resolved).
 2011-05-18 10:46:20 +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
Christian Kamm
ef5dc8c699 QmlJS: Avoid frequent libraryInfoUpdated emissions. 
Also don't require a rehighlight of every open document when the
signal is emitted.

Reviewed-by: Roberto Raggi
 2011-01-12 14:03:01 +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
Roberto Raggi
ea5d923fe0 Don't waste time rehighlighting all the files opened in Creator. 2010-12-14 15:06:01 +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
Christian Kamm
5927137d13 Export QmlJSEditorEditable. 
Rubber-stamped-by: Friedemann Kleint
 2010-11-25 15:16:31 +01:00
Leandro Melo
36fa1de4c6 Editors: Refactor auto-complete code out of the editors for better reusability. 
Reviewed-by: Thorbjorn Lindeijer
 2010-11-09 11:01:47 +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
Friedemann Kleint
77008bc45f Exported Header cleanup: QmlJSEditor 
Move internal classes QmlJSEditorEditable/SemanticHighlighter
out of qmljseditor.h. Move QmlJSEditor from namespace
QmlJSEditor::Internal to QmlJSEditor.

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2010-11-02 11:10:27 +01:00
Friedemann Kleint
6063fb84c2 Fix exported headers in Core and TextEditor. 
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
  helper classes from TextEditor::Internal to TextEditor as they
  are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
 2010-11-01 16:29:45 +01:00
Thomas Hartmann
ff5eb00643 QuickToolBar: do not show QuickToolBar as tooltip anymore. 
Most users perceived this as a bug and found it annoying in
practice. So this feature gets removed.

Reviewed-by: Roberto Raggi
 2010-10-21 15:42:26 +02:00
Thomas Hartmann
4c185a9ac4 QmlDesigner.model: rename id is now a proper refactoring operation 
I an id is now changed in the navaigator or property editor,
we now use the qmljseditor to properly refactor.

Also I changed dynamic_cast to qobject_cast

Reviewed-by: Erik Verbruggen
 2010-09-30 17:43:19 +02:00
Daniel Molkentin
5cf1aaf67d Fix compilation and initialization compile warnings. 
Reviewed-by: Alessandro Portale
 2010-09-29 19:35:25 +02:00
Thomas Hartmann
f5b4668fa5 QmlJsEditor: combine the Quick ToolBar with the toolTip 
1000ms after a tooltip is shown we now also show the quick toolbar

Reviewed-by: Erik Verbruggen
 2010-09-29 16:58:54 +02:00
Christian Kamm
3f505e9982 QmlJS: Add initial 'Find Usages' support. 2010-09-24 14:11:06 +02:00
Erik Verbruggen
0c98d830b8 QML: brought context menu in sync with C++ editor. 2010-09-16 12:57:45 +02: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
Christiaan Janssen
1c702357a6 QmlInspector: tooltips in qmldebug mode 
Reviewed by: Lasse Holmstedt
 2010-09-08 16:53:44 +02:00
Roberto Raggi
e33767205b Introduced SemanticInfo::isValid(). 2010-09-08 11:39:24 +02:00
Christian Kamm
f49a85953b QmlJS: Compute link in SemanticHightlighter thread instead of lazily. 
It's used very often, so lazy computation (potentially in the gui
thread) was too expensive.

Reviewed-by: Kai Koehne
 2010-08-30 13:49:23 +02:00
Lasse Holmstedt
2fe7317981 Fixed typo 2010-08-27 13:12:05 +02:00
Christian Kamm
87e04df257 QmlJS: Refactor LookupContext creation for speed. 
* If possible, create LookupContexts through SemanticInfo; it caches the
  linked Context and will be faster.
* Contexts now own their Engine.

Reviewed-by: Lasse Holmstedt
 2010-08-26 11:34:29 +02:00
Lasse Holmstedt
fe55ba5cd2 QML Inspector: Don't update debug id's when not debugging 
Creating LookupContext seems to be expensive, so don't update anything
unless debug mode is already running.
 2010-08-24 17:46:22 +02:00
Thomas Hartmann
abdda35966 QmlJSEditor: refines textmarker logic 
The textmarker is now updated when the document
gets updated and the textmarker is shown again,
if the user closes the QuickToolBar.
 2010-08-13 17:22:20 +02:00
Thomas Hartmann
9c70e87715 QmlJSEditor: using RefactorMarker for Qt Quick ToolBar 
* Proper implementation using a timer

* We also do a revision check now

* The RefactorMarker is only shown for types that we support
 2010-08-05 10:51:31 +02:00
Thomas Hartmann
b193b3598f QmlJSEditor: add shortcut for Qt Quick Helper (ctrl+alt+space) 
This shortcut forces the Qt Quick Helper to be shown if
available. The action is also registered in the context menu
so it is discoverable.


Reviewed-by: Christian Kamm
 2010-08-04 14:03:09 +02:00
Erik Verbruggen
6bbc732a29 Sprinkled a bit of doxymentation over various classes. 2010-07-28 17:34:00 +02:00
Lasse Holmstedt
cdb5dadfc2 QmlJS Live Preview: Fixed highlighting from text editor-> qml observer 
Now, the items about to be selected must inherit from QGraphicsObject.
Also, coding style was cleaned up a bit.
 2010-07-27 11:58:38 +02:00
Thomas Hartmann
825c43dd2b QmlJSEditor: hiding of the context pane 
We properly hide the pane if the viewport is scrolled or resized.
 2010-07-20 15:02:49 +02:00
Thomas Hartmann
8b90b96f3c QmlJSEditor: adding variant for declaringMember 
declaringMemberNoProperties ignores grouped properties like font
and easing curve. It also skips Gradient and GradientStops
 2010-07-20 15:02:48 +02:00
Olivier Goffart
9a1d97707a Merge branch 'qmljsinspector' 
Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.cpp
	src/plugins/qmljseditor/qmljseditor.h
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/tools/qml/qmlobserver/editor/resizehandleitem.h
 2010-07-14 15:41:27 +02:00
Lasse Holmstedt
4ecad983ec added multiselection from editor to qml viewer 2010-07-14 15:30:53 +02:00
Kai Koehne
df037e1f42 QmlJSEditor: Fix typo 2010-07-13 11:45:10 +02:00
Kai Koehne
1510ad5aa1 QmlJSEditor: Adapt method/variable names 2010-07-13 11:45:10 +02:00
Kai Koehne
8d48c51175 QmlJSEditor: Delay update of outline by 150 ms 2010-07-13 11:45:10 +02:00
Kai Koehne
2bafdb71a2 QmlJSEditor: Rename documentRevision() to editorRevision() 
In line with QmlJS::Document::editorRevision() and
CPPEditor::editorRevision()

Reviewed-by: Roberto Raggi
 2010-07-13 11:45:10 +02:00
Kai Koehne
2e1a36963e QmlJSEditor: Delay synchronization of cursor2outline selection by 150ms 2010-07-12 17:03:49 +02:00
Kai Koehne
503f720f85 Outline: Make recalculation of current model index more robust 2010-07-12 16:40:43 +02:00
Kai Koehne
94264617bf QmlJSEditor: Use QmlOutline model also in combo box 
The drop down combo box and the Outline in the sidebar now share
the same model.
 2010-07-12 14:46:29 +02:00
Olivier Goffart
905f2e629b Merge remote branch 'origin/master' into qmljsinspector 
Conflicts:
	src/plugins/qmlinspector/qmlinspector.cpp
 2010-07-08 16:13:14 +02:00
Kai Koehne
ebe388ee92 QmlJSEditor: Signal that new semanticInfo is available 
Will be used in QmlJSOutline.
 2010-07-08 14:02:51 +02:00
Lasse Holmstedt
9a81759101 manually applied changes from qmlinspector to qmljsinspector 2010-07-08 11:36:26 +02:00
Thomas Hartmann
5a971334ef qmlsjeditor: activate context pane 2010-07-07 13:09:57 +02:00