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

135 Commits

Author SHA1 Message Date
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
Thomas Hartmann
edebca70ed QmlJSEditor: changing behaivour of text markers 
The delay was increased to 500 ms and the marker only
appears now, if the cursor is directly on the type name.

This way the text marker creates less visual noise.
 2010-09-08 16:36:19 +02:00
Roberto Raggi
7df679c019 Increased the interval to update QML/JS documents to 100ms. 2010-09-08 12:53:22 +02:00
Roberto Raggi
e33767205b Introduced SemanticInfo::isValid(). 2010-09-08 11:39:24 +02:00
Roberto Raggi
23a5f173b1 Check the traling text before inserting closing braces. 2010-09-03 14:54:52 +02:00
Kai Koehne
2bbc9643ff Fixes crash when opening a .qml file from command line 
Hopefully fixes crash when opening a .qml file from the command line
(mac os x).
 2010-09-03 14:37:52 +02:00
Thomas Hartmann
70e658680b QuickToolBar: bugfix 
If we stay inside the node we keep the text marker
 2010-09-01 11:55:04 +02:00
Thomas Hartmann
36a955fa1e QuickToolbar: unifies naming to Quick ToolBar and clarifies tooltips 2010-09-01 11:55:03 +02:00
Christian Kamm
f3f3b96c85 QmlJS: Improve performance by avoiding two links in SemanticHighlighter. 
Reviewed-by: Roberto Raggi
 2010-08-31 10:39:07 +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
Christian Kamm
654d94a8c1 QmlJS: Fix uses of ids not being updated correctly. 
updateUses() has to be called for cursor position changes.

Done-with: Kai Koehne
 2010-08-30 12:11:22 +02:00
Lasse Holmstedt
1f1dcfdec1 QML Observer: Fixed updating of selected items 2010-08-27 13:12:05 +02:00
Lasse Holmstedt
2fe7317981 Fixed typo 2010-08-27 13:12:05 +02:00
Kai Koehne
12feb86975 Don't update uses highlight in when updating outline 
updateUses() is already called after each text change.
 2010-08-26 13:44:37 +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
Kai Koehne
6cf563bb25 QmlOutline: Cut down update times considerably 
Cut down update times of Outline by a magnitude by only emitting
itemChanged signal if absolutely needed. This doesn't include the change
of the icon, because QIcon is missing a comparison operator ...
 2010-08-25 13:28:04 +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
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