From 84d3fdc75388ebdd6e72108e9cf329c6368b299b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 3 Feb 2023 10:36:14 +0100 Subject: [PATCH] QmlDesigner: Set object names on QQuickViews Change-Id: Icf2af2967a89b62e3328f7d523b8fc46f580314e Reviewed-by: Qt CI Bot Reviewed-by: Tim Jenssen --- .../assetslibrary/assetslibrarywidget.cpp | 1 + .../contentlibrary/contentlibrarywidget.cpp | 1 + .../components/edit3d/edit3dcanvas.cpp | 2 ++ .../components/itemlibrary/itemlibrarywidget.cpp | 1 + .../materialbrowser/materialbrowserwidget.cpp | 1 + .../materialeditor/materialeditorqmlbackend.cpp | 1 + .../propertyeditor/quick2propertyeditorview.cpp | 3 +++ .../stateseditornew/stateseditorwidget.cpp | 1 + .../textureeditor/textureeditorqmlbackend.cpp | 1 + .../qmldesigner/components/toolbar/toolbar.cpp | 5 +++++ src/plugins/qmldesigner/qmldesignerconstants.h | 16 ++++++++++++++++ src/plugins/qmldesigner/qmldesignerplugin.cpp | 1 + src/plugins/qmlprojectmanager/qdslandingpage.cpp | 2 ++ src/plugins/studiowelcome/qdsnewdialog.cpp | 2 ++ .../studiowelcome/studiowelcomeplugin.cpp | 4 ++++ 15 files changed, 42 insertions(+) diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp index 6ee29fdec02..7fa8f6c58f7 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp @@ -111,6 +111,7 @@ AssetsLibraryWidget::AssetsLibraryWidget(AsynchronousImageCache &asynchronousFon "over the lazy dog\n" "1234567890")}); // create assets widget + m_assetsWidget->setObjectName(Constants::OBJECT_NAME_ASSET_LIBRARY); m_assetsWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); Theme::setupTheme(m_assetsWidget->engine()); m_assetsWidget->engine()->addImportPath(propertyEditorResourcesPath() + "/imports"); diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp index fccc1275e7b..75f816002d7 100644 --- a/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp @@ -94,6 +94,7 @@ ContentLibraryWidget::ContentLibraryWidget() setWindowTitle(tr("Content Library", "Title of content library widget")); setMinimumWidth(120); + m_quickWidget->setObjectName(Constants::OBJECT_NAME_CONTENT_LIBRARY); m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); m_quickWidget->engine()->addImportPath(propertyEditorResourcesPath() + "/imports"); m_quickWidget->setClearColor(Theme::getColor(Theme::Color::DSpanelBackground)); diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp index 7cc837026a7..7630ba7a593 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp @@ -35,6 +35,8 @@ static QQuickWidget *createBusyIndicator(QWidget *p) widget->setAttribute(Qt::WA_AlwaysStackOnTop); widget->setClearColor(Qt::transparent); widget->setResizeMode(QQuickWidget::SizeRootObjectToView); + widget->setObjectName(Constants::OBJECT_NAME_BUSY_INDICATOR); + return widget; } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 484cd1c28a9..ff9ff10c739 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -134,6 +134,7 @@ ItemLibraryWidget::ItemLibraryWidget(AsynchronousImageCache &imageCache) setMinimumWidth(100); // set up Component Library view and model + m_itemsWidget->setObjectName(Constants::OBJECT_NAME_COMPONENT_LIBRARY); m_itemsWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); m_itemsWidget->engine()->addImportPath(propertyEditorResourcesPath() + "/imports"); diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp index b506e5398d1..682d12fc1be 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp @@ -164,6 +164,7 @@ MaterialBrowserWidget::MaterialBrowserWidget(AsynchronousImageCache &imageCache, m_context->setContext(context); m_context->setWidget(this); + m_quickWidget->setObjectName(Constants::OBJECT_NAME_MATERIAL_BROWSER); m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); m_quickWidget->engine()->addImportPath(propertyEditorResourcesPath() + "/imports"); m_quickWidget->setClearColor(Theme::getColor(Theme::Color::DSpanelBackground)); diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp index 4ac5d5b300e..3f678add3a6 100644 --- a/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp @@ -84,6 +84,7 @@ MaterialEditorQmlBackend::MaterialEditorQmlBackend(MaterialEditorView *materialE , m_contextObject(new MaterialEditorContextObject(m_view->rootContext())) , m_materialEditorImageProvider(new MaterialEditorImageProvider()) { + m_view->setObjectName(Constants::OBJECT_NAME_MATERIAL_EDITOR); m_view->setResizeMode(QQuickWidget::SizeRootObjectToView); m_view->engine()->addImportPath(propertyEditorResourcesPath() + "/imports"); m_view->engine()->addImageProvider("materialEditor", m_materialEditorImageProvider); diff --git a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp index 9194bfa7150..d952a8ed808 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp @@ -3,6 +3,8 @@ #include "quick2propertyeditorview.h" +#include + #include "aligndistribute.h" #include "assetimageprovider.h" #include "annotationeditor/annotationeditor.h" @@ -30,6 +32,7 @@ namespace QmlDesigner { Quick2PropertyEditorView::Quick2PropertyEditorView(AsynchronousImageCache &imageCache) : QQuickWidget() { + setObjectName(Constants::OBJECT_NAME_PROPERTY_EDITOR); setResizeMode(QQuickWidget::SizeRootObjectToView); Theme::setupTheme(engine()); engine()->addImageProvider("qmldesigner_thumbnails", diff --git a/src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp index c47f19e4cb2..08f7e6dcc1c 100644 --- a/src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp @@ -109,6 +109,7 @@ StatesEditorWidget::StatesEditorWidget(StatesEditorView *statesEditorView, m_qmlSourceUpdateShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_F10), this); connect(m_qmlSourceUpdateShortcut, &QShortcut::activated, this, &StatesEditorWidget::reloadQmlSource); + setObjectName(Constants::OBJECT_NAME_STATES_EDITOR); setResizeMode(QQuickWidget::SizeRootObjectToView); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); diff --git a/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp index 56f64eb17cb..1b12b04eb8c 100644 --- a/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp @@ -51,6 +51,7 @@ TextureEditorQmlBackend::TextureEditorQmlBackend(TextureEditorView *textureEdito defaultImage.load(Utils::StyleHelper::dpiSpecificImageFile(":/textureeditor/images/texture_default.png")); m_textureEditorImageProvider = new AssetImageProvider(imageCache, defaultImage); m_view->setResizeMode(QQuickWidget::SizeRootObjectToView); + m_view->setObjectName(Constants::OBJECT_NAME_TEXTURE_EDITOR); m_view->engine()->addImportPath(propertyEditorResourcesPath() + "/imports"); m_view->engine()->addImageProvider("qmldesigner_thumbnails", m_textureEditorImageProvider); m_contextObject->setBackendValues(&m_backendValuesPropertyMap); diff --git a/src/plugins/qmldesigner/components/toolbar/toolbar.cpp b/src/plugins/qmldesigner/components/toolbar/toolbar.cpp index 27c304fb4df..7863d6dd015 100644 --- a/src/plugins/qmldesigner/components/toolbar/toolbar.cpp +++ b/src/plugins/qmldesigner/components/toolbar/toolbar.cpp @@ -5,6 +5,7 @@ #include "toolbarbackend.h" #include +#include #include #include @@ -72,6 +73,8 @@ void ToolBar::create() quickWidget->setMinimumWidth(200); quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); + quickWidget->setObjectName(Constants::OBJECT_NAME_TOP_TOOLBAR); + quickWidget->engine()->addImportPath(propertyEditorResourcesPath().toString() + "/imports"); Utils::FilePath qmlFilePath = qmlSourcesPath() / "Main.qml"; @@ -99,6 +102,8 @@ void ToolBar::createStatusBar() quickWidget->setMinimumWidth(200); quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); + quickWidget->setObjectName(Constants::OBJECT_NAME_STATUSBAR); + quickWidget->engine()->addImportPath(propertyEditorResourcesPath().toString() + "/imports"); Utils::FilePath qmlFilePath = qmlSourcesStatusBarPath() + QStringLiteral("/Main.qml"); diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h index 9c0e0b2b1e9..2158c8e32a4 100644 --- a/src/plugins/qmldesigner/qmldesignerconstants.h +++ b/src/plugins/qmldesigner/qmldesignerconstants.h @@ -142,6 +142,22 @@ const char PROPERTY_EDITOR_CLASSNAME_PROPERTY[] = "__classNamePrivateInternal"; // Copy/Paste Headers const char HEADER_3DPASTE_CONTENT[] = "// __QmlDesigner.Editor3D.Paste__ \n"; +const char OBJECT_NAME_ASSET_LIBRARY[] = "QQuickWidgetAssetLibrary"; +const char OBJECT_NAME_CONTENT_LIBRARY[] = "QQuickWidgetContentLibrary"; +const char OBJECT_NAME_BUSY_INDICATOR[] = "QQuickWidgetBusyIndicator"; +const char OBJECT_NAME_COMPONENT_LIBRARY[] = "QQuickWidgetComponentLibrary"; +const char OBJECT_NAME_MATERIAL_BROWSER[] = "QQuickWidgetMaterialBrowser"; +const char OBJECT_NAME_MATERIAL_EDITOR[] = "QQuickWidgetMaterialEditor"; +const char OBJECT_NAME_PROPERTY_EDITOR[] = "QQuickWidgetPropertyEditor"; +const char OBJECT_NAME_STATES_EDITOR[] = "QQuickWidgetStatesEditor"; +const char OBJECT_NAME_TEXTURE_EDITOR[] = "QQuickWidgetTextureEditor"; +const char OBJECT_NAME_TOP_TOOLBAR[] = "QQuickWidgetTopToolbar"; +const char OBJECT_NAME_STATUSBAR[] = "QQuickWidgetStatusbar"; +const char OBJECT_NAME_TOP_FEEDBACK[] = "QQuickWidgetQDSFeedback"; +const char OBJECT_NAME_NEW_DIALOG[] = "QQuickWidgetQDSNewDialog"; +const char OBJECT_NAME_SPLASH_SCREEN[] = "QQuickWidgetSplashScreen"; +const char OBJECT_NAME_WELCOME_PAGE[] = "QQuickWidgetQDSWelcomePage"; + namespace Internal { enum { debug = 0 }; } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 89e4f25dce3..6bd489e1d41 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -730,6 +730,7 @@ void QmlDesignerPlugin::trackWidgetFocusTime(QWidget *widget, const QString &ide void QmlDesignerPlugin::lauchFeedbackPopup(const QString &identifier) { m_feedbackWidget = new QQuickWidget(Core::ICore::dialogParent()); + m_feedbackWidget->setObjectName(Constants::OBJECT_NAME_TOP_FEEDBACK); const QString qmlPath = Core::ICore::resourcePath("qmldesigner/feedback/FeedbackPopup.qml").toString(); diff --git a/src/plugins/qmlprojectmanager/qdslandingpage.cpp b/src/plugins/qmlprojectmanager/qdslandingpage.cpp index d710afc4b90..56850b9a711 100644 --- a/src/plugins/qmlprojectmanager/qdslandingpage.cpp +++ b/src/plugins/qmlprojectmanager/qdslandingpage.cpp @@ -23,6 +23,7 @@ namespace QmlProjectManager { namespace Internal { const char INSTALL_QDS_URL[] = "https://www.qt.io/product/ui-design-tools"; +const char OBJECT_NAME_LANDING_PAGE[] = "QQuickWidgetQDSLandingPage"; QdsLandingPageWidget::QdsLandingPageWidget(QWidget* parent) : QWidget(parent) @@ -50,6 +51,7 @@ QQuickWidget *QdsLandingPageWidget::widget() QdsLandingPageTheme::setupTheme(m_widget->engine()); m_widget->setResizeMode(QQuickWidget::SizeRootObjectToView); + m_widget->setObjectName(OBJECT_NAME_LANDING_PAGE); m_widget->engine()->addImportPath(landingPath + "/imports"); m_widget->engine()->addImportPath(resourcePath); m_widget->engine()->addImportPath("qrc:/studiofonts"); diff --git a/src/plugins/studiowelcome/qdsnewdialog.cpp b/src/plugins/studiowelcome/qdsnewdialog.cpp index dd945f9ee29..112540230e0 100644 --- a/src/plugins/studiowelcome/qdsnewdialog.cpp +++ b/src/plugins/studiowelcome/qdsnewdialog.cpp @@ -11,6 +11,7 @@ #include #include +#include #include "createproject.h" #include "newprojectdialogimageprovider.h" @@ -61,6 +62,7 @@ QdsNewDialog::QdsNewDialog(QWidget *parent) m_recentsStore.setReverseOrder(); m_recentsStore.setMaximum(10); + m_dialog->setObjectName(QmlDesigner::Constants::OBJECT_NAME_NEW_DIALOG); m_dialog->setResizeMode(QQuickWidget::SizeRootObjectToView); // SizeViewToRootObject m_dialog->engine()->addImageProvider(QStringLiteral("newprojectdialog_library"), new Internal::NewProjectDialogImageProvider()); diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index 49cfb3c7161..5e6a2860b07 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -569,11 +570,13 @@ void StudioWelcomePlugin::extensionsInitialized() s_viewWindow->show(); s_viewWindow->requestActivate(); + s_viewWindow->setObjectName(QmlDesigner::Constants::OBJECT_NAME_SPLASH_SCREEN); } else { s_viewWidget = new QQuickWidget(Core::ICore::dialogParent()); s_viewWidget->setWindowFlag(Qt::SplashScreen, true); + s_viewWidget->setObjectName(QmlDesigner::Constants::OBJECT_NAME_SPLASH_SCREEN); s_viewWidget->setWindowModality(Qt::ApplicationModal); s_viewWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); s_viewWidget->engine()->addImportPath("qrc:/studiofonts"); @@ -790,6 +793,7 @@ void WelcomeMode::createQuickWidget() m_quickWidget = new QQuickWidget; m_quickWidget->setMinimumSize(640, 480); m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); + m_quickWidget->setObjectName(QmlDesigner::Constants::OBJECT_NAME_WELCOME_PAGE); QmlDesigner::Theme::setupTheme(m_quickWidget->engine()); m_quickWidget->engine()->addImportPath("qrc:/studiofonts");