philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtquick: Rename guestView to guestItem in the public API

Browse Source
This commit is contained in:
Sergio Martins
2022-06-15 20:13:42 +01:00
parent 78815664cc
commit d2aba705fb
6 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/qtquick/customtitlebar/main.cpp
View File

@@ -53,17 +53,17 @@ int main(int argc, char *argv[])
auto dw1 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #1");
dw1->setGuestView(QStringLiteral("qrc:/Guest1.qml"));
dw1->setGuestItem(QStringLiteral("qrc:/Guest1.qml"));
dw1->resize(QSize(800, 800));
dw1->show();
auto dw2 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #2");
dw2->setGuestView(QStringLiteral("qrc:/Guest2.qml"));
dw2->setGuestItem(QStringLiteral("qrc:/Guest2.qml"));
dw2->resize(QSize(800, 800));
dw2->show();
auto dw3 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #3");
dw3->setGuestView(QStringLiteral("qrc:/Guest3.qml"));
dw3->setGuestItem(QStringLiteral("qrc:/Guest3.qml"));
dw1->dockWidget()->addDockWidgetToContainingWindow(dw3->dockWidget(), KDDockWidgets::Location_OnRight);

6
examples/qtquick/dockwidgets/main.cpp
View File

@@ -94,17 +94,17 @@ int main(int argc, char *argv[])
auto dw1 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #1");
dw1->setGuestView(QStringLiteral("qrc:/Guest1.qml"));
dw1->setGuestItem(QStringLiteral("qrc:/Guest1.qml"));
dw1->resize(QSize(800, 800));
dw1->show();
auto dw2 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #2");
dw2->setGuestView(QStringLiteral("qrc:/Guest2.qml"));
dw2->setGuestItem(QStringLiteral("qrc:/Guest2.qml"));
dw2->resize(QSize(800, 800));
dw2->show();
auto dw3 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #3");
dw3->setGuestView(QStringLiteral("qrc:/Guest3.qml"));
dw3->setGuestItem(QStringLiteral("qrc:/Guest3.qml"));
dw1->dockWidget()->addDockWidgetToContainingWindow(dw3->dockWidget(), KDDockWidgets::Location_OnRight);

6
examples/qtquick/mdi/main.cpp
View File

@@ -39,15 +39,15 @@ int main(int argc, char *argv[])
appEngine.load((QUrl("qrc:/main.qml")));
auto dw1 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #1");
dw1->setGuestView(QStringLiteral("qrc:/Guest1.qml"));
dw1->setGuestItem(QStringLiteral("qrc:/Guest1.qml"));
dw1->resize(QSize(400, 400));
auto dw2 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #2");
dw2->setGuestView(QStringLiteral("qrc:/Guest2.qml"));
dw2->setGuestItem(QStringLiteral("qrc:/Guest2.qml"));
dw2->resize(QSize(400, 400));
auto dw3 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #3");
dw3->setGuestView(QStringLiteral("qrc:/Guest3.qml"));
dw3->setGuestItem(QStringLiteral("qrc:/Guest3.qml"));
auto mainAreaView = KDDockWidgets::DockRegistry::self()->mainDockingAreas().constFirst()->view();
auto mainAreaMDI = static_cast<KDDockWidgets::Views::MainWindowMDI_qtquick *>(mainAreaView);

2
src/qtquick/DockWidgetInstantiator.cpp
View File

@@ -226,7 +226,7 @@ void DockWidgetInstantiator::componentComplete()
m_dockWidget->setGuestView(Views::asQQuickWrapper(childItems.constFirst()));
} else {
auto view = this->dockWidget();
view->setGuestView(m_sourceFilename);
view->setGuestItem(m_sourceFilename);
}
if (!m_title.isEmpty())

10
src/qtquick/views/DockWidget_qtquick.cpp
View File

@@ -89,20 +89,20 @@ void DockWidget_qtquick::init()
});
}
void DockWidget_qtquick::setGuestView(const QString &qmlFilename)
void DockWidget_qtquick::setGuestItem(const QString &qmlFilename)
{
QQuickItem *guest = createItem(d->m_qmlEngine, qmlFilename);
if (!guest)
return;
setGuestView(guest);
setGuestItem(guest);
}
void DockWidget_qtquick::setGuestView(QQuickItem *widget)
void DockWidget_qtquick::setGuestItem(QQuickItem *item)
{
auto wrapper = asQQuickWrapper(widget);
auto wrapper = asQQuickWrapper(item);
wrapper->setParent(this);
makeItemFillParent(widget);
makeItemFillParent(item);
dockWidget()->setGuestView(wrapper);
}

5
src/qtquick/views/DockWidget_qtquick.h
View File

@@ -66,11 +66,10 @@ public:
~DockWidget_qtquick() override;
/// Sets the DockWidget's guest item
/// Similar to Controllers::DockWidget::setGuestView(QQuickItem*)
void setGuestView(const QString &qmlFilename);
void setGuestItem(const QString &qmlFilename);
/// @reimp
Q_INVOKABLE void setGuestView(QQuickItem *);
Q_INVOKABLE void setGuestItem(QQuickItem *);
/// @reimp
QSize minSize() const override;