Commit Graph

125 Commits

Author SHA1 Message Date
Aurindam Jana
16d5b5165c QmlJSInspector: Show root in property inspector
Change-Id: I281ef1f74e8d8128b91c426057c4d727a77543a6
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-30 14:24:57 +02:00
Aurindam Jana
95cfe23e95 QmlJSInspector: Optimize server requests
Fetch objects on demand. Update objects that are
currently in the crumble path rather than query the
complete tree.

Change-Id: Id4e263fa7a35c90248444461210dbba32dd61b12
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-30 08:19:04 +02:00
Aurindam Jana
159058d9eb QmlJSInspector: UI changes
The dock widgets are always enabled. Follow same
behaviour for QmlJSInspector.

Change-Id: Ia13a8041c96c0ff92d6f67920c2a5f908f520ad0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-29 13:48:34 +02:00
Aurindam Jana
d17911c3e0 QmlJSInspector: Add to Window->Views
Regression introduced by 47fedc3d8a

Change-Id: I0c51c5503d94bab63842224e06c6bee391c93d70
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-29 11:06:31 +02:00
Aurindam Jana
f735820b89 QmlDebugging: Use Utils::StyledBar
Use the StyledBar instead of custom widgets in inspector and
messagelog window.

Change-Id: I3bb8fc3aef20caf9c6c2b3c5e214d3642f5f8397
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-26 12:16:57 +02:00
Aurindam Jana
05aa2eb204 QmlJSInspector: Use FindToolBar instead of Filter
QtCreator uses the Find Tool Bar uniformly to search for strings.

Change-Id: I399661597120be3402432b0c99489174f7bf2d62
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-26 11:41:57 +02:00
Aurindam Jana
f14dffe681 QmlJSInspector: Remove Color Picker Tool
Change-Id: Ic1a158f3e96052fcf30071ec827c23a4a83625f5
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-26 11:39:11 +02:00
Aurindam Jana
e412a93006 QmlJSInspector: Query Objects Iteratively
Currently all objects are recursively fetched when the root context
is retrieved. This patch fetches objects on demand.

Change-Id: Idf5c621ec38869dd5a676116bc4df528d7bb2fda
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-22 14:22:06 +01:00
Aurindam Jana
4cd2e32659 QmlEngineDebugClient: Simplify the client and utility classes
Change-Id: I86033bdbdef94c6f17e706f8e13ce390969171c6
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-22 14:21:34 +01:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-20 13:32:49 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
Kai Koehne
e277ace619 Inspector: Use user-set sysroot also when opening files in the inspector
Expose the current debugger engine (with it's start parameters) in
Debugger::QmlAdapter, and use it to initialize the FileInProjectFinder
in QmlJSInspector.

Change-Id: I562012868e72ee9369db210e79468e263c53eda6
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-11-29 12:01:21 +01:00
Aurindam Jana
f5f51b62df InspectorPlugin: Handle disconnect
Disonnect inspector when qml adapter emits disconnected
signal.

Change-Id: I2f9acbe2cc19c44edf500e7329d1590b73f97113
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-11 13:04:14 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Aurindam Jana
1df87ae0e4 QmlJSInspector: Fix Crash.
Check for valid qmlAdapter before dereferencing it.

Change-Id: If226752780a9b8b104e1f82833d35598468e94cb
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-10-31 12:14:05 +01:00
Aurindam Jana
cb0b3424b3 QmlJSScriptConsole: Refactored ScriptConsole, added functionality.
The ScriptConsole is renamed to QmlJSScriptConsole. The console can be used
to evaluate expressions during a QML application debug session.
Changes:
* Console can be used even when application is not on a debug break
* The object context is the currently selected object in Inspector
* ContextMenu has a Clear option
* Multiple line expressions are supported
* Traverse Command History using up and down arrow keys

Change-Id: I4e1cd8763d60be43dbba395ead2a9a086d6bab7d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-10-12 15:03:00 +02:00
Aurindam Jana
dbfae9fb28 QmlDebugger: Attach to QML Port: Fix errors
Connect to user defined host and port. Increased maximum connection tries.

Change-Id: Ie72a9fb36e5178b64311753bd8a3fe20e6f62c3b
Reviewed-on: http://codereview.qt-project.org/4918
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-09-19 13:56:08 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 18:04:55 +02:00
Christian Kamm
c879b9aeed QmlJS: Make the astPath available.
Change-Id: Ice51730ee118723dbd755467dd221eb9940775fd
Reviewed-on: http://codereview.qt.nokia.com/2774
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-08-10 11:56:09 +02:00
Kai Koehne
51a9ff7d4e Qml Tooling: Fix debugging & profiling of .qml files loaded from resources
Don't expect that every url specifying a file is a local file url. Instead
let FileInProjectFinder handle urls with other schemes gracefully, too.

Change-Id: I72457d502ff1caf52f588e8ec41ab260882d1cf5
Reviewed-on: http://codereview.qt.nokia.com/1840
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-21 12:27:43 +02:00
Kai Koehne
4f7ac84555 QmlInspector: Try to find files in project
Try to find files with the same name in the project tree, instead of
resorting to the original path (e.g. in the bundle).

We do the same already for locating files in the stack.

Change-Id: I836cc810f2c6fbeac41de592f2159f7ae823d4e5
Reviewed-on: http://codereview.qt.nokia.com/1783
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-19 14:43:58 +02:00
Kai Koehne
bff9e2618b QmlJSInspector: Fix naming of QmlInspectorToolBar
Add a 'Js' to make it align with the other classes of the plugin.

Change-Id: If9514d7ed3a2244a60e7ebc72256ddfc25695c68
Reviewed-on: http://codereview.qt.nokia.com/817
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-06-28 10:08:55 +02:00
hjk
309593704d qmljsinspector: style
Change-Id: I4d776b9d0ce77a74d0347eb08c15026982ab8054
Reviewed-on: http://codereview.qt.nokia.com/258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-05-31 11:41:32 +02:00
Thorbjørn Lindeijer
335f6ad0f7 QmlJSInspector: Renamed Observer to Inspector
Manually redid Qt 4.8 commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb,
to make future code synchronization easier.

In order not to have to change the QmlApplicationViewer again, a
compatibility class QDeclarativeViewObserver is retained that subclasses
QDeclarativeViewInspector.

Change-Id: Ief87ae2f8f76b1db0c9d65085e4832424b277603
Reviewed-on: http://codereview.qt.nokia.com/242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-31 09:44:09 +02:00
Thorbjørn Lindeijer
38c798a642 Made CrumblePath API a bit more consistent/generic
Was a bit confusing to pass QVariant data in and get an int back.

Change-Id: I613d2eb88ade45baee85a4f84d7db6d3ce7fb923
Reviewed-on: http://codereview.qt.nokia.com/205
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-05-30 11:59:40 +02:00
Thorbjørn Lindeijer
5647e67762 QmlJSInspector: Fixed multi-selection bug
Nothing useful can be done with multi-selection at the moment, but this
bug was introduced in 8d0601515e and is
better to fix straight away.

What happened was that when multiple items are selected in the observed
QML application, Qt Creator would pick the first and send that back as
the new selection. This made it impossible to select more than one item.

Task-number: QTCREATORBUG-3426
Change-Id: I68283480af5e0a21e32e51a49848ff9a809ed5ec
Reviewed-on: http://codereview.qt.nokia.com/151
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-26 16:55:16 +02:00
Thorbjørn Lindeijer
8d0601515e QmlJSInspector: Sync crumble path selection back to the observer
Now selecting an item via the crumble path modifies the selection in the
observed QML application accordingly.

Reviewed-by: Christiaan Janssen
2011-05-12 15:39:11 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Kai Koehne
8a28be85c6 QmlObserver: Disable crumblepath if not active 2011-04-27 17:25:48 +02:00
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Kai Koehne
986c9560e9 QmlObserver: Fix 'Apply Changes on Save' on Mac
Use the generic FileInProjectFinder instead of some homebrewn
matching algorithm (which didn't handle the case that on  Mac OS X,
files are copied to the app bundle).

Reviewed-by: Christiaan Janssen
Task-number: QTCREATORBUG-3188
2011-04-08 11:58:48 +02:00
Thorbjørn Lindeijer
a8bf2ba5e3 QmlJSDebugger: Renamed "execution paused" to "animation paused"
The latter better describes what is paused, since expressions are
actually still executed.

Suggested by Kai.
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
0a813cd67c QmlJSDebugger: Separated animation speed and paused state
This separates animation speed and paused state in the communication
protocol between the Qt Creator QmlJSInspector plugin and the
QmlJSDebugger server.

Point is to allow changing the speed of the animation before resuming
execution. These two things were already separated in the QML Observer,
but not in Qt Creator.

Reviewed-by: Kai Koehne
2011-03-22 10:40:46 +01:00
Kai Koehne
58e697bc09 QmlDebug: Fix crash on app closing
Make sure that the engineClient object is the parent of all of its
queries, since the destructor of a query might try to access the client
...

Reviewed-by: Christiaan Janssen
Task-number: QTCREATORBUG-4105
2011-03-21 15:07:34 +01:00
Christiaan Janssen
ecce5bca6f QmlInspector: break selection loop on cursor change
Reviewed-by: Kai Koehne
2011-03-08 13:26:29 +01:00
Christiaan Janssen
512fe4b668 QmlInspector: fixed bug in crumblepath 2011-02-28 17:14:55 +01: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
Thorbjørn Lindeijer
faabfde7f6 QmlJSInspector: Use a FilterLineEdit for the properties filter
Adds a clear button when text is entered.
2011-02-21 14:13:42 +01:00
Thorbjørn Lindeijer
19aa31979c QmlJSInspector: Make string translatable 2011-02-17 12:54:52 +01:00
Thorbjørn Lindeijer
522ffd8622 QmlJSInspector: Code cosmetics 2011-02-17 12:33:53 +01:00
Thorbjørn Lindeijer
7f90d08c18 QmlJSInspector: Moved the property filter back into the QML observer dock
Changed around the way the background is drawn on the crumble path, so
that the background extends below the filter line edit.

Reviewed-by: Kai Koehne
2011-02-17 10:17:35 +01:00
Thorbjørn Lindeijer
f5c192bf38 Introduced a QML-specific debugger tool bar
This one has the common debugger actions as well as the QML Observer
specific part. This makes sure those actions are generally available and
not only from the QML Observer dock widget.

The filter in the tool bar should still be moved back.

Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-02-16 13:36:12 +01:00
Thorbjørn Lindeijer
7741db1220 Code cosmetics 2011-02-16 11:36:06 +01:00
Christiaan Janssen
49fa40cf9e QmlInspector: changed crumblepath appearance
Reviewed-by: Kai Koehne
2011-02-10 14:33:20 +01:00
Thorbjørn Lindeijer
3e06015b4d QmlJSInspector: Cosmetics
* Renamed Toolbar to ToolBar
* Use mass-disconnect instead of duplicating all connect calls
* Split up setupToolbar(bool)
2011-02-09 14:12:18 +01:00
Christiaan Janssen
a9e79b938c QmlJsInspector: keeping last selected object when disabling observer mode 2011-02-08 17:42:02 +01:00