feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	.github/workflows/build_cmake.yml
	src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
	src/plugins/qmldesigner/designercore/model/model.cpp

Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
This commit is contained in:
Eike Ziller
2022-09-13 11:15:16 +02:00
parent fbd4775f89 67408ac183
commit 5ae23f8c66
73 changed files with 2547 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp
View File

@@ -28,7 +28,7 @@ ConnectionView::ConnectionView(QObject *parent) : AbstractView(parent),
m_connectionViewWidget(new ConnectionViewWidget()),
m_connectionModel(new ConnectionModel(this)),
m_bindingModel(new BindingModel(this)),
m_dynamicPropertiesModel(new DynamicPropertiesModel(this)),
m_dynamicPropertiesModel(new DynamicPropertiesModel(false, this)),
m_backendModel(new BackendModel(this))
{
connectionViewWidget()->setBindingModel(m_bindingModel);
@@ -43,7 +43,7 @@ void ConnectionView::modelAttached(Model *model)
{
AbstractView::modelAttached(model);
bindingModel()->selectionChanged(QList<ModelNode>());
dynamicPropertiesModel()->selectionChanged(QList<ModelNode>());
dynamicPropertiesModel()->reset();
connectionModel()->resetModel();
connectionViewWidget()->resetItemViews();
backendModel()->resetModel();
@@ -53,7 +53,7 @@ void ConnectionView::modelAboutToBeDetached(Model *model)
{
AbstractView::modelAboutToBeDetached(model);
bindingModel()->selectionChanged(QList<ModelNode>());
dynamicPropertiesModel()->selectionChanged(QList<ModelNode>());
dynamicPropertiesModel()->reset();
connectionModel()->resetModel();
connectionViewWidget()->resetItemViews();
}
@@ -99,7 +99,7 @@ void ConnectionView::propertiesAboutToBeRemoved(const QList<AbstractProperty> &p
bindingModel()->bindingRemoved(property.toBindingProperty());
dynamicPropertiesModel()->bindingRemoved(property.toBindingProperty());
} else if (property.isVariantProperty()) {
//### dynamicPropertiesModel->bindingRemoved(property.toVariantProperty());
dynamicPropertiesModel()->variantRemoved(property.toVariantProperty());
} else if (property.isSignalHandlerProperty()) {
connectionModel()->removeRowFromTable(property.toSignalHandlerProperty());
}
@@ -145,7 +145,7 @@ void ConnectionView::selectedNodesChanged(const QList<ModelNode> & selectedNodeL
const QList<ModelNode> & /*lastSelectedNodeList*/)
{
bindingModel()->selectionChanged(selectedNodeList);
dynamicPropertiesModel()->selectionChanged(selectedNodeList);
dynamicPropertiesModel()->reset();
connectionViewWidget()->bindingTableViewSelectionChanged(QModelIndex(), QModelIndex());
connectionViewWidget()->dynamicPropertiesTableViewSelectionChanged(QModelIndex(), QModelIndex());
@@ -184,6 +184,11 @@ void ConnectionView::importsChanged(const QList<Import> & /*addedImports*/, cons
backendModel()->resetModel();
}
void ConnectionView::currentStateChanged(const ModelNode &node)
{
dynamicPropertiesModel()->reset();
}
WidgetInfo ConnectionView::widgetInfo()
{
return createWidgetInfo(m_connectionViewWidget.data(),