feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
19,545 Commits 108 Branches 368 Tags
88ac3daa7fc9849432b6fe4ea5df39c3f3e55433
Commit Graph

30 Commits

Author SHA1 Message Date
Thomas Hartmann
8102f3f6d2 QmlDesigner.componentView: fix for captions 
Change-Id: I0ea2441d2989b8e395955b5e19ad45d341d12379
Reviewed-on: http://codereview.qt.nokia.com/716
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-24 16:22:49 +02:00
Thomas Hartmann
cb63aea838 QmlDesigner.componentView: code cleanup 
Explicit braces to avoid ambiguous ‘else’.

Change-Id: Ic1a48b41b229ba47f7ab737a883277a6547e30ce
Reviewed-on: http://codereview.qt.nokia.com/521
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-20 16:46:54 +02:00
Thomas Hartmann
f38b0e7bd8 QmlDesigner.componentView: cleaning up 
There was some dead code I removed.
I also refactored the node removal and made it more robust.

Change-Id: I3bd566011302968c1d798689fcca3b4a3880b306
Reviewed-on: http://codereview.qt.nokia.com/417
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-09 11:35:36 +02:00
Thomas Hartmann
0793a8dfb8 QmlDesigner.componentView: update and bug fixing 
I implemented nodeReparented() (bugfix)
I use ModelNode::ComponentSource instead of childNode.type() == "QtQuick.Component"
to catch "implicit" components.

Change-Id: Ie5bd48afbb5a5b10c3544406b1229aafc5dabed5
Reviewed-on: http://codereview.qt.nokia.com/416
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-09 10:54:31 +02:00
Thomas Hartmann
7939c270bd QmlDesigner.model: refactoring for nodeSource 
I changed customParserSource into nodeSource and use it also for
components. This means we do not use auxiliaryData anymore with some magic
__component_data identifier.
To distinguish between CustumParserSource and ComponentSource I introduced
the enum NodeSourceType.
Also in this patch I added auxiliaryData in the creation of a node. This was useful
for prototyping and will help with prototyping/testing in the future.

Change-Id: I2152c26c0c767f869f7dce7209abf43f594fd2ad
Reviewed-on: http://codereview.qt.nokia.com/399
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-08 17:53:11 +02:00
Thomas Hartmann
f950b8d7c7 QmlDesigner: reactivating subcomponent editing 
This includes refactoring the DesignDocumentController.
In the ComponentTextMoifier I use replaced because it is not blocked by
beginEditBlock() of the text cursor.

I use the same pattern now for ComponentView like for all the other
views.
The view is created and controlled by DesignModeWidget because we
have only a single instance.

Change-Id: I7809b96f52f4d275f0231f3961c3c4bc2618ce89
Reviewed-on: http://codereview.qt.nokia.com/96
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-05-24 18:50:25 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Thomas Hartmann
faa59b754f QmlDesigner.Model: add support for custom parser types 
This patch enables us to create objects with custom parsers
like ListModel and XmlListModel.
 2011-05-06 13:28:19 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Marco Bubke
e3376b6d8d QmlDesigner: Change importAdded and importRemoved in importsChanged 2011-02-10 15:58:03 +01:00
Marco Bubke
14a5d57572 QmlDesigner: Add notifier for state change 2011-02-02 21:52:15 +01:00
Marco Bubke
7ab575a9d9 QmlDesigner: Refactor custom notifications 
The custom notification code leads to hard readable code.
 2011-02-01 15:55:07 +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
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Marco Bubke
1312a04221 QmlDesigner: Add component complete feature 
This notifies the views if the instance has be really instanced.
 2010-12-09 16:35:28 +01:00
Marco Bubke
562d0c5fbd QmlDesigner: Refactor states editor 
Reviewed-By: Thomas Hartmann
 2010-12-08 17:28:50 +01:00
Kai Koehne
c29e52b331 QmlDesigner: Fix compile warning 2010-10-06 10:17:50 +02:00
Thomas Hartmann
f2ada23d26 QmlDesigner: using Qt 4.7 again 
We need to support the N900

Reviewed-by: Kai Koehne
 2010-10-06 09:47:13 +02:00
Thomas Hartmann
9a49ad003a QmlDesigner: using QtQuick 1.0 instead of Qt 4.7 
huge renaming from Qt to QtQuick
propertyeditor qml files moved from Qt to QtQuick
auotests fixed
files used in tests fixed

autotests pass

Task-number: QTCREATORBUG-2556

Reviewed-by: Kai Koehne
 2010-10-01 13:21:09 +02:00
Thomas Hartmann
bae48751f6 QmlDesigner: use one node instance view 
Bauhaus now uses only one single instance view.

Done by Marco Bubke
 2010-09-24 09:10:40 +02:00
Marco Bubke
35263628d1 Add script function to the model 
This is needed to suppert inline script function of Qml in the designer
 2010-06-10 17:41:22 +02:00
Marco Bubke
299f2be2f4 Let the designer start nodes which have invalid meta info 
This is only a workaround!
 2010-04-08 20:45:29 +02:00
Kai Koehne
ad9036da0c QmlDesigner: Add more stuff to the list of strings to be translated 2010-04-08 12:32:13 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Marco Bubke
f6a06085e0 Change changeNodeType in changeRootNodeType 2010-02-10 13:03:03 +01:00
Kai Koehne
6f0adb7180 Fix MSVC warning 2010-01-14 16:34:29 +01:00
Kai Koehne
45f8895e93 Change signature of AbstractView::nodeSlidedToIndex in QmlDesigner 
The usage of 'int newIndex' was ambiguous in the case of
oldIndex < newIndex. Solved by directly passing the ModelNode that was
moved around.

'nodeSlidedToIndex' was also renamed to 'nodeOrderChanged', since
'Slided' is no proper English.
 2010-01-12 13:59:35 +01:00
Kai Koehne
818a7b226b New QmlDesigner plugin & Design mode 
This adds a new "Design" mode that can be used to manipulate qml files
in a visual way. It will only get build if you have the declarativeui
module in Qt.

This is a squashed import from the Bauhaus project. Share & enjoy :)
 2010-01-07 12:14:35 +01:00