diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml index b7b807b5f7a..054c807ec4f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml @@ -30,11 +30,24 @@ import QtQuick.Controls.Styles 1.1 CheckBoxStyle { spacing: 24 label: Controls.Label { text: control.text ; color: checkBox.textColor } - indicator: Item { + indicator: Item { implicitWidth: 16 implicitHeight: 16 - Image { source: "qrc:qmldesigner/images/checkbox_" + - (control.checked ? "checked": "unchecked") + - (control.pressed ? "_pressed": "") + ".png" } + Rectangle { + anchors.fill: parent + color: control.pressed + ? creatorTheme.FancyToolButtonHoverColor + : creatorTheme.FancyToolButtonSelectedColor + border.color: creatorTheme.QmlDesignerBackgroundColorDarker + anchors.margins: 1 + } + Image { + x: 2 + y: 2 + width: 14 + height: 13 + source: "image://icons/checkbox-indicator" + visible: control.checked + } } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml index 66c6ae46913..56c651859bc 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml @@ -165,16 +165,28 @@ Controls.TextField { style: CheckBoxStyle { spacing: 8 - indicator: Item { - implicitWidth: 16 - implicitHeight: 16 + indicator: Item { + implicitWidth: 15 + implicitHeight: 15 x: 7 y: 1 - Image { source: "qrc:qmldesigner/images/checkbox_tr_" + - (control.checked ? "checked": "unchecked") + - (control.pressed ? "_pressed": "") + ".png" } + Rectangle { + anchors.fill: parent + border.color: creatorTheme.QmlDesignerBackgroundColorDarker + color: control.pressed + ? creatorTheme.QmlDesignerBackgroundColorLighter + : creatorTheme.FancyToolButtonHoverColor + opacity: control.hovered || control.pressed ? 1 : 0.75 + } + Image { + x: 1 + y: 1 + width: 13 + height: 13 + source: "image://icons/tr" + opacity: control.checked ? 1 : 0.3; + } } - } //control.pressed ? "qrc:qmldesigner/images/checkbox_unchecked_pressed.png" : - + } } } diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked.png b/src/libs/qmleditorwidgets/images/checkbox_checked.png deleted file mode 100644 index 519914fc191..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_checked.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked@2x.png b/src/libs/qmleditorwidgets/images/checkbox_checked@2x.png deleted file mode 100644 index 0e91c4e3c86..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_checked@2x.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png deleted file mode 100644 index ace0d06520c..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_checked_pressed.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_checked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_checked_pressed@2x.png deleted file mode 100644 index ce4111e2bf4..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_checked_pressed@2x.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_indicator.png b/src/libs/qmleditorwidgets/images/checkbox_indicator.png new file mode 100644 index 00000000000..8af2814a9de Binary files /dev/null and b/src/libs/qmleditorwidgets/images/checkbox_indicator.png differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_indicator@2x.png b/src/libs/qmleditorwidgets/images/checkbox_indicator@2x.png new file mode 100644 index 00000000000..95b705ba4e1 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/checkbox_indicator@2x.png differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked.png deleted file mode 100644 index c5b7cba8378..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_tr_checked.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked@2x.png deleted file mode 100644 index e4cef9dfa34..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_tr_checked@2x.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png deleted file mode 100644 index 818a51da847..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed@2x.png deleted file mode 100644 index aecb2905208..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_tr_checked_pressed@2x.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png deleted file mode 100644 index b62b894fc2c..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked@2x.png deleted file mode 100644 index e45da33a2ad..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked@2x.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png deleted file mode 100644 index 1710037c9c2..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed@2x.png deleted file mode 100644 index 6d5cc5bd413..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_tr_unchecked_pressed@2x.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked.png deleted file mode 100644 index dd9cffac463..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_unchecked.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked@2x.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked@2x.png deleted file mode 100644 index f135be2287f..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_unchecked@2x.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png deleted file mode 100644 index 2358860d58d..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed@2x.png b/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed@2x.png deleted file mode 100644 index a2c2661fe01..00000000000 Binary files a/src/libs/qmleditorwidgets/images/checkbox_unchecked_pressed@2x.png and /dev/null differ diff --git a/src/libs/qmleditorwidgets/images/tr.png b/src/libs/qmleditorwidgets/images/tr.png new file mode 100644 index 00000000000..e7f32287c70 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/tr.png differ diff --git a/src/libs/qmleditorwidgets/images/tr@2x.png b/src/libs/qmleditorwidgets/images/tr@2x.png new file mode 100644 index 00000000000..05a8af903c1 Binary files /dev/null and b/src/libs/qmleditorwidgets/images/tr@2x.png differ diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 3c0b730732c..f43e57dd288 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -1,21 +1,9 @@ - images/checkbox_checked.png - images/checkbox_checked@2x.png - images/checkbox_checked_pressed.png - images/checkbox_checked_pressed@2x.png - images/checkbox_unchecked.png - images/checkbox_unchecked@2x.png - images/checkbox_unchecked_pressed.png - images/checkbox_unchecked_pressed@2x.png - images/checkbox_tr_checked.png - images/checkbox_tr_checked@2x.png - images/checkbox_tr_checked_pressed.png - images/checkbox_tr_checked_pressed@2x.png - images/checkbox_tr_unchecked.png - images/checkbox_tr_unchecked@2x.png - images/checkbox_tr_unchecked_pressed.png - images/checkbox_tr_unchecked_pressed@2x.png + images/checkbox_indicator.png + images/checkbox_indicator@2x.png + images/tr.png + images/tr@2x.png images/lock.png images/hole.png images/scrollbar-borderimage-horizontal.png diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp index 04db689f4c1..053bf1c240f 100644 --- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp +++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp @@ -25,6 +25,8 @@ #include "qmldesignericonprovider.h" +#include + #include #include @@ -47,42 +49,37 @@ QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, c { Q_UNUSED(requestedSize) - static Utils::Icon UP_ARROW({ - { iconPath() + QLatin1String("up-arrow.png"), Utils::Theme::IconsBaseColor}}); - - static Utils::Icon DOWN_ARROW({ - { iconPath() + QLatin1String("down-arrow.png"), Utils::Theme::IconsBaseColor}}); - - static Utils::Icon PLACEHOLDER({ - { iconPath() + QLatin1String("placeholder.png"), Utils::Theme::IconsBaseColor}}); - - static Utils::Icon EXPRESSION({ - { iconPath() + QLatin1String("expression.png"), Utils::Theme::IconsBaseColor}}); - - static Utils::Icon SUBMENU({ - { iconPath() + QLatin1String("submenu.png"), Utils::Theme::IconsBaseColor}}); + using namespace Utils; QPixmap result; if (id == "close") result = Core::Icons::CLOSE_TOOLBAR.pixmap(); - else if (id == "plus") result = Core::Icons::PLUS.pixmap(); else if (id == "expression") - result = EXPRESSION.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("expression.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "placeholder") - result = PLACEHOLDER.pixmap(); - else if (id == "expression") - result = EXPRESSION.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("placeholder.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "submenu") - result = SUBMENU.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("submenu.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "up-arrow") - result = UP_ARROW.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("up-arrow.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else if (id == "down-arrow") - result = DOWN_ARROW.pixmap(); + result = Icon({ + { iconPath() + QLatin1String("down-arrow.png"), Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "checkbox-indicator") + result = Icon({ + { ":/qmldesigner/images/checkbox_indicator.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); + else if (id == "tr") + result = Icon({ + { ":/qmldesigner/images/tr.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); else - qWarning() << Q_FUNC_INFO << "Image not found."; + qWarning() << Q_FUNC_INFO << "Image not found:" << id; if (size) *size = result.size(); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index ef2b3bbce2b..b39d8ed2490 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -18,41 +18,6 @@ sodipodi:docname="qtcreatoricons.svg"> - - - - - - - - - - - - @@ -590,33 +555,6 @@ x="141" y="408" /> - - - @@ -1479,13 +1417,6 @@ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:nodetypes="cc" /> - - + - - - - - - + d="m 571.87109,590.50735 1.5,-1.5 c 0.62624,0.82304 1.36869,1.69471 2.11049,3.5 0.88951,-2.5 2.40793,-5.00735 7.51842,-8.50735 -4,4.5 -5.5625,7.125 -6.0625,10.625 l -2.28125,1.84375" + style="fill:#000000" + id="path4396" /> - - - - - - - - - - - - - + id="src/libs/qmleditorwidgets/images/tr" + transform="translate(-25,0)"> + - - - - + d="m 593.78663,588.98601 -0.3052,1.56048 -0.55626,0 c 0.01,-0.0689 0.0148,-0.13292 0.0148,-0.19199 0,-0.18378 -0.0394,-0.32653 -0.11814,-0.42827 -0.10502,-0.13784 -0.28223,-0.20675 -0.53165,-0.20675 -0.38068,0 -0.71378,0.16737 -0.9993,0.50211 -0.2855,0.33474 -0.44149,0.57814 -0.55636,1.17214 L 590.61539,594 l -1.74261,0 0.3926,-4.01028 -0.79747,0 0.17951,-0.98972 2.54009,0 -0.17722,0.97546 c 0.23957,-0.36428 0.51688,-0.63338 0.83193,-0.80731 0.31505,-0.17722 0.67604,-0.26583 1.08298,-0.26583 0.10174,0 0.22316,0.008 0.36428,0.0246 0.1444,0.0131 0.31012,0.0328 0.49718,0.0591 z M 583.624,589.98972 583.80351,589 l 0.86858,0 0.27086,-2 1.74261,0 -0.27085,2 1.34169,0 -0.17952,0.98972 -1.34169,0 c -0.0466,1.08737 -0.26951,2.07452 -0.31112,3.151 0,0.0886 0.008,0.1526 0.0246,0.19198 0.0525,0.11158 0.17396,0.16737 0.36427,0.16737 0.21003,0 0.37905,-0.0706 0.50704,-0.21167 0.12799,-0.14112 0.2248,-0.35936 0.29043,-0.65472 l 0.73348,0 c -0.13127,0.52509 -0.34623,0.89429 -0.64487,1.1076 -0.29864,0.21003 -0.76301,0.31505 -1.39311,0.31505 -0.71871,0 -1.18472,-0.11322 -1.39803,-0.33966 -0.13783,-0.1444 -0.20675,-0.36756 -0.20675,-0.66948 l 0.3299,-3.03691 z" + style="fill:#000000" + id="path4400" />