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

QmlDesigner: Set object names on QQuickViews

Browse Source 
Change-Id: Icf2af2967a89b62e3328f7d523b8fc46f580314e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2023-02-03 10:36:14 +01:00
parent f766c2f5dc
commit 84d3fdc753
15 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
View File

@@ -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");

1
src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
View File

@@ -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));

2
src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp
View File

@@ -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;
}

1
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -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");

1
src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp
View File

@@ -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));

1
src/plugins/qmldesigner/components/materialeditor/materialeditorqmlbackend.cpp
View File

@@ -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);

3
src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp
View File

@@ -3,6 +3,8 @@
#include "quick2propertyeditorview.h"
#include <qmldesignerconstants.h>
#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",

1
src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
View File

@@ -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);

1
src/plugins/qmldesigner/components/textureeditor/textureeditorqmlbackend.cpp
View File

@@ -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);

5
src/plugins/qmldesigner/components/toolbar/toolbar.cpp
View File

@@ -5,6 +5,7 @@
#include "toolbarbackend.h"
#include <theme.h>
#include <qmldesignerconstants.h>
#include <coreplugin/icore.h>
#include <utils/filepath.h>
@@ -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");

16
src/plugins/qmldesigner/qmldesignerconstants.h
View File

@@ -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 };
}

1
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -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();

2
src/plugins/qmlprojectmanager/qdslandingpage.cpp
View File

@@ -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");

2
src/plugins/studiowelcome/qdsnewdialog.cpp
View File

@@ -11,6 +11,7 @@
#include <utils/qtcassert.h>
#include <qmldesigner/components/componentcore/theme.h>
#include <qmldesigner/qmldesignerconstants.h>
#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());

4
src/plugins/studiowelcome/studiowelcomeplugin.cpp
View File

@@ -27,6 +27,7 @@
#include <qmldesigner/components/componentcore/theme.h>
#include <qmldesigner/dynamiclicensecheck.h>
#include <qmldesigner/qmldesignerconstants.h>
#include <qmldesigner/qmldesignerplugin.h>
#include <utils/checkablemessagebox.h>
@@ -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");