feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
17,831 Commits 108 Branches 368 Tags
4e2937bf486bfc455722ba064ca877dbb3e4fe09
Commit Graph

52 Commits

Author SHA1 Message Date
Thomas Hartmann
d3eaf05077 QmlDesigner: avoid syncronization errors when going to text mode and back 
To be safe to change to the base state (and back).

Reviewed-by: Kai Koehne
 2011-03-22 12:39:05 +01:00
Thomas Hartmann
8ae0af4f90 QmlDesigner.documentController: hourglass for loading loading progress 
Task-number: QTCREATORBUG-3733
 2011-03-09 15:41:41 +01:00
Thomas Hartmann
bc0303e143 QmlDesigner.documentcontroller: detach node instance view in edit mode 
This patch detaches the node instance view in edit node.
 2011-03-08 18:37:43 +01:00
Thomas Hartmann
d47ce7d286 QmlDesigner.subComponentManager: remove the need for a QDeclarativeEngine 
There were cases where a QDeclarativeEngine was crashing.

Reviewed-by: Kai Koehne
 2011-03-08 18:37:10 +01:00
Thomas Hartmann
583cf29891 QmlDesigner: use '.' instead of '/' for package names 
Using '/' was legacy and is just confusing.
The code is way more consistent now with QmlJS and does not require
conversions.
 2011-03-01 17:21:06 +01:00
Thomas Hartmann
0a02b85ece QmlDesigner: get rid of Qt/ - use QtQuick/ instead 
Qt 4.7 imports are converted to QtQuick 1.0 imports.
 2011-03-01 17:21:04 +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
Marco Bubke
e3376b6d8d QmlDesigner: Change importAdded and importRemoved in importsChanged 2011-02-10 15:58:03 +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
Thomas Hartmann
e4d2d8a2ed QmlDesigner.itemlibrary: filter item library by imports 
Only show items that are available and use requiredImport for filtering
 2010-12-10 22:02:15 +01:00
Thomas Hartmann
7df5ce2d7a QmlDesigner.itemLibrary: turn the item library into a full view. 
This is more consistent with the whole architecture and allows
the item library to listen to imports.
 2010-12-10 17:58:00 +01:00
Marco Bubke
562d0c5fbd QmlDesigner: Refactor states editor 
Reviewed-By: Thomas Hartmann
 2010-12-08 17:28:50 +01:00
Thomas Hartmann
98eee9db6b QmlDesigner.metaInfo: replace old NodeMetaInfo with new implementation 
The new implementation is based on the QmlJS::Interpreter
meta info system and gets its info from parsing qml and qmldumper
instead of interogating QDeclarative classes.

So we share this code with the Qml TextEditor and this approach is also
way more flexible. It also work with different Qt versions.

The meta info is now bound to a document/rewriter.

The api has changed slightly.

subComponentManager: cleanup
The SubComponentManager does not have to provide meta info, anymore.

propertyParser: cleanup
Enums were never properly converted. here.

metaInfo: remove old MetaInfo classes
Removing the old MetaInfo classes and code
 2010-12-01 17:01:05 +01:00
Thomas Hartmann
a4640e361f QmlDesigner: fixes crash 
Deleting an items might have a side effect that turns
the qml code invalid. (e. g. alias properties)

We catch this an show a proper error message.

Task-number: QTCREATORBUG-2973
Reviewed-by: Kai Koehne
 2010-11-02 11:18:22 +01: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
Thomas Hartmann
343719d132 QmlDesigner: copy and paste fixes 
imports are now properly forwarded and we catch
exceptions.
 2010-09-20 14:09:12 +02:00
Kai Koehne
010e6a9ed5 Revert "QmlDesigner: crash fix for copy and paste" 
Enable correct handling of imports again.
This reverts commit de610cac45.
 2010-06-10 15:15:31 +02:00
Thomas Hartmann
cd004cdf98 QmlDesigner: avoid crash for Components and copy and paste 
We have to set the proper fileUrl on all models
 2010-05-18 14:48:21 +02:00
Kai Koehne
a68fffd067 QuickDesigner: Update ItemLibrary when imported directories change 
ItemLibraryInfo has now a signal "entriesChanged()", which the ItemLibrary
connects to. To allow this, ItemLibraryInfo was moved from a stack-based to
a heap-based class.

Reviewed-by: Thomas Hartmann
 2010-05-12 17:47:35 +02:00
Marco Bubke
75803b08d2 Attach the loggerview directly after the model creation. 
Now you get all the changes of the rewriter.

Reviewed-by: kkoehne
 2010-05-05 08:09:49 +02:00
Kai Koehne
ddc7641638 Qml: Bump library version from 4.6 to 4.7 
All types in the Qt namespace now have 4.7 as minimum version.
 2010-04-23 13:46:13 +02:00
Jörg Schummer
052e5fa6ab QmlDesigner.ItemLibrary: Resources view is now updated when switching files 
Task-number: BAUHAUS-599
 2010-04-20 14:40:36 +02:00
Thomas Hartmann
de610cac45 QmlDesigner: crash fix for copy and paste 
imports (in the model) are broken (regression)
Since I rely on working imports in copy and paste broke.

I hardcode 4.7 in this patch!

Reviewed-by: Kai Koehne
 2010-04-16 13:46:35 +02:00
Lasse Holmstedt
0fd5e4e9c4 Removed extra toolbar from quick designer, improved settings page 2010-04-08 17:04:46 +02:00
Kai Koehne
71aafa6555 Disable switching to Component elements 
Feature is pretty fragile, and the primary use case (Delegates
for Views) isn't really supported anyway.

Task-number: BAUHAUS-562
 2010-04-08 12:32:13 +02:00
Kai Koehne
182f284d52 QmlDesigner: Cleanup 
Remove trailing whitespace + fix compilation warning.
 2010-03-24 17:47:39 +01:00
Thomas Hartmann
9d9285cfbf QmlDesigner: renaming widget() to centerWidget() in DesignDocumentController 2010-03-23 14:31:00 +01:00
Thomas Hartmann
7bb8f29c9c QmlDesigner: all views instanciated once and shared now 2010-03-23 14:01:25 +01:00
Kai Koehne
1a37b0e762 Rename QML Viewer to QML Runtime 2010-03-10 16:39:15 +01:00
Kai Koehne
961cdd5e17 QmlDesigner: Disable switching to Component elements for the Alpha 
Changing anything in the submodel right now crashes, and it seems
it will take some time to fix this.

Reviewed-by: Thomas Hartmann
 2010-03-09 12:23:21 +01:00
Thomas Hartmann
54981a4a62 QmlDesigner: tweaking of pasting into the visual designer 2010-03-08 17:40:31 +01:00
Thomas Hartmann
845948cdee QmlDesigner: crash fix 
See BAUHAUS-435
Inside a modification group/transaction we disable undo/redo
 2010-03-08 13:55:19 +01:00
Lasse Holmstedt
736963a422 Context Help support for Bauhaus 
Task-number: BAUHAUS-451
Reviewed-by: kkoehne
 2010-03-08 09:48:31 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Thomas Hartmann
83a7da7c3d QmlDesigner: randomly distribute pasted items by 25% 2010-03-02 16:01:06 +01:00
Thomas Hartmann
14959eb6c3 QmlDesigner: paste to parent instead of selected item 2010-03-02 16:01:06 +01:00
Kai Koehne
ecbb54811c Deleting/pasting multiple items at once are now one Undo/Redo action 
Task-number: BAUHAUS-368
 2010-02-11 12:28:52 +01:00
Erik Verbruggen
b0b893acbf Fixed null-pointer deref in copy/paste. 2010-02-10 14:50:13 +01:00
Marco Bubke
f6a06085e0 Change changeNodeType in changeRootNodeType 2010-02-10 13:03:03 +01:00
Marco Bubke
57de5b20e0 Select pasted node in Bauhaus 2010-02-09 15:47:37 +01:00
Marco Bubke
0a62a383bd Improve Copy and Paste in Bauhaus 
Now the items are pasted to the parent of selected node. It is too
selected after the paste.

Reviewed-by: Kai Koehne
 2010-02-08 16:01:00 +01:00
Erik Verbruggen
a6b1fb94e6 Moved Creator specific code to a subclas. 2010-02-08 14:29:43 +01:00
Marco Bubke
666b454295 Add "Select All" menu item to the design mode 2010-01-25 15:29:45 +01:00
Marco Bubke
47afcf99ca Split the tool box of form editor in a upper and lower one 2010-01-21 20:02:22 +01:00
Thomas Hartmann
5dce709263 QmlDesigner: fixes copy and paste of components 
This patch ensures that meta info is available for all models
during copy and paste
 2010-01-18 18:51:15 +01:00
Kai Koehne
84c30ea99e Let the DesignMode recover when the qml contains an error on first load 
If the qml contains an error on frist call of
DesignDocumentController::loadMaster, we did not wire up the components
to the model. If the user then fixed the qml, the Design mode widgets
were 'enabled', but didn't contain any meaningful input.

Fixed by always wiring up the components. Unfortunately this shows the
'default' model with just a Rectangle.
 2010-01-13 11:53:42 +01:00