diff options
Diffstat (limited to 'src')
75 files changed, 29 insertions, 180 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index 3133ba932a..ff01ccd97d 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -69,14 +69,11 @@ QPixmap QmlDesignerIconProvider::getPixmap(const QString &id) else if (id == "plus") result = Utils::Icons::PLUS_TOOLBAR.pixmap(); else if (id == "expression") - result = Icon({ - { iconPath() + QLatin1String("expression.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + result = Icon(iconPath() + "expression.png").pixmap(); else if (id == "placeholder") - result = Icon({ - { iconPath() + QLatin1String("placeholder.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + result = Icon(iconPath() + "placeholder.png").pixmap(); else if (id == "submenu") - result = Icon({ - { iconPath() + QLatin1String("submenu.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + result = Icon(iconPath() + "submenu.png").pixmap(); else if (id == "up-arrow") result = Icon({ { iconPath() + QLatin1String("up-arrow.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); diff --git a/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png Binary files differindex 1e36a168c7..ef59d89279 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png +++ b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon.png diff --git a/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon@2x.png b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon@2x.png Binary files differnew file mode 100644 index 0000000000..6540cc859c --- /dev/null +++ b/src/plugins/qmldesigner/components/itemlibrary/images/item-default-icon@2x.png diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc index c9899d2ac5..8e786cae4c 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.qrc @@ -1,7 +1,7 @@ <RCC> - <qresource prefix="/ItemLibrary" > + <qresource prefix="/ItemLibrary"> <file>images/item-default-icon.png</file> <file>images/item-invalid-icon.png</file> + <file>images/item-default-icon@2x.png</file> </qresource> </RCC> - diff --git a/src/plugins/qmldesigner/components/navigator/export_checked.png b/src/plugins/qmldesigner/components/navigator/export_checked.png Binary files differindex f0c3b230c0..98e34dd561 100644 --- a/src/plugins/qmldesigner/components/navigator/export_checked.png +++ b/src/plugins/qmldesigner/components/navigator/export_checked.png diff --git a/src/plugins/qmldesigner/components/navigator/export_checked@2x.png b/src/plugins/qmldesigner/components/navigator/export_checked@2x.png Binary files differindex 07f49a8f26..91fb221f04 100644 --- a/src/plugins/qmldesigner/components/navigator/export_checked@2x.png +++ b/src/plugins/qmldesigner/components/navigator/export_checked@2x.png diff --git a/src/plugins/qmldesigner/components/navigator/export_unchecked.png b/src/plugins/qmldesigner/components/navigator/export_unchecked.png Binary files differindex 377c97fa8a..32f052838c 100644 --- a/src/plugins/qmldesigner/components/navigator/export_unchecked.png +++ b/src/plugins/qmldesigner/components/navigator/export_unchecked.png diff --git a/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png b/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png Binary files differindex 6a309be703..05abc2ab41 100644 --- a/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png +++ b/src/plugins/qmldesigner/components/navigator/export_unchecked@2x.png diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc index 04b2667776..0ca65a7948 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc @@ -33,6 +33,10 @@ <file>images/splitview-layouts-icon-16px.png</file> <file>images/stack-layouts-icon.png</file> <file>images/stack-layouts-icon-16px.png</file> + <file>images/column-layouts-icon@2x.png</file> + <file>images/grid-layouts-icon@2x.png</file> + <file>images/row-layouts-icon@2x.png</file> + <file>images/stack-layouts-icon@2x.png</file> </qresource> <qresource prefix="/propertyEditorQmlSources/QtQuick"> <file>Controls/ButtonSpecifics.qml</file> diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png Binary files differindex 474df84f6a..9e17cc85bf 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png +++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png Binary files differindex 0e2ac31fea..a75ee209d5 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png +++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon@2x.png Binary files differnew file mode 100644 index 0000000000..c70f845e70 --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon@2x.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png Binary files differindex 1e9178ff3e..dd6ecb4632 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png +++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon@2x.png Binary files differnew file mode 100644 index 0000000000..3fca41167a --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon@2x.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png Binary files differindex 3a0f5c2186..706194278e 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png +++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png Binary files differindex 1082f43b51..df4b60327e 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png +++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon@2x.png Binary files differnew file mode 100644 index 0000000000..ffef790cdc --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon@2x.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png Binary files differindex 3f7ab00c1d..4e7b74aae3 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png +++ b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png Binary files differindex bbd6783cc5..987ef39507 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png +++ b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon@2x.png b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon@2x.png Binary files differnew file mode 100644 index 0000000000..d57cfc2a27 --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/stack-layouts-icon@2x.png diff --git a/src/plugins/qmldesigner/qmldesignericons.h b/src/plugins/qmldesigner/qmldesignericons.h index 20be7b97f5..9a16ce2b0c 100644 --- a/src/plugins/qmldesigner/qmldesignericons.h +++ b/src/plugins/qmldesigner/qmldesignericons.h @@ -38,10 +38,8 @@ const Utils::Icon ARROW_DOWN({ {QLatin1String(":/navigator/icon/arrowdown.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon ARROW_LEFT({ {QLatin1String(":/navigator/icon/arrowleft.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon EXPORT_CHECKED({ - {QLatin1String(":/navigator/icon/export_checked.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon EXPORT_UNCHECKED({ - {QLatin1String(":/navigator/icon/export_unchecked.png"), Utils::Theme::IconsBaseColor}}); +const Utils::Icon EXPORT_CHECKED(":/navigator/icon/export_checked.png"); +const Utils::Icon EXPORT_UNCHECKED(":/navigator/icon/export_unchecked.png"); const Utils::Icon SNAPPING({ {QLatin1String(":/icon/layout/snapping.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon NO_SNAPPING({ diff --git a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png Binary files differindex acd3d477af..5418a0f55a 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png Binary files differindex e8f79c6bf2..17f7ed0688 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon@2x.png Binary files differnew file mode 100644 index 0000000000..fb4fb33910 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/border-image-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png Binary files differindex b8115abab9..9e17cc85bf 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png Binary files differindex f4ee9fae81..a75ee209d5 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon@2x.png Binary files differnew file mode 100644 index 0000000000..c70f845e70 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/column-positioner-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png Binary files differindex 46e3f57183..bdc2253959 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png Binary files differindex 1f83fbbc5b..d7ab9de8a7 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon@2x.png Binary files differnew file mode 100644 index 0000000000..b28b0fa4d9 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/flickable-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png Binary files differindex 67ed96565e..099def3f5b 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png Binary files differindex c24a713908..5bb3e91da3 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon@2x.png Binary files differnew file mode 100644 index 0000000000..b2714d34b0 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/flow-positioner-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png Binary files differindex 3f6e38e4e4..0dff9a075d 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png Binary files differindex f2acc88761..50c6f75cd8 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon@2x.png Binary files differnew file mode 100644 index 0000000000..b3ffdea6eb --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/focusscope-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png Binary files differindex 8bf1fb2f5a..038a02ed86 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png Binary files differindex c30fec0422..7457fbd7e1 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon@2x.png Binary files differnew file mode 100644 index 0000000000..af233a0df3 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/grid-positioner-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png Binary files differindex 1519fe1eb1..7457fbd7e1 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png Binary files differindex c24ecd99e5..038a02ed86 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon@2x.png Binary files differnew file mode 100644 index 0000000000..af233a0df3 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/gridview-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png Binary files differindex e7a8cff471..318ce0874a 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/image-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png Binary files differindex 8bedea8594..3aa46b6106 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/image-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/image-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/image-icon@2x.png Binary files differnew file mode 100644 index 0000000000..cc84918975 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/image-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png Binary files differindex fc53d38ae7..af81cdfdb1 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/item-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png Binary files differindex 7d2d7a5050..46d3ec1dbc 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/item-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/item-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/item-icon@2x.png Binary files differnew file mode 100644 index 0000000000..f05aa57c2f --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/item-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png Binary files differindex 9c1327373d..5a2f3c203b 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png Binary files differindex 1deac24a2a..2657bf2181 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/listview-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon@2x.png Binary files differnew file mode 100644 index 0000000000..b1d3fb67d2 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/listview-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png Binary files differindex 9260c8b327..791e5f9520 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png Binary files differindex 4f7bb0cd57..f426957af3 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon@2x.png Binary files differnew file mode 100644 index 0000000000..14607fb896 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/mouse-area-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png Binary files differindex 32bb26c059..8dc82b8196 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png Binary files differindex b9b9da253b..a6a61f61b2 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon@2x.png Binary files differnew file mode 100644 index 0000000000..d654a8e7e6 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/pathview-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png Binary files differindex 4a092f1519..3997195f72 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png Binary files differindex e00eb9aef9..72893106ae 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/rect-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon@2x.png Binary files differnew file mode 100644 index 0000000000..150fa50ea2 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/rect-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png Binary files differindex 42c03d6e2c..1113e8148b 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon-16px.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png Binary files differindex f908c3d0d8..df4b60327e 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon@2x.png Binary files differnew file mode 100644 index 0000000000..ffef790cdc --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/row-positioner-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png Binary files differindex 53f10d6c9e..068ebeef0f 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png Binary files differindex da30741772..b96ed468cb 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon@2x.png Binary files differnew file mode 100644 index 0000000000..3b7cb6d5da --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-edit-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png Binary files differindex 9c90cc4403..29a81f5d6c 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png Binary files differindex b744ef0eea..ee7cc512cb 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/text-icon@2x.png Binary files differnew file mode 100644 index 0000000000..1df8f765de --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png Binary files differindex a605c16ba4..c743c22074 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png Binary files differindex 5a565d8b28..3ceef6d037 100644 --- a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon16.png diff --git a/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon@2x.png b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon@2x.png Binary files differnew file mode 100644 index 0000000000..666644d2d3 --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/images/text-input-icon@2x.png diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc index 39121e2340..5b146ece1c 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc @@ -52,5 +52,22 @@ <file>images/grid-positioner-icon-16px.png</file> <file>images/row-positioner-icon.png</file> <file>images/row-positioner-icon-16px.png</file> + <file>images/border-image-icon@2x.png</file> + <file>images/column-positioner-icon@2x.png</file> + <file>images/flickable-icon@2x.png</file> + <file>images/flow-positioner-icon@2x.png</file> + <file>images/focusscope-icon@2x.png</file> + <file>images/grid-positioner-icon@2x.png</file> + <file>images/gridview-icon@2x.png</file> + <file>images/image-icon@2x.png</file> + <file>images/item-icon@2x.png</file> + <file>images/listview-icon@2x.png</file> + <file>images/mouse-area-icon@2x.png</file> + <file>images/pathview-icon@2x.png</file> + <file>images/rect-icon@2x.png</file> + <file>images/row-positioner-icon@2x.png</file> + <file>images/text-edit-icon@2x.png</file> + <file>images/text-icon@2x.png</file> + <file>images/text-input-icon@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo index 0ae6693541..5ecfda7cef 100644 --- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo +++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo @@ -163,16 +163,7 @@ MetaInfo { ItemLibraryEntry { name: "List View" category: "Qt Quick - Views" - libraryIcon: ":/qtquickplugin/images/pathview-icon.png" - version: "1.1" - - QmlSource { source: ":/qtquickplugin/source/listview.qml" } - } - - ItemLibraryEntry { - name: "List View" - category: "Qt Quick - Views" - libraryIcon: ":/qtquickplugin/images/pathview-icon.png" + libraryIcon: ":/qtquickplugin/images/listview-icon.png" version: "2.0" QmlSource { source: ":/qtquickplugin/source/listviewv2.qml" } diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 95f5e2fb3a..f3dca3a6c0 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -1324,123 +1324,6 @@ width="100%" height="100%" /> <g - id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder"> - <rect - y="584" - x="501" - height="14" - width="14" - id="rect6661" - style="fill:#ffffff" /> - <circle - r="2" - cy="591.5" - cx="507.5" - id="path6659" - style="fill:none;stroke:#000000" /> - </g> - <g - id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu"> - <rect - y="584" - x="515" - height="14" - width="14" - id="rect6685" - style="fill:#ffffff" /> - <path - style="fill:#000000" - d="m 521.5,587 c -2.48528,0 -4.5,2.01472 -4.5,4.5 0,2.48528 2.01472,4.5 4.5,4.5 2.48528,0 4.5,-2.01472 4.5,-4.5 0,-2.48528 -2.01472,-4.5 -4.5,-4.5 z m -4,3 8,0 -4,4 z" - id="path6673" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ssssscccc" /> - </g> - <g - id="share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression"> - <rect - y="584" - x="529" - height="14" - width="14" - id="rect6738" - style="fill:#ffffff" /> - <g - transform="matrix(0.98173989,-0.19022827,0.19022827,0.98173989,-103.24469,112.42841)" - id="g6727"> - <circle - style="fill:none;stroke:#000000" - id="path6713" - cx="534" - cy="594" - r="2.5" /> - <rect - style="fill:#000000" - id="rect6715" - width="1" - height="1.5" - x="533.5" - y="590" - inkscape:transform-center-y="-3.25" /> - <use - x="0" - y="0" - xlink:href="#rect6715" - inkscape:transform-center-y="-1.6249936" - id="use6717" - transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" - width="100%" - height="100%" - inkscape:transform-center-x="2.814585" /> - <use - x="0" - y="0" - xlink:href="#use6717" - inkscape:transform-center-x="2.8145807" - inkscape:transform-center-y="1.6250117" - id="use6719" - transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" - width="100%" - height="100%" /> - <use - x="0" - y="0" - xlink:href="#use6719" - inkscape:transform-center-y="3.2500106" - id="use6721" - transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" - width="100%" - height="100%" /> - <use - x="0" - y="0" - xlink:href="#use6721" - inkscape:transform-center-y="1.6250042" - id="use6723" - transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" - width="100%" - height="100%" - inkscape:transform-center-x="-2.8145849" /> - <use - x="0" - y="0" - xlink:href="#use6723" - inkscape:transform-center-x="-2.8145806" - inkscape:transform-center-y="-1.625001" - id="use6725" - transform="matrix(0.5,-0.8660254,0.8660254,0.5,-247.41909,759.45757)" - width="100%" - height="100%" /> - </g> - <use - height="100%" - width="100%" - transform="matrix(0.99010264,-0.14034516,0.14034516,0.99010264,-74.079837,74.823351)" - id="use6736" - xlink:href="#g6727" - y="0" - x="0" /> - </g> - <g id="src/libs/qmleditorwidgets/images/checkbox_indicator" transform="translate(-26,0)"> <rect @@ -4180,47 +4063,6 @@ id="path6788-2" /> </g> <g - transform="translate(378,268)" - style="display:inline" - id="src/plugins/qmldesigner/components/navigator/export_checked"> - <rect - id="rect6774-6" - height="16" - width="16" - y="300" - x="350" - style="fill:#ffffff;fill-opacity:1" /> - <path - style="fill:#000000;fill-opacity:1" - d="m 619,570 0,3 1,0 0,-2 10,0 0,11 -10,0 0,-2 -1,0 0,3 12,0 0,-13 -12,0 z m -2,4 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 5,0 0,-1 -5,0 z m 0,2 0,1 5,0 0,-1 -5,0 z" - transform="translate(-266,-268)" - id="polygon6766-5" - inkscape:connector-curvature="0" /> - </g> - <g - id="src/plugins/qmldesigner/components/navigator/export_unchecked" - transform="translate(394,268)"> - <rect - style="fill:#ffffff;fill-opacity:1" - x="350" - y="300" - width="16" - height="16" - id="rect7336" /> - <path - style="fill:#000000" - d="m 354,303 10,0 0,11 -10,0 z m -1,12 12,0 0,-13 -12,0 z" - id="path7346" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccccccccc" /> - <path - id="path7338" - style="opacity:0.5;fill:#000000;fill-opacity:1" - d="m 354,310 0,1 5,0 0,-1 z m 0,-2 0,1 5,0 0,-1 z m 0,-2 0,1 5,0 0,-1 z" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccccccccccc" /> - </g> - <g transform="translate(710,268)" style="display:inline" id="src/plugins/qmldesigner/components/formeditor/no_snapping"> |