Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
7ab575a9
Commit
7ab575a9
authored
Feb 01, 2011
by
Marco Bubke
Browse files
QmlDesigner: Refactor custom notifications
The custom notification code leads to hard readable code.
parent
ad905869
Changes
25
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
View file @
7ab575a9
...
...
@@ -458,68 +458,68 @@ void FormEditorView::instancesCompleted(const QVector<ModelNode> &completedNodeL
currentTool
()
->
instancesCompleted
(
itemNodeList
);
}
void
FormEditorView
::
customNotification
(
const
AbstractView
*
view
,
const
QString
&
identifier
,
const
QList
<
ModelNode
>
&
nodeList
,
const
QList
<
QVariant
>
&
data
)
void
FormEditorView
::
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
)
{
if
(
identifier
==
"__start rewriter transaction__"
)
{
m_transactionCounter
++
;
if
(
m_transactionCounter
==
1
&&
selectedModelNodes
().
count
()
==
1
)
m_formEditorWidget
->
setFeedbackNode
(
QmlItemNode
(
selectedModelNodes
().
first
()));
}
if
(
identifier
==
"__end rewriter transaction__"
)
{
m_transactionCounter
--
;
if
(
m_transactionCounter
==
0
)
m_formEditorWidget
->
setFeedbackNode
(
QmlItemNode
());
}
if
(
identifier
==
"__instance information changed__"
)
{
QList
<
FormEditorItem
*>
itemNodeList
;
QList
<
FormEditorItem
*>
itemNodeList
;
foreach
(
const
ModelNode
&
node
,
nodeList
)
{
QmlItemNode
qmlItemNode
(
node
);
if
(
qmlItemNode
.
isValid
()
&&
scene
()
->
hasItemForQmlItemNode
(
qmlItemNode
))
{
scene
()
->
synchronizeTransformation
(
qmlItemNode
);
if
(
qmlItemNode
.
isRootModelNode
())
widget
()
->
setRootItemRect
(
qmlItemNode
.
instanceBoundingRect
());
foreach
(
const
ModelNode
&
node
,
nodeList
)
{
QmlItemNode
qmlItemNode
(
node
);
if
(
qmlItemNode
.
isValid
()
&&
scene
()
->
hasItemForQmlItemNode
(
qmlItemNode
))
{
scene
()
->
synchronizeTransformation
(
qmlItemNode
);
if
(
qmlItemNode
.
isRootModelNode
())
widget
()
->
setRootItemRect
(
qmlItemNode
.
instanceBoundingRect
());
itemNodeList
.
append
(
scene
()
->
itemForQmlItemNode
(
qmlItemNode
));
}
itemNodeList
.
append
(
scene
()
->
itemForQmlItemNode
(
qmlItemNode
));
}
m_currentTool
->
formEditorItemsChanged
(
itemNodeList
);
}
if
(
identifier
==
"__instance render pixmap changed__"
)
{
QList
<
FormEditorItem
*>
itemNodeList
;
m_currentTool
->
formEditorItemsChanged
(
itemNodeList
);
}
foreach
(
const
ModelNode
&
node
,
nodeList
)
{
QmlItemNode
qmlItemNode
(
node
);
if
(
qmlItemNode
.
isValid
()
&&
scene
()
->
hasItemForQmlItemNode
(
qmlItemNode
))
{
scene
()
->
itemForQmlItemNode
(
qmlItemNode
)
->
update
();
}
void
FormEditorView
::
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
)
{
foreach
(
const
ModelNode
&
node
,
nodeList
)
{
QmlItemNode
qmlItemNode
(
node
);
if
(
qmlItemNode
.
isValid
()
&&
scene
()
->
hasItemForQmlItemNode
(
qmlItemNode
))
{
scene
()
->
itemForQmlItemNode
(
qmlItemNode
)
->
update
();
}
}
}
if
(
identifier
==
"__instance children changed__"
)
{
QList
<
FormEditorItem
*>
itemNodeList
;
void
FormEditorView
::
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
foreach
(
const
ModelNode
&
node
,
nodeList
)
{
QmlItemNode
qmlItemNode
(
node
);
if
(
qmlItemNode
.
isValid
()
&&
scene
()
->
hasItemForQmlItemNode
(
qmlItemNode
))
{
scene
()
->
synchronizeParent
(
qmlItemNode
);
itemNodeList
.
append
(
scene
()
->
itemForQmlItemNode
(
qmlItemNode
));
}
}
}
m_currentTool
->
formEditorItemsChanged
(
itemNodeList
);
void
FormEditorView
::
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
)
{
QList
<
FormEditorItem
*>
itemNodeList
;
foreach
(
const
ModelNode
&
node
,
nodeList
)
{
QmlItemNode
qmlItemNode
(
node
);
if
(
qmlItemNode
.
isValid
()
&&
scene
()
->
hasItemForQmlItemNode
(
qmlItemNode
))
{
scene
()
->
synchronizeParent
(
qmlItemNode
);
itemNodeList
.
append
(
scene
()
->
itemForQmlItemNode
(
qmlItemNode
));
}
}
QmlModelView
::
customNotification
(
view
,
identifier
,
n
odeList
,
data
);
m_currentTool
->
formEditorItemsChanged
(
itemN
odeList
);
}
void
FormEditorView
::
rewriterBeginTransaction
()
{
m_transactionCounter
++
;
if
(
m_transactionCounter
==
1
&&
selectedModelNodes
().
count
()
==
1
)
m_formEditorWidget
->
setFeedbackNode
(
QmlItemNode
(
selectedModelNodes
().
first
()));
}
void
FormEditorView
::
rewriterEndTransaction
()
{
m_transactionCounter
--
;
if
(
m_transactionCounter
==
0
)
m_formEditorWidget
->
setFeedbackNode
(
QmlItemNode
());
}
double
FormEditorView
::
margins
()
const
{
...
...
src/plugins/qmldesigner/components/formeditor/formeditorview.h
View file @
7ab575a9
...
...
@@ -106,9 +106,15 @@ public:
void
nodeSlidedToIndex
(
const
NodeListProperty
&
listProperty
,
int
newIndex
,
int
oldIndex
);
void
auxiliaryDataChanged
(
const
ModelNode
&
node
,
const
QString
&
name
,
const
QVariant
&
data
);
void
customNotification
(
const
AbstractView
*
view
,
const
QString
&
identifier
,
const
QList
<
ModelNode
>
&
nodeList
,
const
QList
<
QVariant
>
&
data
);
void
instancesCompleted
(
const
QVector
<
ModelNode
>
&
completedNodeList
);
void
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
rewriterBeginTransaction
();
void
rewriterEndTransaction
();
double
margins
()
const
;
double
spacing
()
const
;
...
...
src/plugins/qmldesigner/components/integration/componentview.cpp
View file @
7ab575a9
...
...
@@ -166,7 +166,13 @@ void ComponentView::rootNodeTypeChanged(const QString &/*type*/, int /*majorVers
void
ComponentView
::
scriptFunctionsChanged
(
const
ModelNode
&
/*node*/
,
const
QStringList
&
/*scriptFunctionList*/
)
{}
void
ComponentView
::
instancePropertyChange
(
const
QList
<
QPair
<
ModelNode
,
QString
>
>
&
/*propertyList*/
)
{}
void
ComponentView
::
instancesCompleted
(
const
QVector
<
ModelNode
>
&
/*completedNodeList*/
)
{}
void
ComponentView
::
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{}
void
ComponentView
::
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{}
void
ComponentView
::
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{}
void
ComponentView
::
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{}
void
ComponentView
::
rewriterBeginTransaction
()
{}
void
ComponentView
::
rewriterEndTransaction
()
{}
void
ComponentView
::
selectedNodesChanged
(
const
QList
<
ModelNode
>
&
/*selectedNodeList*/
,
const
QList
<
ModelNode
>
&
/*lastSelectedNodeList*/
)
{}
...
...
src/plugins/qmldesigner/components/integration/componentview.h
View file @
7ab575a9
...
...
@@ -74,6 +74,13 @@ public:
void
scriptFunctionsChanged
(
const
ModelNode
&
node
,
const
QStringList
&
scriptFunctionList
);
void
instancePropertyChange
(
const
QList
<
QPair
<
ModelNode
,
QString
>
>
&
propertyList
);
void
instancesCompleted
(
const
QVector
<
ModelNode
>
&
completedNodeList
);
void
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
rewriterBeginTransaction
();
void
rewriterEndTransaction
();
void
selectedNodesChanged
(
const
QList
<
ModelNode
>
&
selectedNodeList
,
const
QList
<
ModelNode
>
&
lastSelectedNodeList
);
...
...
src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
View file @
7ab575a9
...
...
@@ -73,6 +73,37 @@ void DesignDocumentControllerView::instancesCompleted(const QVector<ModelNode> &
{
}
void
DesignDocumentControllerView
::
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
DesignDocumentControllerView
::
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
DesignDocumentControllerView
::
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
DesignDocumentControllerView
::
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
DesignDocumentControllerView
::
rewriterBeginTransaction
()
{
}
void
DesignDocumentControllerView
::
rewriterEndTransaction
()
{
}
static
QStringList
arrayToStringList
(
const
QByteArray
&
byteArray
)
{
...
...
src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.h
View file @
7ab575a9
...
...
@@ -65,6 +65,13 @@ public:
virtual
void
scriptFunctionsChanged
(
const
ModelNode
&
node
,
const
QStringList
&
scriptFunctionList
);
void
instancePropertyChange
(
const
QList
<
QPair
<
ModelNode
,
QString
>
>
&
propertyList
);
void
instancesCompleted
(
const
QVector
<
ModelNode
>
&
completedNodeList
);
void
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
rewriterBeginTransaction
();
void
rewriterEndTransaction
();
ModelNode
insertModel
(
const
ModelNode
&
modelNode
)
{
return
m_modelMerger
.
insertModel
(
modelNode
);
}
...
...
src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
View file @
7ab575a9
...
...
@@ -128,6 +128,31 @@ void ItemLibraryView::instancesCompleted(const QVector<ModelNode> &)
}
void
ItemLibraryView
::
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
ItemLibraryView
::
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
ItemLibraryView
::
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
ItemLibraryView
::
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
ItemLibraryView
::
rewriterBeginTransaction
()
{
}
void
ItemLibraryView
::
rewriterEndTransaction
()
{
}
void
ItemLibraryView
::
updateImports
()
{
m_widget
->
updateModel
();
...
...
src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
View file @
7ab575a9
...
...
@@ -82,6 +82,13 @@ public:
void
scriptFunctionsChanged
(
const
ModelNode
&
node
,
const
QStringList
&
scriptFunctionList
);
void
instancePropertyChange
(
const
QList
<
QPair
<
ModelNode
,
QString
>
>
&
propertyList
);
void
instancesCompleted
(
const
QVector
<
ModelNode
>
&
completedNodeList
);
void
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
rewriterBeginTransaction
();
void
rewriterEndTransaction
();
protected:
void
updateImports
();
...
...
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
View file @
7ab575a9
...
...
@@ -217,6 +217,31 @@ void NavigatorView::instancesCompleted(const QVector<ModelNode> &/*completedNode
{
}
void
NavigatorView
::
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
NavigatorView
::
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
NavigatorView
::
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
NavigatorView
::
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
NavigatorView
::
rewriterBeginTransaction
()
{
}
void
NavigatorView
::
rewriterEndTransaction
()
{
}
void
NavigatorView
::
nodeOrderChanged
(
const
NodeListProperty
&
listProperty
,
const
ModelNode
&
node
,
int
oldIndex
)
{
if
(
m_treeModel
->
isInTree
(
node
))
...
...
src/plugins/qmldesigner/components/navigator/navigatorview.h
View file @
7ab575a9
...
...
@@ -90,6 +90,13 @@ public:
void
scriptFunctionsChanged
(
const
ModelNode
&
node
,
const
QStringList
&
scriptFunctionList
);
void
instancePropertyChange
(
const
QList
<
QPair
<
ModelNode
,
QString
>
>
&
propertyList
);
void
instancesCompleted
(
const
QVector
<
ModelNode
>
&
completedNodeList
);
void
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
rewriterBeginTransaction
();
void
rewriterEndTransaction
();
private
slots
:
// void handleChangedItem(QStandardItem * item);
...
...
src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
View file @
7ab575a9
...
...
@@ -325,32 +325,25 @@ void StatesEditorView::otherPropertyChanged(const QmlObjectNode &qmlObjectNode,
QmlModelView
::
otherPropertyChanged
(
qmlObjectNode
,
propertyName
);
}
void
StatesEditorView
::
customNotification
(
const
AbstractView
*
view
,
const
QString
&
identifier
,
const
QList
<
ModelNode
>
&
nodeList
,
const
QList
<
QVariant
>
&
imageList
)
void
StatesEditorView
::
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
)
{
if
(
identifier
==
"__instance preview image changed__"
)
{
int
minimumIndex
=
10000
;
int
maximumIndex
=
-
1
;
foreach
(
const
ModelNode
&
node
,
nodeList
)
{
if
(
node
.
isRootNode
())
{
minimumIndex
=
qMin
(
minimumIndex
,
0
);
maximumIndex
=
qMax
(
maximumIndex
,
0
);
}
else
{
int
index
=
rootStateGroup
().
allStates
().
indexOf
(
QmlModelState
(
node
))
+
1
;
if
(
index
>
0
)
{
minimumIndex
=
qMin
(
minimumIndex
,
index
);
maximumIndex
=
qMax
(
maximumIndex
,
index
);
}
int
minimumIndex
=
10000
;
int
maximumIndex
=
-
1
;
foreach
(
const
ModelNode
&
node
,
nodeList
)
{
if
(
node
.
isRootNode
())
{
minimumIndex
=
qMin
(
minimumIndex
,
0
);
maximumIndex
=
qMax
(
maximumIndex
,
0
);
}
else
{
int
index
=
rootStateGroup
().
allStates
().
indexOf
(
QmlModelState
(
node
))
+
1
;
if
(
index
>
0
)
{
minimumIndex
=
qMin
(
minimumIndex
,
index
);
maximumIndex
=
qMax
(
maximumIndex
,
index
);
}
}
if
(
maximumIndex
>=
0
)
m_statesEditorModel
->
updateState
(
minimumIndex
,
maximumIndex
);
}
else
{
QmlModelView
::
customNotification
(
view
,
identifier
,
nodeList
,
imageList
);
}
if
(
maximumIndex
>=
0
)
m_statesEditorModel
->
updateState
(
minimumIndex
,
maximumIndex
);
}
void
StatesEditorView
::
scriptFunctionsChanged
(
const
ModelNode
&
node
,
const
QStringList
&
scriptFunctionList
)
...
...
src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
View file @
7ab575a9
...
...
@@ -72,12 +72,13 @@ public:
void
parentChanged
(
const
QmlObjectNode
&
qmlObjectNode
);
void
otherPropertyChanged
(
const
QmlObjectNode
&
qmlObjectNode
,
const
QString
&
propertyName
);
void
customNotification
(
const
AbstractView
*
view
,
const
QString
&
identifier
,
const
QList
<
ModelNode
>
&
nodeList
,
const
QList
<
QVariant
>
&
data
);
void
scriptFunctionsChanged
(
const
ModelNode
&
node
,
const
QStringList
&
scriptFunctionList
);
void
nodeIdChanged
(
const
ModelNode
&
node
,
const
QString
&
newId
,
const
QString
&
oldId
);
void
bindingPropertiesChanged
(
const
QList
<
BindingProperty
>
&
propertyList
,
PropertyChangeFlags
propertyChange
);
void
selectedNodesChanged
(
const
QList
<
ModelNode
>
&
selectedNodeList
,
const
QList
<
ModelNode
>
&
lastSelectedNodeList
);
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
StatesEditorWidget
*
widget
();
public
slots
:
...
...
src/plugins/qmldesigner/designercore/include/abstractview.h
View file @
7ab575a9
...
...
@@ -112,6 +112,12 @@ public:
void
emitInstancePropertyChange
(
const
QList
<
QPair
<
ModelNode
,
QString
>
>
&
propertyList
);
void
emitInstancesCompleted
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
emitInstanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
emitInstancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
emitInstancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
emitInstancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
emitRewriterBeginTransaction
();
void
emitRewriterEndTransaction
();
virtual
void
modelAttached
(
Model
*
model
);
virtual
void
modelAboutToBeDetached
(
Model
*
model
);
...
...
@@ -130,7 +136,13 @@ public:
virtual
void
instancePropertyChange
(
const
QList
<
QPair
<
ModelNode
,
QString
>
>
&
propertyList
)
=
0
;
virtual
void
instancesCompleted
(
const
QVector
<
ModelNode
>
&
completedNodeList
)
=
0
;
virtual
void
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
)
=
0
;
virtual
void
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
)
=
0
;
virtual
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
)
=
0
;
virtual
void
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
)
=
0
;
virtual
void
rewriterBeginTransaction
()
=
0
;
virtual
void
rewriterEndTransaction
()
=
0
;
virtual
void
selectedNodesChanged
(
const
QList
<
ModelNode
>
&
selectedNodeList
,
const
QList
<
ModelNode
>
&
lastSelectedNodeList
)
=
0
;
...
...
src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
View file @
7ab575a9
...
...
@@ -105,6 +105,13 @@ public:
void
instancesCompleted
(
const
QVector
<
ModelNode
>
&
completedNodeList
);
void
importAdded
(
const
Import
&
import
);
void
importRemoved
(
const
Import
&
import
);
void
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
rewriterBeginTransaction
();
void
rewriterEndTransaction
();
QList
<
NodeInstance
>
instances
()
const
;
NodeInstance
instanceForNode
(
const
ModelNode
&
node
)
const
;
...
...
src/plugins/qmldesigner/designercore/include/qmlmodelview.h
View file @
7ab575a9
...
...
@@ -96,6 +96,13 @@ public:
void
instancePropertyChange
(
const
QList
<
QPair
<
ModelNode
,
QString
>
>
&
propertyList
);
void
instancesCompleted
(
const
QVector
<
ModelNode
>
&
completedNodeList
);
void
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
rewriterBeginTransaction
();
void
rewriterEndTransaction
();
void
nodeCreated
(
const
ModelNode
&
createdNode
);
void
nodeRemoved
(
const
ModelNode
&
removedNode
,
const
NodeAbstractProperty
&
parentProperty
,
PropertyChangeFlags
propertyChange
);
...
...
src/plugins/qmldesigner/designercore/include/rewriterview.h
View file @
7ab575a9
...
...
@@ -140,6 +140,13 @@ public:
void
instancePropertyChange
(
const
QList
<
QPair
<
ModelNode
,
QString
>
>
&
propertyList
);
void
instancesCompleted
(
const
QVector
<
ModelNode
>
&
completedNodeList
);
void
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
nodeList
);
void
rewriterBeginTransaction
();
void
rewriterEndTransaction
();
void
importAdded
(
const
Import
&
import
);
void
importRemoved
(
const
Import
&
import
);
...
...
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View file @
7ab575a9
...
...
@@ -443,6 +443,37 @@ void NodeInstanceView::importRemoved(const Import &/*import*/)
restartProcess
();
}
void
NodeInstanceView
::
instanceInformationsChange
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
NodeInstanceView
::
instancesRenderImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
NodeInstanceView
::
instancesPreviewImageChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
NodeInstanceView
::
instancesChildrenChanged
(
const
QVector
<
ModelNode
>
&
/*nodeList*/
)
{
}
void
NodeInstanceView
::
rewriterBeginTransaction
()
{
}
void
NodeInstanceView
::
rewriterEndTransaction
()
{
}
//\}
...
...
@@ -931,7 +962,7 @@ void NodeInstanceView::pixmapChanged(const PixmapChangedCommand &command)
}
if
(
!
renderImageChangeSet
.
isEmpty
())
emit
CustomNotification
(
"__i
nstance
r
ender
pixmap c
hanged
__"
,
renderImageChangeSet
.
toList
());
emit
I
nstance
sR
ender
ImageC
hanged
(
renderImageChangeSet
.
toList
()
.
toVector
()
);
}
void
NodeInstanceView
::
informationChanged
(
const
InformationChangedCommand
&
command
)
...
...
@@ -953,7 +984,7 @@ void NodeInstanceView::informationChanged(const InformationChangedCommand &comma
}
if
(
!
informationChangedVector
.
isEmpty
())
emit
CustomNotification
(
"__i
nstance
i
nformation
c
hange
d__"
,
informationChangedVector
.
toList
());
emit
I
nstance
I
nformation
sC
hange
(
informationChangedVector
.
toList
()
.
toVector
()
);
}
QImage
NodeInstanceView
::
statePreviewImage
(
const
ModelNode
&
stateNode
)
const
...
...
@@ -969,21 +1000,21 @@ void NodeInstanceView::statePreviewImagesChanged(const StatePreviewImageChangedC
if
(
!
model
())
return
;
Q
List
<
ModelNode
>
previewImageChange
List
;
Q
Vector
<
ModelNode
>
previewImageChange
Vector
;
foreach
(
const
ImageContainer
&
container
,
command
.
previews
())
{
if
(
container
.
instanceId
()
==
0
)
{
m_baseStatePreviewImage
=
container
.
image
();
previewImageChange
List
.
append
(
rootModelNode
());
previewImageChange
Vector
.
append
(
rootModelNode
());
}
else
if
(
hasInstanceForId
(
container
.
instanceId
()))
{
ModelNode
node
=
modelNodeForInternalId
(
container
.
instanceId
());
m_statePreviewImage
.
insert
(
node
,
container
.
image
());
previewImageChange
List
.
append
(
node
);
previewImageChange
Vector
.
append
(
node
);
}
}
if
(
!
previewImageChange
List
.
isEmpty
())
emit
CustomNotification
(
"__i
nstance
p
review
i
mage
c
hanged
__"
,
previewImageChange
List
);
if
(
!
previewImageChange
Vector
.
isEmpty
())
emit
I
nstance
sP
review
I
mage
C
hanged
(
previewImageChange
Vector
);
}
void
NodeInstanceView
::
componentCompleted
(
const
ComponentCompletedCommand
&
command
)
...
...
@@ -1008,18 +1039,18 @@ void NodeInstanceView::childrenChanged(const ChildrenChangedCommand &command)
if
(
!
model
())
return
;
Q
List
<
ModelNode
>
childNode
List
;
Q
Vector
<
ModelNode
>
childNode
Vector
;
foreach
(
qint32
instanceId
,
command
.
childrenInstances
())
{
if
(
hasInstanceForId
(
instanceId
))
{
NodeInstance
instance
=
instanceForId
(
instanceId
);
instance
.
setParentId
(
command
.
parentInstanceId
());
childNode
List
.
append
(
instance
.
modelNode
());
childNode
Vector
.
append
(
instance
.
modelNode
());
}
}
if
(
!
childNode
List
.
isEmpty
())
emit
CustomNotification
(
"__i
nstance
c
hildren
c
hanged
__"
,
childNode
List
);
if
(
!
childNode
Vector
.
isEmpty
())
emit
I
nstance
sC
hildren
C
hanged
(
childNode
Vector
);
}
}
src/plugins/qmldesigner/designercore/model/abstractview.cpp
View file @
7ab575a9
...
...
@@ -403,6 +403,42 @@ void AbstractView::emitInstancesCompleted(const QVector<ModelNode> &nodeVector)
model
()
->
m_d
->
notifyInstancesCompleted
(
nodeVector
);
}
void
AbstractView
::
emitInstanceInformationsChange
(
const
QVector
<
ModelNode
>
&
nodeVector
)
{
if
(
model
()
&&
nodeInstanceView
()
==
this