feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
19,101 Commits 108 Branches 368 Tags
70ca0e32bb801db243d6cb6f8829be43c46dc88c
Commit Graph

96 Commits

Author SHA1 Message Date
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
Christiaan Janssen
4fe5e3be52 QmlInspector: avoiding feedback loop between inspector and editor 2011-02-02 17:41:01 +01:00
Christiaan Janssen
f5039a4a02 QmlJsInspector: implemented Property Inspector 
Reviewed-by: Kai Koehne
 2011-01-20 15:11:39 +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
hjk
5bce99b9e5 Replace BaseMode convenience class by individual implementation. 
Using the convienience class does not really save code and adds another
needless level in the hierarchy. This affects the three remaining BaseMode
users: Help, ProjectExplorer and HelloWorld.
 2010-12-07 16:45:58 +01:00
hjk
2c46a935df debugger: make more bits private 2010-12-03 16:18:50 +01:00
hjk
f8e70add25 debugger: move dockwidget ownership to the mainwindow 2010-12-03 15:04:16 +01:00
hjk
4c5f78de18 qmljsinspector: remove some dependencies on debugger internals 2010-12-03 11:54:41 +01:00
hjk
54ccfe99a8 qmljsinspector: no need to store the dock widget explicitly 2010-12-03 11:45:47 +01:00
hjk
a77353b414 debugger: move DebuggerMainWindow to debuggermainwindow.{h,cpp} 2010-12-02 17:43:14 +01:00
hjk
05f6151d33 debugger: merger DebuggerMainWindow and DebuggerUISwitcher 2010-12-02 17:34:04 +01:00
Kai Koehne
1e86df7191 Utils: New class to map installed file path to source path 
FileInProjectFinder implements an heuristic to find the likely source
file for an aribrary file path, e.g. in the shadow build folder or
on the device. This is useful especially for .qml files, which are
executed at runtime.

Reviewed-by: con
 2010-12-01 16:54:32 +01:00
Kai Koehne
d2ed221b1b QmlObserver: Add 'show app on top' switch to creator + qmlobserver 
This is convenient especially in the observer mode.

Reviewed-by: Christiaan Janssen
 2010-11-23 16:24:23 +01:00
Kai Koehne
72af7899f2 QmlJsInspector: Code cleanup 2010-11-23 16:24:23 +01:00
Kai Koehne
c33348a49f Observer mode: Fix automatic selection of all instances 
If the user clicks on an instance of an element in the running app
while in server mode, the cursor selection is automatically updated.
However, the change of the cursor then leads to all the other
instances of the element at the cursor position being selected too.

Prevent this 'call back' in the QmlInspector by checking whether one
of the newly selected items is the one just selected.

Simpler mechanisms (like a sequential blocking of updates) don't
work because the call back happens through a QTimer.

Task-number: QTCREATORBUG-2366
 2010-11-12 15:08:09 +01:00
Kai Koehne
7e50ebcfba QmlJSInspector: API cleanup 
Rename setSelectedItemsByObjectReference slot to gotoObjectDefinition
 2010-11-12 15:08:09 +01:00
Kai Koehne
c43496d035 QmlJSInspector: API cleanup 
Give m_client, m_designClient member variables more descriptive names.
 2010-11-12 15:08:09 +01:00
Kai Koehne
1cc61e06ea QmlJSInspector: API cleanup 
Simplify method names.
 2010-11-12 15:08:09 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
 2010-11-10 17:02:40 +01:00
hjk
2161e0f6d9 debugger: refactoring of the plugin interface 
There's  some 'external' and some 'internal' part now. Other plugins
are only supposed the external interface.
 2010-11-10 12:08:23 +01:00
Kai Koehne
eac940cd01 QmlInspector: Fix mapping of file names to source dir on Mac 
Qml Applications by default copy the qml files into XX.app/Contents/Resources in
the shadow build directory. Take this into account when trying to find the files in the source directory.

Reviewed-by: Alessandro Portale
 2010-11-05 16:15:53 +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
Kai Koehne
aa0e82e6c8 QmlJS: Fix crash in debugger tooltips 
Check that the node under cursor is indeed a UiObjectMember

Reviewed-by: Christiaan Janssen
Task-number: QTCREATORBUG-2760
 2010-10-19 20:02:32 +02:00
Kai Koehne
542796523d QmlJSDebugger: Disable Observer pane after debugging ends 
At the time setupToolbar is called in the shutdown process the
connection still exists. Instead just use the parameter.

Task-number: QTCREATORBUG-2693
Reviewed-by: Christiaan Janssen
 2010-10-14 14:45:43 +02:00
Kai Koehne
8049a0276d QmlJSInspector: Fix disconnect() warnings on users app shutdown 
Don't try to disconnect from the proxy if you haven't been connected
before, e.g. because the QmlJSObserverService is missing.

Reviewed-by: Christiaan Janssen
 2010-10-08 15:51:55 +02:00
Kai Koehne
83e2a37850 QmlObserver: Disable UI when no server plugin exists 
Reviewed-by: Christiaan Janssen
 2010-10-01 17:34:01 +02:00
Kai Koehne
3e9f333769 QmlDebugger: Enable basic debugging without QmlInspector plugin 
Enable setting breakpoints, and showing the script console even if
the QmlInspector plugin is not loaded.

Reviewed-by: hjk
 2010-09-22 15:45:03 +02:00
Kai Koehne
4fdede8b28 QmlDebugger: Fix qDebug output 2010-09-22 15:45:03 +02:00