feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
13,256 Commits 108 Branches 368 Tags
22fe4f584d26ac3f877722e3fc5457dc0f0b9b89
Commit Graph

118 Commits

Author SHA1 Message Date
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
Kai Koehne
cfa1bed0cb QmlOutline: Increase delay before doing an update to 500ms 
Use same delay as in cppeditor. Hopefully prevents the Outline to be
updated while typing.
 2010-08-24 14:35:04 +02:00
Kai Koehne
ef1e52dfd1 Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline 
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
 2010-08-23 16:00:24 +02:00
Kai Koehne
420a2b4e6e QmlEditor: Remove QtQuick->Preview from tools menu 
This only works when a qmlviewer is in the PATH, which is non obvious.
Removing the feature therefore completely.
 2010-08-19 17:15:40 +02:00
Thomas Hartmann
cb7b38790f QmlJSEditor: QuickToolBar stays visible on wheelEvent 
The mouse wheel should not hide the QuickToolBar
 2010-08-17 15:41:35 +02:00
Thomas Hartmann
d7956ad2e0 QmlJSEditor: bugfix 
We have to check for  m_oldCursorPosition != -1
to avoid calling apply() in the case of a TextMarker
update. Otherwise the QuickToolBar misbehaves.

I also removed the comment.
 2010-08-13 17:22:23 +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
Christian Kamm
538f611503 Indenters: Move style setup into the QtStyleCodeFormatter constructors. 
This makes sure styles are consistent for the editor and the quick fix
engine.
 2010-08-12 14:21:35 +02:00
Christian Kamm
822de6c17a QmlJS: Introduce a new indenter that works similarly to the new C++ one. 
Done-with: Thomas Hartmann
 2010-08-10 14:27:08 +02:00
Roberto Raggi
da5d6d7db2 Get rid of the old deprecated indenter. 2010-08-10 10:50:00 +02:00
Roberto Raggi
df1770ff55 Use LowestPriority instead of IdlePriority. 2010-08-09 12:00:31 +02:00
Thomas Hartmann
ade58cdcee QuickToolBar: The marker only appears if the toolbar is not visible 2010-08-05 15:36:13 +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
Thorbjørn Lindeijer
382b59a5db Use Field instead of Label format for QML properties 
In the default style this is currently the same, but in general it makes
more sense to highlight properties as fields.
 2010-08-03 11:37:11 +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
Roberto Raggi
281c6ad1f6 Get rid of an annoying (useless?) call to qDebug. 2010-07-19 15:46:30 +02:00
Kai Koehne
6eadeb052c QmlOutline: Show sensible tooltips 
Show the same tooltips as in the text editor. To accomplish this
I refactored the QmlOutlineModel quite a bit ...
 2010-07-19 14:29:55 +02:00
Christian Kamm
8519ca11c3 QmlJS: Allow 'follow symbol' to jump to the target of a file import. 
Task-number: QTCREATORBUG-1736
 2010-07-16 11:17:10 +02:00
Christian Kamm
68be307b49 QmlJS: Use LookupContext in findLinkAt. 2010-07-16 10:42:26 +02:00
Thomas Hartmann
c03f2b03b2 QmlJS::IContextPane adapting the interface 
closing windows with escape is now stacked again
 2010-07-15 16:45:34 +02:00
Lasse Holmstedt
bb596688c2 fixed singleselection for states qml file 2010-07-15 13:39:39 +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
8936292dc2 modified selection to accept items without id's 
also cleaned up old stuff
 2010-07-14 15:30:54 +02:00
Lasse Holmstedt
4ecad983ec added multiselection from editor to qml viewer 2010-07-14 15:30:53 +02:00
Kai Koehne
fe82dd7ff7 QmlOutline: Make sure tree view is always expanded 2010-07-14 13:34:18 +02:00
Kai Koehne
5aea93028f Add position to navigation history when navigating through outline 2010-07-14 12:55:58 +02:00
Kai Koehne
ce32f25ba3 QmlOutline: Show icons for known types 2010-07-14 11:40:11 +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
5e3bc834f4 QmlTextEditor: Remove root decoration from outline combo box 2010-07-12 15:49:03 +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
Thomas Hartmann
74610a9137 QmlDesigner: change interface for context pane 2010-07-09 16:10:09 +02:00
Kai Koehne
65ef113367 QmlJSEditor: Fix compilation warning (gcc) 
Reviewed-by: Christian Kamm
(cherry picked from commit 3281a9e691)
 2010-07-09 16:08:58 +02:00
Roberto Raggi
8acde74d79 Forked QSyntaxHighlighter from Qt 4.7. 
We need our very own syntax highlighter in Qt Creator.
 2010-07-09 14:47:18 +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
Roberto Raggi
ef5aaa0368 Renamed QmlJS::Document::documentRevision(). 2010-07-07 17:52:46 +02:00
hjk
100d8bad6e qmljseditor: enable setting breakpoints using the mouse in the ExtraArea 2010-07-07 13:56:39 +02:00
Thomas Hartmann
5a971334ef qmlsjeditor: activate context pane 2010-07-07 13:09:57 +02:00
Kai Koehne
3281a9e691 QmlJSEditor: Fix compilation warning (gcc) 
Reviewed-by: Christian Kamm
 2010-06-29 09:35: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