diff options
1734 files changed, 5389 insertions, 1218 deletions
@@ -21,6 +21,8 @@ /examples/quickcontrols2/contactlist/contactlist /examples/quickcontrols2/flatstyle/flatstyle /examples/quickcontrols2/gallery/gallery +/examples/quickcontrols2/imagine/automotive/automotive +/examples/quickcontrols2/imagine/musicplayer/musicplayer /examples/quickcontrols2/sidepanel/sidepanel /examples/quickcontrols2/swipetoremove/swipetoremove /examples/quickcontrols2/texteditor/texteditor diff --git a/examples/quickcontrols2/imagine/automotive/automotive.cpp b/examples/quickcontrols2/imagine/automotive/automotive.cpp new file mode 100644 index 00000000..63cc702d --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/automotive.cpp @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QGuiApplication> +#include <QQmlApplicationEngine> +#include <QQmlContext> +#include <QSettings> +#include <QQuickStyle> +#include <QIcon> + +int main(int argc, char *argv[]) +{ + QGuiApplication::setApplicationName("Automotive"); + QGuiApplication::setOrganizationName("QtProject"); + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + + QGuiApplication app(argc, argv); + + QIcon::setThemeName("automotive"); + + QQmlApplicationEngine engine; + engine.load(QUrl("qrc:/qml/automotive.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + + return app.exec(); +} diff --git a/examples/quickcontrols2/imagine/automotive/automotive.pro b/examples/quickcontrols2/imagine/automotive/automotive.pro new file mode 100644 index 00000000..890e63d8 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/automotive.pro @@ -0,0 +1,15 @@ +TEMPLATE = app +TARGET = automotive +QT += quick quickcontrols2 + +SOURCES += \ + automotive.cpp + +RESOURCES += \ + icons/icons.qrc \ + imagine-assets/imagine-assets.qrc \ + qml/qml.qrc \ + qtquickcontrols2.conf + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/imagine/automotive +INSTALLS += target diff --git a/examples/quickcontrols2/imagine/automotive/doc/images/qtquickcontrols2-automotive.png b/examples/quickcontrols2/imagine/automotive/doc/images/qtquickcontrols2-automotive.png Binary files differnew file mode 100644 index 00000000..93ea2854 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/doc/images/qtquickcontrols2-automotive.png diff --git a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc new file mode 100644 index 00000000..2107e6ab --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example automotive + \title Qt Quick Controls 2 - Imagine Style Example: Automotive + \ingroup qtquickcontrols2-examples + \brief An automotive user interface using custom Imagine style assets. + + This example demonstrates how custom Imagine style assets can be used to + style an automotive user interface. + + \image qtquickcontrols2-automotive.png + + \include examples-run.qdocinc +*/ diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/air-con.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/air-con.png Binary files differnew file mode 100644 index 00000000..70175f6f --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/air-con.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/command.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/command.png Binary files differnew file mode 100644 index 00000000..8f712c78 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/command.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/message.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/message.png Binary files differnew file mode 100644 index 00000000..7773ca63 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/message.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/music.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/music.png Binary files differnew file mode 100644 index 00000000..dc73322b --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/music.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/seats.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/seats.png Binary files differnew file mode 100644 index 00000000..2f9eaa62 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/seats.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/settings.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/settings.png Binary files differnew file mode 100644 index 00000000..b65598b5 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/settings.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/statistics.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/statistics.png Binary files differnew file mode 100644 index 00000000..97970298 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/statistics.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/windows.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/windows.png Binary files differnew file mode 100644 index 00000000..8ed8cec4 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44/windows.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png Binary files differnew file mode 100644 index 00000000..8822979e --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/air-con.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png Binary files differnew file mode 100644 index 00000000..918e2b69 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/command.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png Binary files differnew file mode 100644 index 00000000..1debfdfb --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/message.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png Binary files differnew file mode 100644 index 00000000..01a3ece4 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/music.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png Binary files differnew file mode 100644 index 00000000..3a18fb5f --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/navigation.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png Binary files differnew file mode 100644 index 00000000..7d67f1be --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/seats.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png Binary files differnew file mode 100644 index 00000000..3ce2a1f1 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/settings.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png Binary files differnew file mode 100644 index 00000000..afc2cc09 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/statistics.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png Binary files differnew file mode 100644 index 00000000..59bac584 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/44x44@2/windows.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/icons.svg b/examples/quickcontrols2/imagine/automotive/icons/automotive/icons.svg new file mode 100644 index 00000000..daf4633c --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/icons.svg @@ -0,0 +1,526 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="449" + height="384.99988" + viewBox="0 0 449.00001 384.99988" + id="svg2" + version="1.1" + inkscape:version="0.92.1 r15371" + sodipodi:docname="icons.svg" + inkscape:export-filename="/home/mitch/dev/qqc2-futuristic-style-demo/icons/futuristic/44x44@2/settings.png" + inkscape:export-xdpi="180" + inkscape:export-ydpi="180"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2.3750001" + inkscape:cx="227.69632" + inkscape:cy="173.66895" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + units="px" + inkscape:window-width="1920" + inkscape:window-height="1137" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + showguides="true" + inkscape:snap-grids="false" + inkscape:snap-midpoints="false" + inkscape:object-paths="false" + inkscape:guide-bbox="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + <inkscape:grid + type="xygrid" + id="grid4380" + originx="-0.042045451" + originy="0.87827274" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-0.04204545,-668.2406)" + style="display:inline"> + <g + id="g4481" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\automotive\44x44@4\navigation.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <rect + y="1009.2405" + x="180.04205" + height="44" + width="44" + id="rect4273" + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4147" + d="m 187.6832,1027.7359 29.7995,-11.9955 -8.46002,30.1783 -5.42957,-15.5311 z" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + id="g4474" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\automotive\44x44@4\music.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <rect + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4279" + width="44" + height="44" + x="135.04205" + y="1009.2405" /> + <path + sodipodi:nodetypes="cscccc" + inkscape:connector-curvature="0" + id="path4140" + d="m 167.59902,1035.8159 c -1.31413,-1.8397 -8.0497,1.4976 -5.98214,5.5357 1.67413,3.2698 7.60481,-0.9006 7.23214,-2.1428 l 0.043,-22.367 -1.3203,2.4448 z" + style="fill:#6affcd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cscccccc" + inkscape:connector-curvature="0" + id="path4149-3" + d="m 151.55515,1038.884 c -1.31413,-1.8398 -8.0497,1.4975 -5.98214,5.5357 1.67413,3.2698 7.60481,-0.9006 7.23214,-2.1428 v -19.7322 l 14.7673,-3.2197 1.32996,-2.4891 -17.34726,3.4767 z" + style="fill:#6affcd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + id="g4518" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\automotive\44x44@4\message.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <rect + y="1009.2405" + x="315.04205" + height="44" + width="44" + id="rect4281" + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + y="1019.9489" + x="321.94974" + height="22.583223" + width="30.18462" + id="rect4144" + style="opacity:1;fill:none;fill-opacity:1;stroke:#6affcd;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4146" + d="m 322.03814,1020.1699 15.1144,15.1144 14.95973,-14.9597" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4148" + d="m 352.09018,1042.3996 -11.00435,-11.0044" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4150" + d="m 321.99394,1042.4438 11.13693,-11.137" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + id="g4460" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\automotive\44x44@4\command.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <rect + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4287" + width="44" + height="44" + x="90.042053" + y="1009.2405" /> + <circle + r="19.047689" + cy="1031.2406" + cx="112.04205" + id="path4152" + style="opacity:1;fill:none;fill-opacity:1;stroke:#6affcd;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + ry="5.5033379" + rx="4.5719934" + y="1018.0177" + x="107.24899" + height="17.67367" + width="9.1883745" + id="rect4156" + style="opacity:1;fill:none;fill-opacity:1;stroke:#6affcd;stroke-width:0.9598186;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:open="true" + d="m 118.4944,1031.2297 a 6.6733203,6.6733203 0 0 1 -3.33666,5.7793 6.6733203,6.6733203 0 0 1 -6.67332,0 6.6733203,6.6733203 0 0 1 -3.33666,-5.7793" + sodipodi:end="3.1415927" + sodipodi:start="0" + sodipodi:ry="6.6733203" + sodipodi:rx="6.6733203" + sodipodi:cy="1031.2297" + sodipodi:cx="111.82108" + sodipodi:type="arc" + id="path4160" + style="opacity:1;fill:none;fill-opacity:1;stroke:#6affcd;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4171" + d="m 111.68097,1037.9274 v 6.75" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4173" + d="m 108.71222,1044.6618 h 5.96875" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + id="g4547" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\weather@4x.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <rect + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4275" + width="44" + height="44" + x="405.04205" + y="1009.2405" /> + <path + sodipodi:nodetypes="sccssssssss" + inkscape:connector-curvature="0" + id="rect4181" + d="m 415.77154,1020.3319 h 1.72458 c 1.92048,-6.3943 13.78409,-9.9869 18.47317,0 h 2.34328 c 4.38985,0 7.92391,3.3764 7.92391,7.5705 v 0.3996 c 0,4.194 -3.53406,7.5704 -7.92391,7.5704 h -22.54103 c -4.38985,0 -7.92392,-3.3764 -7.92392,-7.5704 v -0.3996 c 0,-4.1941 3.53407,-7.5705 7.92392,-7.5705 z" + style="opacity:1;fill:none;fill-opacity:1;stroke:#c6c6c6;stroke-width:1.06007564;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4184" + d="m 418.4242,1048.7629 2.37846,-8.8765" + style="fill:none;fill-rule:evenodd;stroke:#c6c6c6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#c6c6c6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 425.80463,1048.7629 2.37846,-8.8765" + id="path4186" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path4188" + d="m 433.36269,1048.7629 2.37846,-8.8765" + style="fill:none;fill-rule:evenodd;stroke:#c6c6c6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + id="g4408" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\automotive\44x44@4\settings.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <rect + y="1009.2405" + x="0.042050309" + height="44" + width="44" + id="rect4289" + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path4175" + d="m 18.04247,1017.9491 1.40804,-5.2549 h 5.24319 l 1.47,5.4862 2.38326,1.376 4.34476,-3.4414 4.37522,4.3753 -3.31456,4.3973 1.149046,2.6737 h 5.08233 v 6.7396 l -4.596194,0.3315 -1.590992,3.1157 3.137788,4.0438 -4.209498,4.2095 -4.56007,-2.6328 -2.72092,1.5389 -1.3074,4.8793 h -5.14495 l -1.06066,-5.6527 -2.65524,-0.7114 -4.4148,2.5489 -3.89011,-4.3123 3.13778,-4.088 -1.73918,-3.0124 -4.66897,-0.8988 v -5.5905 l 4.83926,-0.4862 1.41421,-2.9831 -3.13778,-4.1321 4.08796,-4.088 4.04377,2.3644 z" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <circle + r="5.5242715" + cy="1031.0306" + cx="22.064146" + id="path4177" + style="opacity:1;fill:none;fill-opacity:1;stroke:#6affcd;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + <g + id="g4487" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\automotive\44x44@4\windows.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <rect + y="1009.2405" + x="225.04205" + height="44" + width="44" + id="rect4277" + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="rect4190" + d="m 261.03309,1017.2897 v 28 h -27.9375 c 2.35953,-27.5958 7.73302,-28.5625 27.9375,-28 z" + style="opacity:1;fill:none;fill-opacity:1;stroke:#6affcd;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + <g + id="g4538" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\automotive\44x44@4\air-con.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384" + transform="translate(-45.000003)"> + <rect + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4283" + width="44" + height="44" + x="405.04205" + y="1009.2405" /> + <path + sodipodi:nodetypes="sscsscsscsscs" + inkscape:connector-curvature="0" + id="path4197" + d="m 421.26481,1044.4851 c -3.23157,3.5413 -10.47885,-3.4697 -9.9718,-8.4477 0.83559,-8.2035 7.65867,-5.1475 12.04763,-6.9077 -1.79559,-3.4382 -6.54603,-1.0408 -9.27801,-3.5338 -3.54131,-3.2316 3.46971,-10.4789 8.44775,-9.9718 8.20348,0.8356 5.14746,7.6586 6.84142,12.0034 3.37187,-1.8398 0.97447,-6.5902 3.4675,-9.3222 3.23157,-3.5413 10.47885,3.4697 9.9718,8.4478 -0.83559,8.2034 -7.65867,5.1474 -12.00344,6.753 1.83978,3.2835 6.59022,0.8861 9.3222,3.3791 3.54131,3.2316 -3.46971,10.4789 -8.44775,9.9718 -8.20348,-0.8356 -5.14746,-7.6587 -6.88561,-11.8488 -3.41606,1.9945 -1.01866,6.7449 -3.51169,9.4769 z" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + id="g4531" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\automotive\44x44@4\seats.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384" + transform="translate(-90.000003)"> + <rect + y="1009.2405" + x="360.04205" + height="44" + width="44" + id="rect4285" + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="sccs" + inkscape:connector-curvature="0" + id="rect4203" + d="m 391.91622,1017.2238 c 0.17067,-5.6932 5.2149,-4.4637 5.2149,-4.4637 v 9.1924 c -0.7292,-0.07 -5.33548,-0.7063 -5.2149,-4.7287 z" + style="opacity:1;fill:none;fill-opacity:1;stroke:#6affcd;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cscccsc" + inkscape:connector-curvature="0" + id="path4206" + d="m 386.60297,1040.4014 c -5.60375,-1.1635 -16.63421,-2.7578 -18.84543,0.6535 -1.53027,2.3608 -0.87435,7.5961 2.06641,8.7796 h 21.0795 c 3.59502,-0.5935 6.26483,-6.7048 2.51333,-8.7058 3.19134,-0.9113 5.05406,-18.5249 2.48667,-19.5701 -1.7401,-0.7084 -5.84062,6.4475 -9.30048,18.8428 z" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + id="g4435" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\automotive\44x44@4\statistics.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <rect + style="opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4291" + width="44" + height="44" + x="45.042053" + y="1009.2405" /> + <path + inkscape:connector-curvature="0" + id="path4208" + d="M 51.05768,1048.9905 V 1032.553" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 54.60974,1048.9905 v -35.5" + id="path4210" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path4212" + d="M 58.16187,1048.9905 V 1019.178" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 61.71393,1048.9905 v -20" + id="path4214" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path4216" + d="m 65.26599,1048.9905 v -22.875" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 68.81812,1048.9905 V 1034.178" + id="path4218" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path4220" + d="m 72.37018,1048.9905 v -6.8125" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 75.92224,1048.9905 v -9.75" + id="path4222" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path4224" + d="m 79.47437,1048.9905 v -19.75" + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 83.02643,1048.9905 V 1026.303" + id="path4226" + inkscape:connector-curvature="0" /> + </g> + <g + id="g4957" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\warning@4x.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <g + id="g4952"> + <g + id="g4984"> + <rect + style="display:inline;opacity:1;fill:#dc7878;fill-opacity:0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4888" + width="44" + height="44" + x="405.04205" + y="964.24048" /> + <path + transform="translate(91.459048,54.521538)" + d="m 335.89844,913.67383 a 6.7448861,6.7448861 0 0 0 -6.15625,3.36328 l -6.5293,11.30859 -6.5293,11.3086 a 6.7448861,6.7448861 0 0 0 5.83985,10.11718 h 13.05859 13.06055 a 6.7448861,6.7448861 0 0 0 5.83984,-10.11718 l -6.53125,-11.3086 -6.52929,-11.30859 a 6.7448861,6.7448861 0 0 0 -5.52344,-3.36328 z" + id="path4914" + style="opacity:1;fill:none;fill-opacity:1;stroke:#d5242f;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + inkscape:original="M 335.58203 920.41016 L 329.05273 931.71875 L 322.52344 943.02734 L 335.58203 943.02734 L 348.64258 943.02734 L 342.11133 931.71875 L 335.58203 920.41016 z " + inkscape:radius="6.7442117" + sodipodi:type="inkscape:offset" /> + <text + id="text4916" + y="997.82135" + x="418.31409" + style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#d5232f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.11217499px;line-height:1.25;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono';fill:#d5232f;fill-opacity:1" + y="997.82135" + x="418.31409" + id="tspan4918" + sodipodi:role="line">!</tspan></text> + </g> + </g> + </g> + <g + id="g4579" + transform="translate(0.91359708)" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\car@4x.png" + inkscape:export-xdpi="384" + inkscape:export-ydpi="384"> + <g + transform="translate(0,-0.52629089)" + inkscape:export-ydpi="180.02795" + inkscape:export-xdpi="180.02795" + inkscape:export-filename="/home/mitch/dev/qqc2-futuristic-style-demo/icons/car@2x.png" + id="g4940"> + <g + inkscape:export-ydpi="288.18481" + inkscape:export-xdpi="288.18481" + inkscape:export-filename="C:\dev\qt5.10\qtquickcontrols2\examples\quickcontrols2\imagine\automotive\icons\car@3x.png" + transform="translate(-4.2105261)" + id="g5027"> + <g + id="g4990" + transform="translate(38)"> + <path + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 155.0705,782.17781 c 6.07598,2.81282 15.70745,5.54152 16.78045,0.12114 1.47822,-7.46742 -7.82673,-9.03073 -12.74213,-11.21517 0.35496,-28.39708 4.52948,-61.94987 -16.18718,-79.16009 -15.28126,-12.6948 -36.88923,-13.70761 -54.94737,-13.89474 -44.75939,1.12608 -72.2307,7.25376 -66.73684,92.42105 -5.10694,0.73154 -15.36618,6.19984 -11.96169,13.62693 2.26424,4.93957 10.32335,-1.55401 16.17222,-2.04798 l -4.42106,70.10526 c -4.88809,9.36444 -1.70447,13.26861 -0.21052,18.31579 l 2.31579,28.21053 c -5.87521,7.89365 -9.18606,65.22384 5.21645,80.45936 20.44842,21.63111 45.69753,20.41018 69.7353,20.35721 29.24164,-0.0644 46.2493,-7.41397 57.516,-25.0271 6.1501,-9.61441 6.80873,-24.11582 6.56857,-37.94412 -0.50608,-29.14019 -2.51723,-31.93372 -3.87843,-38.05588 0.24603,-10.87137 0.62319,-26.86855 0.62319,-26.86855 0.13708,-2.99847 -4.07078,-3.32117 -4.26379,-0.30212 -1.23557,19.32726 -2.52156,37.97398 -4.14887,52.01278 -5.15807,-50.19881 -8.22005,-100.65169 -0.42106,-152.42105 l 1.77142,14.22858" + id="path4198" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cscsccsccccssssccsccc" /> + <rect + style="opacity:0;fill:none;fill-opacity:1;stroke:#6affcd;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4200" + width="75.39991" + height="41.533218" + x="52.331917" + y="811.89917" /> + <rect + ry="5.0999999" + style="opacity:1;fill:none;fill-opacity:1;stroke:#6affcd;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4204" + width="74.730019" + height="42.277542" + x="53.001808" + y="811.97357" + rx="5.0999999" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 33.76375,753.50264 c 21.81505,-33.62758 93.76507,-29.21973 112.94736,0.52631 l -6.52631,45.1579 c -32.75184,-8.71732 -66.12565,-8.2607 -100,-0.42106 z" + id="path4207" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 30.39532,772.45 C 39.7558,824.45977 33.67511,874.57878 29.86901,924.97632 27.0264,874.92466 21.98491,825.44889 30.39532,772.45 Z" + id="path4209" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 40.07953,905.29211 c 31.5016,11.5654 64.23888,15.63953 100.21053,0.10526 l -1.68421,49.36842 c -34.36634,20.89476 -66.32657,16.8029 -97.05263,-0.10526 z" + id="path4211" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 132.39532,693.08158 c -0.1013,1.76525 -0.0679,3.42272 0.52632,4.63158 4.7808,3.23458 8.19086,9.38341 11.57895,15.57895 1.5083,-0.0482 2.87102,0.42463 4.63157,-0.52632 0.15986,-2.57309 0.37258,-5.12353 -0.42105,-8.10526 -3.09684,-4.12667 -6.44714,-7.87314 -10.10526,-11.15789 -2.00632,-0.36221 -3.93976,-0.97762 -6.21053,-0.42106 z" + id="path4213" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" + id="path4215" + d="m 48.05537,693.08158 c 0.1013,1.76525 0.0679,3.42272 -0.52632,4.63158 -4.7808,3.23458 -8.19086,9.38341 -11.57895,15.57895 -1.5083,-0.0482 -2.87102,0.42463 -4.63157,-0.52632 -0.15986,-2.57309 -0.37258,-5.12353 0.42105,-8.10526 3.09684,-4.12667 6.44714,-7.87314 10.10526,-11.15789 2.00632,-0.36221 3.93976,-0.97762 6.21053,-0.42106 z" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#6affcd;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#d5222f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.87843137" + d="m 151.92716,785.02141 59.0707,63.0345 c 1.5809,-0.4544 3.3564,-1.3935 2.958,-3.8128 -1.0167,-6.1727 -4.9133,-10.6123 -10.7475,-11.7661 l -48.0616,-50.3775" + id="path4240" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + </g> + <rect + y="669.29321" + x="4.2525716" + height="338.94736" + width="250.17281" + id="rect4844" + style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + </g> + <rect + y="668.2406" + x="-0.87155163" + height="340" + width="252" + id="rect4563" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.01560712;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + </g> +</svg> diff --git a/examples/quickcontrols2/imagine/automotive/icons/automotive/index.theme b/examples/quickcontrols2/imagine/automotive/icons/automotive/index.theme new file mode 100644 index 00000000..cd84146e --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/automotive/index.theme @@ -0,0 +1,14 @@ +[Icon Theme] +Name=Automotive +Comment=Icon theme for the Qt Quick Controls 2 Automotive Imagine Style Example + +Directories=44x44,44x44@2 + +[44x44] +Size=44 +Type=Fixed + +[44x44@2] +Size=44 +Scale=2 +Type=Fixed diff --git a/examples/quickcontrols2/imagine/automotive/icons/car.png b/examples/quickcontrols2/imagine/automotive/icons/car.png Binary files differnew file mode 100644 index 00000000..4bfc9a47 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/car.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/car@2x.png b/examples/quickcontrols2/imagine/automotive/icons/car@2x.png Binary files differnew file mode 100644 index 00000000..966bc47b --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/car@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/icons.qrc b/examples/quickcontrols2/imagine/automotive/icons/icons.qrc new file mode 100644 index 00000000..5cb79781 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/icons.qrc @@ -0,0 +1,29 @@ +<RCC> + <qresource prefix="/icons"> + <file>car.png</file> + <file>car@2x.png</file> + <file>warning.png</file> + <file>warning@2x.png</file> + <file>weather.png</file> + <file>weather@2x.png</file> + <file>automotive/icons.svg</file> + <file>automotive/index.theme</file> + <file>automotive/44x44/air-con.png</file> + <file>automotive/44x44/command.png</file> + <file>automotive/44x44/message.png</file> + <file>automotive/44x44/music.png</file> + <file>automotive/44x44/seats.png</file> + <file>automotive/44x44/settings.png</file> + <file>automotive/44x44/statistics.png</file> + <file>automotive/44x44/windows.png</file> + <file>automotive/44x44@2/air-con.png</file> + <file>automotive/44x44@2/command.png</file> + <file>automotive/44x44@2/message.png</file> + <file>automotive/44x44@2/music.png</file> + <file>automotive/44x44@2/navigation.png</file> + <file>automotive/44x44@2/seats.png</file> + <file>automotive/44x44@2/settings.png</file> + <file>automotive/44x44@2/statistics.png</file> + <file>automotive/44x44@2/windows.png</file> + </qresource> +</RCC> diff --git a/examples/quickcontrols2/imagine/automotive/icons/warning.png b/examples/quickcontrols2/imagine/automotive/icons/warning.png Binary files differnew file mode 100644 index 00000000..590a61eb --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/warning.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/warning@2x.png b/examples/quickcontrols2/imagine/automotive/icons/warning@2x.png Binary files differnew file mode 100644 index 00000000..487fbafc --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/warning@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/weather.png b/examples/quickcontrols2/imagine/automotive/icons/weather.png Binary files differnew file mode 100644 index 00000000..b1479de2 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/weather.png diff --git a/examples/quickcontrols2/imagine/automotive/icons/weather@2x.png b/examples/quickcontrols2/imagine/automotive/icons/weather@2x.png Binary files differnew file mode 100644 index 00000000..8b4333ab --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/icons/weather@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background.png Binary files differnew file mode 100644 index 00000000..8f7152e5 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background@2x.png Binary files differnew file mode 100644 index 00000000..72bd2f11 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/applicationwindow-background@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered.9.png Binary files differnew file mode 100644 index 00000000..0ec1a28d --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..53e1041f --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked-hovered@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked.9.png Binary files differnew file mode 100644 index 00000000..16ed8185 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked@2x.9.png Binary files differnew file mode 100644 index 00000000..ca5d4db6 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-checked@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered.9.png Binary files differnew file mode 100644 index 00000000..a7a0252e --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..28a0d1f1 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-hovered@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed.9.png Binary files differnew file mode 100644 index 00000000..0f8b0c4e --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..6048dba0 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background-pressed@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background.9.png Binary files differnew file mode 100644 index 00000000..65653dee --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background@2x.9.png Binary files differnew file mode 100644 index 00000000..0cb87ad3 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/button-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered.png Binary files differnew file mode 100644 index 00000000..aaa24dea --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered@2x.png Binary files differnew file mode 100644 index 00000000..6c1a8d9e --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed.png Binary files differnew file mode 100644 index 00000000..e730f74a --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed@2x.png Binary files differnew file mode 100644 index 00000000..bf189c9a --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background.png Binary files differnew file mode 100644 index 00000000..6cb099ce --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background@2x.png Binary files differnew file mode 100644 index 00000000..dca94220 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-background@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed.png Binary files differnew file mode 100644 index 00000000..a65e68bd --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed@2x.png Binary files differnew file mode 100644 index 00000000..c2b4c86a --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle.png Binary files differnew file mode 100644 index 00000000..1f338bbe --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle@2x.png Binary files differnew file mode 100644 index 00000000..a894eb6c --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/dial-handle@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background.9.png Binary files differnew file mode 100644 index 00000000..bfb27a20 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background@2x.9.png Binary files differnew file mode 100644 index 00000000..73db47d3 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/frame-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/imagine-assets.qrc b/examples/quickcontrols2/imagine/automotive/imagine-assets/imagine-assets.qrc new file mode 100644 index 00000000..81eadda6 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/imagine-assets.qrc @@ -0,0 +1,80 @@ +<RCC> + <qresource prefix="/imagine-assets"> + <file>applicationwindow-background.png</file> + <file>applicationwindow-background@2x.png</file> + <file>button-background.9.png</file> + <file>button-background@2x.9.png</file> + <file>button-background-checked.9.png</file> + <file>button-background-checked@2x.9.png</file> + <file>button-background-checked-hovered.9.png</file> + <file>button-background-checked-hovered@2x.9.png</file> + <file>button-background-hovered.9.png</file> + <file>button-background-hovered@2x.9.png</file> + <file>button-background-pressed.9.png</file> + <file>button-background-pressed@2x.9.png</file> + <file>dial-background.png</file> + <file>dial-background@2x.png</file> + <file>dial-background-hovered.png</file> + <file>dial-background-hovered@2x.png</file> + <file>dial-background-pressed.png</file> + <file>dial-background-pressed@2x.png</file> + <file>dial-handle.png</file> + <file>dial-handle@2x.png</file> + <file>dial-handle-pressed.png</file> + <file>dial-handle-pressed@2x.png</file> + <file>frame-background.9.png</file> + <file>frame-background@2x.9.png</file> + <file>itemdelegate-background.9.png</file> + <file>itemdelegate-background@2x.9.png</file> + <file>itemdelegate-background-checked.9.png</file> + <file>itemdelegate-background-checked@2x.9.png</file> + <file>itemdelegate-background-hovered.9.png</file> + <file>itemdelegate-background-hovered@2x.9.png</file> + <file>itemdelegate-background-pressed.9.png</file> + <file>itemdelegate-background-pressed@2x.9.png</file> + <file>radiobutton-indicator.png</file> + <file>radiobutton-indicator@2x.png</file> + <file>radiobutton-indicator-checked.png</file> + <file>radiobutton-indicator-checked@2x.png</file> + <file>radiobutton-indicator-checked-hovered.png</file> + <file>radiobutton-indicator-checked-hovered@2x.png</file> + <file>radiobutton-indicator-checked-pressed.png</file> + <file>radiobutton-indicator-checked-pressed@2x.png</file> + <file>radiobutton-indicator-hovered.png</file> + <file>radiobutton-indicator-hovered@2x.png</file> + <file>radiobutton-indicator-pressed.png</file> + <file>radiobutton-indicator-pressed@2x.png</file> + <file>scrollindicator-handle.png</file> + <file>scrollindicator-handle@2x.png</file> + <file>slider-background-horizontal.9.png</file> + <file>slider-background-horizontal@2x.9.png</file> + <file>slider-handle.png</file> + <file>slider-handle@2x.png</file> + <file>slider-handle-hovered.png</file> + <file>slider-handle-hovered@2x.png</file> + <file>slider-handle-pressed.png</file> + <file>slider-handle-pressed@2x.png</file> + <file>slider-progress-horizontal.9.png</file> + <file>slider-progress-horizontal@2x.9.png</file> + <file>slider-progress-horizontal-pressed.9.png</file> + <file>slider-progress-horizontal-pressed@2x.9.png</file> + <file>switchdelegate-background.9.png</file> + <file>switchdelegate-background@2x.9.png</file> + <file>switchdelegate-handle.png</file> + <file>switchdelegate-handle@2x.png</file> + <file>switchdelegate-handle-checked.png</file> + <file>switchdelegate-handle-checked@2x.png</file> + <file>switchdelegate-handle-checked-hovered.png</file> + <file>switchdelegate-handle-checked-hovered@2x.png</file> + <file>switchdelegate-handle-hovered.png</file> + <file>switchdelegate-handle-hovered@2x.png</file> + <file>switchdelegate-handle-pressed.png</file> + <file>switchdelegate-handle-pressed@2x.png</file> + <file>switchdelegate-indicator.png</file> + <file>switchdelegate-indicator@2x.png</file> + <file>switchdelegate-indicator-pressed.png</file> + <file>switchdelegate-indicator-pressed@2x.png</file> + <file>toolseparator-separator-vertical.9.png</file> + <file>toolseparator-separator-vertical@2x.9.png</file> + </qresource> +</RCC> diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked.9.png Binary files differnew file mode 100644 index 00000000..8941ad9f --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked@2x.9.png Binary files differnew file mode 100644 index 00000000..a17e4469 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-checked@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered.9.png Binary files differnew file mode 100644 index 00000000..ab6d2947 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..65120b4b --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-hovered@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed.9.png Binary files differnew file mode 100644 index 00000000..c9b86741 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..cc3393e1 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background-pressed@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background.9.png Binary files differnew file mode 100644 index 00000000..42d580b0 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background@2x.9.png Binary files differnew file mode 100644 index 00000000..76008e8c --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/itemdelegate-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered.png Binary files differnew file mode 100644 index 00000000..f64c9665 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered@2x.png Binary files differnew file mode 100644 index 00000000..ace1717a --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed.png Binary files differnew file mode 100644 index 00000000..c77ad470 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed@2x.png Binary files differnew file mode 100644 index 00000000..2798f77f --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked.png Binary files differnew file mode 100644 index 00000000..ea714eaa --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked@2x.png Binary files differnew file mode 100644 index 00000000..4f29b80b --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-checked@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered.png Binary files differnew file mode 100644 index 00000000..a7d07ed1 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered@2x.png Binary files differnew file mode 100644 index 00000000..b0fff06e --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed.png Binary files differnew file mode 100644 index 00000000..7d657ac9 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed@2x.png Binary files differnew file mode 100644 index 00000000..9a8b9cd8 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator.png Binary files differnew file mode 100644 index 00000000..b59ba0ce --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator@2x.png Binary files differnew file mode 100644 index 00000000..e4a2b9a2 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/radiobutton-indicator@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle.png Binary files differnew file mode 100644 index 00000000..0faa2592 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle@2x.png Binary files differnew file mode 100644 index 00000000..09616c5e --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/scrollindicator-handle@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal.9.png Binary files differnew file mode 100644 index 00000000..eafe5da0 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal@2x.9.png Binary files differnew file mode 100644 index 00000000..c14bf788 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-background-horizontal@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered.png Binary files differnew file mode 100644 index 00000000..9f56b8c0 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered@2x.png Binary files differnew file mode 100644 index 00000000..87a8126a --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed.png Binary files differnew file mode 100644 index 00000000..771b71c2 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed@2x.png Binary files differnew file mode 100644 index 00000000..b0edf7da --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle.png Binary files differnew file mode 100644 index 00000000..9634d2ae --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle@2x.png Binary files differnew file mode 100644 index 00000000..8983436c --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-handle@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed.9.png Binary files differnew file mode 100644 index 00000000..15726a9f --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..d25c9e63 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal-pressed@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal.9.png Binary files differnew file mode 100644 index 00000000..cff4e860 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal@2x.9.png Binary files differnew file mode 100644 index 00000000..ecb5e15a --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/slider-progress-horizontal@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background.9.png Binary files differnew file mode 100644 index 00000000..1fbb5626 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background@2x.9.png Binary files differnew file mode 100644 index 00000000..18880980 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered.png Binary files differnew file mode 100644 index 00000000..e66ef713 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered@2x.png Binary files differnew file mode 100644 index 00000000..05d6f82e --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked.png Binary files differnew file mode 100644 index 00000000..bcfa06ae --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked@2x.png Binary files differnew file mode 100644 index 00000000..b9985f0f --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-checked@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered.png Binary files differnew file mode 100644 index 00000000..3de8aa15 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered@2x.png Binary files differnew file mode 100644 index 00000000..b9551590 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed.png Binary files differnew file mode 100644 index 00000000..547b2c17 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed@2x.png Binary files differnew file mode 100644 index 00000000..b4bb748a --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle.png Binary files differnew file mode 100644 index 00000000..b30fdaa2 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle@2x.png Binary files differnew file mode 100644 index 00000000..4e98604c --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-handle@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed.png Binary files differnew file mode 100644 index 00000000..6833d624 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed@2x.png Binary files differnew file mode 100644 index 00000000..3d5498a0 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator.png Binary files differnew file mode 100644 index 00000000..3db5fe20 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator@2x.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator@2x.png Binary files differnew file mode 100644 index 00000000..b5c10f74 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/switchdelegate-indicator@2x.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical.9.png Binary files differnew file mode 100644 index 00000000..a6d2009b --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical.9.png diff --git a/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical@2x.9.png b/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical@2x.9.png Binary files differnew file mode 100644 index 00000000..9ab9ca56 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/imagine-assets/toolseparator-separator-vertical@2x.9.png diff --git a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml new file mode 100644 index 00000000..dfd66ada --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtGraphicalEffects 1.0 + +Glow { + color: glowColor + samples: 20 + spread: 0.3 +} diff --git a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml new file mode 100644 index 00000000..e19d8665 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.9 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.3 + +Button { + id: button + checkable: true + font.pixelSize: fontSizeExtraSmall + leftPadding: 4 + rightPadding: 4 + topPadding: 12 + bottomPadding: 12 + implicitWidth: 60 + implicitHeight: 90 + + icon.name: "placeholder" + icon.width: 44 + icon.height: 44 + display: Button.TextUnderIcon +} diff --git a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml new file mode 100644 index 00000000..50f816ce --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml @@ -0,0 +1,90 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.9 +import QtQuick.Controls 2.3 + +// This container and the transform on the Label are +// necessary to get precise bounding rect of the text for layouting reasons, +// since some of the labels' font sizes can get quite large. +Item { + id: root + implicitHeight: labelTextMetrics.tightBoundingRect.height + implicitWidth: label.implicitWidth + + property alias text: label.text + property alias font: label.font + property alias horizontalAlignment: label.horizontalAlignment + property alias verticalAlignment: label.verticalAlignment + property bool glowEnabled: true + property color glowColor: colorGlow + property color color: colorBright + + Label { + id: label + anchors.baseline: root.baseline + color: root.color + + layer.enabled: root.glowEnabled + layer.effect: CustomGlow { + color: glowColor + } + + TextMetrics { + id: labelTextMetrics + text: label.text + font: label.font + } + + transform: Translate { + y: -labelTextMetrics.tightBoundingRect.y + } + } +} diff --git a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml new file mode 100644 index 00000000..a2985d0f --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml @@ -0,0 +1,642 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.9 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.3 +import QtQuick.Controls.Imagine 2.3 +import QtQuick.Window 2.0 + +ApplicationWindow { + id: window + width: 1280 + height: 720 + minimumWidth: 1180 + minimumHeight: 663 + visible: true + title: "Qt Quick Controls 2 - Imagine Style Example: Automotive" + + readonly property color colorGlow: "#1d6d64" + readonly property color colorWarning: "#d5232f" + readonly property color colorMain: "#6affcd" + readonly property color colorBright: "#ffffff" + readonly property color colorLightGrey: "#888" + readonly property color colorDarkGrey: "#333" + + readonly property int fontSizeExtraSmall: Qt.application.font.pixelSize * 0.8 + readonly property int fontSizeMedium: Qt.application.font.pixelSize * 1.5 + readonly property int fontSizeLarge: Qt.application.font.pixelSize * 2 + readonly property int fontSizeExtraLarge: Qt.application.font.pixelSize * 5 + + Component.onCompleted: { + x = Screen.width / 2 - width / 2 + y = Screen.height / 2 - height / 2 + } + + Shortcut { + sequence: "Ctrl+Q" + onActivated: Qt.quit() + } + + Frame { + id: frame + anchors.fill: parent + anchors.margins: 90 + + RowLayout { + id: mainRowLayout + anchors.fill: parent + anchors.margins: 24 + spacing: 36 + + Container { + id: leftTabBar + + currentIndex: 1 + + Layout.fillWidth: false + Layout.fillHeight: true + + ButtonGroup { + buttons: columnLayout.children + } + + contentItem: ColumnLayout { + id: columnLayout + spacing: 3 + + Repeater { + model: leftTabBar.contentModel + } + } + + FeatureButton { + id: navigationFeatureButton + text: qsTr("Navigation") + icon.name: "navigation" + Layout.fillHeight: true + } + + FeatureButton { + text: qsTr("Music") + icon.name: "music" + checked: true + Layout.fillHeight: true + } + + FeatureButton { + text: qsTr("Message") + icon.name: "message" + Layout.fillHeight: true + } + + FeatureButton { + text: qsTr("Command") + icon.name: "command" + Layout.fillHeight: true + } + + FeatureButton { + text: qsTr("Settings") + icon.name: "settings" + Layout.fillHeight: true + } + } + + StackLayout { + currentIndex: leftTabBar.currentIndex + + Layout.preferredWidth: 150 + Layout.maximumWidth: 150 + Layout.fillWidth: false + + Item {} + + ColumnLayout { + spacing: 16 + + ButtonGroup { + id: viewButtonGroup + buttons: viewTypeRowLayout.children + } + + RowLayout { + id: viewTypeRowLayout + spacing: 3 + + Layout.bottomMargin: 12 + + Button { + text: qsTr("Compact") + font.pixelSize: fontSizeExtraSmall + checked: true + + Layout.fillWidth: true + } + Button { + text: qsTr("Full") + font.pixelSize: fontSizeExtraSmall + checkable: true + + Layout.fillWidth: true + } + } + + GlowingLabel { + text: qsTr("VOLUME") + color: "white" + font.pixelSize: fontSizeMedium + } + + Dial { + id: volumeDial + from: 0 + value: 42 + to: 100 + stepSize: 1 + anchors.horizontalCenter: parent.horizontalCenter + + Layout.minimumWidth: 64 + Layout.minimumHeight: 64 + Layout.preferredWidth: 128 + Layout.preferredHeight: 128 + Layout.maximumWidth: 128 + Layout.maximumHeight: 128 + Layout.fillHeight: true + + Label { + text: volumeDial.value.toFixed(0) + color: "white" + font.pixelSize: Qt.application.font.pixelSize * 3 + anchors.centerIn: parent + } + } + + ButtonGroup { + id: audioSourceButtonGroup + } + + RowLayout { + Layout.topMargin: 16 + + GlowingLabel { + id: radioOption + text: qsTr("RADIO") + color: "white" + font.pixelSize: fontSizeMedium + horizontalAlignment: Label.AlignLeft + + Layout.fillWidth: true + } + GlowingLabel { + text: qsTr("AUX") + color: colorLightGrey + font.pixelSize: fontSizeMedium * 0.8 + horizontalAlignment: Label.AlignHCenter + glowEnabled: false + anchors.bottom: radioOption.bottom + + Layout.fillWidth: true + } + GlowingLabel { + text: qsTr("MP3") + color: colorDarkGrey + font.pixelSize: fontSizeMedium * 0.6 + horizontalAlignment: Label.AlignRight + glowEnabled: false + anchors.bottom: radioOption.bottom + + Layout.fillWidth: true + } + } + + Frame { + id: stationFrame + leftPadding: 1 + rightPadding: 1 + topPadding: 1 + bottomPadding: 1 + + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredHeight: 128 + + ListView { + clip: true + anchors.fill: parent + + ScrollIndicator.vertical: ScrollIndicator { + parent: stationFrame + anchors.top: parent.top + anchors.right: parent.right + anchors.rightMargin: 1 + anchors.bottom: parent.bottom + } + + model: ListModel { + ListElement { name: "V-Radio"; frequency: "105.5 MHz" } + ListElement { name: "World News"; frequency: "93.4 MHz" } + ListElement { name: "TekStep FM"; frequency: "95.0 MHz" } + ListElement { name: "Classic Radio"; frequency: "89.9 MHz" } + ListElement { name: "Buena Vista FM"; frequency: "100.8 MHz" } + ListElement { name: "Drive-by Radio"; frequency: "99.1 MHz" } + ListElement { name: "Unknown #1"; frequency: "104.5 MHz" } + ListElement { name: "Unknown #2"; frequency: "91.2 MHz" } + ListElement { name: "Unknown #3"; frequency: "93.8 MHz" } + ListElement { name: "Unknown #4"; frequency: "80.4 MHz" } + ListElement { name: "Unknown #5"; frequency: "101.1 MHz" } + ListElement { name: "Unknown #6"; frequency: "92.2 MHz" } + } + delegate: ItemDelegate { + id: stationDelegate + width: parent.width + height: 22 + text: model.name + font.pixelSize: fontSizeExtraSmall + topPadding: 0 + bottomPadding: 0 + + contentItem: RowLayout { + Label { + text: model.name + font: stationDelegate.font + horizontalAlignment: Text.AlignLeft + Layout.fillWidth: true + } + Label { + text: model.frequency + font: stationDelegate.font + horizontalAlignment: Text.AlignRight + Layout.fillWidth: true + } + } + } + } + } + + Frame { + Layout.fillWidth: true + + RowLayout { + anchors.fill: parent + + Label { + text: qsTr("Sort by") + font.pixelSize: fontSizeExtraSmall + + Layout.alignment: Qt.AlignTop + } + + ColumnLayout { + RadioButton { + text: qsTr("Name") + font.pixelSize: fontSizeExtraSmall + } + RadioButton { + text: qsTr("Frequency") + font.pixelSize: fontSizeExtraSmall + } + RadioButton { + text: qsTr("Favourites") + font.pixelSize: fontSizeExtraSmall + checked: true + } + } + } + } + } + } + + Rectangle { + color: colorMain + implicitWidth: 1 + Layout.fillHeight: true + } + + ColumnLayout { + Layout.preferredWidth: 350 + Layout.fillWidth: true + Layout.fillHeight: true + + GlowingLabel { + id: timeLabel + text: qsTr("11:02") + font.pixelSize: fontSizeExtraLarge + + Layout.alignment: Qt.AlignHCenter + + GlowingLabel { + text: qsTr("AM") + font.pixelSize: fontSizeLarge + anchors.left: parent.right + anchors.leftMargin: 8 + } + } + + Label { + text: qsTr("01/01/2018") + color: colorLightGrey + font.pixelSize: fontSizeMedium + + Layout.alignment: Qt.AlignHCenter + Layout.topMargin: 2 + Layout.bottomMargin: 10 + } + + Image { + source: "qrc:/icons/car.png" + fillMode: Image.PreserveAspectFit + + Layout.fillHeight: true + + Column { + x: parent.width * 0.88 + y: parent.height * 0.56 + spacing: 3 + + Image { + source: "qrc:/icons/warning.png" + anchors.horizontalCenter: parent.horizontalCenter + + layer.enabled: true + layer.effect: CustomGlow { + spread: 0.2 + samples: 40 + color: colorWarning + } + } + + GlowingLabel { + text: qsTr("Door open") + color: colorWarning + glowColor: Qt.rgba(colorWarning.r, colorWarning.g, colorWarning.b, 0.4) + } + } + } + } + + Rectangle { + color: colorMain + implicitWidth: 1 + Layout.fillHeight: true + } + + ColumnLayout { + Row { + spacing: 8 + + Image { + source: "qrc:/icons/weather.png" + } + + Column { + spacing: 8 + + Row { + anchors.horizontalCenter: parent.horizontalCenter + + GlowingLabel { + id: outsideTempValueLabel + text: qsTr("31") + font.pixelSize: fontSizeExtraLarge + } + + GlowingLabel { + text: qsTr("°C") + font.pixelSize: Qt.application.font.pixelSize * 2.5 + anchors.baseline: outsideTempValueLabel.baseline + } + } + + Label { + text: qsTr("Osaka, Japan") + color: colorLightGrey + font.pixelSize: fontSizeMedium + } + } + } + + ColumnLayout { + id: airConRowLayout + spacing: 8 + + Layout.preferredWidth: 128 + Layout.preferredHeight: 380 + Layout.fillHeight: true + + Item { + Layout.fillHeight: true + } + + SwitchDelegate { + text: qsTr("AC") + leftPadding: 0 + rightPadding: 0 + topPadding: 0 + bottomPadding: 0 + + Layout.fillWidth: true + } + + // QTBUG-63269 + Item { + implicitHeight: temperatureValueLabel.implicitHeight + Layout.fillWidth: true + Layout.topMargin: 16 + + Label { + text: qsTr("Temperature") + anchors.baseline: temperatureValueLabel.bottom + anchors.left: parent.left + } + + GlowingLabel { + id: temperatureValueLabel + text: qsTr("24°C") + font.pixelSize: fontSizeLarge + anchors.right: parent.right + } + } + + Slider { + value: 0.35 + Layout.fillWidth: true + } + + // QTBUG-63269 + Item { + implicitHeight: powerValueLabel.implicitHeight + Layout.fillWidth: true + Layout.topMargin: 16 + + Label { + text: qsTr("Power") + anchors.baseline: powerValueLabel.bottom + anchors.left: parent.left + } + + GlowingLabel { + id: powerValueLabel + text: qsTr("10%") + font.pixelSize: fontSizeLarge + anchors.right: parent.right + } + } + + Slider { + value: 0.25 + Layout.fillWidth: true + } + + SwitchDelegate { + text: qsTr("Low") + leftPadding: 0 + rightPadding: 0 + topPadding: 0 + bottomPadding: 0 + + Layout.fillWidth: true + Layout.topMargin: 16 + } + + SwitchDelegate { + text: qsTr("High") + checked: true + leftPadding: 0 + rightPadding: 0 + topPadding: 0 + bottomPadding: 0 + + Layout.fillWidth: true + } + + SwitchDelegate { + text: qsTr("Defog") + leftPadding: 0 + rightPadding: 0 + topPadding: 0 + bottomPadding: 0 + + Layout.fillWidth: true + } + + SwitchDelegate { + text: qsTr("Recirculate") + leftPadding: 0 + rightPadding: 0 + topPadding: 0 + bottomPadding: 0 + + Layout.fillWidth: true + } + + Item { + Layout.fillHeight: true + } + } + } + + Container { + id: rightTabBar + + currentIndex: 1 + + Layout.fillHeight: true + + ButtonGroup { + buttons: rightTabBarContentLayout.children + } + + contentItem: ColumnLayout { + id: rightTabBarContentLayout + spacing: 3 + + Repeater { + model: rightTabBar.contentModel + } + } + + Item { + Layout.fillHeight: true + } + + FeatureButton { + text: qsTr("Windows") + icon.name: "windows" + + Layout.maximumHeight: navigationFeatureButton.height + Layout.fillHeight: true + } + FeatureButton { + text: qsTr("Air Con.") + icon.name: "air-con" + checked: true + + Layout.maximumHeight: navigationFeatureButton.height + Layout.fillHeight: true + } + FeatureButton { + text: qsTr("Seats") + icon.name: "seats" + + Layout.maximumHeight: navigationFeatureButton.height + Layout.fillHeight: true + } + FeatureButton { + text: qsTr("Statistics") + icon.name: "statistics" + + Layout.maximumHeight: navigationFeatureButton.height + Layout.fillHeight: true + } + } + } + } +} diff --git a/examples/quickcontrols2/imagine/automotive/qml/qml.qrc b/examples/quickcontrols2/imagine/automotive/qml/qml.qrc new file mode 100644 index 00000000..d193fd32 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/qml/qml.qrc @@ -0,0 +1,8 @@ +<RCC> + <qresource prefix="/qml"> + <file>FeatureButton.qml</file> + <file>GlowingLabel.qml</file> + <file>CustomGlow.qml</file> + <file>automotive.qml</file> + </qresource> +</RCC> diff --git a/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf b/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf new file mode 100644 index 00000000..c8bcdd40 --- /dev/null +++ b/examples/quickcontrols2/imagine/automotive/qtquickcontrols2.conf @@ -0,0 +1,10 @@ +[Controls] +Style=Imagine + +[Imagine] +Path=qrc:/imagine-assets + +[Imagine\Palette] +Text=#6affcd +ButtonText=#6affcd +WindowText=#6affcd diff --git a/examples/quickcontrols2/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png b/examples/quickcontrols2/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png Binary files differnew file mode 100644 index 00000000..25b6344f --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png diff --git a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc new file mode 100644 index 00000000..cca44e83 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example musicplayer + \title Qt Quick Controls 2 - Imagine Style Example: Music Player + \ingroup qtquickcontrols2-examples + \brief An audio player user interface using custom Imagine style assets. + + This example demonstrates how custom Imagine style assets + can be used to style a user interface for an audio player application. + + \image qtquickcontrols2-musicplayer.png + + \omit + The assets are generated from a Photoshop file: \e musicplayer.psd. + This file can found in the \e design folder in the example directory. + All objects related to a particular asset are collected in a layer group. + For example, the assets for Button's background element are under a layer group with the following name: + + \badcode + 100% button-background.9.png, 200% button-background@2x.9.png, 300% button-background@3x.9.png, 400% button-background@4x.9.png + \endcode + + Using Photoshop's \l {Generate Image Assets}{https://helpx.adobe.com/photoshop/using/generate-assets-layers.html} feature, + the size and name for each asset are encoded into the name of the layer group. + + Where applicable, \l {Smart Objects}{https://helpx.adobe.com/photoshop/using/create-smart-objects.html} + are used to reduce duplication for common objects such as 9-patch lines. + \endomit + + \include examples-run.qdocinc +*/ diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/icons.qrc b/examples/quickcontrols2/imagine/musicplayer/icons/icons.qrc new file mode 100644 index 00000000..870b4445 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/icons.qrc @@ -0,0 +1,40 @@ +<RCC> + <qresource prefix="/icons"> + <file>musicplayer/index.theme</file> + <file>musicplayer/32x32/bluetooth.png</file> + <file>musicplayer/32x32/cart.png</file> + <file>musicplayer/32x32/cloud.png</file> + <file>musicplayer/32x32/filter.png</file> + <file>musicplayer/32x32/folder.png</file> + <file>musicplayer/32x32/message.png</file> + <file>musicplayer/32x32/music.png</file> + <file>musicplayer/32x32/next.png</file> + <file>musicplayer/32x32/pause.png</file> + <file>musicplayer/32x32/power.png</file> + <file>musicplayer/32x32/previous.png</file> + <file>musicplayer/32x32/repeat.png</file> + <file>musicplayer/32x32/save.png</file> + <file>musicplayer/32x32/settings.png</file> + <file>musicplayer/32x32/shuffle.png</file> + <file>musicplayer/32x32/stop.png</file> + <file>musicplayer/32x32@2/bluetooth.png</file> + <file>musicplayer/32x32@2/cart.png</file> + <file>musicplayer/32x32@2/cloud.png</file> + <file>musicplayer/32x32@2/filter.png</file> + <file>musicplayer/32x32@2/folder.png</file> + <file>musicplayer/32x32@2/grid.png</file> + <file>musicplayer/32x32@2/message.png</file> + <file>musicplayer/32x32@2/music.png</file> + <file>musicplayer/32x32@2/next.png</file> + <file>musicplayer/32x32@2/pause.png</file> + <file>musicplayer/32x32@2/power.png</file> + <file>musicplayer/32x32@2/previous.png</file> + <file>musicplayer/32x32@2/repeat.png</file> + <file>musicplayer/32x32@2/save.png</file> + <file>musicplayer/32x32@2/settings.png</file> + <file>musicplayer/32x32@2/shuffle.png</file> + <file>musicplayer/32x32@2/stop.png</file> + <file>musicplayer/32x32/favorite.png</file> + <file>musicplayer/32x32@2/favorite.png</file> + </qresource> +</RCC> diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/bluetooth.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/bluetooth.png Binary files differnew file mode 100644 index 00000000..925f564c --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/bluetooth.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cart.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cart.png Binary files differnew file mode 100644 index 00000000..4d5ad099 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cart.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cloud.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cloud.png Binary files differnew file mode 100644 index 00000000..62ef5118 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/cloud.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/favorite.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/favorite.png Binary files differnew file mode 100644 index 00000000..16ea84de --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/favorite.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/filter.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/filter.png Binary files differnew file mode 100644 index 00000000..4472cead --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/filter.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/folder.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/folder.png Binary files differnew file mode 100644 index 00000000..5dd05778 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/folder.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/message.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/message.png Binary files differnew file mode 100644 index 00000000..1d93b3c6 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/message.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/music.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/music.png Binary files differnew file mode 100644 index 00000000..44489213 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/music.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/next.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/next.png Binary files differnew file mode 100644 index 00000000..ab9164e8 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/next.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/pause.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/pause.png Binary files differnew file mode 100644 index 00000000..9c9ef8fa --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/pause.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/power.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/power.png Binary files differnew file mode 100644 index 00000000..8f7d0c77 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/power.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/previous.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/previous.png Binary files differnew file mode 100644 index 00000000..3a0880fd --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/previous.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/repeat.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/repeat.png Binary files differnew file mode 100644 index 00000000..7c8e8c1c --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/repeat.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/save.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/save.png Binary files differnew file mode 100644 index 00000000..c0b27483 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/save.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/settings.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/settings.png Binary files differnew file mode 100644 index 00000000..7992146a --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/settings.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/shuffle.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/shuffle.png Binary files differnew file mode 100644 index 00000000..885782a2 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/shuffle.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/stop.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/stop.png Binary files differnew file mode 100644 index 00000000..3e9c3327 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32/stop.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/bluetooth.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/bluetooth.png Binary files differnew file mode 100644 index 00000000..2e70afc3 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/bluetooth.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cart.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cart.png Binary files differnew file mode 100644 index 00000000..5717dd65 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cart.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cloud.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cloud.png Binary files differnew file mode 100644 index 00000000..ce5ab9f9 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/cloud.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/favorite.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/favorite.png Binary files differnew file mode 100644 index 00000000..ddc9aa45 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/favorite.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/filter.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/filter.png Binary files differnew file mode 100644 index 00000000..3632c556 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/filter.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/folder.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/folder.png Binary files differnew file mode 100644 index 00000000..49d41e20 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/folder.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/grid.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/grid.png Binary files differnew file mode 100644 index 00000000..8a1624e7 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/grid.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/message.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/message.png Binary files differnew file mode 100644 index 00000000..6650f26b --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/message.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/music.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/music.png Binary files differnew file mode 100644 index 00000000..2cb8d49a --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/music.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/next.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/next.png Binary files differnew file mode 100644 index 00000000..d7bb4b27 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/next.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/pause.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/pause.png Binary files differnew file mode 100644 index 00000000..8a081d02 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/pause.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/power.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/power.png Binary files differnew file mode 100644 index 00000000..1201e55b --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/power.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/previous.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/previous.png Binary files differnew file mode 100644 index 00000000..4236afdb --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/previous.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/repeat.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/repeat.png Binary files differnew file mode 100644 index 00000000..c8cb06d8 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/repeat.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/save.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/save.png Binary files differnew file mode 100644 index 00000000..448b25e4 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/save.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/settings.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/settings.png Binary files differnew file mode 100644 index 00000000..12a0cf6b --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/settings.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/shuffle.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/shuffle.png Binary files differnew file mode 100644 index 00000000..22b901cc --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/shuffle.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/stop.png b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/stop.png Binary files differnew file mode 100644 index 00000000..0521a943 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/32x32@2/stop.png diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/icons.svg b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/icons.svg new file mode 100644 index 00000000..4cede992 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/icons.svg @@ -0,0 +1,648 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="svg4485" + width="1116.5374" + height="64" + viewBox="0 0 1116.5374 63.999997" + sodipodi:docname="icons.svg" + inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"> + <metadata + id="metadata4491"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs4489" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1017" + id="namedview4487" + showgrid="true" + inkscape:zoom="1.9019737" + inkscape:cx="833.25423" + inkscape:cy="74.046593" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="svg4485" + inkscape:snap-grids="false" + inkscape:object-nodes="false" + fit-margin-top="2.7755576e-017" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + <inkscape:grid + type="xygrid" + id="grid4517" + originx="-8.3788162" + originy="-6.3974667" /> + </sodipodi:namedview> + <g + id="g5472" + transform="translate(0,3.2401047)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\grid.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="translate(-8.3787758,-966.40258)" + id="g5318"> + <rect + y="998.53882" + x="27.755102" + height="9.2473469" + width="9.2473469" + id="rect4501" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + <rect + y="1014.5388" + x="11.755102" + height="9.2473469" + width="9.2473469" + id="rect4513" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect4515" + width="9.2473469" + height="9.2473469" + x="27.755102" + y="1014.5388" /> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect4519" + width="9.2473469" + height="9.2473469" + x="11.755102" + y="998.53882" /> + </g> + <rect + y="28.759895" + x="0" + height="32" + width="32" + id="rect5360" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <g + id="g5478" + transform="translate(0,3.6478805)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32\settings.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <g + transform="translate(-8.3787758,-966.40258)" + id="g5322"> + <path + style="fill:none;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 84.166529,1022.8327 69.433468,1008.4131" + id="path4507" + inkscape:connector-curvature="0" /> + <path + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 64.778344,1000.0771 c 0.15838,-2.21589 0.892654,-3.97239 4.064921,-3.9244 l 5.79089,5.4089 -0.06518,5.0971 -6.56108,6.4293 -4.0079,0.3962 -6.391837,-5.0204 c 0.003,-1.8969 0.615654,-4.5976 3.391837,-4.2539 l 3.804082,2.5118 c 1.756369,-0.3456 2.524226,-1.6258 3.156295,-3.1014 z" + id="path4523" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccc" /> + </g> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5362" + width="32" + height="32" + x="47.771301" + y="28.352119" /> + </g> + <g + id="g5484" + transform="translate(0,1.8732223)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\filter.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="translate(-8.3787758,-966.40258)" + id="g5326"> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 124.017,1012.8017 9.67769,-13.7927 H 108.6116 l 9.37299,13.931 v 13.1097 h 6.03241 z" + id="path4509" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 116.70205,1019.6217 h 7.31466" + id="path4525" + inkscape:connector-curvature="0" /> + </g> + <rect + y="30.126778" + x="96.808228" + height="32" + width="32" + id="rect5364" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <g + id="g5490" + transform="translate(0,3.322319)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\message.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="translate(-8.3787758,-966.40258)" + id="g5330"> + <path + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + d="m 155.38109,1005.6573 14.74014,12.3019 14.29684,-12.3019 v 16.8459 h -29.03698 z" + id="rect4527" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + sodipodi:nodetypes="cccccc" + inkscape:connector-curvature="0" + id="path4532" + d="m 155.38109,1002.206 14.74014,12.8565 14.29684,-12.8565 v -2.5487 h -29.03698 z" + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5366" + width="32" + height="32" + x="145.52081" + y="28.677681" /> + </g> + <g + id="g5497" + transform="translate(0,3.5476608)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\music.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="translate(-8.3787758,-966.40258)" + id="g5335"> + <circle + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="path4534" + cx="210.02449" + cy="1019.4025" + r="5.7991834" /> + <circle + r="5.7991834" + cy="1019.4025" + cx="227.51147" + id="circle4536" + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + <path + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.77122235;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + d="m 214.45548,1019.7112 v -19.81316 c 0,-1.11042 0.86314,-2.00436 1.93529,-2.00436 h 13.59886 c 1.07214,0 1.93528,0.89394 1.93528,2.00436 v 19.81316" + id="rect4538" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssssc" /> + </g> + <rect + y="28.452339" + x="194.38922" + height="32" + width="32" + id="rect5368" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <g + id="g5501" + transform="translate(0,3.1662521)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\cloud.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <path + sodipodi:nodetypes="cccscc" + inkscape:connector-curvature="0" + id="rect4181" + d="m 251.48461,45.034419 c 0.4638,-10.8715 12.40207,-12.59447 15.43885,-2.5078 2.73388,0.2127 5.14555,2.6373 5.18665,5.068 0,3.4504 -2.90742,6.2281 -6.51889,6.2281 h -16.54418 c -5.83464,-1.7769 -4.57322,-9.6738 2.43757,-8.7883 z" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.46805668;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5370" + width="32" + height="32" + x="242.73279" + y="28.833748" /> + </g> + <g + id="g5506" + transform="translate(0,2.188591)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32\bluetooth.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <g + transform="translate(-8.3787758,-966.40258)" + id="g5338"> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 302.67171,1006.3777 22.49812,12.0249 -9.75572,5.6324 v -23.642 l 9.85555,5.6901 -22.32088,12.5411" + id="path5197" + inkscape:connector-curvature="0" /> + </g> + <rect + y="29.811409" + x="290.75372" + height="32" + width="32" + id="rect5372" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <g + id="g5514" + transform="translate(0,3.6180954)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\cart.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="translate(-8.3787758,-966.40258)" + id="g5344"> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.30289125;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5199" + width="19.591835" + height="14.419591" + x="355.70938" + y="1002.3185" /> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 373.79839,1003.2635 v -5.25054 h 7.75837" + id="path5201" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccc" /> + <circle + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="path5207" + cx="357.12" + cy="1020.8915" + r="2.6644897" /> + <circle + r="2.6644897" + cy="1020.8915" + cx="374.64978" + id="circle5209" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5374" + width="32" + height="32" + x="342.87732" + y="28.381905" /> + </g> + <g + id="g5520" + transform="translate(0,3.3700485)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32\power.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <g + transform="translate(-8.3787758,-966.40258)" + id="g5348"> + <path + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + d="m 423.9111,999.19805 c 4.9899,1.81935 7.7689,6.19995 7.7689,11.81915 0,7.1847 -5.8243,13.009 -13.009,13.009 -7.1847,0 -13.009,-5.8243 -13.009,-13.009 0,-5.2414 3.0998,-9.7589 7.5661,-11.81915" + id="path5211" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cscsc" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.90877056;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5214" + width="3" + height="14.321534" + x="417.20502" + y="996.53888" /> + </g> + <rect + y="28.629951" + x="394.29221" + height="32" + width="32" + id="rect5376" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <g + id="g5528" + transform="translate(0,1.3681564)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\save.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="translate(-8.3787758,-966.40258)" + id="g5354"> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 461.313,1007.55 7.71825,-7.7187 H 486.75 v 26.4062 h -25.437 z" + id="path5250" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 466.625,1002.4875 v 5.625 h 14.1875 v -7.5625" + id="path5252" + inkscape:connector-curvature="0" /> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.85498571;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5254" + width="3" + height="3" + x="469.43436" + y="1002.7332" /> + <path + inkscape:connector-curvature="0" + id="path5256" + d="m 466.625,1025.1125 v -7.9375 h 14.1875 v 7.875" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + sodipodi:nodetypes="cccc" /> + </g> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5378" + width="32" + height="32" + x="449.65271" + y="30.631844" /> + </g> + <g + id="g5534" + transform="translate(0,2.5602951)" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32\folder.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <g + transform="translate(-8.3787758,-972.40258)" + id="g5358"> + <path + id="rect5216" + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + d="m 510.7344,1007.7803 h 6.307 c 1.108,0 2,0.892 2,2 0.058,1.9158 0.4001,5.5746 -2,5.6471 l -6.307,-4e-4 h -2.0004 v -1.9996 l 4e-4,-3.6471 c 1e-4,-1.108 0.892,-2 2,-2 z m 3.3587,3.7123 h 13.2014 c 1.108,0 2.001,0.8774 2.0005,1.9674 v 1.967 h -2.0005 l -13.2014,5e-4 c -1.108,0 -2,-0.8775 -2,-1.9674 0,-1.09 0.892,-1.9674 2,-1.9674 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sscccccsscssccsssc" /> + <path + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + d="m 508.8555,1017.2315 v 8.6728 c 0,1.108 0.892,2 2,2 h 16.5957 c 1.108,0 2,-0.892 2,-2 v -8.6728 z" + id="rect5242" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csssscc" /> + </g> + <rect + y="29.439705" + x="494.71381" + height="32" + width="32" + id="rect5380" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <g + id="g3966" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\favorite.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <path + sodipodi:nodetypes="ccc" + inkscape:connector-curvature="0" + id="path5258" + d="m 679.76049,43.397888 c -11.16654,-4.90607 -6.54023,-14.887481 0.0528,-8.582499 6.18385,-6.259313 11.86465,3.625989 -0.0528,8.582499 z" + style="fill:none;stroke:#000000;stroke-width:2.2720654;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <rect + y="22.143074" + x="663.8728" + height="32" + width="32" + id="rect5399" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <g + id="g3970" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32\stop.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <rect + ry="2" + rx="2" + y="30.209908" + x="730.55872" + height="13.875" + width="13.875" + id="rect5260" + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5405" + width="32" + height="32" + x="721.49622" + y="21.147408" /> + </g> + <g + id="g3976" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32\previous.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <g + transform="matrix(0.92512795,0,0,0.92512795,49.646365,-1594.3495)" + id="g5275"> + <path + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.84269726;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + inkscape:transform-center-x="1.6220757" + inkscape:transform-center-y="-9.5697762e-005" + d="m 809.37017,1768.9096 h -8.55767 -8.55877 v -4.1758 l 8.55877,-10.6475 8.55767,10.6475 z" + id="path5264" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" + transform="matrix(0,-0.65656157,0.65656157,0,-358.61037,2289.4994)" /> + <path + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" + id="path5267" + d="m 810.35019,1758.0981 v 5.6186 5.6193 h -2.74167 l -6.99073,-5.6193 6.99073,-5.6186 z" + inkscape:transform-center-y="-9.5697762e-005" + inkscape:transform-center-x="1.6220757" + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.20984423;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <rect + y="21.314461" + x="777.32397" + height="32" + width="32" + id="rect5407" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <g + id="g3988" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\next.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="matrix(-0.92512795,0,0,0.92512795,1729.0016,-1594.3495)" + id="g5281"> + <path + transform="matrix(0,-0.65656157,0.65656157,0,-358.61037,2289.4994)" + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" + id="path5277" + d="m 809.37017,1768.9096 h -8.55767 -8.55877 v -4.1758 l 8.55877,-10.6475 8.55767,10.6475 z" + inkscape:transform-center-y="-9.5697762e-005" + inkscape:transform-center-x="1.6220757" + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.84269726;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + <path + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.20984423;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + inkscape:transform-center-x="1.6220757" + inkscape:transform-center-y="-9.5697762e-005" + d="m 810.35019,1758.0981 v 5.6186 5.6193 h -2.74167 l -6.99073,-5.6193 6.99073,-5.6186 z" + id="path5279" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + </g> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5409" + width="32" + height="32" + x="969.32397" + y="21.314461" /> + </g> + <g + id="g3996" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\repeat.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="matrix(0.61777671,0,0,0.61777671,393.26213,-582.60358)" + id="g5386"> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1057,996.9258 h -11 c -1.7949,2e-4 -3.2498,1.4551 -3.25,3.25 v 3.375" + id="path5283" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1055.4787,992.6896 3.375,4.25 -3.75,3.875" + id="path5288" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="path5290" + d="m 1044.6035,1011.3192 h 11 c 1.7949,-2e-4 3.2498,-1.4551 3.25,-3.25 v -3.375" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path5292" + d="m 1046.1248,1015.5554 -3.375,-4.25 3.75,-3.875" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <rect + y="21.719917" + x="1026.423" + height="32" + width="32" + id="rect5411" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <g + id="g4005" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\shuffle.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="matrix(0.6410961,0,0,0.6410961,389.61554,-606.18813)" + id="g5393"> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1101,997.8001 c 10.7776,0 1.9407,12.75 14.125,12.75" + id="path5294" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + inkscape:connector-curvature="0" + id="path5298" + d="m 1113.4787,992.6896 3.375,4.25 -3.75,3.875" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1113.4787,1006.4897 3.375,4.25 -3.75,3.875" + id="path5300" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1101.2501,1010.2375 c 1.479,0.07 2.6346,-0.5915 3.875,-1.6562" + id="path5302" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path5312" + d="m 1113.6825,996.9157 c -1.479,-0.07 -2.6346,0.5915 -3.875,1.6562" + style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <rect + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5413" + width="32" + height="32" + x="1084.5374" + y="21.248909" /> + </g> + <g + id="g3982" + inkscape:export-filename="C:\dev\qqc2-technical-style-demo\icons\technical\32x32@2\pause.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> + <g + transform="matrix(0.26732473,0,0,0.26732473,607.52158,-229.58324)" + id="g5397"> + <rect + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.19984221;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="rect5269" + width="14.495689" + height="54.800774" + x="877.34277" + y="971.0022" /> + <rect + y="971.0022" + x="904.9892" + height="54.800774" + width="14.495689" + id="rect5271" + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.19984221;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> + <rect + y="21.314461" + x="831.68982" + height="32" + width="32" + id="rect5458" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" /> + </g> +</svg> diff --git a/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/index.theme b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/index.theme new file mode 100644 index 00000000..25232935 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/icons/musicplayer/index.theme @@ -0,0 +1,14 @@ +[Icon Theme] +Name=Music Player +Comment=Icon theme for the Qt Quick Controls 2 Music Player Imagine Style Example + +Directories=32x32,32x32@2 + +[32x32] +Size=32 +Type=Fixed + +[32x32@2] +Size=32 +Scale=2 +Type=Fixed diff --git a/examples/quickcontrols2/imagine/musicplayer/images/album-cover.jpg b/examples/quickcontrols2/imagine/musicplayer/images/album-cover.jpg Binary files differnew file mode 100644 index 00000000..48bd6231 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/images/album-cover.jpg diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/applicationwindow-background.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/applicationwindow-background.png Binary files differnew file mode 100644 index 00000000..036bf746 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/applicationwindow-background.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered.9.png Binary files differnew file mode 100644 index 00000000..c275d324 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..eec285f3 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked-hovered@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked.9.png Binary files differnew file mode 100644 index 00000000..2d284a5b --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked@2x.9.png Binary files differnew file mode 100644 index 00000000..fec385f5 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-checked@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled.9.png Binary files differnew file mode 100644 index 00000000..bcad1470 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled@2x.9.png Binary files differnew file mode 100644 index 00000000..03aba153 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-disabled@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered.9.png Binary files differnew file mode 100644 index 00000000..962cf677 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..841c0064 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-hovered@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed.9.png Binary files differnew file mode 100644 index 00000000..f97f42b8 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..97058349 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background-pressed@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background.9.png Binary files differnew file mode 100644 index 00000000..74a8574f --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background@2x.9.png Binary files differnew file mode 100644 index 00000000..25163385 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/button-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered.9.png Binary files differnew file mode 100644 index 00000000..f9f90df4 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..a4be50e1 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-hovered@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open.9.png Binary files differnew file mode 100644 index 00000000..147231ec --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open@2x.9.png Binary files differnew file mode 100644 index 00000000..0a978572 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-open@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed.9.png Binary files differnew file mode 100644 index 00000000..7726198a --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..d64d4052 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background-pressed@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background.9.png Binary files differnew file mode 100644 index 00000000..e919d50a --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background@2x.9.png Binary files differnew file mode 100644 index 00000000..5effba7e --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered.png Binary files differnew file mode 100644 index 00000000..78b06505 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered@2x.png Binary files differnew file mode 100644 index 00000000..ec3c8734 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open.png Binary files differnew file mode 100644 index 00000000..7a831632 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open@2x.png Binary files differnew file mode 100644 index 00000000..47c664a2 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-open@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed.png Binary files differnew file mode 100644 index 00000000..3340294f --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed@2x.png Binary files differnew file mode 100644 index 00000000..aa35b882 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator.png Binary files differnew file mode 100644 index 00000000..2c7f5578 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator@2x.png Binary files differnew file mode 100644 index 00000000..20b9c44c --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-indicator@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup.9.png Binary files differnew file mode 100644 index 00000000..cae75cd7 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup@2x.9.png Binary files differnew file mode 100644 index 00000000..392607bc --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/combobox-popup@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered.png Binary files differnew file mode 100644 index 00000000..ac614678 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered@2x.png Binary files differnew file mode 100644 index 00000000..b13783c2 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed.png Binary files differnew file mode 100644 index 00000000..22e3958d --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed@2x.png Binary files differnew file mode 100644 index 00000000..72f6fadd --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background.png Binary files differnew file mode 100644 index 00000000..4d9eb023 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background@2x.png Binary files differnew file mode 100644 index 00000000..7ca50be8 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-background@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed.png Binary files differnew file mode 100644 index 00000000..39cd2b82 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed@2x.png Binary files differnew file mode 100644 index 00000000..01556b92 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle.png Binary files differnew file mode 100644 index 00000000..8fb85691 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle@2x.png Binary files differnew file mode 100644 index 00000000..f6dc4c90 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/dial-handle@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background.9.png Binary files differnew file mode 100644 index 00000000..aa305355 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background@2x.9.png Binary files differnew file mode 100644 index 00000000..b4a4bc9d --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/frame-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/imagine-assets.qrc b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/imagine-assets.qrc new file mode 100644 index 00000000..7bda4995 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/imagine-assets.qrc @@ -0,0 +1,113 @@ +<RCC> + <qresource prefix="/imagine-assets"> + <file>applicationwindow-background.png</file> + <file>button-background-checked-hovered.9.png</file> + <file>button-background-checked-hovered@2x.9.png</file> + <file>button-background-checked.9.png</file> + <file>button-background-checked@2x.9.png</file> + <file>button-background-disabled.9.png</file> + <file>button-background-disabled@2x.9.png</file> + <file>button-background-hovered.9.png</file> + <file>button-background-hovered@2x.9.png</file> + <file>button-background-pressed.9.png</file> + <file>button-background-pressed@2x.9.png</file> + <file>button-background.9.png</file> + <file>button-background@2x.9.png</file> + <file>combobox-background-hovered.9.png</file> + <file>combobox-background-hovered@2x.9.png</file> + <file>combobox-background-open.9.png</file> + <file>combobox-background-open@2x.9.png</file> + <file>combobox-background-pressed.9.png</file> + <file>combobox-background-pressed@2x.9.png</file> + <file>combobox-background.9.png</file> + <file>combobox-background@2x.9.png</file> + <file>combobox-indicator-hovered.png</file> + <file>combobox-indicator-hovered@2x.png</file> + <file>combobox-indicator-open.png</file> + <file>combobox-indicator-open@2x.png</file> + <file>combobox-indicator-pressed.png</file> + <file>combobox-indicator-pressed@2x.png</file> + <file>combobox-indicator.png</file> + <file>combobox-indicator@2x.png</file> + <file>combobox-popup.9.png</file> + <file>combobox-popup@2x.9.png</file> + <file>dial-background-hovered.png</file> + <file>dial-background-hovered@2x.png</file> + <file>dial-background-pressed.png</file> + <file>dial-background-pressed@2x.png</file> + <file>dial-background.png</file> + <file>dial-background@2x.png</file> + <file>dial-handle-pressed.png</file> + <file>dial-handle-pressed@2x.png</file> + <file>dial-handle.png</file> + <file>dial-handle@2x.png</file> + <file>frame-background.9.png</file> + <file>frame-background@2x.9.png</file> + <file>itemdelegate-background-checked.9.png</file> + <file>itemdelegate-background-checked@2x.9.png</file> + <file>itemdelegate-background-disabled.9.png</file> + <file>itemdelegate-background-disabled@2x.9.png</file> + <file>itemdelegate-background-hovered.9.png</file> + <file>itemdelegate-background-hovered@2x.9.png</file> + <file>itemdelegate-background-pressed.9.png</file> + <file>itemdelegate-background-pressed@2x.9.png</file> + <file>itemdelegate-background.9.png</file> + <file>itemdelegate-background@2x.9.png</file> + <file>roundbutton-background-checked-hovered.png</file> + <file>roundbutton-background-checked-hovered@2x.png</file> + <file>roundbutton-background-checked.png</file> + <file>roundbutton-background-checked@2x.png</file> + <file>roundbutton-background-disabled.png</file> + <file>roundbutton-background-disabled@2x.png</file> + <file>roundbutton-background-hovered.png</file> + <file>roundbutton-background-hovered@2x.png</file> + <file>roundbutton-background-pressed.png</file> + <file>roundbutton-background-pressed@2x.png</file> + <file>roundbutton-background.png</file> + <file>roundbutton-background@2x.png</file> + <file>scrollbar-handle-interactive-hovered.png</file> + <file>scrollbar-handle-interactive-hovered@2x.png</file> + <file>scrollbar-handle-interactive-pressed.png</file> + <file>scrollbar-handle-interactive-pressed@2x.png</file> + <file>scrollbar-handle-interactive.png</file> + <file>scrollbar-handle-interactive@2x.png</file> + <file>slider-background-horizontal-disabled.9.png</file> + <file>slider-background-horizontal-disabled@2x.9.png</file> + <file>slider-background-horizontal.9.png</file> + <file>slider-background-horizontal@2x.9.png</file> + <file>slider-background-vertical-disabled.9.png</file> + <file>slider-background-vertical-disabled@2x.9.png</file> + <file>slider-background-vertical.9.png</file> + <file>slider-background-vertical@2x.9.png</file> + <file>slider-handle-disabled.png</file> + <file>slider-handle-disabled@2x.png</file> + <file>slider-handle-hovered.png</file> + <file>slider-handle-hovered@2x.png</file> + <file>slider-handle.png</file> + <file>slider-handle@2x.png</file> + <file>slider-progress-horizontal.9.png</file> + <file>slider-progress-horizontal@2x.9.png</file> + <file>slider-progress-vertical-disabled.9.png</file> + <file>slider-progress-vertical-disabled@2x.9.png</file> + <file>slider-progress-vertical.9.png</file> + <file>slider-progress-vertical@2x.9.png</file> + <file>textfield-background-disabled.9.png</file> + <file>textfield-background-disabled@2x.9.png</file> + <file>textfield-background.9.png</file> + <file>textfield-background@2x.9.png</file> + <file>toolbar-background.9.png</file> + <file>toolbar-background@2x.9.png</file> + <file>toolbutton-background-checked-hovered.9.png</file> + <file>toolbutton-background-checked-hovered@2x.9.png</file> + <file>toolbutton-background-checked.9.png</file> + <file>toolbutton-background-checked@2x.9.png</file> + <file>toolbutton-background-hovered.9.png</file> + <file>toolbutton-background-hovered@2x.9.png</file> + <file>toolbutton-background-pressed.9.png</file> + <file>toolbutton-background-pressed@2x.9.png</file> + <file>toolbutton-background.9.png</file> + <file>toolbutton-background@2x.9.png</file> + <file>tooltip-background.9.png</file> + <file>tooltip-background@2x.9.png</file> + </qresource> +</RCC> diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked.9.png Binary files differnew file mode 100644 index 00000000..a83c2577 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked@2x.9.png Binary files differnew file mode 100644 index 00000000..ded49620 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-checked@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled.9.png Binary files differnew file mode 100644 index 00000000..2047e888 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled@2x.9.png Binary files differnew file mode 100644 index 00000000..422b2832 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-disabled@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered.9.png Binary files differnew file mode 100644 index 00000000..5c436be5 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..2b98dc22 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-hovered@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed.9.png Binary files differnew file mode 100644 index 00000000..c3c2ac1d --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..3b7ba51a --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background-pressed@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background.9.png Binary files differnew file mode 100644 index 00000000..b926d423 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background@2x.9.png Binary files differnew file mode 100644 index 00000000..422b2832 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/itemdelegate-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered.png Binary files differnew file mode 100644 index 00000000..39e71430 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered@2x.png Binary files differnew file mode 100644 index 00000000..dd9610d1 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked.png Binary files differnew file mode 100644 index 00000000..7020a0f5 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked@2x.png Binary files differnew file mode 100644 index 00000000..b24dc0bf --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-checked@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled.png Binary files differnew file mode 100644 index 00000000..7f60101d --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled@2x.png Binary files differnew file mode 100644 index 00000000..ff0459ed --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-disabled@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered.png Binary files differnew file mode 100644 index 00000000..363d35e6 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered@2x.png Binary files differnew file mode 100644 index 00000000..61f109b7 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed.png Binary files differnew file mode 100644 index 00000000..7ca9d6c9 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed@2x.png Binary files differnew file mode 100644 index 00000000..5b35d944 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background.png Binary files differnew file mode 100644 index 00000000..47f9decd --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background@2x.png Binary files differnew file mode 100644 index 00000000..f6944b7a --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/roundbutton-background@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered.png Binary files differnew file mode 100644 index 00000000..050e9edb --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered@2x.png Binary files differnew file mode 100644 index 00000000..096c750e --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed.png Binary files differnew file mode 100644 index 00000000..2fd4bd65 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed@2x.png Binary files differnew file mode 100644 index 00000000..f5c9fe44 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive-pressed@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive.png Binary files differnew file mode 100644 index 00000000..45edd220 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive@2x.png Binary files differnew file mode 100644 index 00000000..2e02f30a --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/scrollbar-handle-interactive@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled.9.png Binary files differnew file mode 100644 index 00000000..0a3e6d1a --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled@2x.9.png Binary files differnew file mode 100644 index 00000000..174c03fd --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal-disabled@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal.9.png Binary files differnew file mode 100644 index 00000000..a4324dad --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal@2x.9.png Binary files differnew file mode 100644 index 00000000..8a7127c8 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-horizontal@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled.9.png Binary files differnew file mode 100644 index 00000000..ee4486c7 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled@2x.9.png Binary files differnew file mode 100644 index 00000000..b48efcd4 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical-disabled@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical.9.png Binary files differnew file mode 100644 index 00000000..f3f8f75d --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical@2x.9.png Binary files differnew file mode 100644 index 00000000..76397566 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-background-vertical@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled.png Binary files differnew file mode 100644 index 00000000..1157718c --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled@2x.png Binary files differnew file mode 100644 index 00000000..b9c55bdd --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-disabled@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered.png Binary files differnew file mode 100644 index 00000000..50ffc782 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered@2x.png Binary files differnew file mode 100644 index 00000000..a89d05e4 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle-hovered@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle.png Binary files differnew file mode 100644 index 00000000..d9334948 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle@2x.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle@2x.png Binary files differnew file mode 100644 index 00000000..a8c59db8 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-handle@2x.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal.9.png Binary files differnew file mode 100644 index 00000000..08bd59da --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal@2x.9.png Binary files differnew file mode 100644 index 00000000..ce1ca6e5 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-horizontal@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled.9.png Binary files differnew file mode 100644 index 00000000..f906bb7d --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled@2x.9.png Binary files differnew file mode 100644 index 00000000..2ec0f792 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical-disabled@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical.9.png Binary files differnew file mode 100644 index 00000000..7797c4ed --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical@2x.9.png Binary files differnew file mode 100644 index 00000000..891eb100 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/slider-progress-vertical@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled.9.png Binary files differnew file mode 100644 index 00000000..0de72f69 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled@2x.9.png Binary files differnew file mode 100644 index 00000000..6ed5134b --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background-disabled@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background.9.png Binary files differnew file mode 100644 index 00000000..d9396673 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background@2x.9.png Binary files differnew file mode 100644 index 00000000..322b6c40 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/textfield-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background.9.png Binary files differnew file mode 100644 index 00000000..b1e8a08b --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background@2x.9.png Binary files differnew file mode 100644 index 00000000..d3a26620 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbar-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered.9.png Binary files differnew file mode 100644 index 00000000..dcd5e0db --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..f083b78e --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked-hovered@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked.9.png Binary files differnew file mode 100644 index 00000000..154b7d02 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked@2x.9.png Binary files differnew file mode 100644 index 00000000..8c60ca6d --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-checked@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered.9.png Binary files differnew file mode 100644 index 00000000..52c7321a --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered@2x.9.png Binary files differnew file mode 100644 index 00000000..8eda3fc4 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-hovered@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed.9.png Binary files differnew file mode 100644 index 00000000..e1c29027 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..604a3136 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background-pressed@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background.9.png Binary files differnew file mode 100644 index 00000000..205b5f70 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png Binary files differnew file mode 100644 index 00000000..7c97b8d1 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/toolbutton-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background.9.png Binary files differnew file mode 100644 index 00000000..bc56e3bd --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background@2x.9.png b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background@2x.9.png Binary files differnew file mode 100644 index 00000000..72990330 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/imagine-assets/tooltip-background@2x.9.png diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp b/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp new file mode 100644 index 00000000..a9fc2b9e --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/musicplayer.cpp @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QGuiApplication> +#include <QQmlApplicationEngine> +#include <QSettings> +#include <QIcon> + +int main(int argc, char *argv[]) +{ + QGuiApplication::setApplicationName("Music Player"); + QGuiApplication::setOrganizationName("QtProject"); + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + + QGuiApplication app(argc, argv); + + QIcon::setThemeName("musicplayer"); + + QQmlApplicationEngine engine; + engine.load(QUrl("qrc:/musicplayer.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + + return app.exec(); +} diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.pro b/examples/quickcontrols2/imagine/musicplayer/musicplayer.pro new file mode 100644 index 00000000..b1970ee9 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/musicplayer.pro @@ -0,0 +1,16 @@ +TEMPLATE = app +TARGET = musicplayer +QT += quick quickcontrols2 + +SOURCES += \ + musicplayer.cpp + +RESOURCES += \ + icons/icons.qrc \ + images/album-cover.jpg \ + imagine-assets/imagine-assets.qrc \ + qtquickcontrols2.conf \ + musicplayer.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/imagine/musicplayer +INSTALLS += target diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml new file mode 100644 index 00000000..84084862 --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml @@ -0,0 +1,467 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.9 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.3 +import QtQuick.Window 2.0 + +ApplicationWindow { + id: window + width: 1280 + height: 720 + visible: true + title: "Qt Quick Controls 2 - Imagine Style Example: Music Player" + + Component.onCompleted: { + x = Screen.width / 2 - width / 2 + y = Screen.height / 2 - height / 2 + } + + Shortcut { + sequence: "Ctrl+Q" + onActivated: Qt.quit() + } + + header: ToolBar { + RowLayout { + id: headerRowLayout + anchors.fill: parent + spacing: 0 + + ToolButton { + icon.name: "grid" + } + ToolButton { + icon.name: "settings" + } + ToolButton { + icon.name: "filter" + } + ToolButton { + icon.name: "message" + } + ToolButton { + icon.name: "music" + } + ToolButton { + icon.name: "cloud" + } + ToolButton { + icon.name: "bluetooth" + } + ToolButton { + icon.name: "cart" + } + + Item { + Layout.fillWidth: true + } + + ToolButton { + icon.name: "power" + onClicked: Qt.quit() + } + } + } + + Label { + text: "Qtify" + font.pixelSize: Qt.application.font.pixelSize * 1.3 + anchors.centerIn: header + z: header.z + 1 + } + + RowLayout { + spacing: 115 + anchors.fill: parent + anchors.margins: 70 + + ColumnLayout { + spacing: 0 + Layout.preferredWidth: 230 + + RowLayout { + Layout.maximumHeight: 170 + + ColumnLayout { + Label { + text: "12 dB" + Layout.fillHeight: true + } + Label { + text: "6 dB" + Layout.fillHeight: true + } + Label { + text: "0 dB" + Layout.fillHeight: true + } + Label { + text: "-6 dB" + Layout.fillHeight: true + } + Label { + text: "-12 dB" + Layout.fillHeight: true + } + } + + Repeater { + model: 7 + + Slider { + value: Math.random() + orientation: Qt.Vertical + + Layout.fillWidth: true + Layout.fillHeight: true + } + } + } + + RowLayout { + spacing: 10 + Layout.topMargin: 23 + + ComboBox { + currentIndex: 1 + model: ["Blues", "Classical", "Jazz", "Metal"] + Layout.fillWidth: true + } + + Button { + icon.name: "folder" + } + + Button { + icon.name: "save" + enabled: false + } + } + + Dial { + anchors.horizontalCenter: parent.horizontalCenter + + Layout.topMargin: 50 + } + + Label { + text: "Volume" + anchors.horizontalCenter: parent.horizontalCenter + + Layout.topMargin: 12 + } + } + + ColumnLayout { + spacing: 26 + Layout.preferredWidth: 230 + + Item { + Layout.fillWidth: true + Layout.fillHeight: true + + Image { + anchors.fill: parent + fillMode: Image.PreserveAspectCrop + source: "images/album-cover.jpg" + } + } + + Item { + id: songLabelContainer + clip: true + + Layout.fillWidth: true + Layout.preferredHeight: songNameLabel.implicitHeight + + SequentialAnimation { + running: true + loops: Animation.Infinite + + PauseAnimation { + duration: 2000 + } + ParallelAnimation { + XAnimator { + target: songNameLabel + from: 0 + to: songLabelContainer.width - songNameLabel.implicitWidth + duration: 5000 + } + OpacityAnimator { + target: leftGradient + from: 0 + to: 1 + } + } + OpacityAnimator { + target: rightGradient + from: 1 + to: 0 + } + PauseAnimation { + duration: 1000 + } + OpacityAnimator { + target: rightGradient + from: 0 + to: 1 + } + ParallelAnimation { + XAnimator { + target: songNameLabel + from: songLabelContainer.width - songNameLabel.implicitWidth + to: 0 + duration: 5000 + } + OpacityAnimator { + target: leftGradient + from: 0 + to: 1 + } + } + OpacityAnimator { + target: leftGradient + from: 1 + to: 0 + } + } + + Rectangle { + id: leftGradient + gradient: Gradient { + GradientStop { + position: 0 + color: "#dfe4ea" + } + GradientStop { + position: 1 + color: "#00dfe4ea" + } + } + + width: height + height: parent.height + anchors.left: parent.left + z: 1 + rotation: -90 + opacity: 0 + } + + Label { + id: songNameLabel + text: "Edvard Grieg - In the Hall of the Mountain King" + font.pixelSize: Qt.application.font.pixelSize * 1.4 + } + + Rectangle { + id: rightGradient + gradient: Gradient { + GradientStop { + position: 0 + color: "#00dfe4ea" + } + GradientStop { + position: 1 + color: "#dfe4ea" + } + } + + width: height + height: parent.height + anchors.right: parent.right + rotation: -90 + } + } + + RowLayout { + spacing: 8 + Layout.alignment: Qt.AlignHCenter + + RoundButton { + icon.name: "favorite" + icon.width: 32 + icon.height: 32 + } + RoundButton { + icon.name: "stop" + icon.width: 32 + icon.height: 32 + } + RoundButton { + icon.name: "previous" + icon.width: 32 + icon.height: 32 + } + RoundButton { + icon.name: "pause" + icon.width: 32 + icon.height: 32 + } + RoundButton { + icon.name: "next" + icon.width: 32 + icon.height: 32 + } + RoundButton { + icon.name: "repeat" + icon.width: 32 + icon.height: 32 + } + RoundButton { + icon.name: "shuffle" + icon.width: 32 + icon.height: 32 + } + } + + Slider { + id: seekSlider + value: 113 + to: 261 + + Layout.fillWidth: true + + ToolTip { + parent: seekSlider.handle + visible: seekSlider.pressed + text: pad(Math.floor(value / 60)) + ":" + pad(Math.floor(value % 60)) + y: parent.height + + readonly property int value: seekSlider.valueAt(seekSlider.position) + + function pad(number) { + if (number <= 9) + return "0" + number; + return number; + } + } + } + } + + ColumnLayout { + spacing: 16 + Layout.preferredWidth: 230 + + ButtonGroup { + buttons: libraryRowLayout.children + } + + RowLayout { + id: libraryRowLayout + Layout.alignment: Qt.AlignHCenter + + Button { + text: "Files" + checked: true + } + Button { + text: "Playlists" + checkable: true + } + Button { + text: "Favourites" + checkable: true + } + } + + RowLayout { + TextField { + Layout.fillWidth: true + } + Button { + icon.name: "folder" + } + } + + Frame { + id: filesFrame + leftPadding: 1 + rightPadding: 1 + + Layout.fillWidth: true + Layout.fillHeight: true + + ListView { + clip: true + anchors.fill: parent + model: ListModel { + Component.onCompleted: { + for (var i = 0; i < 100; ++i) { + append({ + author: "Author", + album: "Album", + track: "Track 0" + (i % 9 + 1), + }); + } + } + } + delegate: ItemDelegate { + text: model.author + " - " + model.album + " - " + model.track + width: parent.width + } + + ScrollBar.vertical: ScrollBar { + parent: filesFrame + policy: ScrollBar.AlwaysOn + anchors.top: parent.top + anchors.topMargin: filesFrame.topPadding + anchors.right: parent.right + anchors.rightMargin: 1 + anchors.bottom: parent.bottom + anchors.bottomMargin: filesFrame.bottomPadding + } + } + } + } + } +} diff --git a/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf b/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf new file mode 100644 index 00000000..2fc304eb --- /dev/null +++ b/examples/quickcontrols2/imagine/musicplayer/qtquickcontrols2.conf @@ -0,0 +1,10 @@ +[Controls] +Style=Imagine + +[Imagine] +Path=qrc:/imagine-assets + +[Imagine\Palette] +Text=#6b7b89 +ButtonText=#6b7b89 +WindowText=#6b7b89 diff --git a/examples/quickcontrols2/quickcontrols2.pro b/examples/quickcontrols2/quickcontrols2.pro index 858759fb..3e2e3948 100644 --- a/examples/quickcontrols2/quickcontrols2.pro +++ b/examples/quickcontrols2/quickcontrols2.pro @@ -7,4 +7,6 @@ SUBDIRS += \ sidepanel \ swipetoremove \ flatstyle \ - wearable + wearable \ + imagine/automotive \ + imagine/musicplayer diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc index 7d4a6a23..124984c1 100644 --- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc +++ b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc @@ -99,6 +99,21 @@ \skipto } \printuntil /^\}/ + \section1 Icons + + The demo ships a custom icon theme. The icons are bundled into the \c :/icons + folder in the application's resources. The \c index.theme file lists the contents + of the icon theme: + + \quotefile wearable/icons/wearable/index.theme + + Finally, the icon theme is selected in \c main(): + + \snippet wearable/wearable.cpp icons + + The icons are used on the Launcher Page, which is presented below. See + \l {Icons in Qt Quick Controls 2} for more details about icons and themes. + \section1 Launcher Page The application launcher is implemented using a circular PathView in @@ -116,6 +131,9 @@ \skipto "Settings" \printuntil delegate: \dots 8 + \skipto icon.width + \printuntil icon.name + \dots 8 \skipto onClicked: \printto path: \dots diff --git a/examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png Binary files differindex f38b3d4e..f38b3d4e 100644 --- a/examples/quickcontrols2/wearable/qml/Alarms/images/alarms.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36/alarms.png diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png Binary files differindex 80ec43cc..80ec43cc 100644 --- a/examples/quickcontrols2/wearable/qml/Fitness/images/fitness.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36/fitness.png diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png Binary files differnew file mode 100644 index 00000000..9b8cb8e6 --- /dev/null +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36/navigation.png diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png Binary files differindex bcbe85ef..bcbe85ef 100644 --- a/examples/quickcontrols2/wearable/qml/Notifications/images/notifications.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36/notifications.png diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/settings.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png Binary files differindex 093404f9..093404f9 100644 --- a/examples/quickcontrols2/wearable/qml/Settings/images/settings.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36/settings.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/weather.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png Binary files differindex 07bf8187..07bf8187 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/weather.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36/weather.png diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock.png b/examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png Binary files differindex 91a70493..91a70493 100644 --- a/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36/worldclock.png diff --git a/examples/quickcontrols2/wearable/qml/Alarms/images/alarms@2x.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png Binary files differindex ba68519a..ba68519a 100644 --- a/examples/quickcontrols2/wearable/qml/Alarms/images/alarms@2x.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/alarms.png diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png Binary files differindex 088c15b8..088c15b8 100644 --- a/examples/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/fitness.png diff --git a/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png Binary files differnew file mode 100644 index 00000000..8d133abc --- /dev/null +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/navigation.png diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/notifications@2x.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png Binary files differindex c3b284ed..c3b284ed 100644 --- a/examples/quickcontrols2/wearable/qml/Notifications/images/notifications@2x.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/notifications.png diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/settings@2x.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png Binary files differindex a24a1df7..a24a1df7 100644 --- a/examples/quickcontrols2/wearable/qml/Settings/images/settings@2x.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/settings.png diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/weather@2x.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png Binary files differindex 6e4ce2f3..6e4ce2f3 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/images/weather@2x.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/weather.png diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock@2x.png b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png Binary files differindex 03abe162..03abe162 100644 --- a/examples/quickcontrols2/wearable/qml/WorldClock/images/worldclock@2x.png +++ b/examples/quickcontrols2/wearable/icons/wearable/36x36@2/worldclock.png diff --git a/examples/quickcontrols2/wearable/icons/wearable/index.theme b/examples/quickcontrols2/wearable/icons/wearable/index.theme new file mode 100644 index 00000000..da702d4a --- /dev/null +++ b/examples/quickcontrols2/wearable/icons/wearable/index.theme @@ -0,0 +1,14 @@ +[Icon Theme] +Name=Wearable +Comment=Qt Quick Controls 2 Wearable Demo Icon Theme + +Directories=36x36,36x36@2 + +[36x36] +Size=36 +Type=Fixed + +[36x36@2] +Size=36 +Scale=2 +Type=Fixed diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml index 34f117c4..9d6d9ae9 100644 --- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml +++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.7 -import QtQuick.Controls 2.0 as QQC2 +import QtQuick.Controls 2.1 as QQC2 import "Style" PathView { @@ -68,56 +68,53 @@ PathView { model: ListModel { ListElement { title: qsTr("World Clock") - icon: "WorldClock/images/worldclock.png" + icon: "worldclock" page: "WorldClock/WorldClockPage.qml" } ListElement { title: qsTr("Navigation") - icon: "Navigation/images/navigation.png" + icon: "navigation" page: "Navigation/NavigationPage.qml" } ListElement { title: qsTr("Weather") - icon: "Weather/images/weather.png" + icon: "weather" page: "Weather/WeatherPage.qml" } ListElement { title: qsTr("Fitness") - icon: "Fitness/images/fitness.png" + icon: "fitness" page: "Fitness/FitnessPage.qml" } ListElement { title: qsTr("Notifications") - icon: "Notifications/images/notifications.png" + icon: "notifications" page: "Notifications/NotificationsPage.qml" } ListElement { title: qsTr("Alarm") - icon: "Alarms/images/alarms.png" + icon: "alarms" page: "Alarms/AlarmsPage.qml" } ListElement { title: qsTr("Settings") - icon: "Settings/images/settings.png" + icon: "settings" page: "Settings/SettingsPage.qml" } } - delegate: QQC2.AbstractButton { + delegate: QQC2.RoundButton { width: circularView.itemSize height: circularView.itemSize - text: model.title + property string title: model.title + + icon.width: 36 + icon.height: 36 + icon.name: model.icon opacity: PathView.itemOpacity padding: 12 - contentItem: Image { - source: model.icon - fillMode: Image.Pad - sourceSize.width: parent.availableWidth - sourceSize.height: parent.availableHeight - } - background: Rectangle { radius: width / 2 border.width: 3 @@ -180,7 +177,7 @@ PathView { visible: currentItem ? currentItem.PathView.itemOpacity === 1.0 : 0 - text: currentItem ? currentItem.text : "" + text: currentItem ? currentItem.title : "" anchors.centerIn: parent anchors.verticalCenterOffset: (circularView.itemSize + height) / 2 diff --git a/examples/quickcontrols2/wearable/wearable.cpp b/examples/quickcontrols2/wearable/wearable.cpp index e6fdad74..e90ec413 100644 --- a/examples/quickcontrols2/wearable/wearable.cpp +++ b/examples/quickcontrols2/wearable/wearable.cpp @@ -51,6 +51,7 @@ #include <QGuiApplication> #include <QQmlApplicationEngine> #include <QQuickStyle> +#include <QIcon> int main(int argc, char *argv[]) { @@ -61,6 +62,10 @@ int main(int argc, char *argv[]) QQuickStyle::setStyle(QStringLiteral("qrc:/qml/Style")); //! [style] + //! [icons] + QIcon::setThemeName(QStringLiteral("wearable")); + //! [icons] + QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/wearable.qml"))); diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols2/wearable/wearable.qrc index c8143a18..ea81edc6 100644 --- a/examples/quickcontrols2/wearable/wearable.qrc +++ b/examples/quickcontrols2/wearable/wearable.qrc @@ -3,18 +3,29 @@ <file>wearable.qml</file> <file>qml/LauncherPage.qml</file> <file>qml/NaviButton.qml</file> + <file>icons/wearable/index.theme</file> + <file>icons/wearable/36x36/alarms.png</file> + <file>icons/wearable/36x36/fitness.png</file> + <file>icons/wearable/36x36/navigation.png</file> + <file>icons/wearable/36x36/notifications.png</file> + <file>icons/wearable/36x36/settings.png</file> + <file>icons/wearable/36x36/weather.png</file> + <file>icons/wearable/36x36/worldclock.png</file> + <file>icons/wearable/36x36@2/alarms.png</file> + <file>icons/wearable/36x36@2/fitness.png</file> + <file>icons/wearable/36x36@2/navigation.png</file> + <file>icons/wearable/36x36@2/notifications.png</file> + <file>icons/wearable/36x36@2/settings.png</file> + <file>icons/wearable/36x36@2/weather.png</file> + <file>icons/wearable/36x36@2/worldclock.png</file> <file>images/background.png</file> <file>images/back.png</file> <file>images/back@2x.png</file> <file>images/home.png</file> <file>images/home@2x.png</file> <file>qml/Alarms/AlarmsPage.qml</file> - <file>qml/Alarms/images/alarms.png</file> - <file>qml/Alarms/images/alarms@2x.png</file> <file>qml/Fitness/fitness.js</file> <file>qml/Fitness/FitnessPage.qml</file> - <file>qml/Fitness/images/fitness.png</file> - <file>qml/Fitness/images/fitness@2x.png</file> <file>qml/Fitness/images/man-running.png</file> <file>qml/Fitness/images/man-running@2x.png</file> <file>qml/Fitness/images/man-walking.png</file> @@ -45,8 +56,6 @@ <file>qml/Notifications/images/avatarm@2x.png</file> <file>qml/Notifications/images/missedcall.png</file> <file>qml/Notifications/images/missedcall@2x.png</file> - <file>qml/Notifications/images/notifications.png</file> - <file>qml/Notifications/images/notifications@2x.png</file> <file>qml/Settings/SettingsPage.qml</file> <file>qml/Settings/images/bluetooth.png</file> <file>qml/Settings/images/bluetooth@2x.png</file> @@ -54,8 +63,6 @@ <file>qml/Settings/images/brightness@2x.png</file> <file>qml/Settings/images/contrast.png</file> <file>qml/Settings/images/contrast@2x.png</file> - <file>qml/Settings/images/settings.png</file> - <file>qml/Settings/images/settings@2x.png</file> <file>qml/Settings/images/wifi.png</file> <file>qml/Settings/images/wifi@2x.png</file> <file>qml/Style/qmldir</file> @@ -76,8 +83,6 @@ <file>qml/Weather/images/sunset@2x.png</file> <file>qml/Weather/images/temperature.png</file> <file>qml/Weather/images/temperature@2x.png</file> - <file>qml/Weather/images/weather.png</file> - <file>qml/Weather/images/weather@2x.png</file> <file>qml/Weather/images/wind.png</file> <file>qml/Weather/images/wind@2x.png</file> <file>qml/WorldClock/Clock.qml</file> @@ -98,7 +103,5 @@ <file>qml/WorldClock/images/swissnighthour@2x.png</file> <file>qml/WorldClock/images/swissnightminute.png</file> <file>qml/WorldClock/images/swissnightminute@2x.png</file> - <file>qml/WorldClock/images/worldclock.png</file> - <file>qml/WorldClock/images/worldclock@2x.png</file> </qresource> </RCC> diff --git a/src/imports/calendar/plugins.qmltypes b/src/imports/calendar/plugins.qmltypes index 2ad527f7..ef9a5d49 100644 --- a/src/imports/calendar/plugins.qmltypes +++ b/src/imports/calendar/plugins.qmltypes @@ -86,6 +86,8 @@ Module { Property { name: "wheelEnabled"; type: "bool" } Property { name: "background"; type: "QQuickItem"; isPointer: true } Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } + Property { name: "palette"; revision: 3; type: "QPalette" } + Signal { name: "paletteChanged"; revision: 3 } } Component { name: "QQuickDayOfWeekRow" diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 94d9ebca..136c9b36 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -52,22 +52,43 @@ T.CheckBox { padding: 6 spacing: 6 - indicator: CheckIndicator { + // keep in sync with CheckDelegate.qml (shared CheckIndicator.qml was removed for performance reasons) + indicator: Rectangle { + implicitWidth: 28 + implicitHeight: 28 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - control: control + + color: control.down ? control.palette.light : control.palette.base + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? control.palette.highlight : control.palette.mid + + ColorImage { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + defaultColor: "#353637" + color: control.palette.text + source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" + visible: control.checkState === Qt.Checked + } + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 16 + height: 3 + color: control.palette.text + visible: control.checkState === Qt.PartiallyChecked + } } - contentItem: Text { + contentItem: CheckLabel { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font color: control.palette.windowText - elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter } } diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml index 2b14b7e4..5fe39101 100644 --- a/src/imports/controls/CheckDelegate.qml +++ b/src/imports/controls/CheckDelegate.qml @@ -71,11 +71,35 @@ T.CheckDelegate { color: control.palette.text } - indicator: CheckIndicator { - x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding + // keep in sync with CheckBox.qml (shared CheckIndicator.qml was removed for performance reasons) + indicator: Rectangle { + implicitWidth: 28 + implicitHeight: 28 + + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - control: control + color: control.down ? control.palette.light : control.palette.base + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? control.palette.highlight : control.palette.mid + + ColorImage { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + defaultColor: "#353637" + color: control.palette.text + source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" + visible: control.checkState === Qt.Checked + } + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 16 + height: 3 + color: control.palette.text + visible: control.checkState === Qt.PartiallyChecked + } } background: Rectangle { diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 9737efb0..90a19f57 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -94,16 +94,13 @@ T.MenuItem { defaultColor: "#353637" } - background: Item { + background: Rectangle { implicitWidth: 200 implicitHeight: 40 - - Rectangle { - x: 1 - y: 1 - width: parent.width - 2 - height: parent.height - 2 - color: control.down ? control.palette.midlight : control.highlighted ? control.palette.light : "transparent" - } + x: 1 + y: 1 + width: control.width - 2 + height: control.height - 2 + color: control.down ? control.palette.midlight : control.highlighted ? control.palette.light : "transparent" } } diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 7ac857b5..d91bcd57 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -59,9 +59,7 @@ T.ProgressBar { background: Rectangle { implicitWidth: 200 implicitHeight: 6 - x: control.leftPadding - y: control.topPadding + (control.availableHeight - height) / 2 - width: control.availableWidth + y: (control.height - height) / 2 height: 6 color: control.palette.midlight diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 747f3a9f..d95d2a7b 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -52,22 +52,36 @@ T.RadioButton { padding: 6 spacing: 6 - indicator: RadioIndicator { + // keep in sync with RadioDelegate.qml (shared RadioIndicator.qml was removed for performance reasons) + indicator: Rectangle { + implicitWidth: 28 + implicitHeight: 28 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - control: control + + radius: width / 2 + color: control.down ? control.palette.light : control.palette.base + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? control.palette.highlight : control.palette.mid + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 20 + height: 20 + radius: width / 2 + color: control.palette.text + visible: control.checked + } } - contentItem: Text { + contentItem: CheckLabel { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font color: control.palette.windowText - elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter } } diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml index f1bcc839..556d678f 100644 --- a/src/imports/controls/RadioDelegate.qml +++ b/src/imports/controls/RadioDelegate.qml @@ -71,11 +71,28 @@ T.RadioDelegate { color: control.palette.text } - indicator: RadioIndicator { + // keep in sync with RadioButton.qml (shared RadioIndicator.qml was removed for performance reasons) + indicator: Rectangle { + implicitWidth: 28 + implicitHeight: 28 + x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 - control: control + radius: width / 2 + color: control.down ? control.palette.light : control.palette.base + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? control.palette.highlight : control.palette.mid + + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 20 + height: 20 + radius: width / 2 + color: control.palette.text + visible: control.checked + } } background: Rectangle { diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 05f64124..30da70f4 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -52,22 +52,42 @@ T.Switch { padding: 6 spacing: 6 - indicator: SwitchIndicator { + indicator: PaddedRectangle { + implicitWidth: 56 + implicitHeight: 28 + x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - control: control + + radius: 8 + leftPadding: 0 + rightPadding: 0 + padding: (height - 16) / 2 + color: control.checked ? control.palette.dark : control.palette.midlight + + Rectangle { + x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) + y: (parent.height - height) / 2 + width: 28 + height: 28 + radius: 16 + color: control.down ? control.palette.light : control.palette.window + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight + + Behavior on x { + enabled: !control.down + SmoothedAnimation { velocity: 200 } + } + } } - contentItem: Text { + contentItem: CheckLabel { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 text: control.text font: control.font color: control.palette.windowText - elide: Text.ElideRight - visible: control.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter } } diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml index 0caa6fc5..21a11491 100644 --- a/src/imports/controls/SwitchDelegate.qml +++ b/src/imports/controls/SwitchDelegate.qml @@ -56,10 +56,34 @@ T.SwitchDelegate { icon.height: 24 icon.color: control.palette.text - indicator: SwitchIndicator { + indicator: PaddedRectangle { + implicitWidth: 56 + implicitHeight: 28 + x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - control: control + + radius: 8 + leftPadding: 0 + rightPadding: 0 + padding: (height - 16) / 2 + color: control.checked ? control.palette.dark : control.palette.midlight + + Rectangle { + x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) + y: (parent.height - height) / 2 + width: 28 + height: 28 + radius: 16 + color: control.down ? control.palette.light : control.palette.window + border.width: control.visualFocus ? 2 : 1 + border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight + + Behavior on x { + enabled: !control.down + SmoothedAnimation { velocity: 200 } + } + } } contentItem: IconLabel { diff --git a/src/imports/controls/controls.pri b/src/imports/controls/controls.pri index 56c7a8ee..7840f6bf 100644 --- a/src/imports/controls/controls.pri +++ b/src/imports/controls/controls.pri @@ -22,7 +22,6 @@ QML_CONTROLS = \ $$PWD/ButtonGroup.qml \ $$PWD/CheckBox.qml \ $$PWD/CheckDelegate.qml \ - $$PWD/CheckIndicator.qml \ $$PWD/ComboBox.qml \ $$PWD/Container.qml \ $$PWD/Control.qml \ @@ -47,7 +46,6 @@ QML_CONTROLS = \ $$PWD/ProgressBar.qml \ $$PWD/RadioButton.qml \ $$PWD/RadioDelegate.qml \ - $$PWD/RadioIndicator.qml \ $$PWD/RangeSlider.qml \ $$PWD/RoundButton.qml \ $$PWD/ScrollBar.qml \ @@ -58,7 +56,6 @@ QML_CONTROLS = \ $$PWD/StackView.qml \ $$PWD/SwipeDelegate.qml \ $$PWD/Switch.qml \ - $$PWD/SwitchIndicator.qml \ $$PWD/SwitchDelegate.qml \ $$PWD/SwipeView.qml \ $$PWD/TabBar.qml \ diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml index bdb03e39..550680f6 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml @@ -37,30 +37,30 @@ ApplicationWindow { //! [skipfrom] Component.onCompleted: { - header.itemAt(0).triggered() - header.itemAt(0).menu.itemAt(2).highlighted = true + menuBar.itemAt(0).triggered() + menuBar.itemAt(0).menu.itemAt(2).highlighted = true } //! [skipto] - header: MenuBar { + menuBar: MenuBar { Menu { - title: qsTr("File") - Action { text: qsTr("New...") } - Action { text: qsTr("Open...") } - Action { text: qsTr("Save") } - Action { text: qsTr("Save As...") } + title: qsTr("&File") + Action { text: qsTr("&New...") } + Action { text: qsTr("&Open...") } + Action { text: qsTr("&Save") } + Action { text: qsTr("Save &As...") } MenuSeparator { } - Action { text: qsTr("Quit") } + Action { text: qsTr("&Quit") } } Menu { - title: qsTr("Edit") - Action { text: qsTr("Cut") } - Action { text: qsTr("Copy") } - Action { text: qsTr("Paste") } + title: qsTr("&Edit") + Action { text: qsTr("Cu&t") } + Action { text: qsTr("&Copy") } + Action { text: qsTr("&Paste") } } Menu { - title: qsTr("Help") - Action { text: qsTr("About") } + title: qsTr("&Help") + Action { text: qsTr("&About") } } } } diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml index de872300..9e5d991a 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc index 23e52705..33cfcdc8 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc @@ -142,71 +142,8 @@ WindowText=#212121 \endcode - Supported palette attributes: - \table - \header - \li Variable - \li Description - \row - \li \l {QPalette::ColorRole}{\c Window} - \li A general background color. - \row - \li \l {QPalette::ColorRole}{\c WindowText} - \li A general foreground color. - \row - \li \l {QPalette::ColorRole}{\c Base} - \li Used mostly as the background color for text editor controls and items views. - It is usually white or another light color. - \row - \li \l {QPalette::ColorRole}{\c Text} - \li The foreground color used with \c Base. This is usually the same as the \c WindowText, - in which case it must provide good contrast with \c Window and \c Base. - \row - \li \l {QPalette::ColorRole}{\c Button} - \li The general button background color. This background can be different from \c Window - as some styles require a different background color for buttons. - \row - \li \l {QPalette::ColorRole}{\c ButtonText} - \li A foreground color used with the \c Button color. - \row - \li \l {QPalette::ColorRole}{\c BrightText} - \li A text color that is very different from \c WindowText, and contrasts well with e.g. \c Dark. - Typically used for text that needs to be drawn where \c Text, \c WindowText or \c ButtonText - would give poor contrast, such as on highlighted buttons. - \row - \li \l {QPalette::ColorRole}{\c ToolTipBase} - \li Used as the background color for tooltips. - \row - \li \l {QPalette::ColorRole}{\c ToolTipText} - \li Used as the foreground color for tooltips. - - \row - \li \l {QPalette::ColorRole}{\c Light} - \li Lighter than \c Button. - \row - \li \l {QPalette::ColorRole}{\c Midlight} - \li Between \c Button and \c Light. - \row - \li \l {QPalette::ColorRole}{\c Dark} - \li Darker than \c Button. - \row - \li \l {QPalette::ColorRole}{\c Mid} - \li Between \c Button and \c Dark. - \row - \li \l {QPalette::ColorRole}{\c Shadow} - \li A very dark color. - - \row - \li \l {QPalette::ColorRole}{\c Highlight} - \li A color to indicate a selected item or the current item. - \row - \li \l {QPalette::ColorRole}{\c HighlightedText} - \li A text color that contrasts with \c Highlight. - - \row - \li \l {QPalette::ColorRole}{\c Link} - \li A text color used for hyperlinks. - \endtable + See \l {qtquickcontrols2-palette}{palette QML Basic Type} for a full list of supported + attributes. \section1 Using the Configuration File in a Project diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index a1d65396..69e8bc59 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -554,7 +554,7 @@ \image qtquickcontrols2-menu-custom.png \quotefromfile qtquickcontrols2-menu-custom.qml - \skipto import QtQuick 2.9 + \skipto import QtQuick 2.10 \printuntil import QtQuick.Controls 2.3 \skipto Menu \printto eof @@ -569,7 +569,7 @@ \image qtquickcontrols2-menubar-custom.png \quotefromfile qtquickcontrols2-menubar-custom.qml - \skipto import QtQuick 2.9 + \skipto import QtQuick 2.10 \printuntil import QtQuick.Controls 2.3 \skipto MenuBar \printto eof diff --git a/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc new file mode 100644 index 00000000..5e62a2ce --- /dev/null +++ b/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc @@ -0,0 +1,169 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page qtquickcontrols2-icons.html + \title Icons in Qt Quick Controls 2 + + Qt Quick Controls 2.3 (Qt 5.10) introduced built-in support for icons. Buttons, + item delegates, and menu items are now capable of presenting an icon in addition + to a text label. + + \section1 Using Icons + + \l {AbstractButton::icon}{AbstractButton} and \l {Action::icon}{Action} provide + the following properties through which icons can be set: + \list + \li \c icon.name + \li \c icon.source + \li \c icon.width + \li \c icon.height + \li \c icon.color + \endlist + + Theme icons are referenced by a name, and regular icons by a source URL. Both + \c icon.name and \c icon.source can be set to ensure that an icon will always + be found. If the icon is found in the theme, it will always be used; even if + \c icon.source is also set. If the icon is not found in the theme, \c icon.source + will be used instead. + + \code + Button { + icon.name: "edit-cut" + icon.source: "images/cut.png" + } + \endcode + + Each \l {Styling Qt Quick Controls 2}{Qt Quick Controls 2 style} requests a + default icon size and color according to their guidelines, but it is possible + to override these by setting the \c icon.width, \c icon.height, and \c icon.color + properties. + + The image that is loaded by an icon whose \c width and \c height are not set + depends on the type of icon in use. For theme icons, the closest available size + will be chosen. For regular icons, the behavior is the same as the \l {Image::} + {sourceSize} property of \l Image. + + The icon color is specified by default so that it matches the text color in + different states. In order to use an icon with the original colors, set the + color to \c "transparent". + + \code + Button { + icon.color: "transparent" + icon.source: "images/logo.png" + } + \endcode + + For buttons, the \l {AbstractButton::}{display} property can be used to control + how the icon and text are displayed within the button. + + \section1 Icon Themes + + Compliant icon themes must follow the freedesktop icon theme specification, + which can be obtained here: \l {http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html}. + + Traditionally, only Linux and UNIX support icon themes on the platform level, + but it is possible to bundle a compliant icon theme in an application to use + themed icons on any platform. + + The default \l {QIcon::themeSearchPaths()}{icon theme search paths} depend on + the platform. On Linux and UNIX, the search path will use the \c XDG_DATA_DIRS + environment variable if available. All platforms have the resource directory + \c :/icons as a fallback. Custom icon theme search paths can be set with + \l QIcon::setThemeSearchPaths(). + + The following example bundles an icon theme called \e mytheme into the application's + resources using \l {The Qt Resource System}{Qt's resource system}. + + \badcode + <RCC> + <qresource prefix="/"> + <file>icons/mytheme/index.theme</file> + <file>icons/mytheme/32x32/myicon.png</file> + <file>icons/mytheme/32x32@2/myicon.png</file> + </qresource> + </RCC> + \endcode + + The \c index.theme file describes the general attributes of the icon theme, and + lists the available theme icon directories: + + \badcode + [Icon Theme] + Name=mytheme + Comment=My Icon Theme + + Directories=32x32,32x32@2 + + [32x32] + Size=32 + Type=Fixed + + [32x32@2] + Size=32 + Scale=2 + Type=Fixed + \endcode + + In order to use the bundled icon theme, an application should call \l QIcon::setThemeName() + before loading the main QML file: + + \code + #include <QGuiApplication> + #include <QQmlApplicationEngine> + #include <QIcon> + + int main(int argc, char *argv[]) + { + QGuiApplication app(argc, argv); + + QIcon::setThemeName("mytheme"); // <-- + + QQmlApplicationEngine engine; + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + return app.exec(); + } + \endcode + + Now it is possible to use named icons from the bundled icon theme without having + to specify any fallback source: + + \code + Button { + icon.name: "myicon" + } + \endcode + + The \l {Qt Quick Controls 2 - Gallery}{Gallery example} and \l {Qt Quick Controls 2 - Wearable Demo} + {Wearable Demo} provide complete runnable applications with a bundled icon theme. + + \section1 Related Information + \list + \li \l {High-DPI Support in Qt Quick Controls 2} + \endlist +*/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc index e1f974bd..9f736e36 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc @@ -617,24 +617,6 @@ \row \li \li background - \li highlighted, checkable, hovered - \li \image imagine/images/button-background-highlighted-checkable-hovered.9.png - \li - \row - \li - \li background - \li highlighted, checkable, pressed - \li \image imagine/images/button-background-highlighted-checkable-pressed.9.png - \li - \row - \li - \li background - \li highlighted, checkable, checked - \li \image imagine/images/button-background-highlighted-checkable-checked.9.png - \li - \row - \li - \li background \li hovered \li \image imagine/images/button-background-hovered.9.png \li @@ -669,48 +651,6 @@ \li \image imagine/images/button-background-flat-checked.9.png \li \row - \li - \li background - \li flat, checkable - \li \image imagine/images/button-background-flat-checkable.9.png - \li - \row - \li - \li background - \li flat, checkable, hovered - \li \image imagine/images/button-background-flat-checkable-hovered.9.png - \li - \row - \li - \li background - \li flat, checkable, pressed - \li \image imagine/images/button-background-flat-checkable-pressed.9.png - \li - \row - \li - \li background - \li flat, checkable, checked, pressed - \li \image imagine/images/button-background-flat-checkable-checked-pressed.9.png - \li - \row - \li - \li background - \li flat, checkable, highlighted - \li \image imagine/images/button-background-flat-checkable-highlighted.9.png - \li - \row - \li - \li background - \li flat, checkable, highlighted, pressed - \li \image imagine/images/button-background-flat-checkable-highlighted-pressed.9.png - \li - \row - \li - \li background - \li flat, checkable, highlighted, checked - \li \image imagine/images/button-background-flat-checkable-highlighted-checked.9.png - \li - \row \li \l CheckBox \li indicator \li @@ -809,12 +749,6 @@ \row \li \li background - \li checked - \li \image imagine/images/checkdelegate-background-checked.9.png - \li - \row - \li - \li background \li focused \li \image imagine/images/checkdelegate-background-focused.9.png \li @@ -1389,12 +1323,6 @@ \li \image imagine/images/pageindicator-delegate-current.png \li \row - \li - \li delegate - \li mirrored - \li \image imagine/images/pageindicator-delegate-mirrored.png - \li - \row \li \l Pane \li background \li @@ -1511,12 +1439,6 @@ \row \li \li background - \li checked - \li \image imagine/images/radiodelegate-background-checked.9.png - \li - \row - \li - \li background \li focused \li \image imagine/images/radiodelegate-background-focused.9.png \li @@ -2135,12 +2057,6 @@ \row \li \li background - \li checked - \li \image imagine/images/switchdelegate-background-checked.9.png - \li - \row - \li - \li background \li focused \li \image imagine/images/switchdelegate-background-focused.9.png \li @@ -2273,12 +2189,6 @@ \row \li \li background - \li pressed - \li \image imagine/images/textarea-background-pressed.9.png - \li - \row - \li - \li background \li focused \li \image imagine/images/textarea-background-focused.9.png \li @@ -2297,12 +2207,6 @@ \row \li \li background - \li pressed - \li \image imagine/images/textfield-background-pressed.9.png - \li - \row - \li - \li background \li focused \li \image imagine/images/textfield-background-focused.9.png \li diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index f64901d5..661266aa 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -113,6 +113,7 @@ \list \li \l{Qt Quick Controls 2 Guidelines}{Guidelines} \li \l{Styling Qt Quick Controls 2}{Styling} + \li \l{Icons in Qt Quick Controls 2}{Icons} \li \l{Customizing Qt Quick Controls 2}{Customization} \li \l{High-DPI Support in Qt Quick Controls 2}{High-DPI Support} \li \l{Using File Selectors with Qt Quick Controls 2}{Using File Selectors} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-palette.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-palette.qdoc new file mode 100644 index 00000000..e4bac54a --- /dev/null +++ b/src/imports/controls/doc/src/qtquickcontrols2-palette.qdoc @@ -0,0 +1,107 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \qmlbasictype palette + \brief a palette of colors. + \target qtquickcontrols2-palette + + The \c palette type refers to a palette of colors for various roles. + + Available properties: + \table + \header + \li Property + \li Description + \row + \li \b palette.alternateBase : color + \li Used as the alternate background color in item views with alternating row colors. + \row + \li \b palette.base : color + \li Used mostly as the background color for text editor controls and items views. + It is usually white or another light color. + \row + \li \b palette.brightText : color + \li A text color that is very different from \c palette.windowText, and contrasts + well with e.g. \c palette.dark. Typically used for text that needs to be drawn + where \c palette.text, \c palette.windowText or \c palette.buttonText would + give poor contrast, such as on highlighted buttons. + \row + \li \b palette.button : color + \li The general button background color. This background can be different from + \c palette.window as some styles require a different background color for buttons. + \row + \li \b palette.buttonText : color + \li A foreground color used with the \c palette.button color. + \row + \li \b palette.dark : color + \li Darker than \c palette.button. + \row + \li \b palette.highlight : color + \li A color to indicate a selected item or the current item. + \row + \li \b palette.highlightedText : color + \li A text color that contrasts with \c palette.highlight. + \row + \li \b palette.light : color + \li Lighter than \c palette.button. + \row + \li \b palette.link : color + \li A text color used for hyperlinks. + \row + \li \b palette.linkVisited : color + \li A text color used for already visited hyperlinks. + \row + \li \b palette.mid : color + \li Between \c palette.button and \c palette.dark. + \row + \li \b palette.midlight : color + \li Between \c palette.button and \c palette.light. + \row + \li \b palette.shadow : color + \li A very dark color. + \row + \li \b palette.text : color + \li The foreground color used with \c palette.base. This is usually the same as + the \c palette.windowText, in which case it must provide good contrast with + \c palette.window and \c palette.base. + \row + \li \b palette.toolTipBase : color + \li Used as the background color for tooltips. + \row + \li \b palette.toolTipText : color + \li Used as the foreground color for tooltips. + \row + \li \b palette.window : color + \li A general background color. + \row + \li \b palette.windowText : color + \li A general foreground color. + \endtable + + \sa Control::palette, Popup::palette, ApplicationWindow::palette, QPalette::ColorRole +*/ diff --git a/src/imports/controls/imagine/Slider.qml b/src/imports/controls/imagine/Slider.qml index d42af8c6..a206c03b 100644 --- a/src/imports/controls/imagine/Slider.qml +++ b/src/imports/controls/imagine/Slider.qml @@ -53,8 +53,8 @@ T.Slider { bottomPadding: background ? background.bottomPadding : 0 handle: Image { - x: control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) - y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) + x: Math.round(control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)) + y: Math.round(control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))) source: Imagine.url + "slider-handle" ImageSelector on source { diff --git a/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js b/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js new file mode 100644 index 00000000..a7f9a459 --- /dev/null +++ b/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/9-patch-export.js @@ -0,0 +1,24 @@ +// 9-patch export +// +// This plugin crops upscaled 9-patch PNG assets when exported from Sketch, +// to ensure that 9-patch borders remain 1px wide when upscaled. +// +function onExportSlices(context) { + var exports = context.actionContext.exports; + for (var i = 0; i < exports.count(); ++i) { + var name = exports[i].request.name(); + var scale = exports[i].request.scale(); + if (scale > 1 && name.endsWith(".9")) + cropAsset(exports[i].path, scale - 1); + } +} + +function cropAsset(path, inset) { + var url = NSURL.fileURLWithPath(path); + var img = CIImage.imageWithContentsOfURL(url); + var rect = NSInsetRect(img.extent(), inset, inset); + var cropped = img.imageByCroppingToRect(rect); + var rep = NSBitmapImageRep.alloc().initWithCIImage(cropped); + var data = rep.PNGRepresentationWithInterlaced(false); + data.writeToFile(path); +} diff --git a/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json b/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json new file mode 100644 index 00000000..40807aa3 --- /dev/null +++ b/src/imports/controls/imagine/design/9-patch-export.sketchplugin/Contents/Sketch/manifest.json @@ -0,0 +1,19 @@ +{ + "name" : "9-patch export", + "description" : "Crops upscaled 9-patch PNG assets when exported from Sketch.", + "version" : "0.1", + "identifier" : "org.qt-project.sketch.9-patch-export", + "author" : "The Qt Project", + "commands" : [ + { + "name" : "9-patch export", + "identifier" : "9-patch-export", + "script" : "9-patch-export.js", + "handlers" : { + "actions" : { + "ExportSlices": "onExportSlices", + }, + }, + }, + ], +} diff --git a/src/imports/controls/imagine/design/imagine.sketch b/src/imports/controls/imagine/design/imagine.sketch Binary files differindex 31f07fce..ecb437f7 100644 --- a/src/imports/controls/imagine/design/imagine.sketch +++ b/src/imports/controls/imagine/design/imagine.sketch diff --git a/src/imports/controls/imagine/images/applicationwindow-background.png b/src/imports/controls/imagine/images/applicationwindow-background.png Binary files differindex 2d8d70f2..01eb7c73 100644 --- a/src/imports/controls/imagine/images/applicationwindow-background.png +++ b/src/imports/controls/imagine/images/applicationwindow-background.png diff --git a/src/imports/controls/imagine/images/applicationwindow-background@2x.png b/src/imports/controls/imagine/images/applicationwindow-background@2x.png Binary files differindex ba9b40df..72be785c 100644 --- a/src/imports/controls/imagine/images/applicationwindow-background@2x.png +++ b/src/imports/controls/imagine/images/applicationwindow-background@2x.png diff --git a/src/imports/controls/imagine/images/applicationwindow-background@3x.png b/src/imports/controls/imagine/images/applicationwindow-background@3x.png Binary files differindex 3b369748..a488f592 100644 --- a/src/imports/controls/imagine/images/applicationwindow-background@3x.png +++ b/src/imports/controls/imagine/images/applicationwindow-background@3x.png diff --git a/src/imports/controls/imagine/images/applicationwindow-background@4x.png b/src/imports/controls/imagine/images/applicationwindow-background@4x.png Binary files differindex a2fa69df..9343da95 100644 --- a/src/imports/controls/imagine/images/applicationwindow-background@4x.png +++ b/src/imports/controls/imagine/images/applicationwindow-background@4x.png diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay-modal.png b/src/imports/controls/imagine/images/applicationwindow-overlay-modal.png Binary files differindex 3113bd99..296e914a 100644 --- a/src/imports/controls/imagine/images/applicationwindow-overlay-modal.png +++ b/src/imports/controls/imagine/images/applicationwindow-overlay-modal.png diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@2x.png b/src/imports/controls/imagine/images/applicationwindow-overlay-modal@2x.png Binary files differindex 0ad9ce6d..10c89300 100644 --- a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@2x.png +++ b/src/imports/controls/imagine/images/applicationwindow-overlay-modal@2x.png diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@3x.png b/src/imports/controls/imagine/images/applicationwindow-overlay-modal@3x.png Binary files differindex 170607d9..f65996e9 100644 --- a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@3x.png +++ b/src/imports/controls/imagine/images/applicationwindow-overlay-modal@3x.png diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@4x.png b/src/imports/controls/imagine/images/applicationwindow-overlay-modal@4x.png Binary files differindex 8b4b974d..a586f381 100644 --- a/src/imports/controls/imagine/images/applicationwindow-overlay-modal@4x.png +++ b/src/imports/controls/imagine/images/applicationwindow-overlay-modal@4x.png diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay.png b/src/imports/controls/imagine/images/applicationwindow-overlay.png Binary files differindex 7a172720..e7175b46 100644 --- a/src/imports/controls/imagine/images/applicationwindow-overlay.png +++ b/src/imports/controls/imagine/images/applicationwindow-overlay.png diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay@2x.png b/src/imports/controls/imagine/images/applicationwindow-overlay@2x.png Binary files differindex e8fb48ad..db6566e0 100644 --- a/src/imports/controls/imagine/images/applicationwindow-overlay@2x.png +++ b/src/imports/controls/imagine/images/applicationwindow-overlay@2x.png diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay@3x.png b/src/imports/controls/imagine/images/applicationwindow-overlay@3x.png Binary files differindex 1ea6204c..140e4692 100644 --- a/src/imports/controls/imagine/images/applicationwindow-overlay@3x.png +++ b/src/imports/controls/imagine/images/applicationwindow-overlay@3x.png diff --git a/src/imports/controls/imagine/images/applicationwindow-overlay@4x.png b/src/imports/controls/imagine/images/applicationwindow-overlay@4x.png Binary files differindex cc4df170..5115c28a 100644 --- a/src/imports/controls/imagine/images/applicationwindow-overlay@4x.png +++ b/src/imports/controls/imagine/images/applicationwindow-overlay@4x.png diff --git a/src/imports/controls/imagine/images/button-background-checked-disabled.9.png b/src/imports/controls/imagine/images/button-background-checked-disabled.9.png Binary files differindex 3cc20a45..c06fd7cc 100644 --- a/src/imports/controls/imagine/images/button-background-checked-disabled.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-disabled.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-disabled@2x.9.png b/src/imports/controls/imagine/images/button-background-checked-disabled@2x.9.png Binary files differindex 459634ed..b86a13cc 100644 --- a/src/imports/controls/imagine/images/button-background-checked-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-disabled@3x.9.png b/src/imports/controls/imagine/images/button-background-checked-disabled@3x.9.png Binary files differindex ed44c623..7fa4dd83 100644 --- a/src/imports/controls/imagine/images/button-background-checked-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-disabled@4x.9.png b/src/imports/controls/imagine/images/button-background-checked-disabled@4x.9.png Binary files differindex 7795c5cf..676bb0dd 100644 --- a/src/imports/controls/imagine/images/button-background-checked-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-focused.9.png b/src/imports/controls/imagine/images/button-background-checked-focused.9.png Binary files differindex aff98b73..829d68a9 100644 --- a/src/imports/controls/imagine/images/button-background-checked-focused.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-focused.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-focused@2x.9.png b/src/imports/controls/imagine/images/button-background-checked-focused@2x.9.png Binary files differindex ab0d89ec..bf375d43 100644 --- a/src/imports/controls/imagine/images/button-background-checked-focused@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-focused@3x.9.png b/src/imports/controls/imagine/images/button-background-checked-focused@3x.9.png Binary files differindex 299510e2..8759c337 100644 --- a/src/imports/controls/imagine/images/button-background-checked-focused@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-focused@4x.9.png b/src/imports/controls/imagine/images/button-background-checked-focused@4x.9.png Binary files differindex c5031415..7b8f3616 100644 --- a/src/imports/controls/imagine/images/button-background-checked-focused@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-hovered.9.png b/src/imports/controls/imagine/images/button-background-checked-hovered.9.png Binary files differindex aff98b73..829d68a9 100644 --- a/src/imports/controls/imagine/images/button-background-checked-hovered.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-hovered.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-hovered@2x.9.png b/src/imports/controls/imagine/images/button-background-checked-hovered@2x.9.png Binary files differindex ab0d89ec..bf375d43 100644 --- a/src/imports/controls/imagine/images/button-background-checked-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-hovered@3x.9.png b/src/imports/controls/imagine/images/button-background-checked-hovered@3x.9.png Binary files differindex 299510e2..8759c337 100644 --- a/src/imports/controls/imagine/images/button-background-checked-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked-hovered@4x.9.png b/src/imports/controls/imagine/images/button-background-checked-hovered@4x.9.png Binary files differindex c5031415..7b8f3616 100644 --- a/src/imports/controls/imagine/images/button-background-checked-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked.9.png b/src/imports/controls/imagine/images/button-background-checked.9.png Binary files differindex 8127c8e1..3ca06e6c 100644 --- a/src/imports/controls/imagine/images/button-background-checked.9.png +++ b/src/imports/controls/imagine/images/button-background-checked.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked@2x.9.png b/src/imports/controls/imagine/images/button-background-checked@2x.9.png Binary files differindex b11c9e30..0afc3dea 100644 --- a/src/imports/controls/imagine/images/button-background-checked@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked@3x.9.png b/src/imports/controls/imagine/images/button-background-checked@3x.9.png Binary files differindex 31cb846b..348687ad 100644 --- a/src/imports/controls/imagine/images/button-background-checked@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-checked@4x.9.png b/src/imports/controls/imagine/images/button-background-checked@4x.9.png Binary files differindex 558d80a2..4dff0ba8 100644 --- a/src/imports/controls/imagine/images/button-background-checked@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-disabled.9.png b/src/imports/controls/imagine/images/button-background-disabled.9.png Binary files differindex 3cc20a45..c06fd7cc 100644 --- a/src/imports/controls/imagine/images/button-background-disabled.9.png +++ b/src/imports/controls/imagine/images/button-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/button-background-disabled@2x.9.png b/src/imports/controls/imagine/images/button-background-disabled@2x.9.png Binary files differindex 459634ed..b86a13cc 100644 --- a/src/imports/controls/imagine/images/button-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-disabled@3x.9.png b/src/imports/controls/imagine/images/button-background-disabled@3x.9.png Binary files differindex ed44c623..7fa4dd83 100644 --- a/src/imports/controls/imagine/images/button-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-disabled@4x.9.png b/src/imports/controls/imagine/images/button-background-disabled@4x.9.png Binary files differindex 7795c5cf..676bb0dd 100644 --- a/src/imports/controls/imagine/images/button-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed.9.png Binary files differdeleted file mode 100644 index 3cc20a45..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed@2x.9.png Binary files differdeleted file mode 100644 index 459634ed..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed@3x.9.png Binary files differdeleted file mode 100644 index ed44c623..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed@4x.9.png Binary files differdeleted file mode 100644 index 7795c5cf..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-checked-pressed@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked.9.png Binary files differdeleted file mode 100644 index 3cc20a45..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked@2x.9.png Binary files differdeleted file mode 100644 index 459634ed..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked@3x.9.png Binary files differdeleted file mode 100644 index ed44c623..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked@4x.9.png Binary files differdeleted file mode 100644 index 7795c5cf..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-checked@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed.9.png Binary files differdeleted file mode 100644 index 3cc20a45..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed@2x.9.png Binary files differdeleted file mode 100644 index 459634ed..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed@3x.9.png Binary files differdeleted file mode 100644 index ed44c623..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed@4x.9.png Binary files differdeleted file mode 100644 index 7795c5cf..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted-pressed@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted.9.png Binary files differdeleted file mode 100644 index 59907409..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted@2x.9.png Binary files differdeleted file mode 100644 index d66acd9c..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted@3x.9.png Binary files differdeleted file mode 100644 index 89b8c353..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted@4x.9.png Binary files differdeleted file mode 100644 index d3a675cf..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-highlighted@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-hovered.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-hovered.9.png Binary files differdeleted file mode 100644 index 8800e4db..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-hovered.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-hovered@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-hovered@2x.9.png Binary files differdeleted file mode 100644 index 5b3647ca..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-hovered@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-hovered@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-hovered@3x.9.png Binary files differdeleted file mode 100644 index 1714fd98..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-hovered@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-hovered@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-hovered@4x.9.png Binary files differdeleted file mode 100644 index 2ceba458..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-hovered@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-pressed.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-pressed.9.png Binary files differdeleted file mode 100644 index 3cc20a45..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-pressed.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-pressed@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-pressed@2x.9.png Binary files differdeleted file mode 100644 index 459634ed..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-pressed@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-pressed@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-pressed@3x.9.png Binary files differdeleted file mode 100644 index ed44c623..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-pressed@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable-pressed@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable-pressed@4x.9.png Binary files differdeleted file mode 100644 index 7795c5cf..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable-pressed@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable.9.png Binary files differdeleted file mode 100644 index 59907409..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable@2x.9.png Binary files differdeleted file mode 100644 index d66acd9c..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable@3x.9.png Binary files differdeleted file mode 100644 index 89b8c353..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checkable@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-checkable@4x.9.png Binary files differdeleted file mode 100644 index d3a675cf..00000000 --- a/src/imports/controls/imagine/images/button-background-flat-checkable@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-flat-checked-pressed.9.png b/src/imports/controls/imagine/images/button-background-flat-checked-pressed.9.png Binary files differnew file mode 100644 index 00000000..c06fd7cc --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-checked-pressed.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-checked-pressed@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-checked-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..b86a13cc --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-checked-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-checked-pressed@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-checked-pressed@3x.9.png Binary files differnew file mode 100644 index 00000000..7fa4dd83 --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-checked-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-checked-pressed@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-checked-pressed@4x.9.png Binary files differnew file mode 100644 index 00000000..676bb0dd --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-checked-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-checked.9.png b/src/imports/controls/imagine/images/button-background-flat-checked.9.png Binary files differindex 3cc20a45..c06fd7cc 100644 --- a/src/imports/controls/imagine/images/button-background-flat-checked.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-checked.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-checked@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-checked@2x.9.png Binary files differindex 459634ed..b86a13cc 100644 --- a/src/imports/controls/imagine/images/button-background-flat-checked@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-checked@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-checked@3x.9.png Binary files differindex ed44c623..7fa4dd83 100644 --- a/src/imports/controls/imagine/images/button-background-flat-checked@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-checked@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-checked@4x.9.png Binary files differindex 7795c5cf..676bb0dd 100644 --- a/src/imports/controls/imagine/images/button-background-flat-checked@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-disabled.9.png b/src/imports/controls/imagine/images/button-background-flat-disabled.9.png Binary files differindex 59907409..a76e7b86 100644 --- a/src/imports/controls/imagine/images/button-background-flat-disabled.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-disabled.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-disabled@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-disabled@2x.9.png Binary files differindex d66acd9c..58445d50 100644 --- a/src/imports/controls/imagine/images/button-background-flat-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-disabled@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-disabled@3x.9.png Binary files differindex 89b8c353..0a18be32 100644 --- a/src/imports/controls/imagine/images/button-background-flat-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-disabled@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-disabled@4x.9.png Binary files differindex d3a675cf..f60c994d 100644 --- a/src/imports/controls/imagine/images/button-background-flat-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted-checked.9.png Binary files differnew file mode 100644 index 00000000..c06fd7cc --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted-checked.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@2x.9.png Binary files differnew file mode 100644 index 00000000..b86a13cc --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@3x.9.png Binary files differnew file mode 100644 index 00000000..7fa4dd83 --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@4x.9.png Binary files differnew file mode 100644 index 00000000..676bb0dd --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed.9.png Binary files differnew file mode 100644 index 00000000..c06fd7cc --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@2x.9.png Binary files differnew file mode 100644 index 00000000..b86a13cc --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@3x.9.png Binary files differnew file mode 100644 index 00000000..7fa4dd83 --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@4x.9.png Binary files differnew file mode 100644 index 00000000..676bb0dd --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted.9.png Binary files differnew file mode 100644 index 00000000..a76e7b86 --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted@2x.9.png Binary files differnew file mode 100644 index 00000000..58445d50 --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted@3x.9.png Binary files differnew file mode 100644 index 00000000..0a18be32 --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-highlighted@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-highlighted@4x.9.png Binary files differnew file mode 100644 index 00000000..f60c994d --- /dev/null +++ b/src/imports/controls/imagine/images/button-background-flat-highlighted@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-hovered.9.png b/src/imports/controls/imagine/images/button-background-flat-hovered.9.png Binary files differindex 8800e4db..c06fd7cc 100644 --- a/src/imports/controls/imagine/images/button-background-flat-hovered.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-hovered.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-hovered@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-hovered@2x.9.png Binary files differindex 5b3647ca..b86a13cc 100644 --- a/src/imports/controls/imagine/images/button-background-flat-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-hovered@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-hovered@3x.9.png Binary files differindex 1714fd98..7fa4dd83 100644 --- a/src/imports/controls/imagine/images/button-background-flat-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-hovered@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-hovered@4x.9.png Binary files differindex 2ceba458..676bb0dd 100644 --- a/src/imports/controls/imagine/images/button-background-flat-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-pressed.9.png b/src/imports/controls/imagine/images/button-background-flat-pressed.9.png Binary files differindex 3cc20a45..c06fd7cc 100644 --- a/src/imports/controls/imagine/images/button-background-flat-pressed.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-pressed.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-pressed@2x.9.png b/src/imports/controls/imagine/images/button-background-flat-pressed@2x.9.png Binary files differindex 459634ed..b86a13cc 100644 --- a/src/imports/controls/imagine/images/button-background-flat-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-pressed@3x.9.png b/src/imports/controls/imagine/images/button-background-flat-pressed@3x.9.png Binary files differindex ed44c623..7fa4dd83 100644 --- a/src/imports/controls/imagine/images/button-background-flat-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat-pressed@4x.9.png b/src/imports/controls/imagine/images/button-background-flat-pressed@4x.9.png Binary files differindex 7795c5cf..676bb0dd 100644 --- a/src/imports/controls/imagine/images/button-background-flat-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat.9.png b/src/imports/controls/imagine/images/button-background-flat.9.png Binary files differindex 59907409..a76e7b86 100644 --- a/src/imports/controls/imagine/images/button-background-flat.9.png +++ b/src/imports/controls/imagine/images/button-background-flat.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat@2x.9.png b/src/imports/controls/imagine/images/button-background-flat@2x.9.png Binary files differindex d66acd9c..58445d50 100644 --- a/src/imports/controls/imagine/images/button-background-flat@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat@3x.9.png b/src/imports/controls/imagine/images/button-background-flat@3x.9.png Binary files differindex 89b8c353..0a18be32 100644 --- a/src/imports/controls/imagine/images/button-background-flat@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-flat@4x.9.png b/src/imports/controls/imagine/images/button-background-flat@4x.9.png Binary files differindex d3a675cf..f60c994d 100644 --- a/src/imports/controls/imagine/images/button-background-flat@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-flat@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-focused.9.png b/src/imports/controls/imagine/images/button-background-focused.9.png Binary files differindex 64278299..04573ce4 100644 --- a/src/imports/controls/imagine/images/button-background-focused.9.png +++ b/src/imports/controls/imagine/images/button-background-focused.9.png diff --git a/src/imports/controls/imagine/images/button-background-focused@2x.9.png b/src/imports/controls/imagine/images/button-background-focused@2x.9.png Binary files differindex 0213bba2..ad25d378 100644 --- a/src/imports/controls/imagine/images/button-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-focused@3x.9.png b/src/imports/controls/imagine/images/button-background-focused@3x.9.png Binary files differindex e4189bf5..2f599e72 100644 --- a/src/imports/controls/imagine/images/button-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-focused@4x.9.png b/src/imports/controls/imagine/images/button-background-focused@4x.9.png Binary files differindex 7ffc9c80..6ac51521 100644 --- a/src/imports/controls/imagine/images/button-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked.9.png Binary files differdeleted file mode 100644 index 99dec0e9..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked@2x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked@2x.9.png Binary files differdeleted file mode 100644 index 23202bf1..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked@3x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked@3x.9.png Binary files differdeleted file mode 100644 index 57bfcef6..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked@4x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked@4x.9.png Binary files differdeleted file mode 100644 index 81ad9cd2..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-checked@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered.9.png Binary files differdeleted file mode 100644 index 8767034d..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered@2x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered@2x.9.png Binary files differdeleted file mode 100644 index 7b4fb07b..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered@3x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered@3x.9.png Binary files differdeleted file mode 100644 index f932aa9b..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered@4x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered@4x.9.png Binary files differdeleted file mode 100644 index 290da64f..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-hovered@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed.9.png Binary files differdeleted file mode 100644 index 99dec0e9..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed@2x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed@2x.9.png Binary files differdeleted file mode 100644 index 23202bf1..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed@3x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed@3x.9.png Binary files differdeleted file mode 100644 index 57bfcef6..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed@4x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed@4x.9.png Binary files differdeleted file mode 100644 index 81ad9cd2..00000000 --- a/src/imports/controls/imagine/images/button-background-highlighted-checkable-pressed@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checked.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checked.9.png Binary files differindex 99dec0e9..d8803419 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-checked.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-checked.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checked@2x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checked@2x.9.png Binary files differindex 23202bf1..09cae1c0 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-checked@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checked@3x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checked@3x.9.png Binary files differindex 57bfcef6..b37485bb 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-checked@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-checked@4x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-checked@4x.9.png Binary files differindex 81ad9cd2..d4991f75 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-checked@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-disabled.9.png b/src/imports/controls/imagine/images/button-background-highlighted-disabled.9.png Binary files differindex 3cc20a45..c06fd7cc 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-disabled.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-disabled.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-disabled@2x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-disabled@2x.9.png Binary files differindex 459634ed..b86a13cc 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-disabled@3x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-disabled@3x.9.png Binary files differindex ed44c623..7fa4dd83 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-disabled@4x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-disabled@4x.9.png Binary files differindex 7795c5cf..676bb0dd 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-focused.9.png b/src/imports/controls/imagine/images/button-background-highlighted-focused.9.png Binary files differindex 8767034d..594e7446 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-focused.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-focused.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-focused@2x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-focused@2x.9.png Binary files differindex 7b4fb07b..ddd405a2 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-focused@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-focused@3x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-focused@3x.9.png Binary files differindex f932aa9b..085c233e 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-focused@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-focused@4x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-focused@4x.9.png Binary files differindex 290da64f..b9e4aa27 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-focused@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-hovered.9.png b/src/imports/controls/imagine/images/button-background-highlighted-hovered.9.png Binary files differindex 8767034d..594e7446 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-hovered.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-hovered.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-hovered@2x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-hovered@2x.9.png Binary files differindex 7b4fb07b..ddd405a2 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-hovered@3x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-hovered@3x.9.png Binary files differindex f932aa9b..085c233e 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-hovered@4x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-hovered@4x.9.png Binary files differindex 290da64f..b9e4aa27 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-pressed.9.png b/src/imports/controls/imagine/images/button-background-highlighted-pressed.9.png Binary files differindex 99dec0e9..d8803419 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-pressed.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-pressed.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-pressed@2x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-pressed@2x.9.png Binary files differindex 23202bf1..09cae1c0 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-pressed@3x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-pressed@3x.9.png Binary files differindex 57bfcef6..b37485bb 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted-pressed@4x.9.png b/src/imports/controls/imagine/images/button-background-highlighted-pressed@4x.9.png Binary files differindex 81ad9cd2..d4991f75 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted.9.png b/src/imports/controls/imagine/images/button-background-highlighted.9.png Binary files differindex 66e8cf19..f214ba22 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted@2x.9.png b/src/imports/controls/imagine/images/button-background-highlighted@2x.9.png Binary files differindex e4c68712..f363d8df 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted@3x.9.png b/src/imports/controls/imagine/images/button-background-highlighted@3x.9.png Binary files differindex a97f6330..65ed9ca9 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-highlighted@4x.9.png b/src/imports/controls/imagine/images/button-background-highlighted@4x.9.png Binary files differindex 6a8f386c..25be69ca 100644 --- a/src/imports/controls/imagine/images/button-background-highlighted@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-highlighted@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-hovered.9.png b/src/imports/controls/imagine/images/button-background-hovered.9.png Binary files differindex 64278299..04573ce4 100644 --- a/src/imports/controls/imagine/images/button-background-hovered.9.png +++ b/src/imports/controls/imagine/images/button-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/button-background-hovered@2x.9.png b/src/imports/controls/imagine/images/button-background-hovered@2x.9.png Binary files differindex 0213bba2..ad25d378 100644 --- a/src/imports/controls/imagine/images/button-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-hovered@3x.9.png b/src/imports/controls/imagine/images/button-background-hovered@3x.9.png Binary files differindex e4189bf5..2f599e72 100644 --- a/src/imports/controls/imagine/images/button-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-hovered@4x.9.png b/src/imports/controls/imagine/images/button-background-hovered@4x.9.png Binary files differindex 7ffc9c80..6ac51521 100644 --- a/src/imports/controls/imagine/images/button-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background-pressed.9.png b/src/imports/controls/imagine/images/button-background-pressed.9.png Binary files differindex 8127c8e1..3ca06e6c 100644 --- a/src/imports/controls/imagine/images/button-background-pressed.9.png +++ b/src/imports/controls/imagine/images/button-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/button-background-pressed@2x.9.png b/src/imports/controls/imagine/images/button-background-pressed@2x.9.png Binary files differindex b11c9e30..0afc3dea 100644 --- a/src/imports/controls/imagine/images/button-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/button-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background-pressed@3x.9.png b/src/imports/controls/imagine/images/button-background-pressed@3x.9.png Binary files differindex 31cb846b..348687ad 100644 --- a/src/imports/controls/imagine/images/button-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/button-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background-pressed@4x.9.png b/src/imports/controls/imagine/images/button-background-pressed@4x.9.png Binary files differindex 558d80a2..4dff0ba8 100644 --- a/src/imports/controls/imagine/images/button-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/button-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/button-background.9.png b/src/imports/controls/imagine/images/button-background.9.png Binary files differindex 43215ebd..053da917 100644 --- a/src/imports/controls/imagine/images/button-background.9.png +++ b/src/imports/controls/imagine/images/button-background.9.png diff --git a/src/imports/controls/imagine/images/button-background@2x.9.png b/src/imports/controls/imagine/images/button-background@2x.9.png Binary files differindex 6526a1a0..471940f1 100644 --- a/src/imports/controls/imagine/images/button-background@2x.9.png +++ b/src/imports/controls/imagine/images/button-background@2x.9.png diff --git a/src/imports/controls/imagine/images/button-background@3x.9.png b/src/imports/controls/imagine/images/button-background@3x.9.png Binary files differindex c30044cb..06155e8a 100644 --- a/src/imports/controls/imagine/images/button-background@3x.9.png +++ b/src/imports/controls/imagine/images/button-background@3x.9.png diff --git a/src/imports/controls/imagine/images/button-background@4x.9.png b/src/imports/controls/imagine/images/button-background@4x.9.png Binary files differindex e35896fa..7d776e51 100644 --- a/src/imports/controls/imagine/images/button-background@4x.9.png +++ b/src/imports/controls/imagine/images/button-background@4x.9.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-focused.png Binary files differindex d84b6424..f22ebf09 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-focused.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@2x.png Binary files differindex d9974cd3..fd3080a1 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@3x.png Binary files differindex 55f2a641..6393373f 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@4x.png Binary files differindex f0da6e95..32dedb7f 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered.png Binary files differindex d84b6424..f22ebf09 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@2x.png Binary files differindex d9974cd3..fd3080a1 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@3x.png Binary files differindex 55f2a641..6393373f 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@4x.png Binary files differindex f0da6e95..32dedb7f 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed.png Binary files differindex 5ed3cca2..846416aa 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@2x.png Binary files differindex 4a88a2fa..bc85bf94 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@3x.png Binary files differindex 244744e5..17ef9e58 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@4x.png Binary files differindex e782944b..7e9dd750 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked-pressed@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked.png b/src/imports/controls/imagine/images/checkbox-indicator-checked.png Binary files differindex d44ffceb..f06cc5f6 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked@2x.png Binary files differindex f25091e5..3db78a17 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked@3x.png Binary files differindex 74b00801..eadb5968 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-checked@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-checked@4x.png Binary files differindex 1b6b021c..9bdfac8a 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-checked@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-checked@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-disabled.png b/src/imports/controls/imagine/images/checkbox-indicator-disabled.png Binary files differindex 2d47edd5..a8305968 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-disabled.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-disabled.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-disabled@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-disabled@2x.png Binary files differindex 590848e6..e8046c5e 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-disabled@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-disabled@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-disabled@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-disabled@3x.png Binary files differindex 7dcc9dd8..d44111bb 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-disabled@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-disabled@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-disabled@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-disabled@4x.png Binary files differindex c996429a..24fa0c0d 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-disabled@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-disabled@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-focused.png b/src/imports/controls/imagine/images/checkbox-indicator-focused.png Binary files differindex 0faa5917..1c598c1f 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-focused.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-focused.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-focused@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-focused@2x.png Binary files differindex 25f20bb1..31ff320e 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-focused@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-focused@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-focused@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-focused@3x.png Binary files differindex 32de5064..15a1b487 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-focused@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-focused@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-focused@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-focused@4x.png Binary files differindex 73912ac8..db11c0c1 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-focused@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-focused@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-hovered.png b/src/imports/controls/imagine/images/checkbox-indicator-hovered.png Binary files differindex 0faa5917..1c598c1f 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-hovered.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-hovered.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-hovered@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-hovered@2x.png Binary files differindex 25f20bb1..31ff320e 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-hovered@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-hovered@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-hovered@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-hovered@3x.png Binary files differindex 32de5064..15a1b487 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-hovered@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-hovered@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-hovered@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-hovered@4x.png Binary files differindex 73912ac8..db11c0c1 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-hovered@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-hovered@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused.png Binary files differindex b7f4a585..23c8197a 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@2x.png Binary files differindex 0dccb3bc..046a0e6c 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@3x.png Binary files differindex 80acb448..890b4c66 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@4x.png Binary files differindex cfa50540..1dcc73c9 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered.png Binary files differindex b7f4a585..23c8197a 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png Binary files differindex 0dccb3bc..046a0e6c 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png Binary files differindex 80acb448..890b4c66 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png Binary files differindex cfa50540..1dcc73c9 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed.png Binary files differindex a9c9abe9..bdd3b6f7 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png Binary files differindex 778ad295..8e5e3478 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png Binary files differindex ec8f5a22..aa60fac0 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png Binary files differindex f5382745..98c43e17 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked-pressed@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked.png Binary files differindex a507d5cc..9d09b33b 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@2x.png Binary files differindex e3995307..bf4ee4b8 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@3x.png Binary files differindex 8fdcd8c5..6726df07 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@4x.png Binary files differindex a1baf6d8..400daa58 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-partially-checked@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-pressed.png b/src/imports/controls/imagine/images/checkbox-indicator-pressed.png Binary files differindex aebea490..e4f02db1 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-pressed.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-pressed.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-pressed@2x.png b/src/imports/controls/imagine/images/checkbox-indicator-pressed@2x.png Binary files differindex 5b4ac2bb..e2342547 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-pressed@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-pressed@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-pressed@3x.png b/src/imports/controls/imagine/images/checkbox-indicator-pressed@3x.png Binary files differindex 76948af7..8ae24d75 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-pressed@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-pressed@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator-pressed@4x.png b/src/imports/controls/imagine/images/checkbox-indicator-pressed@4x.png Binary files differindex 9ff1655d..04a32370 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator-pressed@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator-pressed@4x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator.png b/src/imports/controls/imagine/images/checkbox-indicator.png Binary files differindex 0e63e749..d7b4c6d1 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator.png +++ b/src/imports/controls/imagine/images/checkbox-indicator.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator@2x.png b/src/imports/controls/imagine/images/checkbox-indicator@2x.png Binary files differindex 0a15f8ef..0ae3fa8f 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator@2x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator@2x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator@3x.png b/src/imports/controls/imagine/images/checkbox-indicator@3x.png Binary files differindex 76650657..f8de503c 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator@3x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator@3x.png diff --git a/src/imports/controls/imagine/images/checkbox-indicator@4x.png b/src/imports/controls/imagine/images/checkbox-indicator@4x.png Binary files differindex fa1e8ac8..4f16042d 100644 --- a/src/imports/controls/imagine/images/checkbox-indicator@4x.png +++ b/src/imports/controls/imagine/images/checkbox-indicator@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-checked.9.png b/src/imports/controls/imagine/images/checkdelegate-background-checked.9.png Binary files differdeleted file mode 100644 index cef1bafa..00000000 --- a/src/imports/controls/imagine/images/checkdelegate-background-checked.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/checkdelegate-background-checked@2x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-checked@2x.9.png Binary files differdeleted file mode 100644 index 5a136a0c..00000000 --- a/src/imports/controls/imagine/images/checkdelegate-background-checked@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/checkdelegate-background-checked@3x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-checked@3x.9.png Binary files differdeleted file mode 100644 index f47a366b..00000000 --- a/src/imports/controls/imagine/images/checkdelegate-background-checked@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/checkdelegate-background-checked@4x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-checked@4x.9.png Binary files differdeleted file mode 100644 index 9ecb680f..00000000 --- a/src/imports/controls/imagine/images/checkdelegate-background-checked@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/checkdelegate-background-disabled.9.png b/src/imports/controls/imagine/images/checkdelegate-background-disabled.9.png Binary files differindex ce48ee74..4b56fe35 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-disabled.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-disabled@2x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-disabled@2x.9.png Binary files differindex c7abb65c..34edef58 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-disabled@3x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-disabled@3x.9.png Binary files differindex 46b84d7d..dd2cc6ba 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-disabled@4x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-disabled@4x.9.png Binary files differindex f4dfd338..b7890a3c 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-focused.9.png b/src/imports/controls/imagine/images/checkdelegate-background-focused.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-focused.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-focused.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-focused@2x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-focused@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-focused@3x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-focused@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-focused@4x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-focused@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-highlighted.9.png b/src/imports/controls/imagine/images/checkdelegate-background-highlighted.9.png Binary files differnew file mode 100644 index 00000000..32847cfa --- /dev/null +++ b/src/imports/controls/imagine/images/checkdelegate-background-highlighted.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-highlighted@2x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-highlighted@2x.9.png Binary files differnew file mode 100644 index 00000000..126fcb29 --- /dev/null +++ b/src/imports/controls/imagine/images/checkdelegate-background-highlighted@2x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-highlighted@3x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-highlighted@3x.9.png Binary files differnew file mode 100644 index 00000000..22b7c9f2 --- /dev/null +++ b/src/imports/controls/imagine/images/checkdelegate-background-highlighted@3x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-highlighted@4x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-highlighted@4x.9.png Binary files differnew file mode 100644 index 00000000..4e67f310 --- /dev/null +++ b/src/imports/controls/imagine/images/checkdelegate-background-highlighted@4x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-hovered.9.png b/src/imports/controls/imagine/images/checkdelegate-background-hovered.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-hovered.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-hovered@2x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-hovered@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-hovered@3x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-hovered@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-hovered@4x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-hovered@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-pressed.9.png b/src/imports/controls/imagine/images/checkdelegate-background-pressed.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-pressed.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-pressed@2x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-pressed@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-pressed@3x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-pressed@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background-pressed@4x.9.png b/src/imports/controls/imagine/images/checkdelegate-background-pressed@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background.9.png b/src/imports/controls/imagine/images/checkdelegate-background.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background@2x.9.png b/src/imports/controls/imagine/images/checkdelegate-background@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background@2x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background@2x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background@3x.9.png b/src/imports/controls/imagine/images/checkdelegate-background@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background@3x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background@3x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-background@4x.9.png b/src/imports/controls/imagine/images/checkdelegate-background@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/checkdelegate-background@4x.9.png +++ b/src/imports/controls/imagine/images/checkdelegate-background@4x.9.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused.png Binary files differindex d84b6424..f22ebf09 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@2x.png Binary files differindex d9974cd3..fd3080a1 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@3x.png Binary files differindex 55f2a641..6393373f 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@4x.png Binary files differindex f0da6e95..32dedb7f 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered.png Binary files differindex d84b6424..f22ebf09 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@2x.png Binary files differindex d9974cd3..fd3080a1 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@3x.png Binary files differindex 55f2a641..6393373f 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@4x.png Binary files differindex f0da6e95..32dedb7f 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed.png Binary files differindex 5ed3cca2..846416aa 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@2x.png Binary files differindex 4a88a2fa..bc85bf94 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@3x.png Binary files differindex 244744e5..17ef9e58 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@4x.png Binary files differindex e782944b..7e9dd750 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked-pressed@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked.png Binary files differindex d44ffceb..f06cc5f6 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked@2x.png Binary files differindex f25091e5..3db78a17 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked@3x.png Binary files differindex 74b00801..eadb5968 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-checked@4x.png Binary files differindex 1b6b021c..9bdfac8a 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-checked@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-checked@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled.png b/src/imports/controls/imagine/images/checkdelegate-indicator-disabled.png Binary files differindex 2d47edd5..a8305968 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-disabled.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@2x.png Binary files differindex 590848e6..e8046c5e 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@3x.png Binary files differindex 7dcc9dd8..d44111bb 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@4x.png Binary files differindex c996429a..24fa0c0d 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-disabled@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-focused.png b/src/imports/controls/imagine/images/checkdelegate-indicator-focused.png Binary files differindex 0faa5917..1c598c1f 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-focused.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-focused.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-focused@2x.png Binary files differindex 25f20bb1..31ff320e 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-focused@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-focused@3x.png Binary files differindex 32de5064..15a1b487 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-focused@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-focused@4x.png Binary files differindex 73912ac8..db11c0c1 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-focused@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-focused@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered.png b/src/imports/controls/imagine/images/checkdelegate-indicator-hovered.png Binary files differindex 0faa5917..1c598c1f 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-hovered.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@2x.png Binary files differindex 25f20bb1..31ff320e 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@3x.png Binary files differindex 32de5064..15a1b487 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@4x.png Binary files differindex 73912ac8..db11c0c1 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-hovered@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused.png Binary files differindex b7f4a585..23c8197a 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png Binary files differindex 0dccb3bc..046a0e6c 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png Binary files differindex 80acb448..890b4c66 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png Binary files differindex cfa50540..1dcc73c9 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered.png Binary files differindex b7f4a585..23c8197a 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png Binary files differindex 0dccb3bc..046a0e6c 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png Binary files differindex 80acb448..890b4c66 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png Binary files differindex cfa50540..1dcc73c9 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed.png Binary files differindex a9c9abe9..bdd3b6f7 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png Binary files differindex 778ad295..8e5e3478 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png Binary files differindex ec8f5a22..aa60fac0 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png Binary files differindex f5382745..98c43e17 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked-pressed@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked.png Binary files differindex a507d5cc..9d09b33b 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@2x.png Binary files differindex e3995307..bf4ee4b8 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@3x.png Binary files differindex 8fdcd8c5..6726df07 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@4x.png Binary files differindex a1baf6d8..400daa58 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-partially-checked@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed.png b/src/imports/controls/imagine/images/checkdelegate-indicator-pressed.png Binary files differindex aebea490..e4f02db1 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-pressed.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@2x.png Binary files differindex 5b4ac2bb..e2342547 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@3x.png Binary files differindex 76948af7..8ae24d75 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@4x.png Binary files differindex 9ff1655d..04a32370 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator-pressed@4x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator.png b/src/imports/controls/imagine/images/checkdelegate-indicator.png Binary files differindex 0e63e749..d7b4c6d1 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator@2x.png b/src/imports/controls/imagine/images/checkdelegate-indicator@2x.png Binary files differindex 0a15f8ef..0ae3fa8f 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator@2x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator@2x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator@3x.png b/src/imports/controls/imagine/images/checkdelegate-indicator@3x.png Binary files differindex 76650657..f8de503c 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator@3x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator@3x.png diff --git a/src/imports/controls/imagine/images/checkdelegate-indicator@4x.png b/src/imports/controls/imagine/images/checkdelegate-indicator@4x.png Binary files differindex fa1e8ac8..4f16042d 100644 --- a/src/imports/controls/imagine/images/checkdelegate-indicator@4x.png +++ b/src/imports/controls/imagine/images/checkdelegate-indicator@4x.png diff --git a/src/imports/controls/imagine/images/combobox-background-disabled.9.png b/src/imports/controls/imagine/images/combobox-background-disabled.9.png Binary files differindex 153ab9c0..695ccd71 100644 --- a/src/imports/controls/imagine/images/combobox-background-disabled.9.png +++ b/src/imports/controls/imagine/images/combobox-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-disabled@2x.9.png b/src/imports/controls/imagine/images/combobox-background-disabled@2x.9.png Binary files differindex 0b29947f..10e8d681 100644 --- a/src/imports/controls/imagine/images/combobox-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-disabled@3x.9.png b/src/imports/controls/imagine/images/combobox-background-disabled@3x.9.png Binary files differindex 16aac1cb..6297b4cf 100644 --- a/src/imports/controls/imagine/images/combobox-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-disabled@4x.9.png b/src/imports/controls/imagine/images/combobox-background-disabled@4x.9.png Binary files differindex 0047174d..715c6cb4 100644 --- a/src/imports/controls/imagine/images/combobox-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable-disabled.9.png b/src/imports/controls/imagine/images/combobox-background-editable-disabled.9.png Binary files differindex 190d9d32..49335bde 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable-disabled.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable-disabled.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable-disabled@2x.9.png b/src/imports/controls/imagine/images/combobox-background-editable-disabled@2x.9.png Binary files differindex 6dbb6b1d..792ae742 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable-disabled@3x.9.png b/src/imports/controls/imagine/images/combobox-background-editable-disabled@3x.9.png Binary files differindex c4f03970..b391c100 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable-disabled@4x.9.png b/src/imports/controls/imagine/images/combobox-background-editable-disabled@4x.9.png Binary files differindex df732fc8..51641c3e 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable-focused.9.png b/src/imports/controls/imagine/images/combobox-background-editable-focused.9.png Binary files differindex 55da8aa7..6710bf1e 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable-focused.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable-focused.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable-focused@2x.9.png b/src/imports/controls/imagine/images/combobox-background-editable-focused@2x.9.png Binary files differindex f2220ecb..d61bac87 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable-focused@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable-focused@3x.9.png b/src/imports/controls/imagine/images/combobox-background-editable-focused@3x.9.png Binary files differindex 55ddac00..380a6e37 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable-focused@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable-focused@4x.9.png b/src/imports/controls/imagine/images/combobox-background-editable-focused@4x.9.png Binary files differindex 98867862..7d2e2cbb 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable-focused@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable.9.png b/src/imports/controls/imagine/images/combobox-background-editable.9.png Binary files differindex ccf07a23..f624616e 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable@2x.9.png b/src/imports/controls/imagine/images/combobox-background-editable@2x.9.png Binary files differindex ab27211e..fbfa7fea 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable@3x.9.png b/src/imports/controls/imagine/images/combobox-background-editable@3x.9.png Binary files differindex 1b41eb6c..d67dda03 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-editable@4x.9.png b/src/imports/controls/imagine/images/combobox-background-editable@4x.9.png Binary files differindex 4e6bf163..5a24717a 100644 --- a/src/imports/controls/imagine/images/combobox-background-editable@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-editable@4x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-focused.9.png b/src/imports/controls/imagine/images/combobox-background-focused.9.png Binary files differindex 1eb48fab..a44ad0a7 100644 --- a/src/imports/controls/imagine/images/combobox-background-focused.9.png +++ b/src/imports/controls/imagine/images/combobox-background-focused.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-focused@2x.9.png b/src/imports/controls/imagine/images/combobox-background-focused@2x.9.png Binary files differindex b14677f9..80c8c612 100644 --- a/src/imports/controls/imagine/images/combobox-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-focused@3x.9.png b/src/imports/controls/imagine/images/combobox-background-focused@3x.9.png Binary files differindex c86acfd6..dca2a6fe 100644 --- a/src/imports/controls/imagine/images/combobox-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-focused@4x.9.png b/src/imports/controls/imagine/images/combobox-background-focused@4x.9.png Binary files differindex eaea1dc4..f578a3bb 100644 --- a/src/imports/controls/imagine/images/combobox-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-hovered.9.png b/src/imports/controls/imagine/images/combobox-background-hovered.9.png Binary files differindex 1eb48fab..a44ad0a7 100644 --- a/src/imports/controls/imagine/images/combobox-background-hovered.9.png +++ b/src/imports/controls/imagine/images/combobox-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-hovered@2x.9.png b/src/imports/controls/imagine/images/combobox-background-hovered@2x.9.png Binary files differindex b14677f9..80c8c612 100644 --- a/src/imports/controls/imagine/images/combobox-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-hovered@3x.9.png b/src/imports/controls/imagine/images/combobox-background-hovered@3x.9.png Binary files differindex c86acfd6..dca2a6fe 100644 --- a/src/imports/controls/imagine/images/combobox-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-hovered@4x.9.png b/src/imports/controls/imagine/images/combobox-background-hovered@4x.9.png Binary files differindex eaea1dc4..f578a3bb 100644 --- a/src/imports/controls/imagine/images/combobox-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-open.9.png b/src/imports/controls/imagine/images/combobox-background-open.9.png Binary files differindex e4d1d23a..00dad7f0 100644 --- a/src/imports/controls/imagine/images/combobox-background-open.9.png +++ b/src/imports/controls/imagine/images/combobox-background-open.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-open@2x.9.png b/src/imports/controls/imagine/images/combobox-background-open@2x.9.png Binary files differindex a8fbfddb..e7bff6c4 100644 --- a/src/imports/controls/imagine/images/combobox-background-open@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-open@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-open@3x.9.png b/src/imports/controls/imagine/images/combobox-background-open@3x.9.png Binary files differindex 95b0a5bc..96f4d58b 100644 --- a/src/imports/controls/imagine/images/combobox-background-open@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-open@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-open@4x.9.png b/src/imports/controls/imagine/images/combobox-background-open@4x.9.png Binary files differindex f78367b8..7c65290a 100644 --- a/src/imports/controls/imagine/images/combobox-background-open@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-open@4x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-pressed.9.png b/src/imports/controls/imagine/images/combobox-background-pressed.9.png Binary files differindex e4d1d23a..00dad7f0 100644 --- a/src/imports/controls/imagine/images/combobox-background-pressed.9.png +++ b/src/imports/controls/imagine/images/combobox-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-pressed@2x.9.png b/src/imports/controls/imagine/images/combobox-background-pressed@2x.9.png Binary files differindex a8fbfddb..e7bff6c4 100644 --- a/src/imports/controls/imagine/images/combobox-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-pressed@3x.9.png b/src/imports/controls/imagine/images/combobox-background-pressed@3x.9.png Binary files differindex 95b0a5bc..96f4d58b 100644 --- a/src/imports/controls/imagine/images/combobox-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background-pressed@4x.9.png b/src/imports/controls/imagine/images/combobox-background-pressed@4x.9.png Binary files differindex f78367b8..7c65290a 100644 --- a/src/imports/controls/imagine/images/combobox-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background.9.png b/src/imports/controls/imagine/images/combobox-background.9.png Binary files differindex 4531fc9f..ff9be7f7 100644 --- a/src/imports/controls/imagine/images/combobox-background.9.png +++ b/src/imports/controls/imagine/images/combobox-background.9.png diff --git a/src/imports/controls/imagine/images/combobox-background@2x.9.png b/src/imports/controls/imagine/images/combobox-background@2x.9.png Binary files differindex 2487f954..bda0a45e 100644 --- a/src/imports/controls/imagine/images/combobox-background@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-background@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background@3x.9.png b/src/imports/controls/imagine/images/combobox-background@3x.9.png Binary files differindex 2830c414..c34beccf 100644 --- a/src/imports/controls/imagine/images/combobox-background@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-background@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-background@4x.9.png b/src/imports/controls/imagine/images/combobox-background@4x.9.png Binary files differindex eef233f2..22d34bd5 100644 --- a/src/imports/controls/imagine/images/combobox-background@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-background@4x.9.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-disabled.png b/src/imports/controls/imagine/images/combobox-indicator-disabled.png Binary files differindex 4a6a4b2c..cf4e0879 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-disabled.png +++ b/src/imports/controls/imagine/images/combobox-indicator-disabled.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-disabled@2x.png b/src/imports/controls/imagine/images/combobox-indicator-disabled@2x.png Binary files differindex 5f1fdadd..74306ec7 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-disabled@2x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-disabled@2x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-disabled@3x.png b/src/imports/controls/imagine/images/combobox-indicator-disabled@3x.png Binary files differindex 841fa7bf..d69fea5c 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-disabled@3x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-disabled@3x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-disabled@4x.png b/src/imports/controls/imagine/images/combobox-indicator-disabled@4x.png Binary files differindex a0a16277..9e63c449 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-disabled@4x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-disabled@4x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled.png b/src/imports/controls/imagine/images/combobox-indicator-editable-disabled.png Binary files differindex cee1fecd..89f4efa2 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-disabled.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@2x.png b/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@2x.png Binary files differindex 2ed968ab..e50ed17b 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@2x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@2x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@3x.png b/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@3x.png Binary files differindex 0af07c5e..c82a5b2a 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@3x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@3x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@4x.png b/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@4x.png Binary files differindex 7b9784fc..6415ef59 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@4x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-disabled@4x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled.png b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled.png Binary files differindex 5f9eea3e..f4e9b366 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png Binary files differindex 0d2b2643..cdbc9773 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@2x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png Binary files differindex 71b8f63e..fbb520b0 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@3x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png Binary files differindex 7996a196..da6d1c24 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored-disabled@4x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored.png b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored.png Binary files differindex 931fd8b1..13a7a520 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@2x.png b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@2x.png Binary files differindex bc6d3f66..c8f74b13 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@2x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@2x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@3x.png b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@3x.png Binary files differindex 41126aef..a330edf3 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@3x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@3x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@4x.png b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@4x.png Binary files differindex de34478e..2acedf54 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@4x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable-mirrored@4x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable.png b/src/imports/controls/imagine/images/combobox-indicator-editable.png Binary files differindex 9044989c..a3899a11 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable@2x.png b/src/imports/controls/imagine/images/combobox-indicator-editable@2x.png Binary files differindex 4f3a7cb5..2cec8359 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable@2x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable@2x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable@3x.png b/src/imports/controls/imagine/images/combobox-indicator-editable@3x.png Binary files differindex aceb17e1..23911865 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable@3x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable@3x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator-editable@4x.png b/src/imports/controls/imagine/images/combobox-indicator-editable@4x.png Binary files differindex 6bb7693d..8095e11b 100644 --- a/src/imports/controls/imagine/images/combobox-indicator-editable@4x.png +++ b/src/imports/controls/imagine/images/combobox-indicator-editable@4x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator.png b/src/imports/controls/imagine/images/combobox-indicator.png Binary files differindex f5cc0858..4859714d 100644 --- a/src/imports/controls/imagine/images/combobox-indicator.png +++ b/src/imports/controls/imagine/images/combobox-indicator.png diff --git a/src/imports/controls/imagine/images/combobox-indicator@2x.png b/src/imports/controls/imagine/images/combobox-indicator@2x.png Binary files differindex f765281e..d492a9d4 100644 --- a/src/imports/controls/imagine/images/combobox-indicator@2x.png +++ b/src/imports/controls/imagine/images/combobox-indicator@2x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator@3x.png b/src/imports/controls/imagine/images/combobox-indicator@3x.png Binary files differindex 21731ead..bf2e4f78 100644 --- a/src/imports/controls/imagine/images/combobox-indicator@3x.png +++ b/src/imports/controls/imagine/images/combobox-indicator@3x.png diff --git a/src/imports/controls/imagine/images/combobox-indicator@4x.png b/src/imports/controls/imagine/images/combobox-indicator@4x.png Binary files differindex 2c2cfeaa..5c107a07 100644 --- a/src/imports/controls/imagine/images/combobox-indicator@4x.png +++ b/src/imports/controls/imagine/images/combobox-indicator@4x.png diff --git a/src/imports/controls/imagine/images/combobox-popup.9.png b/src/imports/controls/imagine/images/combobox-popup.9.png Binary files differindex 26e60fb0..646419d1 100644 --- a/src/imports/controls/imagine/images/combobox-popup.9.png +++ b/src/imports/controls/imagine/images/combobox-popup.9.png diff --git a/src/imports/controls/imagine/images/combobox-popup@2x.9.png b/src/imports/controls/imagine/images/combobox-popup@2x.9.png Binary files differindex f2f3c868..9bce26ac 100644 --- a/src/imports/controls/imagine/images/combobox-popup@2x.9.png +++ b/src/imports/controls/imagine/images/combobox-popup@2x.9.png diff --git a/src/imports/controls/imagine/images/combobox-popup@3x.9.png b/src/imports/controls/imagine/images/combobox-popup@3x.9.png Binary files differindex f6227cd9..1857d8e0 100644 --- a/src/imports/controls/imagine/images/combobox-popup@3x.9.png +++ b/src/imports/controls/imagine/images/combobox-popup@3x.9.png diff --git a/src/imports/controls/imagine/images/combobox-popup@4x.9.png b/src/imports/controls/imagine/images/combobox-popup@4x.9.png Binary files differindex 3791257b..b2132f49 100644 --- a/src/imports/controls/imagine/images/combobox-popup@4x.9.png +++ b/src/imports/controls/imagine/images/combobox-popup@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-focused.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked-focused.9.png Binary files differindex aff98b73..829d68a9 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked-focused.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked-focused.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@2x.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked-focused@2x.9.png Binary files differindex ab0d89ec..bf375d43 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@3x.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked-focused@3x.9.png Binary files differindex 299510e2..8759c337 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@4x.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked-focused@4x.9.png Binary files differindex c5031415..7b8f3616 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked-focused@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked-hovered.9.png Binary files differindex aff98b73..829d68a9 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked-hovered.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@2x.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@2x.9.png Binary files differindex ab0d89ec..bf375d43 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@3x.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@3x.9.png Binary files differindex 299510e2..8759c337 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@4x.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@4x.9.png Binary files differindex c5031415..7b8f3616 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked.9.png Binary files differindex 8127c8e1..3ca06e6c 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked@2x.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked@2x.9.png Binary files differindex b11c9e30..0afc3dea 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked@3x.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked@3x.9.png Binary files differindex 31cb846b..348687ad 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-checked@4x.9.png b/src/imports/controls/imagine/images/delaybutton-background-checked@4x.9.png Binary files differindex 558d80a2..4dff0ba8 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-checked@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked.9.png b/src/imports/controls/imagine/images/delaybutton-background-disabled-checked.9.png Binary files differindex 3cc20a45..c06fd7cc 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-disabled-checked.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@2x.9.png b/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@2x.9.png Binary files differindex 459634ed..b86a13cc 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@3x.9.png b/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@3x.9.png Binary files differindex ed44c623..7fa4dd83 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@4x.9.png b/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@4x.9.png Binary files differindex 7795c5cf..676bb0dd 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-disabled-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled.9.png b/src/imports/controls/imagine/images/delaybutton-background-disabled.9.png Binary files differindex 3cc20a45..c06fd7cc 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-disabled.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled@2x.9.png b/src/imports/controls/imagine/images/delaybutton-background-disabled@2x.9.png Binary files differindex 459634ed..b86a13cc 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled@3x.9.png b/src/imports/controls/imagine/images/delaybutton-background-disabled@3x.9.png Binary files differindex ed44c623..7fa4dd83 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-disabled@4x.9.png b/src/imports/controls/imagine/images/delaybutton-background-disabled@4x.9.png Binary files differindex 7795c5cf..676bb0dd 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-focused.9.png b/src/imports/controls/imagine/images/delaybutton-background-focused.9.png Binary files differindex 64278299..5f304316 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-focused.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-focused.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-focused@2x.9.png b/src/imports/controls/imagine/images/delaybutton-background-focused@2x.9.png Binary files differindex 0213bba2..eaf07709 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-focused@3x.9.png b/src/imports/controls/imagine/images/delaybutton-background-focused@3x.9.png Binary files differindex e4189bf5..405fe421 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-focused@4x.9.png b/src/imports/controls/imagine/images/delaybutton-background-focused@4x.9.png Binary files differindex 7ffc9c80..f5582735 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-hovered.9.png b/src/imports/controls/imagine/images/delaybutton-background-hovered.9.png Binary files differindex 64278299..04573ce4 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-hovered.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-hovered@2x.9.png b/src/imports/controls/imagine/images/delaybutton-background-hovered@2x.9.png Binary files differindex 0213bba2..ad25d378 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-hovered@3x.9.png b/src/imports/controls/imagine/images/delaybutton-background-hovered@3x.9.png Binary files differindex e4189bf5..2f599e72 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-hovered@4x.9.png b/src/imports/controls/imagine/images/delaybutton-background-hovered@4x.9.png Binary files differindex 7ffc9c80..6ac51521 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-pressed.9.png b/src/imports/controls/imagine/images/delaybutton-background-pressed.9.png Binary files differindex 8127c8e1..3ca06e6c 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-pressed.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-pressed@2x.9.png b/src/imports/controls/imagine/images/delaybutton-background-pressed@2x.9.png Binary files differindex b11c9e30..0afc3dea 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-pressed@3x.9.png b/src/imports/controls/imagine/images/delaybutton-background-pressed@3x.9.png Binary files differindex 31cb846b..348687ad 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background-pressed@4x.9.png b/src/imports/controls/imagine/images/delaybutton-background-pressed@4x.9.png Binary files differindex 558d80a2..4dff0ba8 100644 --- a/src/imports/controls/imagine/images/delaybutton-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background.9.png b/src/imports/controls/imagine/images/delaybutton-background.9.png Binary files differindex 43215ebd..053da917 100644 --- a/src/imports/controls/imagine/images/delaybutton-background.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background@2x.9.png b/src/imports/controls/imagine/images/delaybutton-background@2x.9.png Binary files differindex 6526a1a0..471940f1 100644 --- a/src/imports/controls/imagine/images/delaybutton-background@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background@3x.9.png b/src/imports/controls/imagine/images/delaybutton-background@3x.9.png Binary files differindex c30044cb..06155e8a 100644 --- a/src/imports/controls/imagine/images/delaybutton-background@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-background@4x.9.png b/src/imports/controls/imagine/images/delaybutton-background@4x.9.png Binary files differindex e35896fa..7d776e51 100644 --- a/src/imports/controls/imagine/images/delaybutton-background@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-background@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-mask.9.png b/src/imports/controls/imagine/images/delaybutton-mask.9.png Binary files differindex 83dde2d3..06864c1b 100644 --- a/src/imports/controls/imagine/images/delaybutton-mask.9.png +++ b/src/imports/controls/imagine/images/delaybutton-mask.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-mask@2x.9.png b/src/imports/controls/imagine/images/delaybutton-mask@2x.9.png Binary files differindex cfa5a8ad..808d25d3 100644 --- a/src/imports/controls/imagine/images/delaybutton-mask@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-mask@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-mask@3x.9.png b/src/imports/controls/imagine/images/delaybutton-mask@3x.9.png Binary files differindex 62eb0194..4efdcd05 100644 --- a/src/imports/controls/imagine/images/delaybutton-mask@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-mask@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-mask@4x.9.png b/src/imports/controls/imagine/images/delaybutton-mask@4x.9.png Binary files differindex 7d8fdae5..ec246a02 100644 --- a/src/imports/controls/imagine/images/delaybutton-mask@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-mask@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-progress-disabled.9.png b/src/imports/controls/imagine/images/delaybutton-progress-disabled.9.png Binary files differindex 5c209c9c..bdf56055 100644 --- a/src/imports/controls/imagine/images/delaybutton-progress-disabled.9.png +++ b/src/imports/controls/imagine/images/delaybutton-progress-disabled.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-progress-disabled@2x.9.png b/src/imports/controls/imagine/images/delaybutton-progress-disabled@2x.9.png Binary files differindex 0ef11a8d..a58c93a1 100644 --- a/src/imports/controls/imagine/images/delaybutton-progress-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-progress-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-progress-disabled@3x.9.png b/src/imports/controls/imagine/images/delaybutton-progress-disabled@3x.9.png Binary files differindex f3f8e547..259f68ea 100644 --- a/src/imports/controls/imagine/images/delaybutton-progress-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-progress-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-progress-disabled@4x.9.png b/src/imports/controls/imagine/images/delaybutton-progress-disabled@4x.9.png Binary files differindex b24f50e6..a075d444 100644 --- a/src/imports/controls/imagine/images/delaybutton-progress-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-progress-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-progress.9.png b/src/imports/controls/imagine/images/delaybutton-progress.9.png Binary files differindex 4dd3aec5..0848cbcd 100644 --- a/src/imports/controls/imagine/images/delaybutton-progress.9.png +++ b/src/imports/controls/imagine/images/delaybutton-progress.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-progress@2x.9.png b/src/imports/controls/imagine/images/delaybutton-progress@2x.9.png Binary files differindex cd422076..1a376399 100644 --- a/src/imports/controls/imagine/images/delaybutton-progress@2x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-progress@2x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-progress@3x.9.png b/src/imports/controls/imagine/images/delaybutton-progress@3x.9.png Binary files differindex 08610300..704ab464 100644 --- a/src/imports/controls/imagine/images/delaybutton-progress@3x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-progress@3x.9.png diff --git a/src/imports/controls/imagine/images/delaybutton-progress@4x.9.png b/src/imports/controls/imagine/images/delaybutton-progress@4x.9.png Binary files differindex 24cc19ba..ec568ce0 100644 --- a/src/imports/controls/imagine/images/delaybutton-progress@4x.9.png +++ b/src/imports/controls/imagine/images/delaybutton-progress@4x.9.png diff --git a/src/imports/controls/imagine/images/dial-background-disabled.png b/src/imports/controls/imagine/images/dial-background-disabled.png Binary files differindex fdf00515..eaea9591 100644 --- a/src/imports/controls/imagine/images/dial-background-disabled.png +++ b/src/imports/controls/imagine/images/dial-background-disabled.png diff --git a/src/imports/controls/imagine/images/dial-background-disabled@2x.png b/src/imports/controls/imagine/images/dial-background-disabled@2x.png Binary files differindex e84495a5..de2d3fbe 100644 --- a/src/imports/controls/imagine/images/dial-background-disabled@2x.png +++ b/src/imports/controls/imagine/images/dial-background-disabled@2x.png diff --git a/src/imports/controls/imagine/images/dial-background-disabled@3x.png b/src/imports/controls/imagine/images/dial-background-disabled@3x.png Binary files differindex a22eccc1..15d53353 100644 --- a/src/imports/controls/imagine/images/dial-background-disabled@3x.png +++ b/src/imports/controls/imagine/images/dial-background-disabled@3x.png diff --git a/src/imports/controls/imagine/images/dial-background-disabled@4x.png b/src/imports/controls/imagine/images/dial-background-disabled@4x.png Binary files differindex 2bfc73dc..d6708c83 100644 --- a/src/imports/controls/imagine/images/dial-background-disabled@4x.png +++ b/src/imports/controls/imagine/images/dial-background-disabled@4x.png diff --git a/src/imports/controls/imagine/images/dial-background-focused.png b/src/imports/controls/imagine/images/dial-background-focused.png Binary files differindex 10fa4c2d..c7c4f8ad 100644 --- a/src/imports/controls/imagine/images/dial-background-focused.png +++ b/src/imports/controls/imagine/images/dial-background-focused.png diff --git a/src/imports/controls/imagine/images/dial-background-focused@2x.png b/src/imports/controls/imagine/images/dial-background-focused@2x.png Binary files differindex bfb2a3fd..01febba4 100644 --- a/src/imports/controls/imagine/images/dial-background-focused@2x.png +++ b/src/imports/controls/imagine/images/dial-background-focused@2x.png diff --git a/src/imports/controls/imagine/images/dial-background-focused@3x.png b/src/imports/controls/imagine/images/dial-background-focused@3x.png Binary files differindex 77cba1df..2f4533ca 100644 --- a/src/imports/controls/imagine/images/dial-background-focused@3x.png +++ b/src/imports/controls/imagine/images/dial-background-focused@3x.png diff --git a/src/imports/controls/imagine/images/dial-background-focused@4x.png b/src/imports/controls/imagine/images/dial-background-focused@4x.png Binary files differindex 755e497e..806a784d 100644 --- a/src/imports/controls/imagine/images/dial-background-focused@4x.png +++ b/src/imports/controls/imagine/images/dial-background-focused@4x.png diff --git a/src/imports/controls/imagine/images/dial-background.png b/src/imports/controls/imagine/images/dial-background.png Binary files differindex 60837fe5..7836be2d 100644 --- a/src/imports/controls/imagine/images/dial-background.png +++ b/src/imports/controls/imagine/images/dial-background.png diff --git a/src/imports/controls/imagine/images/dial-background@2x.png b/src/imports/controls/imagine/images/dial-background@2x.png Binary files differindex 2103bf55..b80fb882 100644 --- a/src/imports/controls/imagine/images/dial-background@2x.png +++ b/src/imports/controls/imagine/images/dial-background@2x.png diff --git a/src/imports/controls/imagine/images/dial-background@3x.png b/src/imports/controls/imagine/images/dial-background@3x.png Binary files differindex 58a7ff95..76dd0ba5 100644 --- a/src/imports/controls/imagine/images/dial-background@3x.png +++ b/src/imports/controls/imagine/images/dial-background@3x.png diff --git a/src/imports/controls/imagine/images/dial-background@4x.png b/src/imports/controls/imagine/images/dial-background@4x.png Binary files differindex 664ebb9d..774d91f9 100644 --- a/src/imports/controls/imagine/images/dial-background@4x.png +++ b/src/imports/controls/imagine/images/dial-background@4x.png diff --git a/src/imports/controls/imagine/images/dial-handle-disabled.png b/src/imports/controls/imagine/images/dial-handle-disabled.png Binary files differindex 626edccd..e7ecf615 100644 --- a/src/imports/controls/imagine/images/dial-handle-disabled.png +++ b/src/imports/controls/imagine/images/dial-handle-disabled.png diff --git a/src/imports/controls/imagine/images/dial-handle-disabled@2x.png b/src/imports/controls/imagine/images/dial-handle-disabled@2x.png Binary files differindex 28b09f14..5bf4a433 100644 --- a/src/imports/controls/imagine/images/dial-handle-disabled@2x.png +++ b/src/imports/controls/imagine/images/dial-handle-disabled@2x.png diff --git a/src/imports/controls/imagine/images/dial-handle-disabled@3x.png b/src/imports/controls/imagine/images/dial-handle-disabled@3x.png Binary files differindex e1f46a0a..8fc3d43c 100644 --- a/src/imports/controls/imagine/images/dial-handle-disabled@3x.png +++ b/src/imports/controls/imagine/images/dial-handle-disabled@3x.png diff --git a/src/imports/controls/imagine/images/dial-handle-disabled@4x.png b/src/imports/controls/imagine/images/dial-handle-disabled@4x.png Binary files differindex e3c26204..6356c101 100644 --- a/src/imports/controls/imagine/images/dial-handle-disabled@4x.png +++ b/src/imports/controls/imagine/images/dial-handle-disabled@4x.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused-hovered.png b/src/imports/controls/imagine/images/dial-handle-focused-hovered.png Binary files differindex fc9470e6..a64faa7b 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused-hovered.png +++ b/src/imports/controls/imagine/images/dial-handle-focused-hovered.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused-hovered@2x.png b/src/imports/controls/imagine/images/dial-handle-focused-hovered@2x.png Binary files differindex a3dc50bd..3fb2b8d4 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused-hovered@2x.png +++ b/src/imports/controls/imagine/images/dial-handle-focused-hovered@2x.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused-hovered@3x.png b/src/imports/controls/imagine/images/dial-handle-focused-hovered@3x.png Binary files differindex a23de192..05d5b798 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused-hovered@3x.png +++ b/src/imports/controls/imagine/images/dial-handle-focused-hovered@3x.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused-hovered@4x.png b/src/imports/controls/imagine/images/dial-handle-focused-hovered@4x.png Binary files differindex 8820ff1a..eecba9d6 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused-hovered@4x.png +++ b/src/imports/controls/imagine/images/dial-handle-focused-hovered@4x.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused-pressed.png b/src/imports/controls/imagine/images/dial-handle-focused-pressed.png Binary files differindex 6b6dc410..e310a90d 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused-pressed.png +++ b/src/imports/controls/imagine/images/dial-handle-focused-pressed.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused-pressed@2x.png b/src/imports/controls/imagine/images/dial-handle-focused-pressed@2x.png Binary files differindex ac52880b..770572a8 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused-pressed@2x.png +++ b/src/imports/controls/imagine/images/dial-handle-focused-pressed@2x.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused-pressed@3x.png b/src/imports/controls/imagine/images/dial-handle-focused-pressed@3x.png Binary files differindex bfc68881..b58f1909 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused-pressed@3x.png +++ b/src/imports/controls/imagine/images/dial-handle-focused-pressed@3x.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused-pressed@4x.png b/src/imports/controls/imagine/images/dial-handle-focused-pressed@4x.png Binary files differindex 5fa78b1a..2c71a0ac 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused-pressed@4x.png +++ b/src/imports/controls/imagine/images/dial-handle-focused-pressed@4x.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused.png b/src/imports/controls/imagine/images/dial-handle-focused.png Binary files differindex fc9470e6..21969bc5 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused.png +++ b/src/imports/controls/imagine/images/dial-handle-focused.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused@2x.png b/src/imports/controls/imagine/images/dial-handle-focused@2x.png Binary files differindex a3dc50bd..753b6ce7 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused@2x.png +++ b/src/imports/controls/imagine/images/dial-handle-focused@2x.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused@3x.png b/src/imports/controls/imagine/images/dial-handle-focused@3x.png Binary files differindex a23de192..00232d38 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused@3x.png +++ b/src/imports/controls/imagine/images/dial-handle-focused@3x.png diff --git a/src/imports/controls/imagine/images/dial-handle-focused@4x.png b/src/imports/controls/imagine/images/dial-handle-focused@4x.png Binary files differindex 8820ff1a..834850d6 100644 --- a/src/imports/controls/imagine/images/dial-handle-focused@4x.png +++ b/src/imports/controls/imagine/images/dial-handle-focused@4x.png diff --git a/src/imports/controls/imagine/images/dial-handle-hovered.png b/src/imports/controls/imagine/images/dial-handle-hovered.png Binary files differindex 5b9bc934..ad76fda7 100644 --- a/src/imports/controls/imagine/images/dial-handle-hovered.png +++ b/src/imports/controls/imagine/images/dial-handle-hovered.png diff --git a/src/imports/controls/imagine/images/dial-handle-hovered@2x.png b/src/imports/controls/imagine/images/dial-handle-hovered@2x.png Binary files differindex 9c1f4022..215097a3 100644 --- a/src/imports/controls/imagine/images/dial-handle-hovered@2x.png +++ b/src/imports/controls/imagine/images/dial-handle-hovered@2x.png diff --git a/src/imports/controls/imagine/images/dial-handle-hovered@3x.png b/src/imports/controls/imagine/images/dial-handle-hovered@3x.png Binary files differindex 1d621bd4..6653f555 100644 --- a/src/imports/controls/imagine/images/dial-handle-hovered@3x.png +++ b/src/imports/controls/imagine/images/dial-handle-hovered@3x.png diff --git a/src/imports/controls/imagine/images/dial-handle-hovered@4x.png b/src/imports/controls/imagine/images/dial-handle-hovered@4x.png Binary files differindex 2b545261..213e27b3 100644 --- a/src/imports/controls/imagine/images/dial-handle-hovered@4x.png +++ b/src/imports/controls/imagine/images/dial-handle-hovered@4x.png diff --git a/src/imports/controls/imagine/images/dial-handle-pressed.png b/src/imports/controls/imagine/images/dial-handle-pressed.png Binary files differindex 25d334cc..9f8619c0 100644 --- a/src/imports/controls/imagine/images/dial-handle-pressed.png +++ b/src/imports/controls/imagine/images/dial-handle-pressed.png diff --git a/src/imports/controls/imagine/images/dial-handle-pressed@2x.png b/src/imports/controls/imagine/images/dial-handle-pressed@2x.png Binary files differindex f6c3ddce..78a9b9fe 100644 --- a/src/imports/controls/imagine/images/dial-handle-pressed@2x.png +++ b/src/imports/controls/imagine/images/dial-handle-pressed@2x.png diff --git a/src/imports/controls/imagine/images/dial-handle-pressed@3x.png b/src/imports/controls/imagine/images/dial-handle-pressed@3x.png Binary files differindex 523187d0..0d6d1e7e 100644 --- a/src/imports/controls/imagine/images/dial-handle-pressed@3x.png +++ b/src/imports/controls/imagine/images/dial-handle-pressed@3x.png diff --git a/src/imports/controls/imagine/images/dial-handle-pressed@4x.png b/src/imports/controls/imagine/images/dial-handle-pressed@4x.png Binary files differindex c4c9c042..1673343a 100644 --- a/src/imports/controls/imagine/images/dial-handle-pressed@4x.png +++ b/src/imports/controls/imagine/images/dial-handle-pressed@4x.png diff --git a/src/imports/controls/imagine/images/dial-handle.png b/src/imports/controls/imagine/images/dial-handle.png Binary files differindex 606e9583..b4ad6b9a 100644 --- a/src/imports/controls/imagine/images/dial-handle.png +++ b/src/imports/controls/imagine/images/dial-handle.png diff --git a/src/imports/controls/imagine/images/dial-handle@2x.png b/src/imports/controls/imagine/images/dial-handle@2x.png Binary files differindex 4eced358..0e6147d9 100644 --- a/src/imports/controls/imagine/images/dial-handle@2x.png +++ b/src/imports/controls/imagine/images/dial-handle@2x.png diff --git a/src/imports/controls/imagine/images/dial-handle@3x.png b/src/imports/controls/imagine/images/dial-handle@3x.png Binary files differindex 4bf76452..24ff1519 100644 --- a/src/imports/controls/imagine/images/dial-handle@3x.png +++ b/src/imports/controls/imagine/images/dial-handle@3x.png diff --git a/src/imports/controls/imagine/images/dial-handle@4x.png b/src/imports/controls/imagine/images/dial-handle@4x.png Binary files differindex 4fce7c3a..c6b82488 100644 --- a/src/imports/controls/imagine/images/dial-handle@4x.png +++ b/src/imports/controls/imagine/images/dial-handle@4x.png diff --git a/src/imports/controls/imagine/images/dialog-background.9.png b/src/imports/controls/imagine/images/dialog-background.9.png Binary files differindex ddf40352..495d2f0d 100644 --- a/src/imports/controls/imagine/images/dialog-background.9.png +++ b/src/imports/controls/imagine/images/dialog-background.9.png diff --git a/src/imports/controls/imagine/images/dialog-background@2x.9.png b/src/imports/controls/imagine/images/dialog-background@2x.9.png Binary files differindex 5127eab4..ba0df866 100644 --- a/src/imports/controls/imagine/images/dialog-background@2x.9.png +++ b/src/imports/controls/imagine/images/dialog-background@2x.9.png diff --git a/src/imports/controls/imagine/images/dialog-background@3x.9.png b/src/imports/controls/imagine/images/dialog-background@3x.9.png Binary files differindex 42046abb..e71856a5 100644 --- a/src/imports/controls/imagine/images/dialog-background@3x.9.png +++ b/src/imports/controls/imagine/images/dialog-background@3x.9.png diff --git a/src/imports/controls/imagine/images/dialog-background@4x.9.png b/src/imports/controls/imagine/images/dialog-background@4x.9.png Binary files differindex a5841341..d756cda5 100644 --- a/src/imports/controls/imagine/images/dialog-background@4x.9.png +++ b/src/imports/controls/imagine/images/dialog-background@4x.9.png diff --git a/src/imports/controls/imagine/images/dialog-overlay-modal.png b/src/imports/controls/imagine/images/dialog-overlay-modal.png Binary files differindex 3113bd99..296e914a 100644 --- a/src/imports/controls/imagine/images/dialog-overlay-modal.png +++ b/src/imports/controls/imagine/images/dialog-overlay-modal.png diff --git a/src/imports/controls/imagine/images/dialog-overlay-modal@2x.png b/src/imports/controls/imagine/images/dialog-overlay-modal@2x.png Binary files differindex 0ad9ce6d..10c89300 100644 --- a/src/imports/controls/imagine/images/dialog-overlay-modal@2x.png +++ b/src/imports/controls/imagine/images/dialog-overlay-modal@2x.png diff --git a/src/imports/controls/imagine/images/dialog-overlay-modal@3x.png b/src/imports/controls/imagine/images/dialog-overlay-modal@3x.png Binary files differindex 170607d9..f65996e9 100644 --- a/src/imports/controls/imagine/images/dialog-overlay-modal@3x.png +++ b/src/imports/controls/imagine/images/dialog-overlay-modal@3x.png diff --git a/src/imports/controls/imagine/images/dialog-overlay-modal@4x.png b/src/imports/controls/imagine/images/dialog-overlay-modal@4x.png Binary files differindex 8b4b974d..a586f381 100644 --- a/src/imports/controls/imagine/images/dialog-overlay-modal@4x.png +++ b/src/imports/controls/imagine/images/dialog-overlay-modal@4x.png diff --git a/src/imports/controls/imagine/images/dialog-overlay.png b/src/imports/controls/imagine/images/dialog-overlay.png Binary files differindex 7a172720..e7175b46 100644 --- a/src/imports/controls/imagine/images/dialog-overlay.png +++ b/src/imports/controls/imagine/images/dialog-overlay.png diff --git a/src/imports/controls/imagine/images/dialog-overlay@2x.png b/src/imports/controls/imagine/images/dialog-overlay@2x.png Binary files differindex e8fb48ad..db6566e0 100644 --- a/src/imports/controls/imagine/images/dialog-overlay@2x.png +++ b/src/imports/controls/imagine/images/dialog-overlay@2x.png diff --git a/src/imports/controls/imagine/images/dialog-overlay@3x.png b/src/imports/controls/imagine/images/dialog-overlay@3x.png Binary files differindex 1ea6204c..140e4692 100644 --- a/src/imports/controls/imagine/images/dialog-overlay@3x.png +++ b/src/imports/controls/imagine/images/dialog-overlay@3x.png diff --git a/src/imports/controls/imagine/images/dialog-overlay@4x.png b/src/imports/controls/imagine/images/dialog-overlay@4x.png Binary files differindex cc4df170..5115c28a 100644 --- a/src/imports/controls/imagine/images/dialog-overlay@4x.png +++ b/src/imports/controls/imagine/images/dialog-overlay@4x.png diff --git a/src/imports/controls/imagine/images/dialogbuttonbox-background.9.png b/src/imports/controls/imagine/images/dialogbuttonbox-background.9.png Binary files differindex cda610f2..347300bb 100644 --- a/src/imports/controls/imagine/images/dialogbuttonbox-background.9.png +++ b/src/imports/controls/imagine/images/dialogbuttonbox-background.9.png diff --git a/src/imports/controls/imagine/images/dialogbuttonbox-background@2x.9.png b/src/imports/controls/imagine/images/dialogbuttonbox-background@2x.9.png Binary files differindex 79a8aafa..8eddd6f4 100644 --- a/src/imports/controls/imagine/images/dialogbuttonbox-background@2x.9.png +++ b/src/imports/controls/imagine/images/dialogbuttonbox-background@2x.9.png diff --git a/src/imports/controls/imagine/images/dialogbuttonbox-background@3x.9.png b/src/imports/controls/imagine/images/dialogbuttonbox-background@3x.9.png Binary files differindex 8afb56d0..d4a407ba 100644 --- a/src/imports/controls/imagine/images/dialogbuttonbox-background@3x.9.png +++ b/src/imports/controls/imagine/images/dialogbuttonbox-background@3x.9.png diff --git a/src/imports/controls/imagine/images/dialogbuttonbox-background@4x.9.png b/src/imports/controls/imagine/images/dialogbuttonbox-background@4x.9.png Binary files differindex 33f89d09..7af78edb 100644 --- a/src/imports/controls/imagine/images/dialogbuttonbox-background@4x.9.png +++ b/src/imports/controls/imagine/images/dialogbuttonbox-background@4x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-bottom.9.png b/src/imports/controls/imagine/images/drawer-background-bottom.9.png Binary files differindex 90b247b7..d33adad1 100644 --- a/src/imports/controls/imagine/images/drawer-background-bottom.9.png +++ b/src/imports/controls/imagine/images/drawer-background-bottom.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-bottom@2x.9.png b/src/imports/controls/imagine/images/drawer-background-bottom@2x.9.png Binary files differindex b7c2ae57..c2becf9e 100644 --- a/src/imports/controls/imagine/images/drawer-background-bottom@2x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-bottom@2x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-bottom@3x.9.png b/src/imports/controls/imagine/images/drawer-background-bottom@3x.9.png Binary files differindex 5e20598f..52439206 100644 --- a/src/imports/controls/imagine/images/drawer-background-bottom@3x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-bottom@3x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-bottom@4x.9.png b/src/imports/controls/imagine/images/drawer-background-bottom@4x.9.png Binary files differindex 8f915ed8..abf6964e 100644 --- a/src/imports/controls/imagine/images/drawer-background-bottom@4x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-bottom@4x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-left.9.png b/src/imports/controls/imagine/images/drawer-background-left.9.png Binary files differindex 03a5f3ad..95485ea1 100644 --- a/src/imports/controls/imagine/images/drawer-background-left.9.png +++ b/src/imports/controls/imagine/images/drawer-background-left.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-left@2x.9.png b/src/imports/controls/imagine/images/drawer-background-left@2x.9.png Binary files differindex efdb8a87..9060bf37 100644 --- a/src/imports/controls/imagine/images/drawer-background-left@2x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-left@2x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-left@3x.9.png b/src/imports/controls/imagine/images/drawer-background-left@3x.9.png Binary files differindex 4abd55ea..70e39930 100644 --- a/src/imports/controls/imagine/images/drawer-background-left@3x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-left@3x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-left@4x.9.png b/src/imports/controls/imagine/images/drawer-background-left@4x.9.png Binary files differindex 212b5b60..8f26bbf0 100644 --- a/src/imports/controls/imagine/images/drawer-background-left@4x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-left@4x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-right.9.png b/src/imports/controls/imagine/images/drawer-background-right.9.png Binary files differindex 1429e0df..9951229e 100644 --- a/src/imports/controls/imagine/images/drawer-background-right.9.png +++ b/src/imports/controls/imagine/images/drawer-background-right.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-right@2x.9.png b/src/imports/controls/imagine/images/drawer-background-right@2x.9.png Binary files differindex 60d4a3b6..850811c6 100644 --- a/src/imports/controls/imagine/images/drawer-background-right@2x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-right@2x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-right@3x.9.png b/src/imports/controls/imagine/images/drawer-background-right@3x.9.png Binary files differindex 106d260c..a955e241 100644 --- a/src/imports/controls/imagine/images/drawer-background-right@3x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-right@3x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-right@4x.9.png b/src/imports/controls/imagine/images/drawer-background-right@4x.9.png Binary files differindex ccc99ac4..51011c8c 100644 --- a/src/imports/controls/imagine/images/drawer-background-right@4x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-right@4x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-top.9.png b/src/imports/controls/imagine/images/drawer-background-top.9.png Binary files differindex 3019288b..8685246c 100644 --- a/src/imports/controls/imagine/images/drawer-background-top.9.png +++ b/src/imports/controls/imagine/images/drawer-background-top.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-top@2x.9.png b/src/imports/controls/imagine/images/drawer-background-top@2x.9.png Binary files differindex a579d6fe..b4ebf860 100644 --- a/src/imports/controls/imagine/images/drawer-background-top@2x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-top@2x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-top@3x.9.png b/src/imports/controls/imagine/images/drawer-background-top@3x.9.png Binary files differindex 8a7b94ea..2075c6eb 100644 --- a/src/imports/controls/imagine/images/drawer-background-top@3x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-top@3x.9.png diff --git a/src/imports/controls/imagine/images/drawer-background-top@4x.9.png b/src/imports/controls/imagine/images/drawer-background-top@4x.9.png Binary files differindex 8759b67c..fad0cc13 100644 --- a/src/imports/controls/imagine/images/drawer-background-top@4x.9.png +++ b/src/imports/controls/imagine/images/drawer-background-top@4x.9.png diff --git a/src/imports/controls/imagine/images/drawer-overlay-modal.png b/src/imports/controls/imagine/images/drawer-overlay-modal.png Binary files differindex 3113bd99..296e914a 100644 --- a/src/imports/controls/imagine/images/drawer-overlay-modal.png +++ b/src/imports/controls/imagine/images/drawer-overlay-modal.png diff --git a/src/imports/controls/imagine/images/drawer-overlay-modal@2x.png b/src/imports/controls/imagine/images/drawer-overlay-modal@2x.png Binary files differindex 0ad9ce6d..10c89300 100644 --- a/src/imports/controls/imagine/images/drawer-overlay-modal@2x.png +++ b/src/imports/controls/imagine/images/drawer-overlay-modal@2x.png diff --git a/src/imports/controls/imagine/images/drawer-overlay-modal@3x.png b/src/imports/controls/imagine/images/drawer-overlay-modal@3x.png Binary files differindex 170607d9..f65996e9 100644 --- a/src/imports/controls/imagine/images/drawer-overlay-modal@3x.png +++ b/src/imports/controls/imagine/images/drawer-overlay-modal@3x.png diff --git a/src/imports/controls/imagine/images/drawer-overlay-modal@4x.png b/src/imports/controls/imagine/images/drawer-overlay-modal@4x.png Binary files differindex 8b4b974d..a586f381 100644 --- a/src/imports/controls/imagine/images/drawer-overlay-modal@4x.png +++ b/src/imports/controls/imagine/images/drawer-overlay-modal@4x.png diff --git a/src/imports/controls/imagine/images/drawer-overlay.png b/src/imports/controls/imagine/images/drawer-overlay.png Binary files differindex 7a172720..e7175b46 100644 --- a/src/imports/controls/imagine/images/drawer-overlay.png +++ b/src/imports/controls/imagine/images/drawer-overlay.png diff --git a/src/imports/controls/imagine/images/drawer-overlay@2x.png b/src/imports/controls/imagine/images/drawer-overlay@2x.png Binary files differindex e8fb48ad..db6566e0 100644 --- a/src/imports/controls/imagine/images/drawer-overlay@2x.png +++ b/src/imports/controls/imagine/images/drawer-overlay@2x.png diff --git a/src/imports/controls/imagine/images/drawer-overlay@3x.png b/src/imports/controls/imagine/images/drawer-overlay@3x.png Binary files differindex 1ea6204c..140e4692 100644 --- a/src/imports/controls/imagine/images/drawer-overlay@3x.png +++ b/src/imports/controls/imagine/images/drawer-overlay@3x.png diff --git a/src/imports/controls/imagine/images/drawer-overlay@4x.png b/src/imports/controls/imagine/images/drawer-overlay@4x.png Binary files differindex cc4df170..5115c28a 100644 --- a/src/imports/controls/imagine/images/drawer-overlay@4x.png +++ b/src/imports/controls/imagine/images/drawer-overlay@4x.png diff --git a/src/imports/controls/imagine/images/frame-background.9.png b/src/imports/controls/imagine/images/frame-background.9.png Binary files differindex 265ca206..3d3ae702 100644 --- a/src/imports/controls/imagine/images/frame-background.9.png +++ b/src/imports/controls/imagine/images/frame-background.9.png diff --git a/src/imports/controls/imagine/images/frame-background@2x.9.png b/src/imports/controls/imagine/images/frame-background@2x.9.png Binary files differindex e6501fac..8df38fe9 100644 --- a/src/imports/controls/imagine/images/frame-background@2x.9.png +++ b/src/imports/controls/imagine/images/frame-background@2x.9.png diff --git a/src/imports/controls/imagine/images/frame-background@3x.9.png b/src/imports/controls/imagine/images/frame-background@3x.9.png Binary files differindex da98a302..41012873 100644 --- a/src/imports/controls/imagine/images/frame-background@3x.9.png +++ b/src/imports/controls/imagine/images/frame-background@3x.9.png diff --git a/src/imports/controls/imagine/images/frame-background@4x.9.png b/src/imports/controls/imagine/images/frame-background@4x.9.png Binary files differindex 14623218..7da718de 100644 --- a/src/imports/controls/imagine/images/frame-background@4x.9.png +++ b/src/imports/controls/imagine/images/frame-background@4x.9.png diff --git a/src/imports/controls/imagine/images/groupbox-background.9.png b/src/imports/controls/imagine/images/groupbox-background.9.png Binary files differindex 265ca206..3d3ae702 100644 --- a/src/imports/controls/imagine/images/groupbox-background.9.png +++ b/src/imports/controls/imagine/images/groupbox-background.9.png diff --git a/src/imports/controls/imagine/images/groupbox-background@2x.9.png b/src/imports/controls/imagine/images/groupbox-background@2x.9.png Binary files differindex e6501fac..8df38fe9 100644 --- a/src/imports/controls/imagine/images/groupbox-background@2x.9.png +++ b/src/imports/controls/imagine/images/groupbox-background@2x.9.png diff --git a/src/imports/controls/imagine/images/groupbox-background@3x.9.png b/src/imports/controls/imagine/images/groupbox-background@3x.9.png Binary files differindex da98a302..41012873 100644 --- a/src/imports/controls/imagine/images/groupbox-background@3x.9.png +++ b/src/imports/controls/imagine/images/groupbox-background@3x.9.png diff --git a/src/imports/controls/imagine/images/groupbox-background@4x.9.png b/src/imports/controls/imagine/images/groupbox-background@4x.9.png Binary files differindex 14623218..7da718de 100644 --- a/src/imports/controls/imagine/images/groupbox-background@4x.9.png +++ b/src/imports/controls/imagine/images/groupbox-background@4x.9.png diff --git a/src/imports/controls/imagine/images/groupbox-title.9.png b/src/imports/controls/imagine/images/groupbox-title.9.png Binary files differindex d891dd04..e7585354 100644 --- a/src/imports/controls/imagine/images/groupbox-title.9.png +++ b/src/imports/controls/imagine/images/groupbox-title.9.png diff --git a/src/imports/controls/imagine/images/groupbox-title@2x.9.png b/src/imports/controls/imagine/images/groupbox-title@2x.9.png Binary files differindex d5359d85..3b8e23e3 100644 --- a/src/imports/controls/imagine/images/groupbox-title@2x.9.png +++ b/src/imports/controls/imagine/images/groupbox-title@2x.9.png diff --git a/src/imports/controls/imagine/images/groupbox-title@3x.9.png b/src/imports/controls/imagine/images/groupbox-title@3x.9.png Binary files differindex 0e4b5c9f..7ed67b27 100644 --- a/src/imports/controls/imagine/images/groupbox-title@3x.9.png +++ b/src/imports/controls/imagine/images/groupbox-title@3x.9.png diff --git a/src/imports/controls/imagine/images/groupbox-title@4x.9.png b/src/imports/controls/imagine/images/groupbox-title@4x.9.png Binary files differindex 908dfe6b..478bf1de 100644 --- a/src/imports/controls/imagine/images/groupbox-title@4x.9.png +++ b/src/imports/controls/imagine/images/groupbox-title@4x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-disabled.9.png b/src/imports/controls/imagine/images/itemdelegate-background-disabled.9.png Binary files differindex ce48ee74..4b56fe35 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-disabled.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-disabled@2x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-disabled@2x.9.png Binary files differindex c7abb65c..34edef58 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-disabled@3x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-disabled@3x.9.png Binary files differindex 46b84d7d..dd2cc6ba 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-disabled@4x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-disabled@4x.9.png Binary files differindex f4dfd338..b7890a3c 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-focused.9.png b/src/imports/controls/imagine/images/itemdelegate-background-focused.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-focused.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-focused.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-focused@2x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-focused@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-focused@3x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-focused@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-focused@4x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-focused@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-highlighted.9.png b/src/imports/controls/imagine/images/itemdelegate-background-highlighted.9.png Binary files differindex ed949fe2..32847cfa 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-highlighted.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-highlighted.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@2x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-highlighted@2x.9.png Binary files differindex ea68d35f..126fcb29 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@2x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-highlighted@2x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@3x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-highlighted@3x.9.png Binary files differindex 6d610415..22b7c9f2 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@3x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-highlighted@3x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@4x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-highlighted@4x.9.png Binary files differindex 590cca96..4e67f310 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-highlighted@4x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-highlighted@4x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-hovered.9.png b/src/imports/controls/imagine/images/itemdelegate-background-hovered.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-hovered.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-hovered@2x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-hovered@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-hovered@3x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-hovered@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-hovered@4x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-hovered@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-pressed.9.png b/src/imports/controls/imagine/images/itemdelegate-background-pressed.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-pressed.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-pressed@2x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-pressed@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-pressed@3x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-pressed@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background-pressed@4x.9.png b/src/imports/controls/imagine/images/itemdelegate-background-pressed@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background.9.png b/src/imports/controls/imagine/images/itemdelegate-background.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background@2x.9.png b/src/imports/controls/imagine/images/itemdelegate-background@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background@2x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background@2x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background@3x.9.png b/src/imports/controls/imagine/images/itemdelegate-background@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background@3x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background@3x.9.png diff --git a/src/imports/controls/imagine/images/itemdelegate-background@4x.9.png b/src/imports/controls/imagine/images/itemdelegate-background@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/itemdelegate-background@4x.9.png +++ b/src/imports/controls/imagine/images/itemdelegate-background@4x.9.png diff --git a/src/imports/controls/imagine/images/menu-background.9.png b/src/imports/controls/imagine/images/menu-background.9.png Binary files differindex 13591ddb..8253612c 100644 --- a/src/imports/controls/imagine/images/menu-background.9.png +++ b/src/imports/controls/imagine/images/menu-background.9.png diff --git a/src/imports/controls/imagine/images/menu-background@2x.9.png b/src/imports/controls/imagine/images/menu-background@2x.9.png Binary files differindex 451372f7..55438bde 100644 --- a/src/imports/controls/imagine/images/menu-background@2x.9.png +++ b/src/imports/controls/imagine/images/menu-background@2x.9.png diff --git a/src/imports/controls/imagine/images/menu-background@3x.9.png b/src/imports/controls/imagine/images/menu-background@3x.9.png Binary files differindex 1c3a695b..7be5da41 100644 --- a/src/imports/controls/imagine/images/menu-background@3x.9.png +++ b/src/imports/controls/imagine/images/menu-background@3x.9.png diff --git a/src/imports/controls/imagine/images/menu-background@4x.9.png b/src/imports/controls/imagine/images/menu-background@4x.9.png Binary files differindex 1a1b11ce..6e8588ff 100644 --- a/src/imports/controls/imagine/images/menu-background@4x.9.png +++ b/src/imports/controls/imagine/images/menu-background@4x.9.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled.png b/src/imports/controls/imagine/images/menuitem-arrow-disabled.png Binary files differindex e9d77838..4d681e2b 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-disabled.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-disabled.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png b/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png Binary files differindex 62a57de4..cddc7844 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-disabled@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png b/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png Binary files differindex 37591d7c..4546de35 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-disabled@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png b/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png Binary files differindex 0abd7e80..cd403df0 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-disabled@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png Binary files differindex 906392dd..ac94a9a8 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png Binary files differindex 446970de..5533cdc1 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png Binary files differindex 54b63b9b..a3796957 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png Binary files differindex 77e0894b..47a6a0b9 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored-disabled@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png Binary files differindex 5009cb4a..95dbe3dd 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png Binary files differindex fbbe1fc0..53978404 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png Binary files differindex dd56d8df..f922f3c2 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png Binary files differindex 355b92d8..c2a7b8ad 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow-mirrored@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow.png b/src/imports/controls/imagine/images/menuitem-arrow.png Binary files differindex 990c92ae..eac2d6d2 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow.png +++ b/src/imports/controls/imagine/images/menuitem-arrow.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow@2x.png b/src/imports/controls/imagine/images/menuitem-arrow@2x.png Binary files differindex 4bd03ef5..008ca41a 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow@2x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow@3x.png b/src/imports/controls/imagine/images/menuitem-arrow@3x.png Binary files differindex 4748eb2a..83c8a27c 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow@3x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-arrow@4x.png b/src/imports/controls/imagine/images/menuitem-arrow@4x.png Binary files differindex 9201c8c8..d838880e 100644 --- a/src/imports/controls/imagine/images/menuitem-arrow@4x.png +++ b/src/imports/controls/imagine/images/menuitem-arrow@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-background-highlighted.9.png b/src/imports/controls/imagine/images/menuitem-background-highlighted.9.png Binary files differindex 7b8fa0f4..4cc1f069 100644 --- a/src/imports/controls/imagine/images/menuitem-background-highlighted.9.png +++ b/src/imports/controls/imagine/images/menuitem-background-highlighted.9.png diff --git a/src/imports/controls/imagine/images/menuitem-background-highlighted@2x.9.png b/src/imports/controls/imagine/images/menuitem-background-highlighted@2x.9.png Binary files differindex 9edc3079..b44793d6 100644 --- a/src/imports/controls/imagine/images/menuitem-background-highlighted@2x.9.png +++ b/src/imports/controls/imagine/images/menuitem-background-highlighted@2x.9.png diff --git a/src/imports/controls/imagine/images/menuitem-background-highlighted@3x.9.png b/src/imports/controls/imagine/images/menuitem-background-highlighted@3x.9.png Binary files differindex 183f6194..ae0acfb7 100644 --- a/src/imports/controls/imagine/images/menuitem-background-highlighted@3x.9.png +++ b/src/imports/controls/imagine/images/menuitem-background-highlighted@3x.9.png diff --git a/src/imports/controls/imagine/images/menuitem-background-highlighted@4x.9.png b/src/imports/controls/imagine/images/menuitem-background-highlighted@4x.9.png Binary files differindex 0a1ab863..dbb09c33 100644 --- a/src/imports/controls/imagine/images/menuitem-background-highlighted@4x.9.png +++ b/src/imports/controls/imagine/images/menuitem-background-highlighted@4x.9.png diff --git a/src/imports/controls/imagine/images/menuitem-background.9.png b/src/imports/controls/imagine/images/menuitem-background.9.png Binary files differindex aab131ed..1fd1f099 100644 --- a/src/imports/controls/imagine/images/menuitem-background.9.png +++ b/src/imports/controls/imagine/images/menuitem-background.9.png diff --git a/src/imports/controls/imagine/images/menuitem-background@2x.9.png b/src/imports/controls/imagine/images/menuitem-background@2x.9.png Binary files differindex c46938c4..1b30ac3b 100644 --- a/src/imports/controls/imagine/images/menuitem-background@2x.9.png +++ b/src/imports/controls/imagine/images/menuitem-background@2x.9.png diff --git a/src/imports/controls/imagine/images/menuitem-background@3x.9.png b/src/imports/controls/imagine/images/menuitem-background@3x.9.png Binary files differindex bac1a83f..b0012628 100644 --- a/src/imports/controls/imagine/images/menuitem-background@3x.9.png +++ b/src/imports/controls/imagine/images/menuitem-background@3x.9.png diff --git a/src/imports/controls/imagine/images/menuitem-background@4x.9.png b/src/imports/controls/imagine/images/menuitem-background@4x.9.png Binary files differindex ba77504c..1312abee 100644 --- a/src/imports/controls/imagine/images/menuitem-background@4x.9.png +++ b/src/imports/controls/imagine/images/menuitem-background@4x.9.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-focused.png Binary files differindex d84b6424..f22ebf09 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-focused.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@2x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@2x.png Binary files differindex d9974cd3..fd3080a1 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@3x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@3x.png Binary files differindex 55f2a641..6393373f 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@4x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@4x.png Binary files differindex f0da6e95..32dedb7f 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered.png Binary files differindex d84b6424..f22ebf09 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@2x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@2x.png Binary files differindex d9974cd3..fd3080a1 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@3x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@3x.png Binary files differindex 55f2a641..6393373f 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@4x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@4x.png Binary files differindex f0da6e95..32dedb7f 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed.png Binary files differindex 5ed3cca2..846416aa 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@2x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@2x.png Binary files differindex 4a88a2fa..bc85bf94 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@2x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@3x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@3x.png Binary files differindex 244744e5..17ef9e58 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@3x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@4x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@4x.png Binary files differindex e782944b..7e9dd750 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@4x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked-pressed@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked.png b/src/imports/controls/imagine/images/menuitem-indicator-checked.png Binary files differindex d44ffceb..f06cc5f6 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked@2x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked@2x.png Binary files differindex f25091e5..3db78a17 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked@2x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked@3x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked@3x.png Binary files differindex 74b00801..eadb5968 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked@3x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-checked@4x.png b/src/imports/controls/imagine/images/menuitem-indicator-checked@4x.png Binary files differindex 1b6b021c..9bdfac8a 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-checked@4x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-checked@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-disabled.png b/src/imports/controls/imagine/images/menuitem-indicator-disabled.png Binary files differindex 2d47edd5..a8305968 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-disabled.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-disabled.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-disabled@2x.png b/src/imports/controls/imagine/images/menuitem-indicator-disabled@2x.png Binary files differindex 590848e6..e8046c5e 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-disabled@2x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-disabled@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-disabled@3x.png b/src/imports/controls/imagine/images/menuitem-indicator-disabled@3x.png Binary files differindex 7dcc9dd8..d44111bb 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-disabled@3x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-disabled@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-disabled@4x.png b/src/imports/controls/imagine/images/menuitem-indicator-disabled@4x.png Binary files differindex c996429a..24fa0c0d 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-disabled@4x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-disabled@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-focused.png b/src/imports/controls/imagine/images/menuitem-indicator-focused.png Binary files differindex 0faa5917..1c598c1f 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-focused.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-focused.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-focused@2x.png b/src/imports/controls/imagine/images/menuitem-indicator-focused@2x.png Binary files differindex 25f20bb1..31ff320e 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-focused@2x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-focused@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-focused@3x.png b/src/imports/controls/imagine/images/menuitem-indicator-focused@3x.png Binary files differindex 32de5064..15a1b487 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-focused@3x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-focused@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-focused@4x.png b/src/imports/controls/imagine/images/menuitem-indicator-focused@4x.png Binary files differindex 73912ac8..db11c0c1 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-focused@4x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-focused@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-hovered.png b/src/imports/controls/imagine/images/menuitem-indicator-hovered.png Binary files differindex 0faa5917..1c598c1f 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-hovered.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-hovered.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-hovered@2x.png b/src/imports/controls/imagine/images/menuitem-indicator-hovered@2x.png Binary files differindex 25f20bb1..31ff320e 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-hovered@2x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-hovered@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-hovered@3x.png b/src/imports/controls/imagine/images/menuitem-indicator-hovered@3x.png Binary files differindex 32de5064..15a1b487 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-hovered@3x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-hovered@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-hovered@4x.png b/src/imports/controls/imagine/images/menuitem-indicator-hovered@4x.png Binary files differindex 73912ac8..db11c0c1 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-hovered@4x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-hovered@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-pressed.png b/src/imports/controls/imagine/images/menuitem-indicator-pressed.png Binary files differindex aebea490..e4f02db1 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-pressed.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-pressed.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-pressed@2x.png b/src/imports/controls/imagine/images/menuitem-indicator-pressed@2x.png Binary files differindex 5b4ac2bb..e2342547 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-pressed@2x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-pressed@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-pressed@3x.png b/src/imports/controls/imagine/images/menuitem-indicator-pressed@3x.png Binary files differindex 76948af7..8ae24d75 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-pressed@3x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-pressed@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator-pressed@4x.png b/src/imports/controls/imagine/images/menuitem-indicator-pressed@4x.png Binary files differindex 9ff1655d..04a32370 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator-pressed@4x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator-pressed@4x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator.png b/src/imports/controls/imagine/images/menuitem-indicator.png Binary files differindex 0e63e749..d7b4c6d1 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator.png +++ b/src/imports/controls/imagine/images/menuitem-indicator.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator@2x.png b/src/imports/controls/imagine/images/menuitem-indicator@2x.png Binary files differindex 0a15f8ef..0ae3fa8f 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator@2x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator@2x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator@3x.png b/src/imports/controls/imagine/images/menuitem-indicator@3x.png Binary files differindex 76650657..f8de503c 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator@3x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator@3x.png diff --git a/src/imports/controls/imagine/images/menuitem-indicator@4x.png b/src/imports/controls/imagine/images/menuitem-indicator@4x.png Binary files differindex fa1e8ac8..4f16042d 100644 --- a/src/imports/controls/imagine/images/menuitem-indicator@4x.png +++ b/src/imports/controls/imagine/images/menuitem-indicator@4x.png diff --git a/src/imports/controls/imagine/images/menuseparator-separator.9.png b/src/imports/controls/imagine/images/menuseparator-separator.9.png Binary files differindex 2794cd85..a40feb65 100644 --- a/src/imports/controls/imagine/images/menuseparator-separator.9.png +++ b/src/imports/controls/imagine/images/menuseparator-separator.9.png diff --git a/src/imports/controls/imagine/images/menuseparator-separator@2x.9.png b/src/imports/controls/imagine/images/menuseparator-separator@2x.9.png Binary files differindex 4c0dd649..afb99248 100644 --- a/src/imports/controls/imagine/images/menuseparator-separator@2x.9.png +++ b/src/imports/controls/imagine/images/menuseparator-separator@2x.9.png diff --git a/src/imports/controls/imagine/images/menuseparator-separator@3x.9.png b/src/imports/controls/imagine/images/menuseparator-separator@3x.9.png Binary files differindex f63aa47d..197400e0 100644 --- a/src/imports/controls/imagine/images/menuseparator-separator@3x.9.png +++ b/src/imports/controls/imagine/images/menuseparator-separator@3x.9.png diff --git a/src/imports/controls/imagine/images/menuseparator-separator@4x.9.png b/src/imports/controls/imagine/images/menuseparator-separator@4x.9.png Binary files differindex d2c2d127..c4b4ca98 100644 --- a/src/imports/controls/imagine/images/menuseparator-separator@4x.9.png +++ b/src/imports/controls/imagine/images/menuseparator-separator@4x.9.png diff --git a/src/imports/controls/imagine/images/page-background.png b/src/imports/controls/imagine/images/page-background.png Binary files differindex 2d8d70f2..01eb7c73 100644 --- a/src/imports/controls/imagine/images/page-background.png +++ b/src/imports/controls/imagine/images/page-background.png diff --git a/src/imports/controls/imagine/images/page-background@2x.png b/src/imports/controls/imagine/images/page-background@2x.png Binary files differindex ba9b40df..72be785c 100644 --- a/src/imports/controls/imagine/images/page-background@2x.png +++ b/src/imports/controls/imagine/images/page-background@2x.png diff --git a/src/imports/controls/imagine/images/page-background@3x.png b/src/imports/controls/imagine/images/page-background@3x.png Binary files differindex 3b369748..a488f592 100644 --- a/src/imports/controls/imagine/images/page-background@3x.png +++ b/src/imports/controls/imagine/images/page-background@3x.png diff --git a/src/imports/controls/imagine/images/page-background@4x.png b/src/imports/controls/imagine/images/page-background@4x.png Binary files differindex a2fa69df..9343da95 100644 --- a/src/imports/controls/imagine/images/page-background@4x.png +++ b/src/imports/controls/imagine/images/page-background@4x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-current.png b/src/imports/controls/imagine/images/pageindicator-delegate-current.png Binary files differindex 66ee4cb3..002b76e9 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-current.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-current.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-current@2x.png b/src/imports/controls/imagine/images/pageindicator-delegate-current@2x.png Binary files differindex 22bd5d84..47fc8d5a 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-current@2x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-current@2x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-current@3x.png b/src/imports/controls/imagine/images/pageindicator-delegate-current@3x.png Binary files differindex a11690a3..e6bfd1e9 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-current@3x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-current@3x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-current@4x.png b/src/imports/controls/imagine/images/pageindicator-delegate-current@4x.png Binary files differindex fb73840e..f7c7248f 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-current@4x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-current@4x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current.png b/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current.png Binary files differindex d99c2a69..8aae9d8b 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@2x.png b/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@2x.png Binary files differindex c1a924f0..b5a65c9e 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@2x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@2x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@3x.png b/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@3x.png Binary files differindex f22ab01c..8a3e10e1 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@3x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@3x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@4x.png b/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@4x.png Binary files differindex 80fadbbe..58c3d3b8 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@4x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-disabled-current@4x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled.png b/src/imports/controls/imagine/images/pageindicator-delegate-disabled.png Binary files differindex d99c2a69..8aae9d8b 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-disabled.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@2x.png b/src/imports/controls/imagine/images/pageindicator-delegate-disabled@2x.png Binary files differindex c1a924f0..b5a65c9e 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@2x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-disabled@2x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@3x.png b/src/imports/controls/imagine/images/pageindicator-delegate-disabled@3x.png Binary files differindex f22ab01c..8a3e10e1 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@3x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-disabled@3x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@4x.png b/src/imports/controls/imagine/images/pageindicator-delegate-disabled@4x.png Binary files differindex 80fadbbe..58c3d3b8 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-disabled@4x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-disabled@4x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-mirrored.png b/src/imports/controls/imagine/images/pageindicator-delegate-mirrored.png Binary files differdeleted file mode 100644 index 961a12f7..00000000 --- a/src/imports/controls/imagine/images/pageindicator-delegate-mirrored.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-mirrored@2x.png b/src/imports/controls/imagine/images/pageindicator-delegate-mirrored@2x.png Binary files differdeleted file mode 100644 index 2b86f759..00000000 --- a/src/imports/controls/imagine/images/pageindicator-delegate-mirrored@2x.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-mirrored@3x.png b/src/imports/controls/imagine/images/pageindicator-delegate-mirrored@3x.png Binary files differdeleted file mode 100644 index eecf434a..00000000 --- a/src/imports/controls/imagine/images/pageindicator-delegate-mirrored@3x.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-mirrored@4x.png b/src/imports/controls/imagine/images/pageindicator-delegate-mirrored@4x.png Binary files differdeleted file mode 100644 index c8d08bd7..00000000 --- a/src/imports/controls/imagine/images/pageindicator-delegate-mirrored@4x.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-pressed.png b/src/imports/controls/imagine/images/pageindicator-delegate-pressed.png Binary files differindex 66ee4cb3..002b76e9 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-pressed.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-pressed.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@2x.png b/src/imports/controls/imagine/images/pageindicator-delegate-pressed@2x.png Binary files differindex 22bd5d84..47fc8d5a 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@2x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-pressed@2x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@3x.png b/src/imports/controls/imagine/images/pageindicator-delegate-pressed@3x.png Binary files differindex a11690a3..e6bfd1e9 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@3x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-pressed@3x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@4x.png b/src/imports/controls/imagine/images/pageindicator-delegate-pressed@4x.png Binary files differindex fb73840e..f7c7248f 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate-pressed@4x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate-pressed@4x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate.png b/src/imports/controls/imagine/images/pageindicator-delegate.png Binary files differindex 961a12f7..9e13a5ac 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate@2x.png b/src/imports/controls/imagine/images/pageindicator-delegate@2x.png Binary files differindex 2b86f759..806b7e22 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate@2x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate@2x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate@3x.png b/src/imports/controls/imagine/images/pageindicator-delegate@3x.png Binary files differindex eecf434a..05e8f362 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate@3x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate@3x.png diff --git a/src/imports/controls/imagine/images/pageindicator-delegate@4x.png b/src/imports/controls/imagine/images/pageindicator-delegate@4x.png Binary files differindex c8d08bd7..1ac5ccda 100644 --- a/src/imports/controls/imagine/images/pageindicator-delegate@4x.png +++ b/src/imports/controls/imagine/images/pageindicator-delegate@4x.png diff --git a/src/imports/controls/imagine/images/pane-background.9.png b/src/imports/controls/imagine/images/pane-background.9.png Binary files differindex 1d3cff54..5024788e 100644 --- a/src/imports/controls/imagine/images/pane-background.9.png +++ b/src/imports/controls/imagine/images/pane-background.9.png diff --git a/src/imports/controls/imagine/images/pane-background@2x.9.png b/src/imports/controls/imagine/images/pane-background@2x.9.png Binary files differindex a84ac04a..1ed91fee 100644 --- a/src/imports/controls/imagine/images/pane-background@2x.9.png +++ b/src/imports/controls/imagine/images/pane-background@2x.9.png diff --git a/src/imports/controls/imagine/images/pane-background@3x.9.png b/src/imports/controls/imagine/images/pane-background@3x.9.png Binary files differindex 2b1c4da9..c85e09f2 100644 --- a/src/imports/controls/imagine/images/pane-background@3x.9.png +++ b/src/imports/controls/imagine/images/pane-background@3x.9.png diff --git a/src/imports/controls/imagine/images/pane-background@4x.9.png b/src/imports/controls/imagine/images/pane-background@4x.9.png Binary files differindex 90295db4..e117bed0 100644 --- a/src/imports/controls/imagine/images/pane-background@4x.9.png +++ b/src/imports/controls/imagine/images/pane-background@4x.9.png diff --git a/src/imports/controls/imagine/images/popup-background.9.png b/src/imports/controls/imagine/images/popup-background.9.png Binary files differindex ddf40352..495d2f0d 100644 --- a/src/imports/controls/imagine/images/popup-background.9.png +++ b/src/imports/controls/imagine/images/popup-background.9.png diff --git a/src/imports/controls/imagine/images/popup-background@2x.9.png b/src/imports/controls/imagine/images/popup-background@2x.9.png Binary files differindex 5127eab4..ba0df866 100644 --- a/src/imports/controls/imagine/images/popup-background@2x.9.png +++ b/src/imports/controls/imagine/images/popup-background@2x.9.png diff --git a/src/imports/controls/imagine/images/popup-background@3x.9.png b/src/imports/controls/imagine/images/popup-background@3x.9.png Binary files differindex 42046abb..e71856a5 100644 --- a/src/imports/controls/imagine/images/popup-background@3x.9.png +++ b/src/imports/controls/imagine/images/popup-background@3x.9.png diff --git a/src/imports/controls/imagine/images/popup-background@4x.9.png b/src/imports/controls/imagine/images/popup-background@4x.9.png Binary files differindex a5841341..d756cda5 100644 --- a/src/imports/controls/imagine/images/popup-background@4x.9.png +++ b/src/imports/controls/imagine/images/popup-background@4x.9.png diff --git a/src/imports/controls/imagine/images/popup-overlay-modal.png b/src/imports/controls/imagine/images/popup-overlay-modal.png Binary files differindex 3113bd99..296e914a 100644 --- a/src/imports/controls/imagine/images/popup-overlay-modal.png +++ b/src/imports/controls/imagine/images/popup-overlay-modal.png diff --git a/src/imports/controls/imagine/images/popup-overlay-modal@2x.png b/src/imports/controls/imagine/images/popup-overlay-modal@2x.png Binary files differindex 0ad9ce6d..10c89300 100644 --- a/src/imports/controls/imagine/images/popup-overlay-modal@2x.png +++ b/src/imports/controls/imagine/images/popup-overlay-modal@2x.png diff --git a/src/imports/controls/imagine/images/popup-overlay-modal@3x.png b/src/imports/controls/imagine/images/popup-overlay-modal@3x.png Binary files differindex 170607d9..f65996e9 100644 --- a/src/imports/controls/imagine/images/popup-overlay-modal@3x.png +++ b/src/imports/controls/imagine/images/popup-overlay-modal@3x.png diff --git a/src/imports/controls/imagine/images/popup-overlay-modal@4x.png b/src/imports/controls/imagine/images/popup-overlay-modal@4x.png Binary files differindex 8b4b974d..a586f381 100644 --- a/src/imports/controls/imagine/images/popup-overlay-modal@4x.png +++ b/src/imports/controls/imagine/images/popup-overlay-modal@4x.png diff --git a/src/imports/controls/imagine/images/popup-overlay.png b/src/imports/controls/imagine/images/popup-overlay.png Binary files differindex 7a172720..e7175b46 100644 --- a/src/imports/controls/imagine/images/popup-overlay.png +++ b/src/imports/controls/imagine/images/popup-overlay.png diff --git a/src/imports/controls/imagine/images/popup-overlay@2x.png b/src/imports/controls/imagine/images/popup-overlay@2x.png Binary files differindex e8fb48ad..db6566e0 100644 --- a/src/imports/controls/imagine/images/popup-overlay@2x.png +++ b/src/imports/controls/imagine/images/popup-overlay@2x.png diff --git a/src/imports/controls/imagine/images/popup-overlay@3x.png b/src/imports/controls/imagine/images/popup-overlay@3x.png Binary files differindex 1ea6204c..140e4692 100644 --- a/src/imports/controls/imagine/images/popup-overlay@3x.png +++ b/src/imports/controls/imagine/images/popup-overlay@3x.png diff --git a/src/imports/controls/imagine/images/popup-overlay@4x.png b/src/imports/controls/imagine/images/popup-overlay@4x.png Binary files differindex cc4df170..5115c28a 100644 --- a/src/imports/controls/imagine/images/popup-overlay@4x.png +++ b/src/imports/controls/imagine/images/popup-overlay@4x.png diff --git a/src/imports/controls/imagine/images/progressbar-background.9.png b/src/imports/controls/imagine/images/progressbar-background.9.png Binary files differindex 87003ea3..5a8d5ad3 100644 --- a/src/imports/controls/imagine/images/progressbar-background.9.png +++ b/src/imports/controls/imagine/images/progressbar-background.9.png diff --git a/src/imports/controls/imagine/images/progressbar-background@2x.9.png b/src/imports/controls/imagine/images/progressbar-background@2x.9.png Binary files differindex db16055f..057f28ff 100644 --- a/src/imports/controls/imagine/images/progressbar-background@2x.9.png +++ b/src/imports/controls/imagine/images/progressbar-background@2x.9.png diff --git a/src/imports/controls/imagine/images/progressbar-background@3x.9.png b/src/imports/controls/imagine/images/progressbar-background@3x.9.png Binary files differindex 4a8264a6..283f7f72 100644 --- a/src/imports/controls/imagine/images/progressbar-background@3x.9.png +++ b/src/imports/controls/imagine/images/progressbar-background@3x.9.png diff --git a/src/imports/controls/imagine/images/progressbar-background@4x.9.png b/src/imports/controls/imagine/images/progressbar-background@4x.9.png Binary files differindex 33626d99..0eb1d884 100644 --- a/src/imports/controls/imagine/images/progressbar-background@4x.9.png +++ b/src/imports/controls/imagine/images/progressbar-background@4x.9.png diff --git a/src/imports/controls/imagine/images/progressbar-mask.9.png b/src/imports/controls/imagine/images/progressbar-mask.9.png Binary files differindex fd2355ac..23ddb24e 100644 --- a/src/imports/controls/imagine/images/progressbar-mask.9.png +++ b/src/imports/controls/imagine/images/progressbar-mask.9.png diff --git a/src/imports/controls/imagine/images/progressbar-mask@2x.9.png b/src/imports/controls/imagine/images/progressbar-mask@2x.9.png Binary files differindex cb046464..30d53bdf 100644 --- a/src/imports/controls/imagine/images/progressbar-mask@2x.9.png +++ b/src/imports/controls/imagine/images/progressbar-mask@2x.9.png diff --git a/src/imports/controls/imagine/images/progressbar-mask@3x.9.png b/src/imports/controls/imagine/images/progressbar-mask@3x.9.png Binary files differindex d2fcc04c..0181c822 100644 --- a/src/imports/controls/imagine/images/progressbar-mask@3x.9.png +++ b/src/imports/controls/imagine/images/progressbar-mask@3x.9.png diff --git a/src/imports/controls/imagine/images/progressbar-mask@4x.9.png b/src/imports/controls/imagine/images/progressbar-mask@4x.9.png Binary files differindex 45ca4fbf..f3914cdd 100644 --- a/src/imports/controls/imagine/images/progressbar-mask@4x.9.png +++ b/src/imports/controls/imagine/images/progressbar-mask@4x.9.png diff --git a/src/imports/controls/imagine/images/progressbar-progress.png b/src/imports/controls/imagine/images/progressbar-progress.png Binary files differindex 0311ce11..9283df02 100644 --- a/src/imports/controls/imagine/images/progressbar-progress.png +++ b/src/imports/controls/imagine/images/progressbar-progress.png diff --git a/src/imports/controls/imagine/images/progressbar-progress@2x.png b/src/imports/controls/imagine/images/progressbar-progress@2x.png Binary files differindex 55fc5fdd..efd58da5 100644 --- a/src/imports/controls/imagine/images/progressbar-progress@2x.png +++ b/src/imports/controls/imagine/images/progressbar-progress@2x.png diff --git a/src/imports/controls/imagine/images/progressbar-progress@3x.png b/src/imports/controls/imagine/images/progressbar-progress@3x.png Binary files differindex d8513cf8..5372fc55 100644 --- a/src/imports/controls/imagine/images/progressbar-progress@3x.png +++ b/src/imports/controls/imagine/images/progressbar-progress@3x.png diff --git a/src/imports/controls/imagine/images/progressbar-progress@4x.png b/src/imports/controls/imagine/images/progressbar-progress@4x.png Binary files differindex abc8fa67..85925c61 100644 --- a/src/imports/controls/imagine/images/progressbar-progress@4x.png +++ b/src/imports/controls/imagine/images/progressbar-progress@4x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused.png Binary files differindex 1be6da2f..8fb9da47 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@2x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@2x.png Binary files differindex eb8dee7d..86f8043e 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@3x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@3x.png Binary files differindex fcf18108..4350141e 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@4x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@4x.png Binary files differindex cb4f55e6..3573f597 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered.png Binary files differindex 1be6da2f..8fb9da47 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@2x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@2x.png Binary files differindex eb8dee7d..86f8043e 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@3x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@3x.png Binary files differindex fcf18108..4350141e 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@4x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@4x.png Binary files differindex cb4f55e6..3573f597 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed.png Binary files differindex 897a3453..e69d4ca0 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@2x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@2x.png Binary files differindex 9ae59133..48f2ff88 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@2x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@2x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@3x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@3x.png Binary files differindex 94cecc80..3eb80f03 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@3x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@3x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@4x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@4x.png Binary files differindex f9699ec1..1f02e059 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@4x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked-pressed@4x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked.png Binary files differindex 20a7fbc1..dfa8106d 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked@2x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked@2x.png Binary files differindex a868af81..f8696dca 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked@2x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked@2x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked@3x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked@3x.png Binary files differindex 89453cc2..98113a6d 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked@3x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked@3x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-checked@4x.png b/src/imports/controls/imagine/images/radiobutton-indicator-checked@4x.png Binary files differindex ec8d0a85..ec9005e1 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-checked@4x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-checked@4x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-disabled.png b/src/imports/controls/imagine/images/radiobutton-indicator-disabled.png Binary files differindex f841e6b7..4a32fe70 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-disabled.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-disabled.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@2x.png b/src/imports/controls/imagine/images/radiobutton-indicator-disabled@2x.png Binary files differindex dbea47e6..4bd16861 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@2x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-disabled@2x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@3x.png b/src/imports/controls/imagine/images/radiobutton-indicator-disabled@3x.png Binary files differindex e55dd3d5..510e355e 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@3x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-disabled@3x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@4x.png b/src/imports/controls/imagine/images/radiobutton-indicator-disabled@4x.png Binary files differindex 5d2daadc..fba264de 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-disabled@4x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-disabled@4x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-focused.png b/src/imports/controls/imagine/images/radiobutton-indicator-focused.png Binary files differindex 4f24fbfb..5c0ce213 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-focused.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-focused.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-focused@2x.png b/src/imports/controls/imagine/images/radiobutton-indicator-focused@2x.png Binary files differindex 08861807..5219d908 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-focused@2x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-focused@2x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-focused@3x.png b/src/imports/controls/imagine/images/radiobutton-indicator-focused@3x.png Binary files differindex e4ba60ca..eecc21bf 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-focused@3x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-focused@3x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-focused@4x.png b/src/imports/controls/imagine/images/radiobutton-indicator-focused@4x.png Binary files differindex 0aedcfac..8e6bb9bd 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-focused@4x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-focused@4x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-hovered.png b/src/imports/controls/imagine/images/radiobutton-indicator-hovered.png Binary files differindex 4f24fbfb..5c0ce213 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-hovered.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-hovered.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@2x.png b/src/imports/controls/imagine/images/radiobutton-indicator-hovered@2x.png Binary files differindex 08861807..5219d908 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@2x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-hovered@2x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@3x.png b/src/imports/controls/imagine/images/radiobutton-indicator-hovered@3x.png Binary files differindex e4ba60ca..eecc21bf 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@3x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-hovered@3x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@4x.png b/src/imports/controls/imagine/images/radiobutton-indicator-hovered@4x.png Binary files differindex 0aedcfac..8e6bb9bd 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-hovered@4x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-hovered@4x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-pressed.png b/src/imports/controls/imagine/images/radiobutton-indicator-pressed.png Binary files differindex 77643bce..d9a1cd01 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-pressed.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-pressed.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@2x.png b/src/imports/controls/imagine/images/radiobutton-indicator-pressed@2x.png Binary files differindex f7cc7332..e3cd65cb 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@2x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-pressed@2x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@3x.png b/src/imports/controls/imagine/images/radiobutton-indicator-pressed@3x.png Binary files differindex 40c698ee..7857bff7 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@3x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-pressed@3x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@4x.png b/src/imports/controls/imagine/images/radiobutton-indicator-pressed@4x.png Binary files differindex ec1e6c40..7f3b3548 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator-pressed@4x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator-pressed@4x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator.png b/src/imports/controls/imagine/images/radiobutton-indicator.png Binary files differindex 2914fae6..7f7a88ad 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator@2x.png b/src/imports/controls/imagine/images/radiobutton-indicator@2x.png Binary files differindex f7f84db4..250117b4 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator@2x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator@2x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator@3x.png b/src/imports/controls/imagine/images/radiobutton-indicator@3x.png Binary files differindex 65811cf6..5011f4da 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator@3x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator@3x.png diff --git a/src/imports/controls/imagine/images/radiobutton-indicator@4x.png b/src/imports/controls/imagine/images/radiobutton-indicator@4x.png Binary files differindex 5cde89a1..538f11a1 100644 --- a/src/imports/controls/imagine/images/radiobutton-indicator@4x.png +++ b/src/imports/controls/imagine/images/radiobutton-indicator@4x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-checked.9.png b/src/imports/controls/imagine/images/radiodelegate-background-checked.9.png Binary files differdeleted file mode 100644 index cef1bafa..00000000 --- a/src/imports/controls/imagine/images/radiodelegate-background-checked.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/radiodelegate-background-checked@2x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-checked@2x.9.png Binary files differdeleted file mode 100644 index 5a136a0c..00000000 --- a/src/imports/controls/imagine/images/radiodelegate-background-checked@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/radiodelegate-background-checked@3x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-checked@3x.9.png Binary files differdeleted file mode 100644 index f47a366b..00000000 --- a/src/imports/controls/imagine/images/radiodelegate-background-checked@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/radiodelegate-background-checked@4x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-checked@4x.9.png Binary files differdeleted file mode 100644 index 9ecb680f..00000000 --- a/src/imports/controls/imagine/images/radiodelegate-background-checked@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/radiodelegate-background-disabled.9.png b/src/imports/controls/imagine/images/radiodelegate-background-disabled.9.png Binary files differindex ce48ee74..4b56fe35 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-disabled.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-disabled@2x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-disabled@2x.9.png Binary files differindex c7abb65c..34edef58 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-disabled@3x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-disabled@3x.9.png Binary files differindex 46b84d7d..dd2cc6ba 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-disabled@4x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-disabled@4x.9.png Binary files differindex f4dfd338..b7890a3c 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-focused.9.png b/src/imports/controls/imagine/images/radiodelegate-background-focused.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-focused.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-focused.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-focused@2x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-focused@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-focused@3x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-focused@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-focused@4x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-focused@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-highlighted.9.png b/src/imports/controls/imagine/images/radiodelegate-background-highlighted.9.png Binary files differnew file mode 100644 index 00000000..32847cfa --- /dev/null +++ b/src/imports/controls/imagine/images/radiodelegate-background-highlighted.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-highlighted@2x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-highlighted@2x.9.png Binary files differnew file mode 100644 index 00000000..126fcb29 --- /dev/null +++ b/src/imports/controls/imagine/images/radiodelegate-background-highlighted@2x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-highlighted@3x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-highlighted@3x.9.png Binary files differnew file mode 100644 index 00000000..22b7c9f2 --- /dev/null +++ b/src/imports/controls/imagine/images/radiodelegate-background-highlighted@3x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-highlighted@4x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-highlighted@4x.9.png Binary files differnew file mode 100644 index 00000000..4e67f310 --- /dev/null +++ b/src/imports/controls/imagine/images/radiodelegate-background-highlighted@4x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-hovered.9.png b/src/imports/controls/imagine/images/radiodelegate-background-hovered.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-hovered.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-hovered@2x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-hovered@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-hovered@3x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-hovered@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-hovered@4x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-hovered@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-pressed.9.png b/src/imports/controls/imagine/images/radiodelegate-background-pressed.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-pressed.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-pressed@2x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-pressed@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-pressed@3x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-pressed@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background-pressed@4x.9.png b/src/imports/controls/imagine/images/radiodelegate-background-pressed@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background.9.png b/src/imports/controls/imagine/images/radiodelegate-background.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background@2x.9.png b/src/imports/controls/imagine/images/radiodelegate-background@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background@2x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background@2x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background@3x.9.png b/src/imports/controls/imagine/images/radiodelegate-background@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background@3x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background@3x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-background@4x.9.png b/src/imports/controls/imagine/images/radiodelegate-background@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/radiodelegate-background@4x.9.png +++ b/src/imports/controls/imagine/images/radiodelegate-background@4x.9.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused.png Binary files differindex 1be6da2f..8fb9da47 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@2x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@2x.png Binary files differindex eb8dee7d..86f8043e 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@3x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@3x.png Binary files differindex fcf18108..4350141e 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@4x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@4x.png Binary files differindex cb4f55e6..3573f597 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered.png Binary files differindex 1be6da2f..8fb9da47 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@2x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@2x.png Binary files differindex eb8dee7d..86f8043e 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@3x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@3x.png Binary files differindex fcf18108..4350141e 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@4x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@4x.png Binary files differindex cb4f55e6..3573f597 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed.png Binary files differindex 897a3453..e69d4ca0 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@2x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@2x.png Binary files differindex 9ae59133..48f2ff88 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@2x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@2x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@3x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@3x.png Binary files differindex 94cecc80..3eb80f03 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@3x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@3x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@4x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@4x.png Binary files differindex f9699ec1..1f02e059 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@4x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked-pressed@4x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked.png Binary files differindex 20a7fbc1..dfa8106d 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@2x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked@2x.png Binary files differindex a868af81..f8696dca 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@2x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked@2x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@3x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked@3x.png Binary files differindex 89453cc2..98113a6d 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@3x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked@3x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@4x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-checked@4x.png Binary files differindex ec8d0a85..ec9005e1 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-checked@4x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-checked@4x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled.png b/src/imports/controls/imagine/images/radiodelegate-indicator-disabled.png Binary files differindex f841e6b7..4a32fe70 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-disabled.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@2x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@2x.png Binary files differindex dbea47e6..4bd16861 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@2x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@2x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@3x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@3x.png Binary files differindex e55dd3d5..510e355e 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@3x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@3x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@4x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@4x.png Binary files differindex 5d2daadc..fba264de 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@4x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-disabled@4x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-focused.png b/src/imports/controls/imagine/images/radiodelegate-indicator-focused.png Binary files differindex 4f24fbfb..5c0ce213 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-focused.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-focused.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@2x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-focused@2x.png Binary files differindex 08861807..5219d908 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@2x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-focused@2x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@3x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-focused@3x.png Binary files differindex e4ba60ca..eecc21bf 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@3x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-focused@3x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@4x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-focused@4x.png Binary files differindex 0aedcfac..8e6bb9bd 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-focused@4x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-focused@4x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered.png b/src/imports/controls/imagine/images/radiodelegate-indicator-hovered.png Binary files differindex 4f24fbfb..5c0ce213 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-hovered.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@2x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@2x.png Binary files differindex 08861807..5219d908 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@2x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@2x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@3x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@3x.png Binary files differindex e4ba60ca..eecc21bf 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@3x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@3x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@4x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@4x.png Binary files differindex 0aedcfac..8e6bb9bd 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@4x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-hovered@4x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed.png b/src/imports/controls/imagine/images/radiodelegate-indicator-pressed.png Binary files differindex 77643bce..d9a1cd01 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-pressed.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@2x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@2x.png Binary files differindex f7cc7332..e3cd65cb 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@2x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@2x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@3x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@3x.png Binary files differindex 40c698ee..7857bff7 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@3x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@3x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@4x.png b/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@4x.png Binary files differindex ec1e6c40..7f3b3548 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@4x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator-pressed@4x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator.png b/src/imports/controls/imagine/images/radiodelegate-indicator.png Binary files differindex 2914fae6..7f7a88ad 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator@2x.png b/src/imports/controls/imagine/images/radiodelegate-indicator@2x.png Binary files differindex f7f84db4..250117b4 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator@2x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator@2x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator@3x.png b/src/imports/controls/imagine/images/radiodelegate-indicator@3x.png Binary files differindex 65811cf6..5011f4da 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator@3x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator@3x.png diff --git a/src/imports/controls/imagine/images/radiodelegate-indicator@4x.png b/src/imports/controls/imagine/images/radiodelegate-indicator@4x.png Binary files differindex 5cde89a1..538f11a1 100644 --- a/src/imports/controls/imagine/images/radiodelegate-indicator@4x.png +++ b/src/imports/controls/imagine/images/radiodelegate-indicator@4x.png diff --git a/src/imports/controls/imagine/images/rangeslider-background-horizontal.9.png b/src/imports/controls/imagine/images/rangeslider-background-horizontal.9.png Binary files differindex 15bb3445..1493d559 100644 --- a/src/imports/controls/imagine/images/rangeslider-background-horizontal.9.png +++ b/src/imports/controls/imagine/images/rangeslider-background-horizontal.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-background-horizontal@2x.9.png b/src/imports/controls/imagine/images/rangeslider-background-horizontal@2x.9.png Binary files differindex 3d03e1e7..64c87e20 100644 --- a/src/imports/controls/imagine/images/rangeslider-background-horizontal@2x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-background-horizontal@2x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-background-horizontal@3x.9.png b/src/imports/controls/imagine/images/rangeslider-background-horizontal@3x.9.png Binary files differindex 301c2562..7ed7de73 100644 --- a/src/imports/controls/imagine/images/rangeslider-background-horizontal@3x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-background-horizontal@3x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-background-horizontal@4x.9.png b/src/imports/controls/imagine/images/rangeslider-background-horizontal@4x.9.png Binary files differindex 4221018b..7c45cc7d 100644 --- a/src/imports/controls/imagine/images/rangeslider-background-horizontal@4x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-background-horizontal@4x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-background-vertical.9.png b/src/imports/controls/imagine/images/rangeslider-background-vertical.9.png Binary files differindex f2c5f90e..5866879c 100644 --- a/src/imports/controls/imagine/images/rangeslider-background-vertical.9.png +++ b/src/imports/controls/imagine/images/rangeslider-background-vertical.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-background-vertical@2x.9.png b/src/imports/controls/imagine/images/rangeslider-background-vertical@2x.9.png Binary files differindex 1318a6f3..f3928ec5 100644 --- a/src/imports/controls/imagine/images/rangeslider-background-vertical@2x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-background-vertical@2x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-background-vertical@3x.9.png b/src/imports/controls/imagine/images/rangeslider-background-vertical@3x.9.png Binary files differindex 20b5c99a..f49dcb95 100644 --- a/src/imports/controls/imagine/images/rangeslider-background-vertical@3x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-background-vertical@3x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-background-vertical@4x.9.png b/src/imports/controls/imagine/images/rangeslider-background-vertical@4x.9.png Binary files differindex 36b55661..e7203f99 100644 --- a/src/imports/controls/imagine/images/rangeslider-background-vertical@4x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-background-vertical@4x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-disabled.png b/src/imports/controls/imagine/images/rangeslider-handle-disabled.png Binary files differindex 25138580..88ea4699 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-disabled.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-disabled.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-disabled@2x.png b/src/imports/controls/imagine/images/rangeslider-handle-disabled@2x.png Binary files differindex cf3f67fe..3cad66e2 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-disabled@2x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-disabled@2x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-disabled@3x.png b/src/imports/controls/imagine/images/rangeslider-handle-disabled@3x.png Binary files differindex c0814aa9..18b7482c 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-disabled@3x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-disabled@3x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-disabled@4x.png b/src/imports/controls/imagine/images/rangeslider-handle-disabled@4x.png Binary files differindex 6a6d9da3..1d03b803 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-disabled@4x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-disabled@4x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered.png b/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered.png Binary files differindex b4979b53..5787bc8d 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@2x.png b/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@2x.png Binary files differindex bb23d803..0663628f 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@2x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@2x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@3x.png b/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@3x.png Binary files differindex 7f336dc2..cb6149d3 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@3x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@3x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@4x.png b/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@4x.png Binary files differindex b6d9611d..21484332 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@4x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused-hovered@4x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed.png b/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed.png Binary files differindex 635eb024..5787bc8d 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@2x.png b/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@2x.png Binary files differindex 4134f02c..0663628f 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@2x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@2x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@3x.png b/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@3x.png Binary files differindex 3e667643..cb6149d3 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@3x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@3x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@4x.png b/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@4x.png Binary files differindex e2be77f3..21484332 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@4x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused-pressed@4x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused.png b/src/imports/controls/imagine/images/rangeslider-handle-focused.png Binary files differindex 03c23d68..0a0ab739 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused@2x.png b/src/imports/controls/imagine/images/rangeslider-handle-focused@2x.png Binary files differindex 2efb4932..8ced0916 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused@2x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused@2x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused@3x.png b/src/imports/controls/imagine/images/rangeslider-handle-focused@3x.png Binary files differindex 51363323..a7bdc453 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused@3x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused@3x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-focused@4x.png b/src/imports/controls/imagine/images/rangeslider-handle-focused@4x.png Binary files differindex 68a58ee4..5827d534 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-focused@4x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-focused@4x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-hovered.png b/src/imports/controls/imagine/images/rangeslider-handle-hovered.png Binary files differindex e2d89d4f..88ea4699 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-hovered.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-hovered.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-hovered@2x.png b/src/imports/controls/imagine/images/rangeslider-handle-hovered@2x.png Binary files differindex ade1f99d..3cad66e2 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-hovered@2x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-hovered@2x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-hovered@3x.png b/src/imports/controls/imagine/images/rangeslider-handle-hovered@3x.png Binary files differindex ad5ee70a..18b7482c 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-hovered@3x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-hovered@3x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-hovered@4x.png b/src/imports/controls/imagine/images/rangeslider-handle-hovered@4x.png Binary files differindex a0970f90..1d03b803 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-hovered@4x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-hovered@4x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-pressed.png b/src/imports/controls/imagine/images/rangeslider-handle-pressed.png Binary files differindex 25138580..88ea4699 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-pressed.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-pressed.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-pressed@2x.png b/src/imports/controls/imagine/images/rangeslider-handle-pressed@2x.png Binary files differindex cf3f67fe..3cad66e2 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-pressed@2x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-pressed@2x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-pressed@3x.png b/src/imports/controls/imagine/images/rangeslider-handle-pressed@3x.png Binary files differindex c0814aa9..18b7482c 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-pressed@3x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-pressed@3x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle-pressed@4x.png b/src/imports/controls/imagine/images/rangeslider-handle-pressed@4x.png Binary files differindex 6a6d9da3..1d03b803 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle-pressed@4x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle-pressed@4x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle.png b/src/imports/controls/imagine/images/rangeslider-handle.png Binary files differindex f60f6da1..370f5141 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle.png +++ b/src/imports/controls/imagine/images/rangeslider-handle.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle@2x.png b/src/imports/controls/imagine/images/rangeslider-handle@2x.png Binary files differindex cd125824..d98f56d3 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle@2x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle@2x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle@3x.png b/src/imports/controls/imagine/images/rangeslider-handle@3x.png Binary files differindex 9836bd2c..a6e12b61 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle@3x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle@3x.png diff --git a/src/imports/controls/imagine/images/rangeslider-handle@4x.png b/src/imports/controls/imagine/images/rangeslider-handle@4x.png Binary files differindex a465f239..194e3496 100644 --- a/src/imports/controls/imagine/images/rangeslider-handle@4x.png +++ b/src/imports/controls/imagine/images/rangeslider-handle@4x.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled.9.png b/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled.9.png Binary files differindex bee9547d..d3a87e37 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png Binary files differindex ceed0464..b87350eb 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png Binary files differindex 502d04b7..a5b7b80c 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png Binary files differindex aa70191c..47975047 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-horizontal-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal.9.png b/src/imports/controls/imagine/images/rangeslider-progress-horizontal.9.png Binary files differindex a618468e..49adc3ec 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-horizontal.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@2x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-horizontal@2x.9.png Binary files differindex 587dc96f..b71adeb3 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@2x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-horizontal@2x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@3x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-horizontal@3x.9.png Binary files differindex 9163bc71..c78c22b3 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@3x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-horizontal@3x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@4x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-horizontal@4x.9.png Binary files differindex 7c833b08..69142b4e 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-horizontal@4x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-horizontal@4x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled.9.png b/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled.9.png Binary files differindex 7327188d..6ae0b6b6 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png Binary files differindex d0659595..dacd2692 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png Binary files differindex 225adb29..23f5461e 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png Binary files differindex d738587b..9ec4cefe 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-vertical-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical.9.png b/src/imports/controls/imagine/images/rangeslider-progress-vertical.9.png Binary files differindex d11d31d1..c2616422 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-vertical.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-vertical.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical@2x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-vertical@2x.9.png Binary files differindex cedd14e5..0339d4cd 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-vertical@2x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-vertical@2x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical@3x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-vertical@3x.9.png Binary files differindex 7f144fe1..d1d22e60 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-vertical@3x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-vertical@3x.9.png diff --git a/src/imports/controls/imagine/images/rangeslider-progress-vertical@4x.9.png b/src/imports/controls/imagine/images/rangeslider-progress-vertical@4x.9.png Binary files differindex 413883a1..f9b96a3b 100644 --- a/src/imports/controls/imagine/images/rangeslider-progress-vertical@4x.9.png +++ b/src/imports/controls/imagine/images/rangeslider-progress-vertical@4x.9.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-focused.png b/src/imports/controls/imagine/images/roundbutton-background-checked-focused.png Binary files differindex 5f201a8e..543b2d7a 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked-focused.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked-focused.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@2x.png b/src/imports/controls/imagine/images/roundbutton-background-checked-focused@2x.png Binary files differindex 2280e5a8..75dceff8 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@3x.png b/src/imports/controls/imagine/images/roundbutton-background-checked-focused@3x.png Binary files differindex e263ab81..c504faaf 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@4x.png b/src/imports/controls/imagine/images/roundbutton-background-checked-focused@4x.png Binary files differindex 08ee587c..65c5ecab 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered.png b/src/imports/controls/imagine/images/roundbutton-background-checked-hovered.png Binary files differindex 5f201a8e..543b2d7a 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked-hovered.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@2x.png b/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@2x.png Binary files differindex 2280e5a8..75dceff8 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@3x.png b/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@3x.png Binary files differindex e263ab81..c504faaf 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@4x.png b/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@4x.png Binary files differindex 08ee587c..65c5ecab 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked.png b/src/imports/controls/imagine/images/roundbutton-background-checked.png Binary files differindex 1cf540bf..e7c15402 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked@2x.png b/src/imports/controls/imagine/images/roundbutton-background-checked@2x.png Binary files differindex 7f4e414a..6412ae27 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked@3x.png b/src/imports/controls/imagine/images/roundbutton-background-checked@3x.png Binary files differindex b896b9a9..7c1523cb 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-checked@4x.png b/src/imports/controls/imagine/images/roundbutton-background-checked@4x.png Binary files differindex 7eca6055..887c7579 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-checked@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-checked@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked.png b/src/imports/controls/imagine/images/roundbutton-background-disabled-checked.png Binary files differindex dbea47e6..4bd16861 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked.png +++ b/src/imports/controls/imagine/images/roundbutton-background-disabled-checked.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@2x.png b/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@2x.png Binary files differindex 5d2daadc..fba264de 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@3x.png b/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@3x.png Binary files differindex af159453..112ee781 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@4x.png b/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@4x.png Binary files differindex 5b9265de..8ce10a01 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-disabled-checked@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled.png b/src/imports/controls/imagine/images/roundbutton-background-disabled.png Binary files differindex dbea47e6..4bd16861 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-disabled.png +++ b/src/imports/controls/imagine/images/roundbutton-background-disabled.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled@2x.png b/src/imports/controls/imagine/images/roundbutton-background-disabled@2x.png Binary files differindex 5d2daadc..fba264de 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-disabled@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-disabled@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled@3x.png b/src/imports/controls/imagine/images/roundbutton-background-disabled@3x.png Binary files differindex af159453..112ee781 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-disabled@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-disabled@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-disabled@4x.png b/src/imports/controls/imagine/images/roundbutton-background-disabled@4x.png Binary files differindex 5b9265de..8ce10a01 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-disabled@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-disabled@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-focused.png b/src/imports/controls/imagine/images/roundbutton-background-focused.png Binary files differindex 6463712b..abdada0d 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-focused.png +++ b/src/imports/controls/imagine/images/roundbutton-background-focused.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-focused@2x.png b/src/imports/controls/imagine/images/roundbutton-background-focused@2x.png Binary files differindex 0f6328fa..f90efda1 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-focused@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-focused@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-focused@3x.png b/src/imports/controls/imagine/images/roundbutton-background-focused@3x.png Binary files differindex 9c54a505..b1977d97 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-focused@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-focused@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-focused@4x.png b/src/imports/controls/imagine/images/roundbutton-background-focused@4x.png Binary files differindex 487ac9c2..2efb3dcc 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-focused@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-focused@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused.png Binary files differindex 0733e0d7..64b69500 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@2x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@2x.png Binary files differindex b68ef94b..60b211d5 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@3x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@3x.png Binary files differindex c154da07..4d6e21eb 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@4x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@4x.png Binary files differindex 21d75716..03033c20 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-focused@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered.png Binary files differindex 0733e0d7..64b69500 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@2x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@2x.png Binary files differindex b68ef94b..60b211d5 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@3x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@3x.png Binary files differindex c154da07..4d6e21eb 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@4x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@4x.png Binary files differindex 21d75716..03033c20 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-hovered@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed.png Binary files differindex a743679c..7a2a06f1 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@2x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@2x.png Binary files differindex bbebd799..f2eb51e3 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@3x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@3x.png Binary files differindex 0302453b..df6eaf4e 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@4x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@4x.png Binary files differindex 266899c4..4465f9da 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted-pressed@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted.png Binary files differindex 4e75d76c..f0be8431 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted@2x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted@2x.png Binary files differindex 89b1d6f6..dc0ba620 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted@3x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted@3x.png Binary files differindex 0575aff6..e178c293 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-highlighted@4x.png b/src/imports/controls/imagine/images/roundbutton-background-highlighted@4x.png Binary files differindex 7ee9159f..85f1fa52 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-highlighted@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-highlighted@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-hovered.png b/src/imports/controls/imagine/images/roundbutton-background-hovered.png Binary files differindex 6463712b..abdada0d 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-hovered.png +++ b/src/imports/controls/imagine/images/roundbutton-background-hovered.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-hovered@2x.png b/src/imports/controls/imagine/images/roundbutton-background-hovered@2x.png Binary files differindex 0f6328fa..f90efda1 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-hovered@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-hovered@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-hovered@3x.png b/src/imports/controls/imagine/images/roundbutton-background-hovered@3x.png Binary files differindex 9c54a505..b1977d97 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-hovered@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-hovered@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-hovered@4x.png b/src/imports/controls/imagine/images/roundbutton-background-hovered@4x.png Binary files differindex 487ac9c2..2efb3dcc 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-hovered@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-hovered@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-pressed.png b/src/imports/controls/imagine/images/roundbutton-background-pressed.png Binary files differindex 1cf540bf..e7c15402 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-pressed.png +++ b/src/imports/controls/imagine/images/roundbutton-background-pressed.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-pressed@2x.png b/src/imports/controls/imagine/images/roundbutton-background-pressed@2x.png Binary files differindex 7f4e414a..6412ae27 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-pressed@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-pressed@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-pressed@3x.png b/src/imports/controls/imagine/images/roundbutton-background-pressed@3x.png Binary files differindex b896b9a9..7c1523cb 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-pressed@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-pressed@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background-pressed@4x.png b/src/imports/controls/imagine/images/roundbutton-background-pressed@4x.png Binary files differindex 7eca6055..887c7579 100644 --- a/src/imports/controls/imagine/images/roundbutton-background-pressed@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background-pressed@4x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background.png b/src/imports/controls/imagine/images/roundbutton-background.png Binary files differindex f7cc7332..e3cd65cb 100644 --- a/src/imports/controls/imagine/images/roundbutton-background.png +++ b/src/imports/controls/imagine/images/roundbutton-background.png diff --git a/src/imports/controls/imagine/images/roundbutton-background@2x.png b/src/imports/controls/imagine/images/roundbutton-background@2x.png Binary files differindex ec1e6c40..7f3b3548 100644 --- a/src/imports/controls/imagine/images/roundbutton-background@2x.png +++ b/src/imports/controls/imagine/images/roundbutton-background@2x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background@3x.png b/src/imports/controls/imagine/images/roundbutton-background@3x.png Binary files differindex 971ff0b5..7988f337 100644 --- a/src/imports/controls/imagine/images/roundbutton-background@3x.png +++ b/src/imports/controls/imagine/images/roundbutton-background@3x.png diff --git a/src/imports/controls/imagine/images/roundbutton-background@4x.png b/src/imports/controls/imagine/images/roundbutton-background@4x.png Binary files differindex d8443545..74dbebae 100644 --- a/src/imports/controls/imagine/images/roundbutton-background@4x.png +++ b/src/imports/controls/imagine/images/roundbutton-background@4x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-disabled.png b/src/imports/controls/imagine/images/scrollbar-handle-disabled.png Binary files differindex a6ee16bf..d79dcf2a 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-disabled.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-disabled.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-disabled@2x.png b/src/imports/controls/imagine/images/scrollbar-handle-disabled@2x.png Binary files differindex 5105af6e..0f751bb2 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-disabled@2x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-disabled@2x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-disabled@3x.png b/src/imports/controls/imagine/images/scrollbar-handle-disabled@3x.png Binary files differindex 92f235b3..651c4c14 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-disabled@3x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-disabled@3x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-disabled@4x.png b/src/imports/controls/imagine/images/scrollbar-handle-disabled@4x.png Binary files differindex 2584d3db..46bb4324 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-disabled@4x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-disabled@4x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled.png Binary files differindex 8e3b88d5..0ec3de1a 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@2x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@2x.png Binary files differindex abc3d2c0..6ffaffee 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@2x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@2x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@3x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@3x.png Binary files differindex e215cf5b..8445a158 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@3x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@3x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@4x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@4x.png Binary files differindex c6ec0520..458ce4bf 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@4x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-disabled@4x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered.png Binary files differindex 670979e0..c8db3901 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@2x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@2x.png Binary files differindex 8f5abb84..719d31a0 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@2x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@2x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@3x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@3x.png Binary files differindex 73963d75..33884426 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@3x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@3x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@4x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@4x.png Binary files differindex 04d6131e..045a6b76 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@4x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-hovered@4x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed.png Binary files differindex 8af97568..771c9e01 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@2x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@2x.png Binary files differindex 63459b00..80397488 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@2x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@2x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@3x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@3x.png Binary files differindex 81003729..6b3fbca1 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@3x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@3x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@4x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@4x.png Binary files differindex a137eda0..b505c95d 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@4x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive-pressed@4x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive.png Binary files differindex 55b60d27..a9a67ca6 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive@2x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive@2x.png Binary files differindex bd63a1b1..60a174bb 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive@2x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive@2x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive@3x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive@3x.png Binary files differindex 31452954..af70f46c 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive@3x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive@3x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle-interactive@4x.png b/src/imports/controls/imagine/images/scrollbar-handle-interactive@4x.png Binary files differindex 6db4d81d..1b91108c 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle-interactive@4x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle-interactive@4x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle.png b/src/imports/controls/imagine/images/scrollbar-handle.png Binary files differindex 2c96de52..c1d0a009 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle.png +++ b/src/imports/controls/imagine/images/scrollbar-handle.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle@2x.png b/src/imports/controls/imagine/images/scrollbar-handle@2x.png Binary files differindex 49a08629..72246c67 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle@2x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle@2x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle@3x.png b/src/imports/controls/imagine/images/scrollbar-handle@3x.png Binary files differindex de06a761..c7caa2df 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle@3x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle@3x.png diff --git a/src/imports/controls/imagine/images/scrollbar-handle@4x.png b/src/imports/controls/imagine/images/scrollbar-handle@4x.png Binary files differindex 55887ca5..ad61f644 100644 --- a/src/imports/controls/imagine/images/scrollbar-handle@4x.png +++ b/src/imports/controls/imagine/images/scrollbar-handle@4x.png diff --git a/src/imports/controls/imagine/images/scrollindicator-handle.png b/src/imports/controls/imagine/images/scrollindicator-handle.png Binary files differindex 7c41d869..c1d0a009 100644 --- a/src/imports/controls/imagine/images/scrollindicator-handle.png +++ b/src/imports/controls/imagine/images/scrollindicator-handle.png diff --git a/src/imports/controls/imagine/images/scrollindicator-handle@2x.png b/src/imports/controls/imagine/images/scrollindicator-handle@2x.png Binary files differindex d937e753..72246c67 100644 --- a/src/imports/controls/imagine/images/scrollindicator-handle@2x.png +++ b/src/imports/controls/imagine/images/scrollindicator-handle@2x.png diff --git a/src/imports/controls/imagine/images/scrollindicator-handle@3x.png b/src/imports/controls/imagine/images/scrollindicator-handle@3x.png Binary files differindex 49a08629..c7caa2df 100644 --- a/src/imports/controls/imagine/images/scrollindicator-handle@3x.png +++ b/src/imports/controls/imagine/images/scrollindicator-handle@3x.png diff --git a/src/imports/controls/imagine/images/scrollindicator-handle@4x.png b/src/imports/controls/imagine/images/scrollindicator-handle@4x.png Binary files differindex 55b60d27..ad61f644 100644 --- a/src/imports/controls/imagine/images/scrollindicator-handle@4x.png +++ b/src/imports/controls/imagine/images/scrollindicator-handle@4x.png diff --git a/src/imports/controls/imagine/images/slider-background-horizontal.9.png b/src/imports/controls/imagine/images/slider-background-horizontal.9.png Binary files differindex 15bb3445..1493d559 100644 --- a/src/imports/controls/imagine/images/slider-background-horizontal.9.png +++ b/src/imports/controls/imagine/images/slider-background-horizontal.9.png diff --git a/src/imports/controls/imagine/images/slider-background-horizontal@2x.9.png b/src/imports/controls/imagine/images/slider-background-horizontal@2x.9.png Binary files differindex 3d03e1e7..64c87e20 100644 --- a/src/imports/controls/imagine/images/slider-background-horizontal@2x.9.png +++ b/src/imports/controls/imagine/images/slider-background-horizontal@2x.9.png diff --git a/src/imports/controls/imagine/images/slider-background-horizontal@3x.9.png b/src/imports/controls/imagine/images/slider-background-horizontal@3x.9.png Binary files differindex 301c2562..7ed7de73 100644 --- a/src/imports/controls/imagine/images/slider-background-horizontal@3x.9.png +++ b/src/imports/controls/imagine/images/slider-background-horizontal@3x.9.png diff --git a/src/imports/controls/imagine/images/slider-background-horizontal@4x.9.png b/src/imports/controls/imagine/images/slider-background-horizontal@4x.9.png Binary files differindex 4221018b..7c45cc7d 100644 --- a/src/imports/controls/imagine/images/slider-background-horizontal@4x.9.png +++ b/src/imports/controls/imagine/images/slider-background-horizontal@4x.9.png diff --git a/src/imports/controls/imagine/images/slider-background-vertical.9.png b/src/imports/controls/imagine/images/slider-background-vertical.9.png Binary files differindex f2c5f90e..5866879c 100644 --- a/src/imports/controls/imagine/images/slider-background-vertical.9.png +++ b/src/imports/controls/imagine/images/slider-background-vertical.9.png diff --git a/src/imports/controls/imagine/images/slider-background-vertical@2x.9.png b/src/imports/controls/imagine/images/slider-background-vertical@2x.9.png Binary files differindex 1318a6f3..f3928ec5 100644 --- a/src/imports/controls/imagine/images/slider-background-vertical@2x.9.png +++ b/src/imports/controls/imagine/images/slider-background-vertical@2x.9.png diff --git a/src/imports/controls/imagine/images/slider-background-vertical@3x.9.png b/src/imports/controls/imagine/images/slider-background-vertical@3x.9.png Binary files differindex 20b5c99a..f49dcb95 100644 --- a/src/imports/controls/imagine/images/slider-background-vertical@3x.9.png +++ b/src/imports/controls/imagine/images/slider-background-vertical@3x.9.png diff --git a/src/imports/controls/imagine/images/slider-background-vertical@4x.9.png b/src/imports/controls/imagine/images/slider-background-vertical@4x.9.png Binary files differindex 36b55661..e7203f99 100644 --- a/src/imports/controls/imagine/images/slider-background-vertical@4x.9.png +++ b/src/imports/controls/imagine/images/slider-background-vertical@4x.9.png diff --git a/src/imports/controls/imagine/images/slider-handle-disabled.png b/src/imports/controls/imagine/images/slider-handle-disabled.png Binary files differindex 25138580..88ea4699 100644 --- a/src/imports/controls/imagine/images/slider-handle-disabled.png +++ b/src/imports/controls/imagine/images/slider-handle-disabled.png diff --git a/src/imports/controls/imagine/images/slider-handle-disabled@2x.png b/src/imports/controls/imagine/images/slider-handle-disabled@2x.png Binary files differindex cf3f67fe..3cad66e2 100644 --- a/src/imports/controls/imagine/images/slider-handle-disabled@2x.png +++ b/src/imports/controls/imagine/images/slider-handle-disabled@2x.png diff --git a/src/imports/controls/imagine/images/slider-handle-disabled@3x.png b/src/imports/controls/imagine/images/slider-handle-disabled@3x.png Binary files differindex c0814aa9..18b7482c 100644 --- a/src/imports/controls/imagine/images/slider-handle-disabled@3x.png +++ b/src/imports/controls/imagine/images/slider-handle-disabled@3x.png diff --git a/src/imports/controls/imagine/images/slider-handle-disabled@4x.png b/src/imports/controls/imagine/images/slider-handle-disabled@4x.png Binary files differindex 6a6d9da3..1d03b803 100644 --- a/src/imports/controls/imagine/images/slider-handle-disabled@4x.png +++ b/src/imports/controls/imagine/images/slider-handle-disabled@4x.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused-hovered.png b/src/imports/controls/imagine/images/slider-handle-focused-hovered.png Binary files differindex b4979b53..5787bc8d 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused-hovered.png +++ b/src/imports/controls/imagine/images/slider-handle-focused-hovered.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused-hovered@2x.png b/src/imports/controls/imagine/images/slider-handle-focused-hovered@2x.png Binary files differindex bb23d803..0663628f 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused-hovered@2x.png +++ b/src/imports/controls/imagine/images/slider-handle-focused-hovered@2x.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused-hovered@3x.png b/src/imports/controls/imagine/images/slider-handle-focused-hovered@3x.png Binary files differindex 7f336dc2..cb6149d3 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused-hovered@3x.png +++ b/src/imports/controls/imagine/images/slider-handle-focused-hovered@3x.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused-hovered@4x.png b/src/imports/controls/imagine/images/slider-handle-focused-hovered@4x.png Binary files differindex b6d9611d..21484332 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused-hovered@4x.png +++ b/src/imports/controls/imagine/images/slider-handle-focused-hovered@4x.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused-pressed.png b/src/imports/controls/imagine/images/slider-handle-focused-pressed.png Binary files differindex 635eb024..5787bc8d 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused-pressed.png +++ b/src/imports/controls/imagine/images/slider-handle-focused-pressed.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused-pressed@2x.png b/src/imports/controls/imagine/images/slider-handle-focused-pressed@2x.png Binary files differindex 4134f02c..0663628f 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused-pressed@2x.png +++ b/src/imports/controls/imagine/images/slider-handle-focused-pressed@2x.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused-pressed@3x.png b/src/imports/controls/imagine/images/slider-handle-focused-pressed@3x.png Binary files differindex 3e667643..cb6149d3 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused-pressed@3x.png +++ b/src/imports/controls/imagine/images/slider-handle-focused-pressed@3x.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused-pressed@4x.png b/src/imports/controls/imagine/images/slider-handle-focused-pressed@4x.png Binary files differindex e2be77f3..21484332 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused-pressed@4x.png +++ b/src/imports/controls/imagine/images/slider-handle-focused-pressed@4x.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused.png b/src/imports/controls/imagine/images/slider-handle-focused.png Binary files differindex 03c23d68..0a0ab739 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused.png +++ b/src/imports/controls/imagine/images/slider-handle-focused.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused@2x.png b/src/imports/controls/imagine/images/slider-handle-focused@2x.png Binary files differindex 2efb4932..8ced0916 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused@2x.png +++ b/src/imports/controls/imagine/images/slider-handle-focused@2x.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused@3x.png b/src/imports/controls/imagine/images/slider-handle-focused@3x.png Binary files differindex 51363323..a7bdc453 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused@3x.png +++ b/src/imports/controls/imagine/images/slider-handle-focused@3x.png diff --git a/src/imports/controls/imagine/images/slider-handle-focused@4x.png b/src/imports/controls/imagine/images/slider-handle-focused@4x.png Binary files differindex 68a58ee4..5827d534 100644 --- a/src/imports/controls/imagine/images/slider-handle-focused@4x.png +++ b/src/imports/controls/imagine/images/slider-handle-focused@4x.png diff --git a/src/imports/controls/imagine/images/slider-handle-hovered.png b/src/imports/controls/imagine/images/slider-handle-hovered.png Binary files differindex e2d89d4f..88ea4699 100644 --- a/src/imports/controls/imagine/images/slider-handle-hovered.png +++ b/src/imports/controls/imagine/images/slider-handle-hovered.png diff --git a/src/imports/controls/imagine/images/slider-handle-hovered@2x.png b/src/imports/controls/imagine/images/slider-handle-hovered@2x.png Binary files differindex ade1f99d..3cad66e2 100644 --- a/src/imports/controls/imagine/images/slider-handle-hovered@2x.png +++ b/src/imports/controls/imagine/images/slider-handle-hovered@2x.png diff --git a/src/imports/controls/imagine/images/slider-handle-hovered@3x.png b/src/imports/controls/imagine/images/slider-handle-hovered@3x.png Binary files differindex ad5ee70a..18b7482c 100644 --- a/src/imports/controls/imagine/images/slider-handle-hovered@3x.png +++ b/src/imports/controls/imagine/images/slider-handle-hovered@3x.png diff --git a/src/imports/controls/imagine/images/slider-handle-hovered@4x.png b/src/imports/controls/imagine/images/slider-handle-hovered@4x.png Binary files differindex a0970f90..1d03b803 100644 --- a/src/imports/controls/imagine/images/slider-handle-hovered@4x.png +++ b/src/imports/controls/imagine/images/slider-handle-hovered@4x.png diff --git a/src/imports/controls/imagine/images/slider-handle-pressed.png b/src/imports/controls/imagine/images/slider-handle-pressed.png Binary files differindex 25138580..88ea4699 100644 --- a/src/imports/controls/imagine/images/slider-handle-pressed.png +++ b/src/imports/controls/imagine/images/slider-handle-pressed.png diff --git a/src/imports/controls/imagine/images/slider-handle-pressed@2x.png b/src/imports/controls/imagine/images/slider-handle-pressed@2x.png Binary files differindex cf3f67fe..3cad66e2 100644 --- a/src/imports/controls/imagine/images/slider-handle-pressed@2x.png +++ b/src/imports/controls/imagine/images/slider-handle-pressed@2x.png diff --git a/src/imports/controls/imagine/images/slider-handle-pressed@3x.png b/src/imports/controls/imagine/images/slider-handle-pressed@3x.png Binary files differindex c0814aa9..18b7482c 100644 --- a/src/imports/controls/imagine/images/slider-handle-pressed@3x.png +++ b/src/imports/controls/imagine/images/slider-handle-pressed@3x.png diff --git a/src/imports/controls/imagine/images/slider-handle-pressed@4x.png b/src/imports/controls/imagine/images/slider-handle-pressed@4x.png Binary files differindex 6a6d9da3..1d03b803 100644 --- a/src/imports/controls/imagine/images/slider-handle-pressed@4x.png +++ b/src/imports/controls/imagine/images/slider-handle-pressed@4x.png diff --git a/src/imports/controls/imagine/images/slider-handle.png b/src/imports/controls/imagine/images/slider-handle.png Binary files differindex f60f6da1..370f5141 100644 --- a/src/imports/controls/imagine/images/slider-handle.png +++ b/src/imports/controls/imagine/images/slider-handle.png diff --git a/src/imports/controls/imagine/images/slider-handle@2x.png b/src/imports/controls/imagine/images/slider-handle@2x.png Binary files differindex cd125824..d98f56d3 100644 --- a/src/imports/controls/imagine/images/slider-handle@2x.png +++ b/src/imports/controls/imagine/images/slider-handle@2x.png diff --git a/src/imports/controls/imagine/images/slider-handle@3x.png b/src/imports/controls/imagine/images/slider-handle@3x.png Binary files differindex 9836bd2c..a6e12b61 100644 --- a/src/imports/controls/imagine/images/slider-handle@3x.png +++ b/src/imports/controls/imagine/images/slider-handle@3x.png diff --git a/src/imports/controls/imagine/images/slider-handle@4x.png b/src/imports/controls/imagine/images/slider-handle@4x.png Binary files differindex a465f239..194e3496 100644 --- a/src/imports/controls/imagine/images/slider-handle@4x.png +++ b/src/imports/controls/imagine/images/slider-handle@4x.png diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled.9.png b/src/imports/controls/imagine/images/slider-progress-horizontal-disabled.9.png Binary files differindex bee9547d..d3a87e37 100644 --- a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled.9.png +++ b/src/imports/controls/imagine/images/slider-progress-horizontal-disabled.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@2x.9.png b/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@2x.9.png Binary files differindex ceed0464..b87350eb 100644 --- a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@3x.9.png b/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@3x.9.png Binary files differindex 502d04b7..a5b7b80c 100644 --- a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@4x.9.png b/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@4x.9.png Binary files differindex aa70191c..47975047 100644 --- a/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-horizontal-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal.9.png b/src/imports/controls/imagine/images/slider-progress-horizontal.9.png Binary files differindex a618468e..49adc3ec 100644 --- a/src/imports/controls/imagine/images/slider-progress-horizontal.9.png +++ b/src/imports/controls/imagine/images/slider-progress-horizontal.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal@2x.9.png b/src/imports/controls/imagine/images/slider-progress-horizontal@2x.9.png Binary files differindex 587dc96f..b71adeb3 100644 --- a/src/imports/controls/imagine/images/slider-progress-horizontal@2x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-horizontal@2x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal@3x.9.png b/src/imports/controls/imagine/images/slider-progress-horizontal@3x.9.png Binary files differindex 9163bc71..c78c22b3 100644 --- a/src/imports/controls/imagine/images/slider-progress-horizontal@3x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-horizontal@3x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-horizontal@4x.9.png b/src/imports/controls/imagine/images/slider-progress-horizontal@4x.9.png Binary files differindex 7c833b08..69142b4e 100644 --- a/src/imports/controls/imagine/images/slider-progress-horizontal@4x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-horizontal@4x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-vertical-disabled.9.png b/src/imports/controls/imagine/images/slider-progress-vertical-disabled.9.png Binary files differindex 7327188d..6ae0b6b6 100644 --- a/src/imports/controls/imagine/images/slider-progress-vertical-disabled.9.png +++ b/src/imports/controls/imagine/images/slider-progress-vertical-disabled.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@2x.9.png b/src/imports/controls/imagine/images/slider-progress-vertical-disabled@2x.9.png Binary files differindex d0659595..dacd2692 100644 --- a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-vertical-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@3x.9.png b/src/imports/controls/imagine/images/slider-progress-vertical-disabled@3x.9.png Binary files differindex 225adb29..23f5461e 100644 --- a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-vertical-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@4x.9.png b/src/imports/controls/imagine/images/slider-progress-vertical-disabled@4x.9.png Binary files differindex d738587b..9ec4cefe 100644 --- a/src/imports/controls/imagine/images/slider-progress-vertical-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-vertical-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-vertical.9.png b/src/imports/controls/imagine/images/slider-progress-vertical.9.png Binary files differindex d11d31d1..c2616422 100644 --- a/src/imports/controls/imagine/images/slider-progress-vertical.9.png +++ b/src/imports/controls/imagine/images/slider-progress-vertical.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-vertical@2x.9.png b/src/imports/controls/imagine/images/slider-progress-vertical@2x.9.png Binary files differindex cedd14e5..0339d4cd 100644 --- a/src/imports/controls/imagine/images/slider-progress-vertical@2x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-vertical@2x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-vertical@3x.9.png b/src/imports/controls/imagine/images/slider-progress-vertical@3x.9.png Binary files differindex 7f144fe1..d1d22e60 100644 --- a/src/imports/controls/imagine/images/slider-progress-vertical@3x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-vertical@3x.9.png diff --git a/src/imports/controls/imagine/images/slider-progress-vertical@4x.9.png b/src/imports/controls/imagine/images/slider-progress-vertical@4x.9.png Binary files differindex 413883a1..f9b96a3b 100644 --- a/src/imports/controls/imagine/images/slider-progress-vertical@4x.9.png +++ b/src/imports/controls/imagine/images/slider-progress-vertical@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-disabled.9.png b/src/imports/controls/imagine/images/spinbox-background-disabled.9.png Binary files differindex 30a87be6..16df3677 100644 --- a/src/imports/controls/imagine/images/spinbox-background-disabled.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-disabled@2x.9.png b/src/imports/controls/imagine/images/spinbox-background-disabled@2x.9.png Binary files differindex 3e1ca104..be72ec16 100644 --- a/src/imports/controls/imagine/images/spinbox-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-disabled@3x.9.png b/src/imports/controls/imagine/images/spinbox-background-disabled@3x.9.png Binary files differindex f8e22ccc..ca2d3322 100644 --- a/src/imports/controls/imagine/images/spinbox-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-disabled@4x.9.png b/src/imports/controls/imagine/images/spinbox-background-disabled@4x.9.png Binary files differindex 826ecc67..62040f69 100644 --- a/src/imports/controls/imagine/images/spinbox-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-editable.9.png b/src/imports/controls/imagine/images/spinbox-background-editable.9.png Binary files differindex 6e2a2d26..0bd1f239 100644 --- a/src/imports/controls/imagine/images/spinbox-background-editable.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-editable.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-editable@2x.9.png b/src/imports/controls/imagine/images/spinbox-background-editable@2x.9.png Binary files differindex 8e8ec57a..c523826a 100644 --- a/src/imports/controls/imagine/images/spinbox-background-editable@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-editable@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-editable@3x.9.png b/src/imports/controls/imagine/images/spinbox-background-editable@3x.9.png Binary files differindex da076f2c..f47a77f8 100644 --- a/src/imports/controls/imagine/images/spinbox-background-editable@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-editable@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-editable@4x.9.png b/src/imports/controls/imagine/images/spinbox-background-editable@4x.9.png Binary files differindex aa430c4c..37939aab 100644 --- a/src/imports/controls/imagine/images/spinbox-background-editable@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-editable@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-focused.9.png b/src/imports/controls/imagine/images/spinbox-background-focused.9.png Binary files differindex 84404c7f..5b1d97ca 100644 --- a/src/imports/controls/imagine/images/spinbox-background-focused.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-background-focused@2x.9.png Binary files differindex aaeff8a4..3424bf2d 100644 --- a/src/imports/controls/imagine/images/spinbox-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-background-focused@3x.9.png Binary files differindex 0d1ea9f2..a53a76d7 100644 --- a/src/imports/controls/imagine/images/spinbox-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-background-focused@4x.9.png Binary files differindex 379b3ab7..9ea30032 100644 --- a/src/imports/controls/imagine/images/spinbox-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background.9.png b/src/imports/controls/imagine/images/spinbox-background.9.png Binary files differindex ce4702b0..16560593 100644 --- a/src/imports/controls/imagine/images/spinbox-background.9.png +++ b/src/imports/controls/imagine/images/spinbox-background.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background@2x.9.png b/src/imports/controls/imagine/images/spinbox-background@2x.9.png Binary files differindex e947d167..4b7dcd74 100644 --- a/src/imports/controls/imagine/images/spinbox-background@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background@3x.9.png b/src/imports/controls/imagine/images/spinbox-background@3x.9.png Binary files differindex f485196f..af86d12c 100644 --- a/src/imports/controls/imagine/images/spinbox-background@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-background@4x.9.png b/src/imports/controls/imagine/images/spinbox-background@4x.9.png Binary files differindex 5482d667..bbcd8745 100644 --- a/src/imports/controls/imagine/images/spinbox-background@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-background@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-disabled.9.png Binary files differindex c20d4edf..9ec6bf4a 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-disabled.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@2x.9.png Binary files differindex c65b70d2..94219759 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@3x.9.png Binary files differindex e13ef88f..38b73979 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@4x.9.png Binary files differindex c7903568..2a5ab52d 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused.9.png Binary files differindex ca207709..9ac0c8f7 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png Binary files differindex 4e6c2c6d..aa71e927 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png Binary files differindex c9c46568..c773e31e 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png Binary files differindex 538b8048..5e8e1a5c 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered.9.png Binary files differindex ca207709..9ac0c8f7 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png Binary files differindex 4e6c2c6d..aa71e927 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png Binary files differindex c9c46568..c773e31e 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png Binary files differindex 538b8048..5e8e1a5c 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png Binary files differindex 0b34d6c4..c77a6a04 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png Binary files differindex ae9c07c3..8e652dcc 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png Binary files differindex 9b862ef7..368f9b21 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png Binary files differindex 298d3996..02be2e5e 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png Binary files differindex 0b34d6c4..c77a6a04 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png Binary files differindex ae9c07c3..8e652dcc 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png Binary files differindex 9b862ef7..368f9b21 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png Binary files differindex 298d3996..02be2e5e 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png Binary files differindex 9a580be3..1d81aef2 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png Binary files differindex 8e8192d2..8638c47e 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png Binary files differindex 5a751c6a..19e44058 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png Binary files differindex 80aff885..bf92d5a1 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png Binary files differindex 63e48ae2..5cb05b25 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png Binary files differindex eadedcd3..d09d180a 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png Binary files differindex 140f0d33..e33ff83d 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png Binary files differindex 5db63bc6..c0062bfa 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed.9.png Binary files differindex 0bf2d73c..3b91414f 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png Binary files differindex 2e3c13d2..6cf943f8 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png Binary files differindex 8d9569df..3866a67d 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png Binary files differindex a89b6e37..076a0b35 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable.9.png Binary files differindex f50434fc..60feb583 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable@2x.9.png Binary files differindex 82a7b71e..612f3996 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable@3x.9.png Binary files differindex 91ae261d..f4b23374 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-editable@4x.9.png Binary files differindex 7e93bd09..e69314c0 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-editable@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-editable@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-focused.9.png Binary files differindex 2166d461..cb406d57 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-focused.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-focused@2x.9.png Binary files differindex 2e04ac11..8004e824 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-focused@3x.9.png Binary files differindex 4c421cae..8003117d 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-focused@4x.9.png Binary files differindex 0642a8e7..2ccf36ac 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-focused@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-hovered.9.png Binary files differindex 2166d461..cb406d57 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@2x.9.png Binary files differindex 2e04ac11..8004e824 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@3x.9.png Binary files differindex 4c421cae..8003117d 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@4x.9.png Binary files differindex 0642a8e7..2ccf36ac 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png Binary files differindex 5ca41cba..ef6341e1 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png Binary files differindex 5efb47dd..b89d2da7 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png Binary files differindex 4ff3d439..cc2b2935 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png Binary files differindex f2241ab3..86ef1436 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png Binary files differindex 648b30c4..d4814abe 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png Binary files differindex f87ce876..501a2204 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png Binary files differindex bea3eff1..06854614 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png Binary files differindex 44b9f81f..37610e71 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png Binary files differindex 648b30c4..d4814abe 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png Binary files differindex f87ce876..501a2204 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png Binary files differindex bea3eff1..06854614 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png Binary files differindex 44b9f81f..37610e71 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png Binary files differindex eb6a9812..35fddf9a 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png Binary files differindex 51f20f47..63050cf1 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png Binary files differindex 00082963..7428a6dd 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png Binary files differindex 6ae20279..d2849eeb 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png Binary files differindex 0eb5528f..603dbd38 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png Binary files differindex 7d234c78..fcd5a7e2 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png Binary files differindex dee53c86..fdd6f575 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png Binary files differindex df682f98..02364a67 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-pressed.9.png Binary files differindex 9452dd71..18abfb0b 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@2x.9.png Binary files differindex 0d1eaeb8..ac60f187 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@3x.9.png Binary files differindex 7e3ad172..507b4c6c 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@4x.9.png Binary files differindex 30c31fe1..58934f8a 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down.9.png Binary files differindex e7dd2bd8..171ff635 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down@2x.9.png Binary files differindex 4ff2bc4e..e5fc7ffa 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down@3x.9.png Binary files differindex 7876005b..bc1c50db 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-down@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-down@4x.9.png Binary files differindex b59c8501..656c5a58 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-down@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-down@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-disabled.9.png Binary files differindex 1f089e25..233ed958 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-disabled.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@2x.9.png Binary files differindex 59ae5ab3..1f212179 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@3x.9.png Binary files differindex 17759082..cdebd5b3 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@4x.9.png Binary files differindex a65e1002..e05430e6 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused.9.png Binary files differindex 989203b7..71d9ab11 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png Binary files differindex ee421c80..d12e77fa 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png Binary files differindex a718107a..22523122 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png Binary files differindex a9e6d6cd..f1082d21 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered.9.png Binary files differindex 989203b7..71d9ab11 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png Binary files differindex ee421c80..d12e77fa 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png Binary files differindex a718107a..22523122 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png Binary files differindex a9e6d6cd..f1082d21 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png Binary files differindex 5f05bc73..97c49ddc 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png Binary files differindex c83d7574..50ee8be8 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png Binary files differindex f3cffa2b..0ac31744 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png Binary files differindex 4bda0ce3..b4e8cf5a 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png Binary files differindex 5f05bc73..97c49ddc 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png Binary files differindex c83d7574..50ee8be8 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png Binary files differindex f3cffa2b..0ac31744 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png Binary files differindex 4bda0ce3..b4e8cf5a 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png Binary files differindex 243ebfca..10033ff3 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png Binary files differindex 79d87a9c..6ff2b151 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png Binary files differindex a644865d..430a3456 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png Binary files differindex 45189533..bc1606e7 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png Binary files differindex 0f946e4b..107bb699 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png Binary files differindex 8e1a3f4d..e9e26e34 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png Binary files differindex e76b4a79..c060ee79 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png Binary files differindex bd256696..2f5012f9 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed.9.png Binary files differindex 256b2e03..3a864191 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png Binary files differindex d79fe89c..8b2c8d98 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png Binary files differindex f85f0179..2d843abb 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png Binary files differindex 96f8ba7e..f93e4ef2 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable.9.png Binary files differindex a1dfa8b3..f27911f9 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable@2x.9.png Binary files differindex f86efbd1..1873dd3b 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable@3x.9.png Binary files differindex acd9d658..003f3937 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-editable@4x.9.png Binary files differindex cf9d25d1..5fcfffa6 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-editable@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-editable@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-focused.9.png Binary files differindex e4363213..93b9c34c 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-focused.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-focused@2x.9.png Binary files differindex 4ab68a4d..425c1725 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-focused@3x.9.png Binary files differindex 47f032d6..c6c728c3 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-focused@4x.9.png Binary files differindex 96bef030..e0772bf3 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-focused@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-hovered.9.png Binary files differindex e4363213..93b9c34c 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@2x.9.png Binary files differindex 4ab68a4d..425c1725 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@3x.9.png Binary files differindex 47f032d6..c6c728c3 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@4x.9.png Binary files differindex 96bef030..e0772bf3 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png Binary files differindex b5c1c5c6..059c46ed 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png Binary files differindex 5246ee8e..670280ea 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png Binary files differindex 466a7e19..b5e30546 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png Binary files differindex 1e510d84..f34c65e8 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png Binary files differindex 314ed022..8722a522 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png Binary files differindex 798f2e9c..3e0dfafa 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png Binary files differindex 447dfda6..2337ccdc 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png Binary files differindex b11cb7f2..9dca0ec1 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png Binary files differindex 314ed022..8722a522 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png Binary files differindex 798f2e9c..3e0dfafa 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png Binary files differindex 447dfda6..2337ccdc 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png Binary files differindex b11cb7f2..9dca0ec1 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png Binary files differindex 56a6a992..3e9030d1 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png Binary files differindex d5329c51..5edc3dbe 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png Binary files differindex 1667bfdf..5f497719 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png Binary files differindex 45b48332..c376fb75 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png Binary files differindex 222285e3..32a0613c 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png Binary files differindex 5788f366..8fdb30f8 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png Binary files differindex 1f8342c6..6e9e0172 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png Binary files differindex b19c5629..7e556e2c 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-mirrored@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-pressed.9.png Binary files differindex 619d2ef2..8f8ef7c4 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-pressed.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@2x.9.png Binary files differindex a8ef2345..8760aef9 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@3x.9.png Binary files differindex 64c93785..03beb7b9 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@4x.9.png Binary files differindex e12ce5e9..876fd4af 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up.9.png Binary files differindex 9a76855d..049d5806 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up@2x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up@2x.9.png Binary files differindex b883e239..75ce9cc1 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up@2x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up@2x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up@3x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up@3x.9.png Binary files differindex b3efe0cc..42b5cdb5 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up@3x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up@3x.9.png diff --git a/src/imports/controls/imagine/images/spinbox-indicator-up@4x.9.png b/src/imports/controls/imagine/images/spinbox-indicator-up@4x.9.png Binary files differindex 68b90337..b59d4e77 100644 --- a/src/imports/controls/imagine/images/spinbox-indicator-up@4x.9.png +++ b/src/imports/controls/imagine/images/spinbox-indicator-up@4x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-disabled.9.png b/src/imports/controls/imagine/images/swipedelegate-background-disabled.9.png Binary files differindex ce48ee74..4b56fe35 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-disabled.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-disabled@2x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-disabled@2x.9.png Binary files differindex c7abb65c..34edef58 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-disabled@3x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-disabled@3x.9.png Binary files differindex 46b84d7d..dd2cc6ba 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-disabled@4x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-disabled@4x.9.png Binary files differindex f4dfd338..b7890a3c 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-focused.9.png b/src/imports/controls/imagine/images/swipedelegate-background-focused.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-focused.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-focused.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-focused@2x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-focused@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-focused@3x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-focused@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-focused@4x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-focused@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-highlighted.9.png b/src/imports/controls/imagine/images/swipedelegate-background-highlighted.9.png Binary files differnew file mode 100644 index 00000000..32847cfa --- /dev/null +++ b/src/imports/controls/imagine/images/swipedelegate-background-highlighted.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-highlighted@2x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-highlighted@2x.9.png Binary files differnew file mode 100644 index 00000000..126fcb29 --- /dev/null +++ b/src/imports/controls/imagine/images/swipedelegate-background-highlighted@2x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-highlighted@3x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-highlighted@3x.9.png Binary files differnew file mode 100644 index 00000000..22b7c9f2 --- /dev/null +++ b/src/imports/controls/imagine/images/swipedelegate-background-highlighted@3x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-highlighted@4x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-highlighted@4x.9.png Binary files differnew file mode 100644 index 00000000..4e67f310 --- /dev/null +++ b/src/imports/controls/imagine/images/swipedelegate-background-highlighted@4x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-hovered.9.png b/src/imports/controls/imagine/images/swipedelegate-background-hovered.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-hovered.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-hovered@2x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-hovered@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-hovered@3x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-hovered@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-hovered@4x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-hovered@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-pressed.9.png b/src/imports/controls/imagine/images/swipedelegate-background-pressed.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-pressed.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-pressed@2x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-pressed@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-pressed@3x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-pressed@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background-pressed@4x.9.png b/src/imports/controls/imagine/images/swipedelegate-background-pressed@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background.9.png b/src/imports/controls/imagine/images/swipedelegate-background.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background@2x.9.png b/src/imports/controls/imagine/images/swipedelegate-background@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background@2x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background@2x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background@3x.9.png b/src/imports/controls/imagine/images/swipedelegate-background@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background@3x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background@3x.9.png diff --git a/src/imports/controls/imagine/images/swipedelegate-background@4x.9.png b/src/imports/controls/imagine/images/swipedelegate-background@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/swipedelegate-background@4x.9.png +++ b/src/imports/controls/imagine/images/swipedelegate-background@4x.9.png diff --git a/src/imports/controls/imagine/images/switch-handle-disabled.png b/src/imports/controls/imagine/images/switch-handle-disabled.png Binary files differindex 0924073f..4108457f 100644 --- a/src/imports/controls/imagine/images/switch-handle-disabled.png +++ b/src/imports/controls/imagine/images/switch-handle-disabled.png diff --git a/src/imports/controls/imagine/images/switch-handle-disabled@2x.png b/src/imports/controls/imagine/images/switch-handle-disabled@2x.png Binary files differindex 4703c210..c73b8b45 100644 --- a/src/imports/controls/imagine/images/switch-handle-disabled@2x.png +++ b/src/imports/controls/imagine/images/switch-handle-disabled@2x.png diff --git a/src/imports/controls/imagine/images/switch-handle-disabled@3x.png b/src/imports/controls/imagine/images/switch-handle-disabled@3x.png Binary files differindex 352cd9ca..3a927393 100644 --- a/src/imports/controls/imagine/images/switch-handle-disabled@3x.png +++ b/src/imports/controls/imagine/images/switch-handle-disabled@3x.png diff --git a/src/imports/controls/imagine/images/switch-handle-disabled@4x.png b/src/imports/controls/imagine/images/switch-handle-disabled@4x.png Binary files differindex cd0fdc3c..2893b7a6 100644 --- a/src/imports/controls/imagine/images/switch-handle-disabled@4x.png +++ b/src/imports/controls/imagine/images/switch-handle-disabled@4x.png diff --git a/src/imports/controls/imagine/images/switch-handle-pressed.png b/src/imports/controls/imagine/images/switch-handle-pressed.png Binary files differindex 0924073f..4108457f 100644 --- a/src/imports/controls/imagine/images/switch-handle-pressed.png +++ b/src/imports/controls/imagine/images/switch-handle-pressed.png diff --git a/src/imports/controls/imagine/images/switch-handle-pressed@2x.png b/src/imports/controls/imagine/images/switch-handle-pressed@2x.png Binary files differindex 4703c210..c73b8b45 100644 --- a/src/imports/controls/imagine/images/switch-handle-pressed@2x.png +++ b/src/imports/controls/imagine/images/switch-handle-pressed@2x.png diff --git a/src/imports/controls/imagine/images/switch-handle-pressed@3x.png b/src/imports/controls/imagine/images/switch-handle-pressed@3x.png Binary files differindex 352cd9ca..3a927393 100644 --- a/src/imports/controls/imagine/images/switch-handle-pressed@3x.png +++ b/src/imports/controls/imagine/images/switch-handle-pressed@3x.png diff --git a/src/imports/controls/imagine/images/switch-handle-pressed@4x.png b/src/imports/controls/imagine/images/switch-handle-pressed@4x.png Binary files differindex cd0fdc3c..2893b7a6 100644 --- a/src/imports/controls/imagine/images/switch-handle-pressed@4x.png +++ b/src/imports/controls/imagine/images/switch-handle-pressed@4x.png diff --git a/src/imports/controls/imagine/images/switch-handle.png b/src/imports/controls/imagine/images/switch-handle.png Binary files differindex 856c1f19..814cfe4f 100644 --- a/src/imports/controls/imagine/images/switch-handle.png +++ b/src/imports/controls/imagine/images/switch-handle.png diff --git a/src/imports/controls/imagine/images/switch-handle@2x.png b/src/imports/controls/imagine/images/switch-handle@2x.png Binary files differindex 0f3ef325..df3e41c5 100644 --- a/src/imports/controls/imagine/images/switch-handle@2x.png +++ b/src/imports/controls/imagine/images/switch-handle@2x.png diff --git a/src/imports/controls/imagine/images/switch-handle@3x.png b/src/imports/controls/imagine/images/switch-handle@3x.png Binary files differindex 336686af..601c0d53 100644 --- a/src/imports/controls/imagine/images/switch-handle@3x.png +++ b/src/imports/controls/imagine/images/switch-handle@3x.png diff --git a/src/imports/controls/imagine/images/switch-handle@4x.png b/src/imports/controls/imagine/images/switch-handle@4x.png Binary files differindex a888832a..b03a1d31 100644 --- a/src/imports/controls/imagine/images/switch-handle@4x.png +++ b/src/imports/controls/imagine/images/switch-handle@4x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-focused.png b/src/imports/controls/imagine/images/switch-indicator-checked-focused.png Binary files differindex d542dfc4..06f09514 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-focused.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-focused.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-focused@2x.png b/src/imports/controls/imagine/images/switch-indicator-checked-focused@2x.png Binary files differindex 221e0c1a..90044add 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-focused@3x.png b/src/imports/controls/imagine/images/switch-indicator-checked-focused@3x.png Binary files differindex 095092a8..c987c7b5 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-focused@4x.png b/src/imports/controls/imagine/images/switch-indicator-checked-focused@4x.png Binary files differindex 9894fb7d..c2351de8 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-hovered.png b/src/imports/controls/imagine/images/switch-indicator-checked-hovered.png Binary files differindex d542dfc4..06f09514 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-hovered.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-hovered.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@2x.png b/src/imports/controls/imagine/images/switch-indicator-checked-hovered@2x.png Binary files differindex 221e0c1a..90044add 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@3x.png b/src/imports/controls/imagine/images/switch-indicator-checked-hovered@3x.png Binary files differindex 095092a8..c987c7b5 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@4x.png b/src/imports/controls/imagine/images/switch-indicator-checked-hovered@4x.png Binary files differindex 9894fb7d..c2351de8 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-pressed.png b/src/imports/controls/imagine/images/switch-indicator-checked-pressed.png Binary files differindex a8a48c68..fcf8a5f3 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-pressed.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-pressed.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@2x.png b/src/imports/controls/imagine/images/switch-indicator-checked-pressed@2x.png Binary files differindex cdb2d08a..b8747547 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@2x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-pressed@2x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@3x.png b/src/imports/controls/imagine/images/switch-indicator-checked-pressed@3x.png Binary files differindex 6fcc036c..1a254945 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@3x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-pressed@3x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@4x.png b/src/imports/controls/imagine/images/switch-indicator-checked-pressed@4x.png Binary files differindex d48a45aa..7af5cc05 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked-pressed@4x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked-pressed@4x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked.png b/src/imports/controls/imagine/images/switch-indicator-checked.png Binary files differindex 59d722e4..00af5fd7 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked@2x.png b/src/imports/controls/imagine/images/switch-indicator-checked@2x.png Binary files differindex 60fac1e5..b9ae1ce2 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked@2x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked@2x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked@3x.png b/src/imports/controls/imagine/images/switch-indicator-checked@3x.png Binary files differindex d9a46c95..fbcd46df 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked@3x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked@3x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-checked@4x.png b/src/imports/controls/imagine/images/switch-indicator-checked@4x.png Binary files differindex ee0b3234..04807b20 100644 --- a/src/imports/controls/imagine/images/switch-indicator-checked@4x.png +++ b/src/imports/controls/imagine/images/switch-indicator-checked@4x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-disabled.png b/src/imports/controls/imagine/images/switch-indicator-disabled.png Binary files differindex 41ecf82e..47800da2 100644 --- a/src/imports/controls/imagine/images/switch-indicator-disabled.png +++ b/src/imports/controls/imagine/images/switch-indicator-disabled.png diff --git a/src/imports/controls/imagine/images/switch-indicator-disabled@2x.png b/src/imports/controls/imagine/images/switch-indicator-disabled@2x.png Binary files differindex 0fee44f1..bc3cfbf4 100644 --- a/src/imports/controls/imagine/images/switch-indicator-disabled@2x.png +++ b/src/imports/controls/imagine/images/switch-indicator-disabled@2x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-disabled@3x.png b/src/imports/controls/imagine/images/switch-indicator-disabled@3x.png Binary files differindex c25438fa..b29d5756 100644 --- a/src/imports/controls/imagine/images/switch-indicator-disabled@3x.png +++ b/src/imports/controls/imagine/images/switch-indicator-disabled@3x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-disabled@4x.png b/src/imports/controls/imagine/images/switch-indicator-disabled@4x.png Binary files differindex d028eb27..22562fdf 100644 --- a/src/imports/controls/imagine/images/switch-indicator-disabled@4x.png +++ b/src/imports/controls/imagine/images/switch-indicator-disabled@4x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-focused.png b/src/imports/controls/imagine/images/switch-indicator-focused.png Binary files differindex 9ceb35c6..570f6872 100644 --- a/src/imports/controls/imagine/images/switch-indicator-focused.png +++ b/src/imports/controls/imagine/images/switch-indicator-focused.png diff --git a/src/imports/controls/imagine/images/switch-indicator-focused@2x.png b/src/imports/controls/imagine/images/switch-indicator-focused@2x.png Binary files differindex 5f049cc0..389c7f51 100644 --- a/src/imports/controls/imagine/images/switch-indicator-focused@2x.png +++ b/src/imports/controls/imagine/images/switch-indicator-focused@2x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-focused@3x.png b/src/imports/controls/imagine/images/switch-indicator-focused@3x.png Binary files differindex fa43264b..c2e2a155 100644 --- a/src/imports/controls/imagine/images/switch-indicator-focused@3x.png +++ b/src/imports/controls/imagine/images/switch-indicator-focused@3x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-focused@4x.png b/src/imports/controls/imagine/images/switch-indicator-focused@4x.png Binary files differindex 6f9b35e8..3637139f 100644 --- a/src/imports/controls/imagine/images/switch-indicator-focused@4x.png +++ b/src/imports/controls/imagine/images/switch-indicator-focused@4x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-hovered.png b/src/imports/controls/imagine/images/switch-indicator-hovered.png Binary files differindex 9ceb35c6..570f6872 100644 --- a/src/imports/controls/imagine/images/switch-indicator-hovered.png +++ b/src/imports/controls/imagine/images/switch-indicator-hovered.png diff --git a/src/imports/controls/imagine/images/switch-indicator-hovered@2x.png b/src/imports/controls/imagine/images/switch-indicator-hovered@2x.png Binary files differindex 5f049cc0..389c7f51 100644 --- a/src/imports/controls/imagine/images/switch-indicator-hovered@2x.png +++ b/src/imports/controls/imagine/images/switch-indicator-hovered@2x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-hovered@3x.png b/src/imports/controls/imagine/images/switch-indicator-hovered@3x.png Binary files differindex fa43264b..c2e2a155 100644 --- a/src/imports/controls/imagine/images/switch-indicator-hovered@3x.png +++ b/src/imports/controls/imagine/images/switch-indicator-hovered@3x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-hovered@4x.png b/src/imports/controls/imagine/images/switch-indicator-hovered@4x.png Binary files differindex 6f9b35e8..3637139f 100644 --- a/src/imports/controls/imagine/images/switch-indicator-hovered@4x.png +++ b/src/imports/controls/imagine/images/switch-indicator-hovered@4x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-pressed.png b/src/imports/controls/imagine/images/switch-indicator-pressed.png Binary files differindex 385992ea..6129c382 100644 --- a/src/imports/controls/imagine/images/switch-indicator-pressed.png +++ b/src/imports/controls/imagine/images/switch-indicator-pressed.png diff --git a/src/imports/controls/imagine/images/switch-indicator-pressed@2x.png b/src/imports/controls/imagine/images/switch-indicator-pressed@2x.png Binary files differindex f67dc74b..144eb013 100644 --- a/src/imports/controls/imagine/images/switch-indicator-pressed@2x.png +++ b/src/imports/controls/imagine/images/switch-indicator-pressed@2x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-pressed@3x.png b/src/imports/controls/imagine/images/switch-indicator-pressed@3x.png Binary files differindex 8781317d..f59d9051 100644 --- a/src/imports/controls/imagine/images/switch-indicator-pressed@3x.png +++ b/src/imports/controls/imagine/images/switch-indicator-pressed@3x.png diff --git a/src/imports/controls/imagine/images/switch-indicator-pressed@4x.png b/src/imports/controls/imagine/images/switch-indicator-pressed@4x.png Binary files differindex 7eebff6c..48d24f7c 100644 --- a/src/imports/controls/imagine/images/switch-indicator-pressed@4x.png +++ b/src/imports/controls/imagine/images/switch-indicator-pressed@4x.png diff --git a/src/imports/controls/imagine/images/switch-indicator.png b/src/imports/controls/imagine/images/switch-indicator.png Binary files differindex f7352cda..e0ec85e2 100644 --- a/src/imports/controls/imagine/images/switch-indicator.png +++ b/src/imports/controls/imagine/images/switch-indicator.png diff --git a/src/imports/controls/imagine/images/switch-indicator@2x.png b/src/imports/controls/imagine/images/switch-indicator@2x.png Binary files differindex eefb2f1c..d0026507 100644 --- a/src/imports/controls/imagine/images/switch-indicator@2x.png +++ b/src/imports/controls/imagine/images/switch-indicator@2x.png diff --git a/src/imports/controls/imagine/images/switch-indicator@3x.png b/src/imports/controls/imagine/images/switch-indicator@3x.png Binary files differindex 6254561d..1a59e3b0 100644 --- a/src/imports/controls/imagine/images/switch-indicator@3x.png +++ b/src/imports/controls/imagine/images/switch-indicator@3x.png diff --git a/src/imports/controls/imagine/images/switch-indicator@4x.png b/src/imports/controls/imagine/images/switch-indicator@4x.png Binary files differindex dcc5e3cf..1db31ec3 100644 --- a/src/imports/controls/imagine/images/switch-indicator@4x.png +++ b/src/imports/controls/imagine/images/switch-indicator@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-checked.9.png b/src/imports/controls/imagine/images/switchdelegate-background-checked.9.png Binary files differdeleted file mode 100644 index cef1bafa..00000000 --- a/src/imports/controls/imagine/images/switchdelegate-background-checked.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/switchdelegate-background-checked@2x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-checked@2x.9.png Binary files differdeleted file mode 100644 index 5a136a0c..00000000 --- a/src/imports/controls/imagine/images/switchdelegate-background-checked@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/switchdelegate-background-checked@3x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-checked@3x.9.png Binary files differdeleted file mode 100644 index f47a366b..00000000 --- a/src/imports/controls/imagine/images/switchdelegate-background-checked@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/switchdelegate-background-checked@4x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-checked@4x.9.png Binary files differdeleted file mode 100644 index 9ecb680f..00000000 --- a/src/imports/controls/imagine/images/switchdelegate-background-checked@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/switchdelegate-background-disabled.9.png b/src/imports/controls/imagine/images/switchdelegate-background-disabled.9.png Binary files differindex ce48ee74..4b56fe35 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-disabled.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-disabled@2x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-disabled@2x.9.png Binary files differindex c7abb65c..34edef58 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-disabled@3x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-disabled@3x.9.png Binary files differindex 46b84d7d..dd2cc6ba 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-disabled@4x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-disabled@4x.9.png Binary files differindex f4dfd338..b7890a3c 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-focused.9.png b/src/imports/controls/imagine/images/switchdelegate-background-focused.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-focused.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-focused.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-focused@2x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-focused@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-focused@3x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-focused@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-focused@4x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-focused@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-hovered.9.png b/src/imports/controls/imagine/images/switchdelegate-background-hovered.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-hovered.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-hovered@2x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-hovered@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-hovered@3x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-hovered@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-hovered@4x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-hovered@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-pressed.9.png b/src/imports/controls/imagine/images/switchdelegate-background-pressed.9.png Binary files differindex 39fa8664..b31343dd 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-pressed.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-pressed@2x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-pressed@2x.9.png Binary files differindex 6b61562c..c56c62da 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-pressed@3x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-pressed@3x.9.png Binary files differindex e46c0bf1..bfbc82f9 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background-pressed@4x.9.png b/src/imports/controls/imagine/images/switchdelegate-background-pressed@4x.9.png Binary files differindex 010444e8..e31ab63b 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background.9.png b/src/imports/controls/imagine/images/switchdelegate-background.9.png Binary files differindex cef1bafa..a53f63cd 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background@2x.9.png b/src/imports/controls/imagine/images/switchdelegate-background@2x.9.png Binary files differindex 5a136a0c..07510b10 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background@2x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background@2x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background@3x.9.png b/src/imports/controls/imagine/images/switchdelegate-background@3x.9.png Binary files differindex f47a366b..db2a210a 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background@3x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background@3x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-background@4x.9.png b/src/imports/controls/imagine/images/switchdelegate-background@4x.9.png Binary files differindex 9ecb680f..6427d7ab 100644 --- a/src/imports/controls/imagine/images/switchdelegate-background@4x.9.png +++ b/src/imports/controls/imagine/images/switchdelegate-background@4x.9.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-disabled.png b/src/imports/controls/imagine/images/switchdelegate-handle-disabled.png Binary files differindex 0924073f..4108457f 100644 --- a/src/imports/controls/imagine/images/switchdelegate-handle-disabled.png +++ b/src/imports/controls/imagine/images/switchdelegate-handle-disabled.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@2x.png b/src/imports/controls/imagine/images/switchdelegate-handle-disabled@2x.png Binary files differindex 4703c210..c73b8b45 100644 --- a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-handle-disabled@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@3x.png b/src/imports/controls/imagine/images/switchdelegate-handle-disabled@3x.png Binary files differindex 352cd9ca..3a927393 100644 --- a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-handle-disabled@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@4x.png b/src/imports/controls/imagine/images/switchdelegate-handle-disabled@4x.png Binary files differindex cd0fdc3c..2893b7a6 100644 --- a/src/imports/controls/imagine/images/switchdelegate-handle-disabled@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-handle-disabled@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-pressed.png b/src/imports/controls/imagine/images/switchdelegate-handle-pressed.png Binary files differnew file mode 100644 index 00000000..4108457f --- /dev/null +++ b/src/imports/controls/imagine/images/switchdelegate-handle-pressed.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-pressed@2x.png b/src/imports/controls/imagine/images/switchdelegate-handle-pressed@2x.png Binary files differnew file mode 100644 index 00000000..c73b8b45 --- /dev/null +++ b/src/imports/controls/imagine/images/switchdelegate-handle-pressed@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-pressed@3x.png b/src/imports/controls/imagine/images/switchdelegate-handle-pressed@3x.png Binary files differnew file mode 100644 index 00000000..3a927393 --- /dev/null +++ b/src/imports/controls/imagine/images/switchdelegate-handle-pressed@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle-pressed@4x.png b/src/imports/controls/imagine/images/switchdelegate-handle-pressed@4x.png Binary files differnew file mode 100644 index 00000000..2893b7a6 --- /dev/null +++ b/src/imports/controls/imagine/images/switchdelegate-handle-pressed@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle.png b/src/imports/controls/imagine/images/switchdelegate-handle.png Binary files differindex 856c1f19..814cfe4f 100644 --- a/src/imports/controls/imagine/images/switchdelegate-handle.png +++ b/src/imports/controls/imagine/images/switchdelegate-handle.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle@2x.png b/src/imports/controls/imagine/images/switchdelegate-handle@2x.png Binary files differindex 0f3ef325..df3e41c5 100644 --- a/src/imports/controls/imagine/images/switchdelegate-handle@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-handle@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle@3x.png b/src/imports/controls/imagine/images/switchdelegate-handle@3x.png Binary files differindex 336686af..601c0d53 100644 --- a/src/imports/controls/imagine/images/switchdelegate-handle@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-handle@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-handle@4x.png b/src/imports/controls/imagine/images/switchdelegate-handle@4x.png Binary files differindex a888832a..b03a1d31 100644 --- a/src/imports/controls/imagine/images/switchdelegate-handle@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-handle@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused.png Binary files differindex d542dfc4..06f09514 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@2x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@2x.png Binary files differindex 221e0c1a..90044add 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@3x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@3x.png Binary files differindex 095092a8..c987c7b5 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@4x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@4x.png Binary files differindex 9894fb7d..c2351de8 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-focused@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered.png Binary files differindex d542dfc4..06f09514 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@2x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@2x.png Binary files differindex 221e0c1a..90044add 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@3x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@3x.png Binary files differindex 095092a8..c987c7b5 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@4x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@4x.png Binary files differindex 9894fb7d..c2351de8 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-hovered@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed.png Binary files differindex a8a48c68..fcf8a5f3 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@2x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@2x.png Binary files differindex cdb2d08a..b8747547 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@3x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@3x.png Binary files differindex 6fcc036c..1a254945 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@4x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@4x.png Binary files differindex d48a45aa..7af5cc05 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked-pressed@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked.png Binary files differindex 59d722e4..00af5fd7 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@2x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked@2x.png Binary files differindex 60fac1e5..b9ae1ce2 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@3x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked@3x.png Binary files differindex d9a46c95..fbcd46df 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@4x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-checked@4x.png Binary files differindex ee0b3234..04807b20 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-checked@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-checked@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled.png b/src/imports/controls/imagine/images/switchdelegate-indicator-disabled.png Binary files differindex 41ecf82e..47800da2 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-disabled.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@2x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@2x.png Binary files differindex 0fee44f1..bc3cfbf4 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@3x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@3x.png Binary files differindex c25438fa..b29d5756 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@4x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@4x.png Binary files differindex d028eb27..22562fdf 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-disabled@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-focused.png b/src/imports/controls/imagine/images/switchdelegate-indicator-focused.png Binary files differindex 9ceb35c6..570f6872 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-focused.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-focused.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@2x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-focused@2x.png Binary files differindex 5f049cc0..389c7f51 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-focused@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@3x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-focused@3x.png Binary files differindex fa43264b..c2e2a155 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-focused@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@4x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-focused@4x.png Binary files differindex 6f9b35e8..3637139f 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-focused@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-focused@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered.png b/src/imports/controls/imagine/images/switchdelegate-indicator-hovered.png Binary files differindex 9ceb35c6..570f6872 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-hovered.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@2x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@2x.png Binary files differindex 5f049cc0..389c7f51 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@3x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@3x.png Binary files differindex fa43264b..c2e2a155 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@4x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@4x.png Binary files differindex 6f9b35e8..3637139f 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-hovered@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed.png b/src/imports/controls/imagine/images/switchdelegate-indicator-pressed.png Binary files differindex 385992ea..6129c382 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-pressed.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@2x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@2x.png Binary files differindex f67dc74b..144eb013 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@3x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@3x.png Binary files differindex 8781317d..f59d9051 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@4x.png b/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@4x.png Binary files differindex 7eebff6c..48d24f7c 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator-pressed@4x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator.png b/src/imports/controls/imagine/images/switchdelegate-indicator.png Binary files differindex f7352cda..e0ec85e2 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator@2x.png b/src/imports/controls/imagine/images/switchdelegate-indicator@2x.png Binary files differindex eefb2f1c..d0026507 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator@2x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator@2x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator@3x.png b/src/imports/controls/imagine/images/switchdelegate-indicator@3x.png Binary files differindex 6254561d..1a59e3b0 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator@3x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator@3x.png diff --git a/src/imports/controls/imagine/images/switchdelegate-indicator@4x.png b/src/imports/controls/imagine/images/switchdelegate-indicator@4x.png Binary files differindex dcc5e3cf..1db31ec3 100644 --- a/src/imports/controls/imagine/images/switchdelegate-indicator@4x.png +++ b/src/imports/controls/imagine/images/switchdelegate-indicator@4x.png diff --git a/src/imports/controls/imagine/images/tabbar-background.png b/src/imports/controls/imagine/images/tabbar-background.png Binary files differindex 9e5bf120..1d806c2d 100644 --- a/src/imports/controls/imagine/images/tabbar-background.png +++ b/src/imports/controls/imagine/images/tabbar-background.png diff --git a/src/imports/controls/imagine/images/tabbar-background@2x.png b/src/imports/controls/imagine/images/tabbar-background@2x.png Binary files differindex 9beecae2..943f11ba 100644 --- a/src/imports/controls/imagine/images/tabbar-background@2x.png +++ b/src/imports/controls/imagine/images/tabbar-background@2x.png diff --git a/src/imports/controls/imagine/images/tabbar-background@3x.png b/src/imports/controls/imagine/images/tabbar-background@3x.png Binary files differindex b064b560..4f0568a7 100644 --- a/src/imports/controls/imagine/images/tabbar-background@3x.png +++ b/src/imports/controls/imagine/images/tabbar-background@3x.png diff --git a/src/imports/controls/imagine/images/tabbar-background@4x.png b/src/imports/controls/imagine/images/tabbar-background@4x.png Binary files differindex 5f8767f6..33a7918c 100644 --- a/src/imports/controls/imagine/images/tabbar-background@4x.png +++ b/src/imports/controls/imagine/images/tabbar-background@4x.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-checked.9.png b/src/imports/controls/imagine/images/tabbutton-background-checked.9.png Binary files differindex d2f0fa76..7f2f6aa6 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-checked.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-checked.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-checked@2x.9.png b/src/imports/controls/imagine/images/tabbutton-background-checked@2x.9.png Binary files differindex bee13292..86dab9ac 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-checked@2x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-checked@3x.9.png b/src/imports/controls/imagine/images/tabbutton-background-checked@3x.9.png Binary files differindex 70afb7d3..f426f6a3 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-checked@3x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-checked@4x.9.png b/src/imports/controls/imagine/images/tabbutton-background-checked@4x.9.png Binary files differindex 3a2015c4..fa4859e5 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-checked@4x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked.9.png b/src/imports/controls/imagine/images/tabbutton-background-disabled-checked.9.png Binary files differindex a6d3011b..0397108c 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-disabled-checked.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@2x.9.png b/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@2x.9.png Binary files differindex 8ebfa026..e80b3c78 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@2x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@3x.9.png b/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@3x.9.png Binary files differindex 1d5a1d51..97653e39 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@3x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@4x.9.png b/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@4x.9.png Binary files differindex f06dc55f..f32db8c9 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@4x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-disabled-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled.9.png b/src/imports/controls/imagine/images/tabbutton-background-disabled.9.png Binary files differindex a6d3011b..0397108c 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-disabled.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled@2x.9.png b/src/imports/controls/imagine/images/tabbutton-background-disabled@2x.9.png Binary files differindex 8ebfa026..e80b3c78 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled@3x.9.png b/src/imports/controls/imagine/images/tabbutton-background-disabled@3x.9.png Binary files differindex 1d5a1d51..97653e39 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-disabled@4x.9.png b/src/imports/controls/imagine/images/tabbutton-background-disabled@4x.9.png Binary files differindex f06dc55f..f32db8c9 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-hovered.9.png b/src/imports/controls/imagine/images/tabbutton-background-hovered.9.png Binary files differindex 2416c79a..0838287b 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-hovered.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-hovered@2x.9.png b/src/imports/controls/imagine/images/tabbutton-background-hovered@2x.9.png Binary files differindex 3d6282fd..71fde8ce 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-hovered@3x.9.png b/src/imports/controls/imagine/images/tabbutton-background-hovered@3x.9.png Binary files differindex f8bc9772..a289bbd2 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-hovered@4x.9.png b/src/imports/controls/imagine/images/tabbutton-background-hovered@4x.9.png Binary files differindex e653b356..20e16933 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-pressed.9.png b/src/imports/controls/imagine/images/tabbutton-background-pressed.9.png Binary files differindex d48733ed..92e078bb 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-pressed.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-pressed@2x.9.png b/src/imports/controls/imagine/images/tabbutton-background-pressed@2x.9.png Binary files differindex fbbaad7b..20f7e55e 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-pressed@3x.9.png b/src/imports/controls/imagine/images/tabbutton-background-pressed@3x.9.png Binary files differindex 3a0ba70e..74e8ce65 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background-pressed@4x.9.png b/src/imports/controls/imagine/images/tabbutton-background-pressed@4x.9.png Binary files differindex c04f124e..20e52e48 100644 --- a/src/imports/controls/imagine/images/tabbutton-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background.9.png b/src/imports/controls/imagine/images/tabbutton-background.9.png Binary files differindex 2266c722..60bddd70 100644 --- a/src/imports/controls/imagine/images/tabbutton-background.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background@2x.9.png b/src/imports/controls/imagine/images/tabbutton-background@2x.9.png Binary files differindex b7adb7ad..5e92aa79 100644 --- a/src/imports/controls/imagine/images/tabbutton-background@2x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background@2x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background@3x.9.png b/src/imports/controls/imagine/images/tabbutton-background@3x.9.png Binary files differindex d8f4eae5..b60a9a57 100644 --- a/src/imports/controls/imagine/images/tabbutton-background@3x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background@3x.9.png diff --git a/src/imports/controls/imagine/images/tabbutton-background@4x.9.png b/src/imports/controls/imagine/images/tabbutton-background@4x.9.png Binary files differindex 066d35b3..5fa46bbd 100644 --- a/src/imports/controls/imagine/images/tabbutton-background@4x.9.png +++ b/src/imports/controls/imagine/images/tabbutton-background@4x.9.png diff --git a/src/imports/controls/imagine/images/textarea-background-disabled.9.png b/src/imports/controls/imagine/images/textarea-background-disabled.9.png Binary files differindex 910fbca9..23291866 100644 --- a/src/imports/controls/imagine/images/textarea-background-disabled.9.png +++ b/src/imports/controls/imagine/images/textarea-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/textarea-background-disabled@2x.9.png b/src/imports/controls/imagine/images/textarea-background-disabled@2x.9.png Binary files differindex 32a488ce..62b0697a 100644 --- a/src/imports/controls/imagine/images/textarea-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/textarea-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/textarea-background-disabled@3x.9.png b/src/imports/controls/imagine/images/textarea-background-disabled@3x.9.png Binary files differindex 7d788599..188f0adf 100644 --- a/src/imports/controls/imagine/images/textarea-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/textarea-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/textarea-background-disabled@4x.9.png b/src/imports/controls/imagine/images/textarea-background-disabled@4x.9.png Binary files differindex 997ea6cc..3040bc55 100644 --- a/src/imports/controls/imagine/images/textarea-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/textarea-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/textarea-background-focused.9.png b/src/imports/controls/imagine/images/textarea-background-focused.9.png Binary files differindex 22009a1b..5098d8b3 100644 --- a/src/imports/controls/imagine/images/textarea-background-focused.9.png +++ b/src/imports/controls/imagine/images/textarea-background-focused.9.png diff --git a/src/imports/controls/imagine/images/textarea-background-focused@2x.9.png b/src/imports/controls/imagine/images/textarea-background-focused@2x.9.png Binary files differindex 51d393df..41e3d319 100644 --- a/src/imports/controls/imagine/images/textarea-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/textarea-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/textarea-background-focused@3x.9.png b/src/imports/controls/imagine/images/textarea-background-focused@3x.9.png Binary files differindex 621f912e..86052b8d 100644 --- a/src/imports/controls/imagine/images/textarea-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/textarea-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/textarea-background-focused@4x.9.png b/src/imports/controls/imagine/images/textarea-background-focused@4x.9.png Binary files differindex d2b0f85f..8891d4b0 100644 --- a/src/imports/controls/imagine/images/textarea-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/textarea-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/textarea-background-pressed.9.png b/src/imports/controls/imagine/images/textarea-background-pressed.9.png Binary files differdeleted file mode 100644 index 7a8cd7f9..00000000 --- a/src/imports/controls/imagine/images/textarea-background-pressed.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/textarea-background-pressed@2x.9.png b/src/imports/controls/imagine/images/textarea-background-pressed@2x.9.png Binary files differdeleted file mode 100644 index e580a5a6..00000000 --- a/src/imports/controls/imagine/images/textarea-background-pressed@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/textarea-background-pressed@3x.9.png b/src/imports/controls/imagine/images/textarea-background-pressed@3x.9.png Binary files differdeleted file mode 100644 index cf1b19da..00000000 --- a/src/imports/controls/imagine/images/textarea-background-pressed@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/textarea-background-pressed@4x.9.png b/src/imports/controls/imagine/images/textarea-background-pressed@4x.9.png Binary files differdeleted file mode 100644 index 1c6e0ef7..00000000 --- a/src/imports/controls/imagine/images/textarea-background-pressed@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/textarea-background.9.png b/src/imports/controls/imagine/images/textarea-background.9.png Binary files differindex efd78e1e..c7c34666 100644 --- a/src/imports/controls/imagine/images/textarea-background.9.png +++ b/src/imports/controls/imagine/images/textarea-background.9.png diff --git a/src/imports/controls/imagine/images/textarea-background@2x.9.png b/src/imports/controls/imagine/images/textarea-background@2x.9.png Binary files differindex a644ec9a..7196c109 100644 --- a/src/imports/controls/imagine/images/textarea-background@2x.9.png +++ b/src/imports/controls/imagine/images/textarea-background@2x.9.png diff --git a/src/imports/controls/imagine/images/textarea-background@3x.9.png b/src/imports/controls/imagine/images/textarea-background@3x.9.png Binary files differindex 0b80c021..8e23e0aa 100644 --- a/src/imports/controls/imagine/images/textarea-background@3x.9.png +++ b/src/imports/controls/imagine/images/textarea-background@3x.9.png diff --git a/src/imports/controls/imagine/images/textarea-background@4x.9.png b/src/imports/controls/imagine/images/textarea-background@4x.9.png Binary files differindex 78cdcb28..b0bbb7ce 100644 --- a/src/imports/controls/imagine/images/textarea-background@4x.9.png +++ b/src/imports/controls/imagine/images/textarea-background@4x.9.png diff --git a/src/imports/controls/imagine/images/textfield-background-disabled.9.png b/src/imports/controls/imagine/images/textfield-background-disabled.9.png Binary files differindex 9f2dd1c5..b734333e 100644 --- a/src/imports/controls/imagine/images/textfield-background-disabled.9.png +++ b/src/imports/controls/imagine/images/textfield-background-disabled.9.png diff --git a/src/imports/controls/imagine/images/textfield-background-disabled@2x.9.png b/src/imports/controls/imagine/images/textfield-background-disabled@2x.9.png Binary files differindex 6f573f77..a24df3b9 100644 --- a/src/imports/controls/imagine/images/textfield-background-disabled@2x.9.png +++ b/src/imports/controls/imagine/images/textfield-background-disabled@2x.9.png diff --git a/src/imports/controls/imagine/images/textfield-background-disabled@3x.9.png b/src/imports/controls/imagine/images/textfield-background-disabled@3x.9.png Binary files differindex 279c3a74..094b8ab9 100644 --- a/src/imports/controls/imagine/images/textfield-background-disabled@3x.9.png +++ b/src/imports/controls/imagine/images/textfield-background-disabled@3x.9.png diff --git a/src/imports/controls/imagine/images/textfield-background-disabled@4x.9.png b/src/imports/controls/imagine/images/textfield-background-disabled@4x.9.png Binary files differindex ae0743ab..3610c116 100644 --- a/src/imports/controls/imagine/images/textfield-background-disabled@4x.9.png +++ b/src/imports/controls/imagine/images/textfield-background-disabled@4x.9.png diff --git a/src/imports/controls/imagine/images/textfield-background-focused.9.png b/src/imports/controls/imagine/images/textfield-background-focused.9.png Binary files differindex d9596759..b89c7a84 100644 --- a/src/imports/controls/imagine/images/textfield-background-focused.9.png +++ b/src/imports/controls/imagine/images/textfield-background-focused.9.png diff --git a/src/imports/controls/imagine/images/textfield-background-focused@2x.9.png b/src/imports/controls/imagine/images/textfield-background-focused@2x.9.png Binary files differindex 149a0f2d..411ef62c 100644 --- a/src/imports/controls/imagine/images/textfield-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/textfield-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/textfield-background-focused@3x.9.png b/src/imports/controls/imagine/images/textfield-background-focused@3x.9.png Binary files differindex 9ca64625..52dc65c2 100644 --- a/src/imports/controls/imagine/images/textfield-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/textfield-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/textfield-background-focused@4x.9.png b/src/imports/controls/imagine/images/textfield-background-focused@4x.9.png Binary files differindex 756bdc3b..be9f5420 100644 --- a/src/imports/controls/imagine/images/textfield-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/textfield-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/textfield-background-pressed.9.png b/src/imports/controls/imagine/images/textfield-background-pressed.9.png Binary files differdeleted file mode 100644 index 1eeceff5..00000000 --- a/src/imports/controls/imagine/images/textfield-background-pressed.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/textfield-background-pressed@2x.9.png b/src/imports/controls/imagine/images/textfield-background-pressed@2x.9.png Binary files differdeleted file mode 100644 index 3271ae54..00000000 --- a/src/imports/controls/imagine/images/textfield-background-pressed@2x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/textfield-background-pressed@3x.9.png b/src/imports/controls/imagine/images/textfield-background-pressed@3x.9.png Binary files differdeleted file mode 100644 index f00ec72d..00000000 --- a/src/imports/controls/imagine/images/textfield-background-pressed@3x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/textfield-background-pressed@4x.9.png b/src/imports/controls/imagine/images/textfield-background-pressed@4x.9.png Binary files differdeleted file mode 100644 index 9adf1b4b..00000000 --- a/src/imports/controls/imagine/images/textfield-background-pressed@4x.9.png +++ /dev/null diff --git a/src/imports/controls/imagine/images/textfield-background.9.png b/src/imports/controls/imagine/images/textfield-background.9.png Binary files differindex ec33410f..c307aa00 100644 --- a/src/imports/controls/imagine/images/textfield-background.9.png +++ b/src/imports/controls/imagine/images/textfield-background.9.png diff --git a/src/imports/controls/imagine/images/textfield-background@2x.9.png b/src/imports/controls/imagine/images/textfield-background@2x.9.png Binary files differindex 7d661b44..f7df296f 100644 --- a/src/imports/controls/imagine/images/textfield-background@2x.9.png +++ b/src/imports/controls/imagine/images/textfield-background@2x.9.png diff --git a/src/imports/controls/imagine/images/textfield-background@3x.9.png b/src/imports/controls/imagine/images/textfield-background@3x.9.png Binary files differindex 5ad6a93b..81d73086 100644 --- a/src/imports/controls/imagine/images/textfield-background@3x.9.png +++ b/src/imports/controls/imagine/images/textfield-background@3x.9.png diff --git a/src/imports/controls/imagine/images/textfield-background@4x.9.png b/src/imports/controls/imagine/images/textfield-background@4x.9.png Binary files differindex f100945a..d8a96fdd 100644 --- a/src/imports/controls/imagine/images/textfield-background@4x.9.png +++ b/src/imports/controls/imagine/images/textfield-background@4x.9.png diff --git a/src/imports/controls/imagine/images/toolbar-background.png b/src/imports/controls/imagine/images/toolbar-background.png Binary files differindex 2203da02..dcd0cb75 100644 --- a/src/imports/controls/imagine/images/toolbar-background.png +++ b/src/imports/controls/imagine/images/toolbar-background.png diff --git a/src/imports/controls/imagine/images/toolbar-background@2x.png b/src/imports/controls/imagine/images/toolbar-background@2x.png Binary files differindex e264fd93..5a8518c7 100644 --- a/src/imports/controls/imagine/images/toolbar-background@2x.png +++ b/src/imports/controls/imagine/images/toolbar-background@2x.png diff --git a/src/imports/controls/imagine/images/toolbar-background@3x.png b/src/imports/controls/imagine/images/toolbar-background@3x.png Binary files differindex 6d6cead5..0285b12c 100644 --- a/src/imports/controls/imagine/images/toolbar-background@3x.png +++ b/src/imports/controls/imagine/images/toolbar-background@3x.png diff --git a/src/imports/controls/imagine/images/toolbar-background@4x.png b/src/imports/controls/imagine/images/toolbar-background@4x.png Binary files differindex 028eb28b..e8d784ce 100644 --- a/src/imports/controls/imagine/images/toolbar-background@4x.png +++ b/src/imports/controls/imagine/images/toolbar-background@4x.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-focused.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked-focused.9.png Binary files differindex 287a2872..8ce5b791 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked-focused.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked-focused.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@2x.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked-focused@2x.9.png Binary files differindex aa844165..d99d1577 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@2x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@3x.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked-focused@3x.9.png Binary files differindex 8c682255..c47247fe 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@3x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@4x.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked-focused@4x.9.png Binary files differindex 89bdd096..e1e519da 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked-focused@4x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked-hovered.9.png Binary files differindex 3c95ab6d..8ce5b791 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked-hovered.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@2x.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@2x.9.png Binary files differindex 1195aa1e..d99d1577 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@3x.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@3x.9.png Binary files differindex 9e2666c5..c47247fe 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@4x.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@4x.9.png Binary files differindex 24e93b95..e1e519da 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked.9.png Binary files differindex 287a2872..8ce5b791 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked@2x.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked@2x.9.png Binary files differindex aa844165..d99d1577 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked@2x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked@3x.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked@3x.9.png Binary files differindex 8c682255..c47247fe 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked@3x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-checked@4x.9.png b/src/imports/controls/imagine/images/toolbutton-background-checked@4x.9.png Binary files differindex 89bdd096..e1e519da 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-checked@4x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked.9.png b/src/imports/controls/imagine/images/toolbutton-background-disabled-checked.9.png Binary files differindex 287a2872..8ce5b791 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-disabled-checked.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@2x.9.png b/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@2x.9.png Binary files differindex aa844165..d99d1577 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@2x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@2x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@3x.9.png b/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@3x.9.png Binary files differindex 8c682255..c47247fe 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@3x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@3x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@4x.9.png b/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@4x.9.png Binary files differindex 89bdd096..e1e519da 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@4x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-disabled-checked@4x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-focused.9.png b/src/imports/controls/imagine/images/toolbutton-background-focused.9.png Binary files differindex 5a72a621..8ce5b791 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-focused.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-focused.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-focused@2x.9.png b/src/imports/controls/imagine/images/toolbutton-background-focused@2x.9.png Binary files differindex 688a071a..d99d1577 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-focused@2x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-focused@2x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-focused@3x.9.png b/src/imports/controls/imagine/images/toolbutton-background-focused@3x.9.png Binary files differindex 64375a7e..c47247fe 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-focused@3x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-focused@3x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-focused@4x.9.png b/src/imports/controls/imagine/images/toolbutton-background-focused@4x.9.png Binary files differindex 96004a10..e1e519da 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-focused@4x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-focused@4x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-hovered.9.png b/src/imports/controls/imagine/images/toolbutton-background-hovered.9.png Binary files differindex 0de6e5b1..8ce5b791 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-hovered.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-hovered.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-hovered@2x.9.png b/src/imports/controls/imagine/images/toolbutton-background-hovered@2x.9.png Binary files differindex 68245c68..d99d1577 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-hovered@2x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-hovered@2x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-hovered@3x.9.png b/src/imports/controls/imagine/images/toolbutton-background-hovered@3x.9.png Binary files differindex c05ef625..c47247fe 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-hovered@3x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-hovered@3x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-hovered@4x.9.png b/src/imports/controls/imagine/images/toolbutton-background-hovered@4x.9.png Binary files differindex dda2a933..e1e519da 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-hovered@4x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-hovered@4x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-pressed.9.png b/src/imports/controls/imagine/images/toolbutton-background-pressed.9.png Binary files differindex 287a2872..8ce5b791 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-pressed.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-pressed.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-pressed@2x.9.png b/src/imports/controls/imagine/images/toolbutton-background-pressed@2x.9.png Binary files differindex aa844165..d99d1577 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-pressed@2x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-pressed@2x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-pressed@3x.9.png b/src/imports/controls/imagine/images/toolbutton-background-pressed@3x.9.png Binary files differindex 8c682255..c47247fe 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-pressed@3x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-pressed@3x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background-pressed@4x.9.png b/src/imports/controls/imagine/images/toolbutton-background-pressed@4x.9.png Binary files differindex 89bdd096..e1e519da 100644 --- a/src/imports/controls/imagine/images/toolbutton-background-pressed@4x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background-pressed@4x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background.9.png b/src/imports/controls/imagine/images/toolbutton-background.9.png Binary files differindex 5a72a621..2359b090 100644 --- a/src/imports/controls/imagine/images/toolbutton-background.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background@2x.9.png b/src/imports/controls/imagine/images/toolbutton-background@2x.9.png Binary files differindex 688a071a..6c36bf22 100644 --- a/src/imports/controls/imagine/images/toolbutton-background@2x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background@2x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background@3x.9.png b/src/imports/controls/imagine/images/toolbutton-background@3x.9.png Binary files differindex 64375a7e..f3cb6144 100644 --- a/src/imports/controls/imagine/images/toolbutton-background@3x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background@3x.9.png diff --git a/src/imports/controls/imagine/images/toolbutton-background@4x.9.png b/src/imports/controls/imagine/images/toolbutton-background@4x.9.png Binary files differindex 96004a10..1bf51a87 100644 --- a/src/imports/controls/imagine/images/toolbutton-background@4x.9.png +++ b/src/imports/controls/imagine/images/toolbutton-background@4x.9.png diff --git a/src/imports/controls/imagine/images/toolseparator-separator-horizontal.9.png b/src/imports/controls/imagine/images/toolseparator-separator-horizontal.9.png Binary files differindex 923d53ed..45a22b6d 100644 --- a/src/imports/controls/imagine/images/toolseparator-separator-horizontal.9.png +++ b/src/imports/controls/imagine/images/toolseparator-separator-horizontal.9.png diff --git a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@2x.9.png b/src/imports/controls/imagine/images/toolseparator-separator-horizontal@2x.9.png Binary files differindex d1144b51..a2dc5227 100644 --- a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@2x.9.png +++ b/src/imports/controls/imagine/images/toolseparator-separator-horizontal@2x.9.png diff --git a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@3x.9.png b/src/imports/controls/imagine/images/toolseparator-separator-horizontal@3x.9.png Binary files differindex 247b7f9d..471da912 100644 --- a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@3x.9.png +++ b/src/imports/controls/imagine/images/toolseparator-separator-horizontal@3x.9.png diff --git a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@4x.9.png b/src/imports/controls/imagine/images/toolseparator-separator-horizontal@4x.9.png Binary files differindex e03e5fe7..23a8b1d3 100644 --- a/src/imports/controls/imagine/images/toolseparator-separator-horizontal@4x.9.png +++ b/src/imports/controls/imagine/images/toolseparator-separator-horizontal@4x.9.png diff --git a/src/imports/controls/imagine/images/toolseparator-separator-vertical.9.png b/src/imports/controls/imagine/images/toolseparator-separator-vertical.9.png Binary files differindex 0d797eb0..31f24342 100644 --- a/src/imports/controls/imagine/images/toolseparator-separator-vertical.9.png +++ b/src/imports/controls/imagine/images/toolseparator-separator-vertical.9.png diff --git a/src/imports/controls/imagine/images/toolseparator-separator-vertical@2x.9.png b/src/imports/controls/imagine/images/toolseparator-separator-vertical@2x.9.png Binary files differindex 44cd4d0f..c1722962 100644 --- a/src/imports/controls/imagine/images/toolseparator-separator-vertical@2x.9.png +++ b/src/imports/controls/imagine/images/toolseparator-separator-vertical@2x.9.png diff --git a/src/imports/controls/imagine/images/toolseparator-separator-vertical@3x.9.png b/src/imports/controls/imagine/images/toolseparator-separator-vertical@3x.9.png Binary files differindex a4f4ff1c..c7de6ead 100644 --- a/src/imports/controls/imagine/images/toolseparator-separator-vertical@3x.9.png +++ b/src/imports/controls/imagine/images/toolseparator-separator-vertical@3x.9.png diff --git a/src/imports/controls/imagine/images/toolseparator-separator-vertical@4x.9.png b/src/imports/controls/imagine/images/toolseparator-separator-vertical@4x.9.png Binary files differindex 04e97483..e17b5dbd 100644 --- a/src/imports/controls/imagine/images/toolseparator-separator-vertical@4x.9.png +++ b/src/imports/controls/imagine/images/toolseparator-separator-vertical@4x.9.png diff --git a/src/imports/controls/imagine/images/tooltip-background.9.png b/src/imports/controls/imagine/images/tooltip-background.9.png Binary files differindex 2078d7de..b7f04322 100644 --- a/src/imports/controls/imagine/images/tooltip-background.9.png +++ b/src/imports/controls/imagine/images/tooltip-background.9.png diff --git a/src/imports/controls/imagine/images/tooltip-background@2x.9.png b/src/imports/controls/imagine/images/tooltip-background@2x.9.png Binary files differindex 823b48f3..9825f59b 100644 --- a/src/imports/controls/imagine/images/tooltip-background@2x.9.png +++ b/src/imports/controls/imagine/images/tooltip-background@2x.9.png diff --git a/src/imports/controls/imagine/images/tooltip-background@3x.9.png b/src/imports/controls/imagine/images/tooltip-background@3x.9.png Binary files differindex 594d7e05..59dad6cc 100644 --- a/src/imports/controls/imagine/images/tooltip-background@3x.9.png +++ b/src/imports/controls/imagine/images/tooltip-background@3x.9.png diff --git a/src/imports/controls/imagine/images/tooltip-background@4x.9.png b/src/imports/controls/imagine/images/tooltip-background@4x.9.png Binary files differindex db542e0a..e14599cf 100644 --- a/src/imports/controls/imagine/images/tooltip-background@4x.9.png +++ b/src/imports/controls/imagine/images/tooltip-background@4x.9.png diff --git a/src/imports/controls/imagine/qquickimageselector.cpp b/src/imports/controls/imagine/qquickimageselector.cpp index 41cbc6f2..1b3e80a9 100644 --- a/src/imports/controls/imagine/qquickimageselector.cpp +++ b/src/imports/controls/imagine/qquickimageselector.cpp @@ -39,12 +39,25 @@ #include <QtCore/qdir.h> #include <QtCore/qfileinfo.h> #include <QtCore/qcache.h> +#include <QtCore/qloggingcategory.h> +#include <QtCore/qfileselector.h> #include <QtQml/qqmlfile.h> #include <QtQml/private/qqmlproperty_p.h> #include <algorithm> QT_BEGIN_NAMESPACE +static const int DEFAULT_CACHE = 500; + +static inline int cacheSize() +{ + static bool ok = false; + static const int size = qEnvironmentVariableIntValue("QT_QUICK_CONTROLS_IMAGINE_CACHE", &ok); + return ok ? size : DEFAULT_CACHE; +} + +Q_DECLARE_LOGGING_CATEGORY(lcQtQuickControlsImagine) + // input: [focused, pressed] // => [[focused, pressed], [pressed, focused], [focused], [pressed]] static QList<QStringList> permutations(const QStringList &input, int count = -1) @@ -84,14 +97,16 @@ static QString findFile(const QDir &dir, const QString &baseName, const QStringL for (const QString &ext : extensions) { QString filePath = dir.filePath(baseName + QLatin1Char('.') + ext); if (QFile::exists(filePath)) - return filePath; + return QFileSelector().select(filePath); } - return QString(); + // return an empty string to indicate that the lookup has been done + // even if no matching asset was found + return QLatin1String(""); } QQuickImageSelector::QQuickImageSelector(QObject *parent) : QObject(parent), - m_cache(false), + m_cache(cacheSize() > 0), m_complete(false), m_separator(QLatin1String("-")) { @@ -220,18 +235,20 @@ QString QQuickImageSelector::cacheKey() const void QQuickImageSelector::updateSource() { - static QCache<QString, QString> cache(200); // TODO: cost + static QCache<QString, QString> cache(cacheSize()); const QString key = cacheKey(); QString bestFilePath; + if (m_cache) { QString *cachedPath = cache.object(key); if (cachedPath) bestFilePath = *cachedPath; } - if (bestFilePath.isEmpty()) { + // note: a cached file path may be empty + if (bestFilePath.isNull()) { QDir dir(m_path); int bestScore = -1; @@ -256,6 +273,8 @@ void QQuickImageSelector::updateSource() cache.insert(key, new QString(bestFilePath)); } + qCDebug(lcQtQuickControlsImagine) << m_name << m_activeStates << "->" << bestFilePath; + if (bestFilePath.startsWith(QLatin1Char(':'))) setSource(QUrl(QLatin1String("qrc") + bestFilePath)); else diff --git a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp index c50199fa..7aa78075 100644 --- a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp +++ b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp @@ -35,6 +35,7 @@ ****************************************************************************/ #include <QtQuickControls2/private/qquickstyleplugin_p.h> +#include <QtCore/qloggingcategory.h> #include <QtQml/qqml.h> #include "qquickimageselector_p.h" @@ -52,6 +53,8 @@ static inline void initResources() QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(lcQtQuickControlsImagine, "qt.quick.controls.imagine") + class QtQuickControls2ImagineStylePlugin: public QQuickStylePlugin { Q_OBJECT diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml index ffdc3bf4..0f08c732 100644 --- a/src/imports/controls/material/ProgressBar.qml +++ b/src/imports/controls/material/ProgressBar.qml @@ -59,9 +59,7 @@ T.ProgressBar { background: Rectangle { implicitWidth: 200 implicitHeight: 4 - x: control.leftPadding - y: control.topPadding + (control.availableHeight - height) / 2 - width: control.availableWidth + y: (control.height - height) / 2 height: 4 color: Qt.rgba(control.Material.accentColor.r, control.Material.accentColor.g, control.Material.accentColor.b, 0.25) diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index eba8e74e..d5593246 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -13,6 +13,13 @@ Module { "QtQuick.Window 2.2" ] Component { + name: "QQuickCheckLabel" + defaultProperty: "data" + prototype: "QQuickText" + exports: ["QtQuick.Controls.impl/CheckLabel 2.3"] + exportMetaObjectRevisions: [0] + } + Component { name: "QQuickColor" prototype: "QObject" exports: ["QtQuick.Controls.impl/Color 2.3"] @@ -25,6 +32,13 @@ Module { Parameter { name: "color"; type: "QColor" } Parameter { name: "opacity"; type: "double" } } + Method { + name: "blend" + type: "QColor" + Parameter { name: "a"; type: "QColor" } + Parameter { name: "b"; type: "QColor" } + Parameter { name: "factor"; type: "double" } + } } Component { name: "QQuickColorImage" @@ -33,6 +47,7 @@ Module { exports: ["QtQuick.Controls.impl/ColorImage 2.3"] exportMetaObjectRevisions: [0] Property { name: "color"; type: "QColor" } + Property { name: "defaultColor"; type: "QColor" } } Component { name: "QQuickDefaultBusyIndicator" @@ -70,11 +85,17 @@ Module { isSingleton: true exportMetaObjectRevisions: [0] Property { name: "backgroundColor"; type: "QColor"; isReadonly: true } + Property { name: "overlayModalColor"; type: "QColor"; isReadonly: true } + Property { name: "overlayDimColor"; type: "QColor"; isReadonly: true } Property { name: "textColor"; type: "QColor"; isReadonly: true } Property { name: "textDarkColor"; type: "QColor"; isReadonly: true } Property { name: "textLightColor"; type: "QColor"; isReadonly: true } + Property { name: "textLinkColor"; type: "QColor"; isReadonly: true } + Property { name: "textSelectionColor"; type: "QColor"; isReadonly: true } Property { name: "textDisabledColor"; type: "QColor"; isReadonly: true } Property { name: "textDisabledLightColor"; type: "QColor"; isReadonly: true } + Property { name: "textPlaceholderColor"; type: "QColor"; isReadonly: true } + Property { name: "focusColor"; type: "QColor"; isReadonly: true } Property { name: "focusLightColor"; type: "QColor"; isReadonly: true } Property { name: "focusPressedColor"; type: "QColor"; isReadonly: true } Property { name: "buttonColor"; type: "QColor"; isReadonly: true } @@ -98,6 +119,9 @@ Module { Property { name: "frameLightColor"; type: "QColor"; isReadonly: true } Property { name: "scrollBarColor"; type: "QColor"; isReadonly: true } Property { name: "scrollBarPressedColor"; type: "QColor"; isReadonly: true } + Property { name: "progressBarColor"; type: "QColor"; isReadonly: true } + Property { name: "pageIndicatorColor"; type: "QColor"; isReadonly: true } + Property { name: "separatorColor"; type: "QColor"; isReadonly: true } Property { name: "disabledDarkColor"; type: "QColor"; isReadonly: true } Property { name: "disabledLightColor"; type: "QColor"; isReadonly: true } } @@ -139,6 +163,15 @@ Module { Property { name: "bottomPadding"; type: "double" } } Component { + name: "QQuickMnemonicLabel" + defaultProperty: "data" + prototype: "QQuickText" + exports: ["QtQuick.Controls.impl/MnemonicLabel 2.3"] + exportMetaObjectRevisions: [0] + Property { name: "text"; type: "string" } + Property { name: "mnemonicVisible"; type: "bool" } + } + Component { name: "QQuickPaddedRectangle" defaultProperty: "data" prototype: "QQuickRectangle" @@ -188,6 +221,7 @@ Module { exports: ["QtQuick.Controls/ActionGroup 2.3"] exportMetaObjectRevisions: [3] isComposite: true + defaultProperty: "actions" } Component { prototype: "QQuickApplicationWindow" @@ -237,15 +271,6 @@ Module { defaultProperty: "data" } Component { - prototype: "QQuickRectangle" - name: "QtQuick.Controls.impl/CheckIndicator 2.0" - exports: ["QtQuick.Controls.impl/CheckIndicator 2.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "control"; type: "QQuickItem"; isPointer: true } - } - Component { prototype: "QQuickComboBox" name: "QtQuick.Controls/ComboBox 2.0" exports: ["QtQuick.Controls/ComboBox 2.0"] @@ -350,6 +375,22 @@ Module { defaultProperty: "contentData" } Component { + prototype: "QQuickMenuBar" + name: "QtQuick.Controls/MenuBar 2.3" + exports: ["QtQuick.Controls/MenuBar 2.3"] + exportMetaObjectRevisions: [3] + isComposite: true + defaultProperty: "contentData" + } + Component { + prototype: "QQuickMenuBarItem" + name: "QtQuick.Controls/MenuBarItem 2.3" + exports: ["QtQuick.Controls/MenuBarItem 2.3"] + exportMetaObjectRevisions: [3] + isComposite: true + defaultProperty: "data" + } + Component { prototype: "QQuickMenuItem" name: "QtQuick.Controls/MenuItem 2.0" exports: ["QtQuick.Controls/MenuItem 2.0"] @@ -422,15 +463,6 @@ Module { defaultProperty: "data" } Component { - prototype: "QQuickRectangle" - name: "QtQuick.Controls.impl/RadioIndicator 2.0" - exports: ["QtQuick.Controls.impl/RadioIndicator 2.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "control"; type: "QQuickItem"; isPointer: true } - } - Component { prototype: "QQuickRangeSlider" name: "QtQuick.Controls/RangeSlider 2.0" exports: ["QtQuick.Controls/RangeSlider 2.0"] @@ -527,15 +559,6 @@ Module { defaultProperty: "data" } Component { - prototype: "QQuickItem" - name: "QtQuick.Controls.impl/SwitchIndicator 2.0" - exports: ["QtQuick.Controls.impl/SwitchIndicator 2.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "control"; type: "QQuickItem"; isPointer: true } - } - Component { prototype: "QQuickTabBar" name: "QtQuick.Controls/TabBar 2.0" exports: ["QtQuick.Controls/TabBar 2.0"] @@ -641,9 +664,9 @@ Module { Signal { name: "released" } Signal { name: "canceled" } Signal { name: "clicked" } - Signal { name: "toggled"; revision: 2 } Signal { name: "pressAndHold" } Signal { name: "doubleClicked" } + Signal { name: "toggled"; revision: 2 } Signal { name: "iconChanged"; revision: 3 } Signal { name: "displayChanged"; revision: 3 } Signal { name: "actionChanged"; revision: 3 } @@ -707,6 +730,7 @@ Module { } Component { name: "QQuickActionGroup" + defaultProperty: "actions" prototype: "QObject" exports: ["QtQuick.Templates/ActionGroup 2.3"] exportMetaObjectRevisions: [0] @@ -753,7 +777,9 @@ Module { Property { name: "font"; type: "QFont" } Property { name: "locale"; type: "QLocale" } Property { name: "palette"; revision: 3; type: "QPalette" } + Property { name: "menuBar"; revision: 3; type: "QQuickItem"; isPointer: true } Signal { name: "paletteChanged"; revision: 3 } + Signal { name: "menuBarChanged"; revision: 3 } } Component { name: "QQuickApplicationWindowAttached" @@ -764,6 +790,7 @@ Module { Property { name: "header"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } + Property { name: "menuBar"; type: "QQuickItem"; isReadonly: true; isPointer: true } } Component { name: "QQuickBusyIndicator" @@ -796,12 +823,12 @@ Module { Property { name: "checkedButton"; type: "QQuickAbstractButton"; isPointer: true } Property { name: "buttons"; type: "QQuickAbstractButton"; isList: true; isReadonly: true } Property { name: "exclusive"; revision: 3; type: "bool" } - Signal { name: "exclusiveChanged"; revision: 3 } Signal { name: "clicked" revision: 1 Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } } + Signal { name: "exclusiveChanged"; revision: 3 } Method { name: "addButton" Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } @@ -847,31 +874,23 @@ Module { Property { name: "count"; type: "int"; isReadonly: true } Property { name: "model"; type: "QVariant" } Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true } - Property { name: "editable"; revision: 2; type: "bool" } - Property { name: "flat"; revision: 1; type: "bool" } - Property { name: "down"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "highlightedIndex"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } Property { name: "currentText"; type: "string"; isReadonly: true } Property { name: "displayText"; type: "string" } - Property { name: "editText"; revision: 2; type: "string" } Property { name: "textRole"; type: "string" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Property { name: "popup"; type: "QQuickPopup"; isPointer: true } + Property { name: "flat"; revision: 1; type: "bool" } + Property { name: "down"; revision: 2; type: "bool" } + Property { name: "editable"; revision: 2; type: "bool" } + Property { name: "editText"; revision: 2; type: "string" } Property { name: "validator"; revision: 2; type: "QValidator"; isPointer: true } Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } Property { name: "acceptableInput"; revision: 2; type: "bool"; isReadonly: true } - Signal { name: "editableChanged"; revision: 2 } - Signal { name: "flatChanged"; revision: 1 } - Signal { name: "downChanged"; revision: 2 } - Signal { name: "editTextChanged"; revision: 2 } - Signal { name: "validatorChanged"; revision: 2 } - Signal { name: "inputMethodHintsChanged"; revision: 2 } - Signal { name: "inputMethodComposingChanged"; revision: 2 } - Signal { name: "acceptableInputChanged"; revision: 2 } Signal { name: "activated" Parameter { name: "index"; type: "int" } @@ -880,7 +899,15 @@ Module { name: "highlighted" Parameter { name: "index"; type: "int" } } + Signal { name: "flatChanged"; revision: 1 } Signal { name: "accepted"; revision: 2 } + Signal { name: "downChanged"; revision: 2 } + Signal { name: "editableChanged"; revision: 2 } + Signal { name: "editTextChanged"; revision: 2 } + Signal { name: "validatorChanged"; revision: 2 } + Signal { name: "inputMethodHintsChanged"; revision: 2 } + Signal { name: "inputMethodComposingChanged"; revision: 2 } + Signal { name: "acceptableInputChanged"; revision: 2 } Method { name: "incrementCurrentIndex" } Method { name: "decrementCurrentIndex" } Method { name: "selectAll"; revision: 2 } @@ -1018,10 +1045,10 @@ Module { Property { name: "snapMode"; type: "SnapMode" } Property { name: "wrap"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } - Property { name: "live"; revision: 2; type: "bool" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } - Signal { name: "liveChanged"; revision: 2 } + Property { name: "live"; revision: 2; type: "bool" } Signal { name: "moved"; revision: 2 } + Signal { name: "liveChanged"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } } @@ -1074,7 +1101,7 @@ Module { "QtQuick.Templates/DialogButtonBox 2.1", "QtQuick.Templates/DialogButtonBox 2.3" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 3] attachedType: "QQuickDialogButtonBoxAttached" Enum { name: "Position" @@ -1165,6 +1192,7 @@ Module { prototype: "QQuickPopup" exports: ["QtQuick.Templates/Menu 2.0", "QtQuick.Templates/Menu 2.3"] exportMetaObjectRevisions: [0, 3] + Property { name: "count"; revision: 3; type: "int"; isReadonly: true } Property { name: "contentModel"; type: "QVariant"; isReadonly: true } Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "title"; type: "string" } @@ -1172,11 +1200,16 @@ Module { Property { name: "overlap"; revision: 3; type: "double" } Property { name: "delegate"; revision: 3; type: "QQmlComponent"; isPointer: true } Property { name: "currentIndex"; revision: 3; type: "int" } + Signal { name: "countChanged"; revision: 3 } Signal { name: "titleChanged" Parameter { name: "title"; type: "string" } } - Signal { name: "cascadeChanged"; revision: 3 } + Signal { + name: "cascadeChanged" + revision: 3 + Parameter { name: "cascade"; type: "bool" } + } Signal { name: "overlapChanged"; revision: 3 } Signal { name: "delegateChanged"; revision: 3 } Signal { name: "currentIndexChanged"; revision: 3 } @@ -1210,6 +1243,12 @@ Module { Parameter { name: "index"; type: "int" } } Method { + name: "menuAt" + revision: 3 + type: "QQuickMenu*" + Parameter { name: "index"; type: "int" } + } + Method { name: "addMenu" revision: 3 Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } @@ -1232,6 +1271,12 @@ Module { Parameter { name: "index"; type: "int" } } Method { + name: "actionAt" + revision: 3 + type: "QQuickAction*" + Parameter { name: "index"; type: "int" } + } + Method { name: "addAction" revision: 3 Parameter { name: "action"; type: "QQuickAction"; isPointer: true } @@ -1258,6 +1303,53 @@ Module { revision: 3 Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } } + Method { name: "dismiss"; revision: 3 } + } + Component { + name: "QQuickMenuBar" + defaultProperty: "contentData" + prototype: "QQuickContainer" + exports: ["QtQuick.Templates/MenuBar 2.3"] + exportMetaObjectRevisions: [0] + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Method { + name: "menuAt" + type: "QQuickMenu*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "addMenu" + Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } + } + Method { + name: "insertMenu" + Parameter { name: "index"; type: "int" } + Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } + } + Method { + name: "removeMenu" + Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } + } + Method { + name: "takeMenu" + type: "QQuickMenu*" + Parameter { name: "index"; type: "int" } + } + } + Component { + name: "QQuickMenuBarItem" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["QtQuick.Templates/MenuBarItem 2.3"] + exportMetaObjectRevisions: [0] + Property { name: "menuBar"; type: "QQuickMenuBar"; isReadonly: true; isPointer: true } + Property { name: "menu"; type: "QQuickMenu"; isPointer: true } + Property { name: "highlighted"; type: "bool" } + Signal { name: "triggered" } } Component { name: "QQuickMenuItem" @@ -1288,6 +1380,19 @@ Module { name: "QQuickOverlay" defaultProperty: "data" prototype: "QQuickItem" + exports: ["QtQuick.Templates/Overlay 2.3"] + isCreatable: false + exportMetaObjectRevisions: [0] + attachedType: "QQuickOverlayAttached" + Property { name: "modal"; type: "QQmlComponent"; isPointer: true } + Property { name: "modeless"; type: "QQmlComponent"; isPointer: true } + Signal { name: "pressed" } + Signal { name: "released" } + } + Component { + name: "QQuickOverlayAttached" + prototype: "QObject" + Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } Property { name: "modal"; type: "QQmlComponent"; isPointer: true } Property { name: "modeless"; type: "QQmlComponent"; isPointer: true } Signal { name: "pressed" } @@ -1302,10 +1407,10 @@ Module { Property { name: "title"; type: "string" } Property { name: "header"; type: "QQuickItem"; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isPointer: true } - Property { name: "contentWidth"; revision: 1; type: "double" } - Property { name: "contentHeight"; revision: 1; type: "double" } Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "contentWidth"; revision: 1; type: "double" } + Property { name: "contentHeight"; revision: 1; type: "double" } Signal { name: "contentWidthChanged"; revision: 1 } Signal { name: "contentHeightChanged"; revision: 1 } } @@ -1377,7 +1482,6 @@ Module { Property { name: "contentHeight"; type: "double" } Property { name: "availableWidth"; type: "double"; isReadonly: true } Property { name: "availableHeight"; type: "double"; isReadonly: true } - Property { name: "spacing"; revision: 1; type: "double" } Property { name: "margins"; type: "double" } Property { name: "topMargin"; type: "double" } Property { name: "leftMargin"; type: "double" } @@ -1389,6 +1493,7 @@ Module { Property { name: "rightPadding"; type: "double" } Property { name: "bottomPadding"; type: "double" } Property { name: "locale"; type: "QLocale" } + Property { name: "mirrored"; revision: 3; type: "bool"; isReadonly: true } Property { name: "font"; type: "QFont" } Property { name: "palette"; revision: 3; type: "QPalette" } Property { name: "parent"; type: "QQuickItem"; isPointer: true } @@ -1410,7 +1515,12 @@ Module { Property { name: "transformOrigin"; type: "TransformOrigin" } Property { name: "enter"; type: "QQuickTransition"; isPointer: true } Property { name: "exit"; type: "QQuickTransition"; isPointer: true } - Signal { name: "spacingChanged"; revision: 1 } + Property { name: "spacing"; revision: 1; type: "double" } + Signal { name: "opened" } + Signal { name: "closed" } + Signal { name: "aboutToShow" } + Signal { name: "aboutToHide" } + Signal { name: "mirroredChanged"; revision: 3 } Signal { name: "paletteChanged"; revision: 3 } Signal { name: "enabledChanged"; revision: 3 } Signal { name: "openedChanged"; revision: 3 } @@ -1418,10 +1528,7 @@ Module { name: "windowChanged" Parameter { name: "window"; type: "QQuickWindow"; isPointer: true } } - Signal { name: "aboutToShow" } - Signal { name: "aboutToHide" } - Signal { name: "opened" } - Signal { name: "closed" } + Signal { name: "spacingChanged"; revision: 1 } Method { name: "open" } Method { name: "close" } Method { @@ -1483,9 +1590,9 @@ Module { Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "live"; revision: 2; type: "bool" } Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "live"; revision: 2; type: "bool" } Signal { name: "liveChanged"; revision: 2 } Method { name: "setValues" @@ -1640,14 +1747,14 @@ Module { Property { name: "visualPosition"; type: "double"; isReadonly: true } Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } - Property { name: "live"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } Property { name: "orientation"; type: "Qt::Orientation" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } - Signal { name: "liveChanged"; revision: 2 } + Property { name: "live"; revision: 2; type: "bool" } Signal { name: "moved"; revision: 2 } + Signal { name: "liveChanged"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -1692,8 +1799,8 @@ Module { name: "QQuickSpinButton" prototype: "QObject" Property { name: "pressed"; type: "bool" } - Property { name: "hovered"; revision: 1; type: "bool" } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + Property { name: "hovered"; revision: 1; type: "bool" } Signal { name: "hoveredChanged"; revision: 1 } } Component { @@ -1802,23 +1909,23 @@ Module { prototype: "QObject" Property { name: "position"; type: "double" } Property { name: "complete"; type: "bool"; isReadonly: true } - Property { name: "enabled"; type: "bool" } Property { name: "left"; type: "QQmlComponent"; isPointer: true } Property { name: "behind"; type: "QQmlComponent"; isPointer: true } Property { name: "right"; type: "QQmlComponent"; isPointer: true } Property { name: "leftItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "behindItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "rightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "enabled"; type: "bool" } Property { name: "transition"; type: "QQuickTransition"; isPointer: true } Signal { name: "completed" } Signal { name: "opened" } Signal { name: "closed" } + Method { name: "close"; revision: 1 } Method { name: "open" revision: 2 Parameter { name: "side"; type: "QQuickSwipeDelegate::Side" } } - Method { name: "close"; revision: 1 } } Component { name: "QQuickSwipeDelegate" @@ -1869,9 +1976,9 @@ Module { prototype: "QObject" Property { name: "index"; type: "int"; isReadonly: true } Property { name: "isCurrentItem"; type: "bool"; isReadonly: true } + Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } Property { name: "isNextItem"; revision: 1; type: "bool"; isReadonly: true } Property { name: "isPreviousItem"; revision: 1; type: "bool"; isReadonly: true } - Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } } Component { name: "QQuickSwitch" @@ -1949,8 +2056,6 @@ Module { Property { name: "palette"; revision: 3; type: "QPalette" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } - Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "pressAndHold" Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } @@ -1965,6 +2070,8 @@ Module { revision: 1 Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } } + Signal { name: "hoveredChanged"; revision: 1 } + Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "paletteChanged"; revision: 3 } } Component { @@ -1992,8 +2099,6 @@ Module { Property { name: "palette"; revision: 3; type: "QPalette" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } - Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "pressAndHold" Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } @@ -2008,6 +2113,8 @@ Module { revision: 1 Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } } + Signal { name: "hoveredChanged"; revision: 1 } + Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "paletteChanged"; revision: 3 } } Component { diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index dbb1e106..4ac5b7e0 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -36,9 +36,11 @@ #include <QtCore/private/qfileselector_p.h> #include <QtQuickControls2/qquickstyle.h> +#include <QtQuickControls2/private/qquickchecklabel_p.h> #include <QtQuickControls2/private/qquickcolor_p.h> #include <QtQuickControls2/private/qquickcolorimage_p.h> #include <QtQuickControls2/private/qquickiconimage_p.h> +#include <QtQuickControls2/private/qquickmnemoniclabel_p.h> #include <QtQuickControls2/private/qquickpaddedrectangle_p.h> #include <QtQuickControls2/private/qquickplaceholdertext_p.h> #include <QtQuickControls2/private/qquickiconlabel_p.h> @@ -193,14 +195,14 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur qmlRegisterType<QQuickTumblerView>(import, 2, 1, "TumblerView"); #endif qmlRegisterSingletonType<QQuickDefaultStyle>(import, 2, 1, "Default", styleSingleton); - qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); - qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); - qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); qmlRegisterType<QQuickColorImage>(import, 2, 3, "ColorImage"); qmlRegisterType<QQuickIconImage>(import, 2, 3, "IconImage"); qmlRegisterSingletonType<QQuickColor>(import, 2, 3, "Color", colorSingleton); qmlRegisterType<QQuickIconLabel>(import, 2, 3, "IconLabel"); + qmlRegisterType<QQuickCheckLabel>(import, 2, 3, "CheckLabel"); + qmlRegisterType<QQuickMnemonicLabel>(import, 2, 3, "MnemonicLabel"); + qmlRegisterRevision<QQuickText, 6>(import, 2, 3); } QString QtQuickControls2Plugin::name() const diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml index d4835d24..e7aa6bbe 100644 --- a/src/imports/controls/universal/ProgressBar.qml +++ b/src/imports/controls/universal/ProgressBar.qml @@ -59,10 +59,7 @@ T.ProgressBar { background: Rectangle { implicitWidth: 100 implicitHeight: 10 - - x: control.leftPadding - y: control.topPadding + (control.availableHeight - height) / 2 - width: control.availableWidth + y: (control.height - height) / 2 height: 10 visible: !control.indeterminate diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index 776c62ee..b951182f 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -41,9 +41,9 @@ Module { Signal { name: "released" } Signal { name: "canceled" } Signal { name: "clicked" } - Signal { name: "toggled"; revision: 2 } Signal { name: "pressAndHold" } Signal { name: "doubleClicked" } + Signal { name: "toggled"; revision: 2 } Signal { name: "iconChanged"; revision: 3 } Signal { name: "displayChanged"; revision: 3 } Signal { name: "actionChanged"; revision: 3 } @@ -107,6 +107,7 @@ Module { } Component { name: "QQuickActionGroup" + defaultProperty: "actions" prototype: "QObject" exports: ["QtQuick.Templates/ActionGroup 2.3"] exportMetaObjectRevisions: [0] @@ -153,7 +154,9 @@ Module { Property { name: "font"; type: "QFont" } Property { name: "locale"; type: "QLocale" } Property { name: "palette"; revision: 3; type: "QPalette" } + Property { name: "menuBar"; revision: 3; type: "QQuickItem"; isPointer: true } Signal { name: "paletteChanged"; revision: 3 } + Signal { name: "menuBarChanged"; revision: 3 } } Component { name: "QQuickApplicationWindowAttached" @@ -164,6 +167,7 @@ Module { Property { name: "header"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } + Property { name: "menuBar"; type: "QQuickItem"; isReadonly: true; isPointer: true } } Component { name: "QQuickBusyIndicator" @@ -196,12 +200,12 @@ Module { Property { name: "checkedButton"; type: "QQuickAbstractButton"; isPointer: true } Property { name: "buttons"; type: "QQuickAbstractButton"; isList: true; isReadonly: true } Property { name: "exclusive"; revision: 3; type: "bool" } - Signal { name: "exclusiveChanged"; revision: 3 } Signal { name: "clicked" revision: 1 Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } } + Signal { name: "exclusiveChanged"; revision: 3 } Method { name: "addButton" Parameter { name: "button"; type: "QQuickAbstractButton"; isPointer: true } @@ -247,31 +251,23 @@ Module { Property { name: "count"; type: "int"; isReadonly: true } Property { name: "model"; type: "QVariant" } Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true } - Property { name: "editable"; revision: 2; type: "bool" } - Property { name: "flat"; revision: 1; type: "bool" } - Property { name: "down"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "highlightedIndex"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } Property { name: "currentText"; type: "string"; isReadonly: true } Property { name: "displayText"; type: "string" } - Property { name: "editText"; revision: 2; type: "string" } Property { name: "textRole"; type: "string" } Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } Property { name: "popup"; type: "QQuickPopup"; isPointer: true } + Property { name: "flat"; revision: 1; type: "bool" } + Property { name: "down"; revision: 2; type: "bool" } + Property { name: "editable"; revision: 2; type: "bool" } + Property { name: "editText"; revision: 2; type: "string" } Property { name: "validator"; revision: 2; type: "QValidator"; isPointer: true } Property { name: "inputMethodHints"; revision: 2; type: "Qt::InputMethodHints" } Property { name: "inputMethodComposing"; revision: 2; type: "bool"; isReadonly: true } Property { name: "acceptableInput"; revision: 2; type: "bool"; isReadonly: true } - Signal { name: "editableChanged"; revision: 2 } - Signal { name: "flatChanged"; revision: 1 } - Signal { name: "downChanged"; revision: 2 } - Signal { name: "editTextChanged"; revision: 2 } - Signal { name: "validatorChanged"; revision: 2 } - Signal { name: "inputMethodHintsChanged"; revision: 2 } - Signal { name: "inputMethodComposingChanged"; revision: 2 } - Signal { name: "acceptableInputChanged"; revision: 2 } Signal { name: "activated" Parameter { name: "index"; type: "int" } @@ -280,7 +276,15 @@ Module { name: "highlighted" Parameter { name: "index"; type: "int" } } + Signal { name: "flatChanged"; revision: 1 } Signal { name: "accepted"; revision: 2 } + Signal { name: "downChanged"; revision: 2 } + Signal { name: "editableChanged"; revision: 2 } + Signal { name: "editTextChanged"; revision: 2 } + Signal { name: "validatorChanged"; revision: 2 } + Signal { name: "inputMethodHintsChanged"; revision: 2 } + Signal { name: "inputMethodComposingChanged"; revision: 2 } + Signal { name: "acceptableInputChanged"; revision: 2 } Method { name: "incrementCurrentIndex" } Method { name: "decrementCurrentIndex" } Method { name: "selectAll"; revision: 2 } @@ -418,10 +422,10 @@ Module { Property { name: "snapMode"; type: "SnapMode" } Property { name: "wrap"; type: "bool" } Property { name: "pressed"; type: "bool"; isReadonly: true } - Property { name: "live"; revision: 2; type: "bool" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } - Signal { name: "liveChanged"; revision: 2 } + Property { name: "live"; revision: 2; type: "bool" } Signal { name: "moved"; revision: 2 } + Signal { name: "liveChanged"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } } @@ -474,7 +478,7 @@ Module { "QtQuick.Templates/DialogButtonBox 2.1", "QtQuick.Templates/DialogButtonBox 2.3" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 3] attachedType: "QQuickDialogButtonBoxAttached" Enum { name: "Position" @@ -565,6 +569,7 @@ Module { prototype: "QQuickPopup" exports: ["QtQuick.Templates/Menu 2.0", "QtQuick.Templates/Menu 2.3"] exportMetaObjectRevisions: [0, 3] + Property { name: "count"; revision: 3; type: "int"; isReadonly: true } Property { name: "contentModel"; type: "QVariant"; isReadonly: true } Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "title"; type: "string" } @@ -572,11 +577,16 @@ Module { Property { name: "overlap"; revision: 3; type: "double" } Property { name: "delegate"; revision: 3; type: "QQmlComponent"; isPointer: true } Property { name: "currentIndex"; revision: 3; type: "int" } + Signal { name: "countChanged"; revision: 3 } Signal { name: "titleChanged" Parameter { name: "title"; type: "string" } } - Signal { name: "cascadeChanged"; revision: 3 } + Signal { + name: "cascadeChanged" + revision: 3 + Parameter { name: "cascade"; type: "bool" } + } Signal { name: "overlapChanged"; revision: 3 } Signal { name: "delegateChanged"; revision: 3 } Signal { name: "currentIndexChanged"; revision: 3 } @@ -610,6 +620,12 @@ Module { Parameter { name: "index"; type: "int" } } Method { + name: "menuAt" + revision: 3 + type: "QQuickMenu*" + Parameter { name: "index"; type: "int" } + } + Method { name: "addMenu" revision: 3 Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } @@ -632,6 +648,12 @@ Module { Parameter { name: "index"; type: "int" } } Method { + name: "actionAt" + revision: 3 + type: "QQuickAction*" + Parameter { name: "index"; type: "int" } + } + Method { name: "addAction" revision: 3 Parameter { name: "action"; type: "QQuickAction"; isPointer: true } @@ -658,6 +680,53 @@ Module { revision: 3 Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true } } + Method { name: "dismiss"; revision: 3 } + } + Component { + name: "QQuickMenuBar" + defaultProperty: "contentData" + prototype: "QQuickContainer" + exports: ["QtQuick.Templates/MenuBar 2.3"] + exportMetaObjectRevisions: [0] + Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Property { name: "menus"; type: "QQuickMenu"; isList: true; isReadonly: true } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Method { + name: "menuAt" + type: "QQuickMenu*" + Parameter { name: "index"; type: "int" } + } + Method { + name: "addMenu" + Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } + } + Method { + name: "insertMenu" + Parameter { name: "index"; type: "int" } + Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } + } + Method { + name: "removeMenu" + Parameter { name: "menu"; type: "QQuickMenu"; isPointer: true } + } + Method { + name: "takeMenu" + type: "QQuickMenu*" + Parameter { name: "index"; type: "int" } + } + } + Component { + name: "QQuickMenuBarItem" + defaultProperty: "data" + prototype: "QQuickAbstractButton" + exports: ["QtQuick.Templates/MenuBarItem 2.3"] + exportMetaObjectRevisions: [0] + Property { name: "menuBar"; type: "QQuickMenuBar"; isReadonly: true; isPointer: true } + Property { name: "menu"; type: "QQuickMenu"; isPointer: true } + Property { name: "highlighted"; type: "bool" } + Signal { name: "triggered" } } Component { name: "QQuickMenuItem" @@ -688,6 +757,19 @@ Module { name: "QQuickOverlay" defaultProperty: "data" prototype: "QQuickItem" + exports: ["QtQuick.Templates/Overlay 2.3"] + isCreatable: false + exportMetaObjectRevisions: [0] + attachedType: "QQuickOverlayAttached" + Property { name: "modal"; type: "QQmlComponent"; isPointer: true } + Property { name: "modeless"; type: "QQmlComponent"; isPointer: true } + Signal { name: "pressed" } + Signal { name: "released" } + } + Component { + name: "QQuickOverlayAttached" + prototype: "QObject" + Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true } Property { name: "modal"; type: "QQmlComponent"; isPointer: true } Property { name: "modeless"; type: "QQmlComponent"; isPointer: true } Signal { name: "pressed" } @@ -702,10 +784,10 @@ Module { Property { name: "title"; type: "string" } Property { name: "header"; type: "QQuickItem"; isPointer: true } Property { name: "footer"; type: "QQuickItem"; isPointer: true } - Property { name: "contentWidth"; revision: 1; type: "double" } - Property { name: "contentHeight"; revision: 1; type: "double" } Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + Property { name: "contentWidth"; revision: 1; type: "double" } + Property { name: "contentHeight"; revision: 1; type: "double" } Signal { name: "contentWidthChanged"; revision: 1 } Signal { name: "contentHeightChanged"; revision: 1 } } @@ -777,7 +859,6 @@ Module { Property { name: "contentHeight"; type: "double" } Property { name: "availableWidth"; type: "double"; isReadonly: true } Property { name: "availableHeight"; type: "double"; isReadonly: true } - Property { name: "spacing"; revision: 1; type: "double" } Property { name: "margins"; type: "double" } Property { name: "topMargin"; type: "double" } Property { name: "leftMargin"; type: "double" } @@ -789,6 +870,7 @@ Module { Property { name: "rightPadding"; type: "double" } Property { name: "bottomPadding"; type: "double" } Property { name: "locale"; type: "QLocale" } + Property { name: "mirrored"; revision: 3; type: "bool"; isReadonly: true } Property { name: "font"; type: "QFont" } Property { name: "palette"; revision: 3; type: "QPalette" } Property { name: "parent"; type: "QQuickItem"; isPointer: true } @@ -810,7 +892,12 @@ Module { Property { name: "transformOrigin"; type: "TransformOrigin" } Property { name: "enter"; type: "QQuickTransition"; isPointer: true } Property { name: "exit"; type: "QQuickTransition"; isPointer: true } - Signal { name: "spacingChanged"; revision: 1 } + Property { name: "spacing"; revision: 1; type: "double" } + Signal { name: "opened" } + Signal { name: "closed" } + Signal { name: "aboutToShow" } + Signal { name: "aboutToHide" } + Signal { name: "mirroredChanged"; revision: 3 } Signal { name: "paletteChanged"; revision: 3 } Signal { name: "enabledChanged"; revision: 3 } Signal { name: "openedChanged"; revision: 3 } @@ -818,10 +905,7 @@ Module { name: "windowChanged" Parameter { name: "window"; type: "QQuickWindow"; isPointer: true } } - Signal { name: "aboutToShow" } - Signal { name: "aboutToHide" } - Signal { name: "opened" } - Signal { name: "closed" } + Signal { name: "spacingChanged"; revision: 1 } Method { name: "open" } Method { name: "close" } Method { @@ -883,9 +967,9 @@ Module { Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } Property { name: "orientation"; type: "Qt::Orientation" } + Property { name: "live"; revision: 2; type: "bool" } Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } - Property { name: "live"; revision: 2; type: "bool" } Signal { name: "liveChanged"; revision: 2 } Method { name: "setValues" @@ -1040,14 +1124,14 @@ Module { Property { name: "visualPosition"; type: "double"; isReadonly: true } Property { name: "stepSize"; type: "double" } Property { name: "snapMode"; type: "SnapMode" } - Property { name: "live"; revision: 2; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "horizontal"; revision: 3; type: "bool"; isReadonly: true } Property { name: "vertical"; revision: 3; type: "bool"; isReadonly: true } Property { name: "orientation"; type: "Qt::Orientation" } Property { name: "handle"; type: "QQuickItem"; isPointer: true } - Signal { name: "liveChanged"; revision: 2 } + Property { name: "live"; revision: 2; type: "bool" } Signal { name: "moved"; revision: 2 } + Signal { name: "liveChanged"; revision: 2 } Method { name: "increase" } Method { name: "decrease" } Method { @@ -1092,8 +1176,8 @@ Module { name: "QQuickSpinButton" prototype: "QObject" Property { name: "pressed"; type: "bool" } - Property { name: "hovered"; revision: 1; type: "bool" } Property { name: "indicator"; type: "QQuickItem"; isPointer: true } + Property { name: "hovered"; revision: 1; type: "bool" } Signal { name: "hoveredChanged"; revision: 1 } } Component { @@ -1202,23 +1286,23 @@ Module { prototype: "QObject" Property { name: "position"; type: "double" } Property { name: "complete"; type: "bool"; isReadonly: true } - Property { name: "enabled"; type: "bool" } Property { name: "left"; type: "QQmlComponent"; isPointer: true } Property { name: "behind"; type: "QQmlComponent"; isPointer: true } Property { name: "right"; type: "QQmlComponent"; isPointer: true } Property { name: "leftItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "behindItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } Property { name: "rightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { name: "enabled"; type: "bool" } Property { name: "transition"; type: "QQuickTransition"; isPointer: true } Signal { name: "completed" } Signal { name: "opened" } Signal { name: "closed" } + Method { name: "close"; revision: 1 } Method { name: "open" revision: 2 Parameter { name: "side"; type: "QQuickSwipeDelegate::Side" } } - Method { name: "close"; revision: 1 } } Component { name: "QQuickSwipeDelegate" @@ -1269,9 +1353,9 @@ Module { prototype: "QObject" Property { name: "index"; type: "int"; isReadonly: true } Property { name: "isCurrentItem"; type: "bool"; isReadonly: true } + Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } Property { name: "isNextItem"; revision: 1; type: "bool"; isReadonly: true } Property { name: "isPreviousItem"; revision: 1; type: "bool"; isReadonly: true } - Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true } } Component { name: "QQuickSwitch" @@ -1349,8 +1433,6 @@ Module { Property { name: "palette"; revision: 3; type: "QPalette" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } - Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "pressAndHold" Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } @@ -1365,6 +1447,8 @@ Module { revision: 1 Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } } + Signal { name: "hoveredChanged"; revision: 1 } + Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "paletteChanged"; revision: 3 } } Component { @@ -1392,8 +1476,6 @@ Module { Property { name: "palette"; revision: 3; type: "QPalette" } Signal { name: "implicitWidthChanged3" } Signal { name: "implicitHeightChanged3" } - Signal { name: "hoveredChanged"; revision: 1 } - Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "pressAndHold" Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } @@ -1408,6 +1490,8 @@ Module { revision: 1 Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true } } + Signal { name: "hoveredChanged"; revision: 1 } + Signal { name: "hoverEnabledChanged"; revision: 1 } Signal { name: "paletteChanged"; revision: 3 } } Component { diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index ffe2d50a..f5d1118f 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -299,7 +299,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickControl, 3>(uri, 2, 3, "Control"); qmlRegisterType<QQuickContainer, 3>(uri, 2, 3, "Container"); qmlRegisterType<QQuickDialog, 3>(uri, 2, 3, "Dialog"); - qmlRegisterType<QQuickDialogButtonBox>(uri, 2, 3, "DialogButtonBox"); + qmlRegisterType<QQuickDialogButtonBox, 3>(uri, 2, 3, "DialogButtonBox"); qRegisterMetaType<QQuickIcon>(); qmlRegisterType<QQuickMenu, 3>(uri, 2, 3, "Menu"); qmlRegisterType<QQuickMenuBar>(uri, 2, 3, "MenuBar"); diff --git a/src/imports/controls/RadioIndicator.qml b/src/quickcontrols2/qquickchecklabel.cpp index f5da9792..dccbf77f 100644 --- a/src/imports/controls/RadioIndicator.qml +++ b/src/quickcontrols2/qquickchecklabel.cpp @@ -34,28 +34,16 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.impl 2.4 +#include "qquickchecklabel_p.h" -Rectangle { - implicitWidth: 28 - implicitHeight: 28 +QT_BEGIN_NAMESPACE - radius: width / 2 - color: control.down ? control.palette.light : control.palette.base - border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.palette.mid - - property Item control - - Rectangle { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - width: 20 - height: 20 - radius: width / 2 - color: control.palette.text - visible: control.checked - } +QQuickCheckLabel::QQuickCheckLabel(QQuickItem *parent) : + QQuickText(parent) +{ + setHAlign(AlignLeft); + setVAlign(AlignVCenter); + setElideMode(ElideRight); } + +QT_END_NAMESPACE diff --git a/src/imports/controls/CheckIndicator.qml b/src/quickcontrols2/qquickchecklabel_p.h index d79fa55f..100ef48f 100644 --- a/src/imports/controls/CheckIndicator.qml +++ b/src/quickcontrols2/qquickchecklabel_p.h @@ -34,37 +34,35 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.impl 2.4 +#ifndef QQUICKCHECKLABEL_P_H +#define QQUICKCHECKLABEL_P_H -Rectangle { - id: indicator +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// - property Item control +#include <QtQuick/private/qquicktext_p.h> +#include <QtQuickControls2/private/qtquickcontrols2global_p.h> - implicitWidth: 28 - implicitHeight: 28 +QT_BEGIN_NAMESPACE - color: control.down ? control.palette.light : control.palette.base - border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.palette.mid +class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickCheckLabel : public QQuickText +{ + Q_OBJECT - ColorImage { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - defaultColor: "#353637" - color: control.palette.text - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" - visible: control.checkState === Qt.Checked - } +public: + explicit QQuickCheckLabel(QQuickItem *parent = nullptr); +}; - Rectangle { - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - width: 16 - height: 3 - color: control.palette.text - visible: control.checkState === Qt.PartiallyChecked - } -} +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QQuickCheckLabel) + +#endif // QQUICKCHECKLABEL_P_H diff --git a/src/quickcontrols2/qquickiconimage.cpp b/src/quickcontrols2/qquickiconimage.cpp index c628c7ae..885bc7f9 100644 --- a/src/quickcontrols2/qquickiconimage.cpp +++ b/src/quickcontrols2/qquickiconimage.cpp @@ -125,9 +125,7 @@ qreal QQuickIconImagePrivate::calculateDevicePixelRatio() const QQuickIconImage::QQuickIconImage(QQuickItem *parent) : QQuickImage(*(new QQuickIconImagePrivate), parent) { - Q_D(QQuickIconImage); setFillMode(Pad); - QObjectPrivate::connect(this, &QQuickImageBase::sourceSizeChanged, d, &QQuickIconImagePrivate::updateIcon); } QString QQuickIconImage::name() const @@ -183,6 +181,7 @@ void QQuickIconImage::componentComplete() Q_D(QQuickIconImage); QQuickImage::componentComplete(); d->updateIcon(); + QObjectPrivate::connect(this, &QQuickImageBase::sourceSizeChanged, d, &QQuickIconImagePrivate::updateIcon); } void QQuickIconImage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) diff --git a/src/quickcontrols2/qquickiconlabel.cpp b/src/quickcontrols2/qquickiconlabel.cpp index 06d74d43..266d30d7 100644 --- a/src/quickcontrols2/qquickiconlabel.cpp +++ b/src/quickcontrols2/qquickiconlabel.cpp @@ -37,6 +37,7 @@ #include "qquickiconlabel_p.h" #include "qquickiconlabel_p_p.h" #include "qquickiconimage_p.h" +#include "qquickmnemoniclabel_p.h" #include <QtGui/private/qguiapplication_p.h> #include <QtQuick/private/qquickitem_p.h> @@ -147,7 +148,7 @@ bool QQuickIconLabelPrivate::createLabel() if (label) return false; - label = new QQuickText(q); + label = new QQuickMnemonicLabel(q); watchChanges(label); beginClass(label); label->setObjectName(QStringLiteral("label")); diff --git a/src/quickcontrols2/qquickiconlabel_p_p.h b/src/quickcontrols2/qquickiconlabel_p_p.h index 5762187c..f0f4df4c 100644 --- a/src/quickcontrols2/qquickiconlabel_p_p.h +++ b/src/quickcontrols2/qquickiconlabel_p_p.h @@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE -class QQuickText; class QQuickIconImage; +class QQuickMnemonicLabel; class QQuickIconLabelPrivate : public QQuickItemPrivate, public QQuickItemChangeListener { @@ -105,7 +105,7 @@ public: QString text; QQuickIcon icon; QQuickIconImage *image; - QQuickText *label; + QQuickMnemonicLabel *label; }; QT_END_NAMESPACE diff --git a/src/quickcontrols2/qquickmnemoniclabel.cpp b/src/quickcontrols2/qquickmnemoniclabel.cpp new file mode 100644 index 00000000..9c8e9ab1 --- /dev/null +++ b/src/quickcontrols2/qquickmnemoniclabel.cpp @@ -0,0 +1,133 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qquickmnemoniclabel_p.h" + +#include <QtQuick/private/qquicktext_p_p.h> + +QT_BEGIN_NAMESPACE + +QQuickMnemonicLabel::QQuickMnemonicLabel(QQuickItem *parent) + : QQuickText(parent), + m_mnemonicVisible(true) +{ +} + +QString QQuickMnemonicLabel::text() const +{ + return m_fullText; +} + +void QQuickMnemonicLabel::setText(const QString &text) +{ + if (m_fullText == text) + return; + + m_fullText = text; + updateMnemonic(); +} + +bool QQuickMnemonicLabel::isMnemonicVisible() const +{ + return m_mnemonicVisible; +} + +void QQuickMnemonicLabel::setMnemonicVisible(bool visible) +{ + if (m_mnemonicVisible == visible) + return; + + m_mnemonicVisible = visible; + updateMnemonic(); + + if (isComponentComplete()) + forceLayout(); +} + +static QTextLayout::FormatRange underlineRange(int start, int length = 1) +{ + QTextLayout::FormatRange range; + range.start = start; + range.length = length; + range.format.setFontUnderline(true); + return range; +} + +// based on QPlatformTheme::removeMnemonics() +void QQuickMnemonicLabel::updateMnemonic() +{ + QString text(m_fullText.size(), 0); + int idx = 0; + int pos = 0; + int len = m_fullText.length(); + QVector<QTextLayout::FormatRange> formats; + while (len) { + if (m_fullText.at(pos) == QLatin1Char('&') && (len == 1 || m_fullText.at(pos + 1) != QLatin1Char('&'))) { + if (m_mnemonicVisible && (pos == 0 || m_fullText.at(pos - 1) != QLatin1Char('&'))) + formats += underlineRange(pos); + ++pos; + --len; + if (len == 0) + break; + } else if (m_fullText.at(pos) == QLatin1Char('(') && len >= 4 && + m_fullText.at(pos + 1) == QLatin1Char('&') && + m_fullText.at(pos + 2) != QLatin1Char('&') && + m_fullText.at(pos + 3) == QLatin1Char(')')) { + // a mnemonic with format "\s*(&X)" + if (m_mnemonicVisible) { + formats += underlineRange(pos + 1); + } else { + int n = 0; + while (idx > n && text.at(idx - n - 1).isSpace()) + ++n; + idx -= n; + pos += 4; + len -= 4; + continue; + } + } + text[idx] = m_fullText.at(pos); + ++pos; + ++idx; + --len; + } + text.truncate(idx); + + QQuickTextPrivate::get(this)->layout.setFormats(formats); + QQuickText::setText(text); +} + +QT_END_NAMESPACE diff --git a/src/imports/controls/SwitchIndicator.qml b/src/quickcontrols2/qquickmnemoniclabel_p.h index 6b38709f..33bc1e08 100644 --- a/src/imports/controls/SwitchIndicator.qml +++ b/src/quickcontrols2/qquickmnemoniclabel_p.h @@ -34,37 +34,49 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.impl 2.4 +#ifndef QQUICKMNEMONICLABEL_P_H +#define QQUICKMNEMONICLABEL_P_H -Item { - implicitWidth: 56 - implicitHeight: 28 +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// - property Item control +#include <QtQuick/private/qquicktext_p.h> +#include <QtQuickControls2/private/qtquickcontrols2global_p.h> - Rectangle { - y: parent.height / 2 - height / 2 - width: 56 - height: 16 - radius: 8 - color: control.checked ? control.palette.dark : control.palette.midlight - } +QT_BEGIN_NAMESPACE - Rectangle { - x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2))) - y: (parent.height - height) / 2 - width: 28 - height: 28 - radius: 16 - color: control.down ? control.palette.light : control.palette.window - border.width: control.visualFocus ? 2 : 1 - border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight +class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickMnemonicLabel : public QQuickText +{ + Q_OBJECT + Q_PROPERTY(QString text READ text WRITE setText FINAL) + Q_PROPERTY(bool mnemonicVisible READ isMnemonicVisible WRITE setMnemonicVisible FINAL) - Behavior on x { - enabled: !control.down - SmoothedAnimation { velocity: 200 } - } - } -} +public: + explicit QQuickMnemonicLabel(QQuickItem *parent = nullptr); + + QString text() const; + void setText(const QString &text); + + bool isMnemonicVisible() const; + void setMnemonicVisible(bool visible); + +private: + void updateMnemonic(); + + bool m_mnemonicVisible; + QString m_fullText; +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QQuickMnemonicLabel) + +#endif // QQUICKMNEMONICLABEL_P_H diff --git a/src/quickcontrols2/quickcontrols2.pri b/src/quickcontrols2/quickcontrols2.pri index 31b8e66f..6537a599 100644 --- a/src/quickcontrols2/quickcontrols2.pri +++ b/src/quickcontrols2/quickcontrols2.pri @@ -1,12 +1,14 @@ HEADERS += \ $$PWD/qquickanimatednode_p.h \ $$PWD/qquickattachedobject_p.h \ + $$PWD/qquickchecklabel_p.h \ $$PWD/qquickcolor_p.h \ $$PWD/qquickcolorimage_p.h \ $$PWD/qquickiconimage_p.h \ $$PWD/qquickiconimage_p_p.h \ $$PWD/qquickiconlabel_p.h \ $$PWD/qquickiconlabel_p_p.h \ + $$PWD/qquickmnemoniclabel_p.h \ $$PWD/qquickpaddedrectangle_p.h \ $$PWD/qquickplaceholdertext_p.h \ $$PWD/qquickproxytheme_p.h \ @@ -20,10 +22,12 @@ HEADERS += \ SOURCES += \ $$PWD/qquickanimatednode.cpp \ $$PWD/qquickattachedobject.cpp \ + $$PWD/qquickchecklabel.cpp \ $$PWD/qquickcolor.cpp \ $$PWD/qquickcolorimage.cpp \ $$PWD/qquickiconimage.cpp \ $$PWD/qquickiconlabel.cpp \ + $$PWD/qquickmnemoniclabel.cpp \ $$PWD/qquickpaddedrectangle.cpp \ $$PWD/qquickplaceholdertext.cpp \ $$PWD/qquickproxytheme.cpp \ diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index e5a563f9..9e1a2502 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -68,56 +68,6 @@ static const int AUTO_REPEAT_INTERVAL = 100; radio buttons and check boxes. As an abstract control, it has no delegate implementations, leaving them to the types that derive from it. - \section2 Button Icons - - AbstractButton provides the following properties through which icons can - be set: - - \list - \li \l icon.name - \li \l icon.source - \li \l icon.width - \li \l icon.height - \li \l icon.color - \endlist - - For applications that target platforms that support both - \l {QIcon::fromTheme()}{theme icons} and regular icons, - both \l icon.name and \l icon.source can be set to ensure that an icon will - always be found. If the icon is found in the theme, it will always be used; - even if \l icon.source is also set. If the icon is not found, - \l icon.source will be used instead. - - \code - Button { - icon.name: "edit-cut" - icon.source: "qrc:/icons/edit-cut.png" - } - \endcode - - Each \l {Styling Qt Quick Controls 2}{style} sets a default icon size and - color according to their guidelines, but it is possible to override these - by setting the \l icon.width, \l icon.height, and \l icon.color properties. - - The image that is loaded by an icon whose \c width and \c height are not set - depends on the type of icon in use. For theme icons, the closest available - size will be chosen. For regular icons, the behavior is the same as the - \l {Image::}{sourceSize} property of \l Image. - - The icon color is specified by default so that it matches the text color in - different states. In order to use an icon with the original colors, set the - color to \c "transparent". - - \code - Button { - icon.color: "transparent" - icon.source: "qrc:/icons/logo.png" - } - \endcode - - The \l display property can be used to control how the icon and text are - displayed within the button. - \sa ButtonGroup, {Button Controls} */ @@ -463,7 +413,7 @@ QQuickAbstractButton::~QQuickAbstractButton() \note The text is used for accessibility purposes, so it makes sense to set a textual description even if the content item is an image. - \sa {Control::contentItem}{contentItem} + \sa icon, display, {Control::contentItem}{contentItem} */ QString QQuickAbstractButton::text() const { @@ -481,7 +431,7 @@ void QQuickAbstractButton::setText(const QString &text) setShortcut(QKeySequence::mnemonic(text)); #endif - d->text = QPlatformTheme::removeMnemonics(text); // ### TODO: visualize mnemonics + d->text = text; setAccessibleName(d->text); buttonChange(ButtonTextChange); emit textChanged(); @@ -719,7 +669,7 @@ void QQuickAbstractButton::setIndicator(QQuickItem *indicator) \include qquickicon.qdocinc grouped-properties - \sa {Button Icons} + \sa text, display, {Icons in Qt Quick Controls 2} */ QQuickIcon QQuickAbstractButton::icon() const diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h index ccaf6d19..81caed5a 100644 --- a/src/quicktemplates2/qquickabstractbutton_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p.h @@ -67,6 +67,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButton : public QQuickContr Q_PROPERTY(bool autoExclusive READ autoExclusive WRITE setAutoExclusive NOTIFY autoExclusiveChanged FINAL) Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL) Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 3) Q_PROPERTY(Display display READ display WRITE setDisplay NOTIFY displayChanged FINAL REVISION 3) Q_PROPERTY(QQuickAction *action READ action WRITE setAction NOTIFY actionChanged FINAL REVISION 3) @@ -104,6 +105,7 @@ public: QQuickItem *indicator() const; void setIndicator(QQuickItem *indicator); + // 2.3 (Qt 5.10) QQuickIcon icon() const; void setIcon(const QQuickIcon &icon); @@ -143,7 +145,6 @@ Q_SIGNALS: void released(); void canceled(); void clicked(); - Q_REVISION(2) void toggled(); void pressAndHold(); void doubleClicked(); void textChanged(); @@ -154,6 +155,9 @@ Q_SIGNALS: void autoExclusiveChanged(); void autoRepeatChanged(); void indicatorChanged(); + // 2.2 (Qt 5.9) + Q_REVISION(2) void toggled(); + // 2.3 (Qt 5.10) Q_REVISION(3) void iconChanged(); Q_REVISION(3) void displayChanged(); Q_REVISION(3) void actionChanged(); diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 2ef84a17..d579afb2 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -349,6 +349,11 @@ QQuickApplicationWindow::~QQuickApplicationWindow() d_ptr.reset(); // QTBUG-52731 } +QQuickApplicationWindowAttached *QQuickApplicationWindow::qmlAttachedProperties(QObject *object) +{ + return new QQuickApplicationWindowAttached(object); +} + /*! \qmlproperty Item QtQuick.Controls::ApplicationWindow::background @@ -718,7 +723,7 @@ void QQuickApplicationWindow::resetLocale() property on the window's palette, that property propagates to all child controls in the window, overriding any system defaults for that property. - \sa Control::palette + \sa Control::palette, Popup::palette, {qtquickcontrols2-palette}{palette QML Basic Type} */ QPalette QQuickApplicationWindow::palette() const { @@ -788,11 +793,6 @@ void QQuickApplicationWindow::setMenuBar(QQuickItem *menuBar) emit menuBarChanged(); } -QQuickApplicationWindowAttached *QQuickApplicationWindow::qmlAttachedProperties(QObject *object) -{ - return new QQuickApplicationWindowAttached(object); -} - bool QQuickApplicationWindow::isComponentComplete() const { Q_D(const QQuickApplicationWindow); diff --git a/src/quicktemplates2/qquickapplicationwindow_p.h b/src/quicktemplates2/qquickapplicationwindow_p.h index ceab70e6..4e24009f 100644 --- a/src/quicktemplates2/qquickapplicationwindow_p.h +++ b/src/quicktemplates2/qquickapplicationwindow_p.h @@ -73,6 +73,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindow : public QQuickWi Q_PROPERTY(QQuickOverlay *overlay READ overlay CONSTANT FINAL) Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL) Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) Q_PROPERTY(QQuickItem *menuBar READ menuBar WRITE setMenuBar NOTIFY menuBarChanged FINAL REVISION 3) Q_CLASSINFO("DefaultProperty", "contentData") @@ -81,6 +82,8 @@ public: explicit QQuickApplicationWindow(QWindow *parent = nullptr); ~QQuickApplicationWindow(); + static QQuickApplicationWindowAttached *qmlAttachedProperties(QObject *object); + QQuickItem *background() const; void setBackground(QQuickItem *background); @@ -105,6 +108,7 @@ public: void setLocale(const QLocale &locale); void resetLocale(); + // 2.3 (Qt 5.10) QPalette palette() const; void setPalette(const QPalette &palette); void resetPalette(); @@ -112,8 +116,6 @@ public: QQuickItem *menuBar() const; void setMenuBar(QQuickItem *menuBar); - static QQuickApplicationWindowAttached *qmlAttachedProperties(QObject *object); - Q_SIGNALS: void backgroundChanged(); void activeFocusControlChanged(); @@ -146,7 +148,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindowAttached : public Q_PROPERTY(QQuickItem *header READ header NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer NOTIFY footerChanged FINAL) Q_PROPERTY(QQuickOverlay *overlay READ overlay NOTIFY overlayChanged FINAL) - Q_PROPERTY(QQuickItem *menuBar READ menuBar NOTIFY menuBarChanged FINAL /*REVISION 3*/) + Q_PROPERTY(QQuickItem *menuBar READ menuBar NOTIFY menuBarChanged FINAL) // REVISION 3 public: explicit QQuickApplicationWindowAttached(QObject *parent = nullptr); @@ -166,6 +168,7 @@ Q_SIGNALS: void headerChanged(); void footerChanged(); void overlayChanged(); + // 2.3 (Qt 5.10) /*Q_REVISION(3)*/ void menuBarChanged(); private: diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp index adbc48fd..a1bea792 100644 --- a/src/quicktemplates2/qquickbutton.cpp +++ b/src/quicktemplates2/qquickbutton.cpp @@ -57,6 +57,10 @@ QT_BEGIN_NAMESPACE a question. Typical buttons are \e OK, \e Apply, \e Cancel, \e Close, \e Yes, \e No, and \e Help. + Button inherits its API from AbstractButton. For instance, you can set + \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon}, + and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API. + A button emits the signal \l {AbstractButton::}{clicked()} when it is activated by the user. Connect to this signal to perform the button's action. Buttons also provide the signals \l {AbstractButton::}{canceled()}, \l {AbstractButton::}{doubleClicked()}, \l {AbstractButton::}{pressed()}, @@ -77,9 +81,6 @@ QT_BEGIN_NAMESPACE } \endcode - In addition to displaying \l {AbstractButton::}{text}, buttons can also - display an \l [QML]{Button Icons}{icon}. - \sa {Customizing Button}, {Button Controls} */ diff --git a/src/quicktemplates2/qquickbuttongroup_p.h b/src/quicktemplates2/qquickbuttongroup_p.h index d2cbb8c2..30a09a62 100644 --- a/src/quicktemplates2/qquickbuttongroup_p.h +++ b/src/quicktemplates2/qquickbuttongroup_p.h @@ -65,6 +65,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButtonGroup : public QObject, publi Q_OBJECT Q_PROPERTY(QQuickAbstractButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged FINAL) Q_PROPERTY(QQmlListProperty<QQuickAbstractButton> buttons READ buttons NOTIFY buttonsChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(bool exclusive READ isExclusive WRITE setExclusive NOTIFY exclusiveChanged FINAL REVISION 3) Q_PROPERTY(Qt::CheckState checkState READ checkState WRITE setCheckState NOTIFY checkStateChanged FINAL REVISION 4) Q_INTERFACES(QQmlParserStatus) @@ -93,9 +94,11 @@ public Q_SLOTS: Q_SIGNALS: void checkedButtonChanged(); void buttonsChanged(); + // 2.1 (Qt 5.8) + Q_REVISION(1) void clicked(QQuickAbstractButton *button); + // 2.3 (Qt 5.10) Q_REVISION(3) void exclusiveChanged(); Q_REVISION(4) void checkStateChanged(); - Q_REVISION(1) void clicked(QQuickAbstractButton *button); protected: void classBegin() override; diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 48d75f88..6b20e6a5 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -792,124 +792,6 @@ QQmlInstanceModel *QQuickComboBox::delegateModel() const return d->delegateModel; } -/*! - \since QtQuick.Controls 2.2 (Qt 5.9) - \qmlproperty bool QtQuick.Controls::ComboBox::editable - - This property holds whether the combo box is editable. - - The default value is \c false. - - \sa validator -*/ -bool QQuickComboBox::isEditable() const -{ - Q_D(const QQuickComboBox); - return d->extra.isAllocated() && d->extra->editable; -} - -void QQuickComboBox::setEditable(bool editable) -{ - Q_D(QQuickComboBox); - if (editable == isEditable()) - return; - - if (d->contentItem) { - if (editable) { - d->contentItem->installEventFilter(this); - if (QQuickTextInput *input = qobject_cast<QQuickTextInput *>(d->contentItem)) { - QObjectPrivate::connect(input, &QQuickTextInput::textChanged, d, &QQuickComboBoxPrivate::updateEditText); - QObjectPrivate::connect(input, &QQuickTextInput::accepted, d, &QQuickComboBoxPrivate::acceptInput); - } -#if QT_CONFIG(cursor) - d->contentItem->setCursor(Qt::IBeamCursor); -#endif - } else { - d->contentItem->removeEventFilter(this); - if (QQuickTextInput *input = qobject_cast<QQuickTextInput *>(d->contentItem)) { - QObjectPrivate::disconnect(input, &QQuickTextInput::textChanged, d, &QQuickComboBoxPrivate::updateEditText); - QObjectPrivate::disconnect(input, &QQuickTextInput::accepted, d, &QQuickComboBoxPrivate::acceptInput); - } -#if QT_CONFIG(cursor) - d->contentItem->unsetCursor(); -#endif - } - } - - d->extra.value().editable = editable; - setAccessibleProperty("editable", editable); - emit editableChanged(); -} - -/*! - \since QtQuick.Controls 2.1 (Qt 5.8) - \qmlproperty bool QtQuick.Controls::ComboBox::flat - - This property holds whether the combo box button is flat. - - A flat combo box button does not draw a background unless it is interacted - with. In comparison to normal combo boxes, flat combo boxes provide looks - that make them stand out less from the rest of the UI. For instance, when - placing a combo box into a tool bar, it may be desirable to make the combo - box flat so it matches better with the flat looks of tool buttons. - - The default value is \c false. -*/ -bool QQuickComboBox::isFlat() const -{ - Q_D(const QQuickComboBox); - return d->flat; -} - -void QQuickComboBox::setFlat(bool flat) -{ - Q_D(QQuickComboBox); - if (d->flat == flat) - return; - - d->flat = flat; - emit flatChanged(); -} - -/*! - \since QtQuick.Controls 2.2 (Qt 5.9) - \qmlproperty bool QtQuick.Controls::ComboBox::down - - This property holds whether the combo box button is visually down. - - Unless explicitly set, this property is \c true when either \c pressed - or \c popup.visible is \c true. To return to the default value, set this - property to \c undefined. - - \sa pressed, popup -*/ -bool QQuickComboBox::isDown() const -{ - Q_D(const QQuickComboBox); - return d->down; -} - -void QQuickComboBox::setDown(bool down) -{ - Q_D(QQuickComboBox); - d->hasDown = true; - - if (d->down == down) - return; - - d->down = down; - emit downChanged(); -} - -void QQuickComboBox::resetDown() -{ - Q_D(QQuickComboBox); - if (!d->hasDown) - return; - - setDown(d->pressed || d->isPopupVisible()); - d->hasDown = false; -} /*! \qmlproperty bool QtQuick.Controls::ComboBox::pressed @@ -1039,34 +921,6 @@ void QQuickComboBox::resetDisplayText() d->updateCurrentText(); } -/*! - \since QtQuick.Controls 2.2 (Qt 5.9) - \qmlproperty string QtQuick.Controls::ComboBox::editText - - This property holds the text in the text field of an editable combo box. - - \sa editable -*/ -QString QQuickComboBox::editText() const -{ - Q_D(const QQuickComboBox); - return d->extra.isAllocated() ? d->extra->editText : QString(); -} - -void QQuickComboBox::setEditText(const QString &text) -{ - Q_D(QQuickComboBox); - if (text == editText()) - return; - - d->extra.value().editText = text; - emit editTextChanged(); -} - -void QQuickComboBox::resetEditText() -{ - setEditText(QString()); -} /*! \qmlproperty string QtQuick.Controls::ComboBox::textRole @@ -1209,6 +1063,154 @@ void QQuickComboBox::setPopup(QQuickPopup *popup) } /*! + \since QtQuick.Controls 2.1 (Qt 5.8) + \qmlproperty bool QtQuick.Controls::ComboBox::flat + + This property holds whether the combo box button is flat. + + A flat combo box button does not draw a background unless it is interacted + with. In comparison to normal combo boxes, flat combo boxes provide looks + that make them stand out less from the rest of the UI. For instance, when + placing a combo box into a tool bar, it may be desirable to make the combo + box flat so it matches better with the flat looks of tool buttons. + + The default value is \c false. +*/ +bool QQuickComboBox::isFlat() const +{ + Q_D(const QQuickComboBox); + return d->flat; +} + +void QQuickComboBox::setFlat(bool flat) +{ + Q_D(QQuickComboBox); + if (d->flat == flat) + return; + + d->flat = flat; + emit flatChanged(); +} + +/*! + \since QtQuick.Controls 2.2 (Qt 5.9) + \qmlproperty bool QtQuick.Controls::ComboBox::down + + This property holds whether the combo box button is visually down. + + Unless explicitly set, this property is \c true when either \c pressed + or \c popup.visible is \c true. To return to the default value, set this + property to \c undefined. + + \sa pressed, popup +*/ +bool QQuickComboBox::isDown() const +{ + Q_D(const QQuickComboBox); + return d->down; +} + +void QQuickComboBox::setDown(bool down) +{ + Q_D(QQuickComboBox); + d->hasDown = true; + + if (d->down == down) + return; + + d->down = down; + emit downChanged(); +} + +void QQuickComboBox::resetDown() +{ + Q_D(QQuickComboBox); + if (!d->hasDown) + return; + + setDown(d->pressed || d->isPopupVisible()); + d->hasDown = false; +} + +/*! + \since QtQuick.Controls 2.2 (Qt 5.9) + \qmlproperty bool QtQuick.Controls::ComboBox::editable + + This property holds whether the combo box is editable. + + The default value is \c false. + + \sa validator +*/ +bool QQuickComboBox::isEditable() const +{ + Q_D(const QQuickComboBox); + return d->extra.isAllocated() && d->extra->editable; +} + +void QQuickComboBox::setEditable(bool editable) +{ + Q_D(QQuickComboBox); + if (editable == isEditable()) + return; + + if (d->contentItem) { + if (editable) { + d->contentItem->installEventFilter(this); + if (QQuickTextInput *input = qobject_cast<QQuickTextInput *>(d->contentItem)) { + QObjectPrivate::connect(input, &QQuickTextInput::textChanged, d, &QQuickComboBoxPrivate::updateEditText); + QObjectPrivate::connect(input, &QQuickTextInput::accepted, d, &QQuickComboBoxPrivate::acceptInput); + } +#if QT_CONFIG(cursor) + d->contentItem->setCursor(Qt::IBeamCursor); +#endif + } else { + d->contentItem->removeEventFilter(this); + if (QQuickTextInput *input = qobject_cast<QQuickTextInput *>(d->contentItem)) { + QObjectPrivate::disconnect(input, &QQuickTextInput::textChanged, d, &QQuickComboBoxPrivate::updateEditText); + QObjectPrivate::disconnect(input, &QQuickTextInput::accepted, d, &QQuickComboBoxPrivate::acceptInput); + } +#if QT_CONFIG(cursor) + d->contentItem->unsetCursor(); +#endif + } + } + + d->extra.value().editable = editable; + setAccessibleProperty("editable", editable); + emit editableChanged(); +} + +/*! + \since QtQuick.Controls 2.2 (Qt 5.9) + \qmlproperty string QtQuick.Controls::ComboBox::editText + + This property holds the text in the text field of an editable combo box. + + \sa editable +*/ +QString QQuickComboBox::editText() const +{ + Q_D(const QQuickComboBox); + return d->extra.isAllocated() ? d->extra->editText : QString(); +} + +void QQuickComboBox::setEditText(const QString &text) +{ + Q_D(QQuickComboBox); + if (text == editText()) + return; + + d->extra.value().editText = text; + emit editTextChanged(); +} + +void QQuickComboBox::resetEditText() +{ + setEditText(QString()); +} + +/*! \since QtQuick.Controls 2.2 (Qt 5.9) \qmlproperty Validator QtQuick.Controls::ComboBox::validator diff --git a/src/quicktemplates2/qquickcombobox_p.h b/src/quicktemplates2/qquickcombobox_p.h index ce9ff17e..dd1e1d4f 100644 --- a/src/quicktemplates2/qquickcombobox_p.h +++ b/src/quicktemplates2/qquickcombobox_p.h @@ -63,19 +63,21 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickComboBox : public QQuickControl Q_PROPERTY(int count READ count NOTIFY countChanged FINAL) Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged FINAL) Q_PROPERTY(QQmlInstanceModel *delegateModel READ delegateModel NOTIFY delegateModelChanged FINAL) - Q_PROPERTY(bool editable READ isEditable WRITE setEditable NOTIFY editableChanged FINAL REVISION 2) - Q_PROPERTY(bool flat READ isFlat WRITE setFlat NOTIFY flatChanged FINAL REVISION 1) - Q_PROPERTY(bool down READ isDown WRITE setDown RESET resetDown NOTIFY downChanged FINAL REVISION 2) Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL) // ### Qt 6: should not be writable Q_PROPERTY(int highlightedIndex READ highlightedIndex NOTIFY highlightedIndexChanged FINAL) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL) Q_PROPERTY(QString currentText READ currentText NOTIFY currentTextChanged FINAL) Q_PROPERTY(QString displayText READ displayText WRITE setDisplayText RESET resetDisplayText NOTIFY displayTextChanged FINAL) - Q_PROPERTY(QString editText READ editText WRITE setEditText RESET resetEditText NOTIFY editTextChanged FINAL REVISION 2) Q_PROPERTY(QString textRole READ textRole WRITE setTextRole NOTIFY textRoleChanged FINAL) Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL) Q_PROPERTY(QQuickPopup *popup READ popup WRITE setPopup NOTIFY popupChanged FINAL) + // 2.1 (Qt 5.8) + Q_PROPERTY(bool flat READ isFlat WRITE setFlat NOTIFY flatChanged FINAL REVISION 1) + // 2.2 (Qt 5.9) + Q_PROPERTY(bool down READ isDown WRITE setDown RESET resetDown NOTIFY downChanged FINAL REVISION 2) + Q_PROPERTY(bool editable READ isEditable WRITE setEditable NOTIFY editableChanged FINAL REVISION 2) + Q_PROPERTY(QString editText READ editText WRITE setEditText RESET resetEditText NOTIFY editTextChanged FINAL REVISION 2) Q_PROPERTY(QValidator *validator READ validator WRITE setValidator NOTIFY validatorChanged FINAL REVISION 2) Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints NOTIFY inputMethodHintsChanged FINAL REVISION 2) Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged FINAL REVISION 2) @@ -91,16 +93,6 @@ public: void setModel(const QVariant &model); QQmlInstanceModel *delegateModel() const; - bool isEditable() const; - void setEditable(bool editable); - - bool isFlat() const; - void setFlat(bool flat); - - bool isDown() const; - void setDown(bool down); - void resetDown(); - bool isPressed() const; void setPressed(bool pressed); @@ -115,10 +107,6 @@ public: void setDisplayText(const QString &text); void resetDisplayText(); - QString editText() const; - void setEditText(const QString &text); - void resetEditText(); - QString textRole() const; void setTextRole(const QString &role); @@ -131,6 +119,25 @@ public: QQuickPopup *popup() const; void setPopup(QQuickPopup *popup); + Q_INVOKABLE QString textAt(int index) const; + Q_INVOKABLE int find(const QString &text, Qt::MatchFlags flags = Qt::MatchExactly) const; + + // 2.1 (Qt 5.8) + bool isFlat() const; + void setFlat(bool flat); + + // 2.2 (Qt 5.9) + bool isDown() const; + void setDown(bool down); + void resetDown(); + + bool isEditable() const; + void setEditable(bool editable); + + QString editText() const; + void setEditText(const QString &text); + void resetEditText(); + QValidator *validator() const; void setValidator(QValidator *validator); @@ -140,40 +147,38 @@ public: bool isInputMethodComposing() const; bool hasAcceptableInput() const; - Q_INVOKABLE QString textAt(int index) const; - Q_INVOKABLE int find(const QString &text, Qt::MatchFlags flags = Qt::MatchExactly) const; - public Q_SLOTS: void incrementCurrentIndex(); void decrementCurrentIndex(); Q_REVISION(2) void selectAll(); Q_SIGNALS: + void activated(int index); + void highlighted(int index); void countChanged(); void modelChanged(); void delegateModelChanged(); - Q_REVISION(2) void editableChanged(); - Q_REVISION(1) void flatChanged(); - Q_REVISION(2) void downChanged(); void pressedChanged(); void highlightedIndexChanged(); void currentIndexChanged(); void currentTextChanged(); void displayTextChanged(); - Q_REVISION(2) void editTextChanged(); void textRoleChanged(); void delegateChanged(); void indicatorChanged(); void popupChanged(); + // 2.1 (Qt 5.8) + Q_REVISION(1) void flatChanged(); + // 2.2 (Qt 5.9) + Q_REVISION(2) void accepted(); + Q_REVISION(2) void downChanged(); + Q_REVISION(2) void editableChanged(); + Q_REVISION(2) void editTextChanged(); Q_REVISION(2) void validatorChanged(); Q_REVISION(2) void inputMethodHintsChanged(); Q_REVISION(2) void inputMethodComposingChanged(); Q_REVISION(2) void acceptableInputChanged(); - void activated(int index); - void highlighted(int index); - Q_REVISION(2) void accepted(); - protected: bool eventFilter(QObject *object, QEvent *event) override; void focusInEvent(QFocusEvent *event) override; diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index a62de655..07fe04d2 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -324,6 +324,24 @@ void QQuickContainerPrivate::removeItem(int index, QQuickItem *item) updatingCurrent = false; } +void QQuickContainerPrivate::reorderItems() +{ + Q_Q(QQuickContainer); + if (!contentItem) + return; + + QList<QQuickItem *> siblings = effectiveContentItem(contentItem)->childItems(); + + int to = 0; + for (int i = 0; i < siblings.count(); ++i) { + QQuickItem* sibling = siblings.at(i); + if (QQuickItemPrivate::get(sibling)->isTransparentForPositioner()) + continue; + int index = contentModel->indexOf(sibling, nullptr); + q->moveItem(index, to++); + } +} + void QQuickContainerPrivate::_q_currentIndexChanged() { Q_Q(QQuickContainer); @@ -347,18 +365,11 @@ void QQuickContainerPrivate::itemParentChanged(QQuickItem *item, QQuickItem *par void QQuickContainerPrivate::itemSiblingOrderChanged(QQuickItem *) { - // reorder the restacked items (eg. by a Repeater) - Q_Q(QQuickContainer); - QList<QQuickItem *> siblings = effectiveContentItem(contentItem)->childItems(); + if (!componentComplete) + return; - int to = 0; - for (int i = 0; i < siblings.count(); ++i) { - QQuickItem* sibling = siblings.at(i); - if (QQuickItemPrivate::get(sibling)->isTransparentForPositioner()) - continue; - int index = contentModel->indexOf(sibling, nullptr); - q->moveItem(index, to++); - } + // reorder the restacked items (eg. by a Repeater) + reorderItems(); } void QQuickContainerPrivate::itemDestroyed(QQuickItem *item) @@ -737,6 +748,13 @@ QQuickItem *QQuickContainer::currentItem() const return itemAt(d->currentIndex); } +void QQuickContainer::componentComplete() +{ + Q_D(QQuickContainer); + QQuickControl::componentComplete(); + d->reorderItems(); +} + void QQuickContainer::itemChange(ItemChange change, const ItemChangeData &data) { Q_D(QQuickContainer); diff --git a/src/quicktemplates2/qquickcontainer_p.h b/src/quicktemplates2/qquickcontainer_p.h index 5ac585c2..030497cf 100644 --- a/src/quicktemplates2/qquickcontainer_p.h +++ b/src/quicktemplates2/qquickcontainer_p.h @@ -77,6 +77,7 @@ public: Q_INVOKABLE void moveItem(int from, int to); Q_INVOKABLE void removeItem(const QVariant &item); // ### Qt 6: remove void removeItem(QQuickItem *item); // ### Qt 6: Q_INVOKABLE + // 2.3 (Qt 5.10) Q_REVISION(3) Q_INVOKABLE QQuickItem *takeItem(int index); QVariant contentModel() const; @@ -88,6 +89,7 @@ public: public Q_SLOTS: void setCurrentIndex(int index); + // 2.1 (Qt 5.8) Q_REVISION(1) void incrementCurrentIndex(); Q_REVISION(1) void decrementCurrentIndex(); @@ -100,6 +102,8 @@ Q_SIGNALS: protected: QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent); + void componentComplete() override; + void itemChange(ItemChange change, const ItemChangeData &data) override; void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override; diff --git a/src/quicktemplates2/qquickcontainer_p_p.h b/src/quicktemplates2/qquickcontainer_p_p.h index 54fc5c60..7791b69c 100644 --- a/src/quicktemplates2/qquickcontainer_p_p.h +++ b/src/quicktemplates2/qquickcontainer_p_p.h @@ -74,6 +74,7 @@ public: void insertItem(int index, QQuickItem *item); void moveItem(int from, int to, QQuickItem *item); void removeItem(int index, QQuickItem *item); + void reorderItems(); void _q_currentIndexChanged(); diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index e3b5c9ef..8448f9ad 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -1361,6 +1361,8 @@ void QQuickControl::setContentItem(QQuickItem *item) } } \endcode + + \sa ApplicationWindow::palette, Popup::palette, {qtquickcontrols2-palette}{palette QML Basic Type} */ QPalette QQuickControl::palette() const { diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h index eaf00ced..7dd1deb3 100644 --- a/src/quicktemplates2/qquickcontrol_p.h +++ b/src/quicktemplates2/qquickcontrol_p.h @@ -79,6 +79,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControl : public QQuickItem Q_PROPERTY(bool wheelEnabled READ isWheelEnabled WRITE setWheelEnabled NOTIFY wheelEnabledChanged FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) public: @@ -145,6 +146,7 @@ public: QQuickItem *contentItem() const; void setContentItem(QQuickItem *item); + // 2.3 (Qt 5.10) QPalette palette() const; void setPalette(const QPalette &palette); void resetPalette(); @@ -169,6 +171,7 @@ Q_SIGNALS: void wheelEnabledChanged(); void backgroundChanged(); void contentItemChanged(); + // 2.3 (Qt 5.10) Q_REVISION(3) void paletteChanged(); protected: diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp index 93ad0b5a..c0e2c8ed 100644 --- a/src/quicktemplates2/qquickdial.cpp +++ b/src/quicktemplates2/qquickdial.cpp @@ -514,6 +514,34 @@ void QQuickDial::setPressed(bool pressed) } /*! + \qmlproperty Item QtQuick.Controls::Dial::handle + + This property holds the handle of the dial. + + The handle acts as a visual indicator of the position of the dial. + + \sa {Customizing Dial} +*/ +QQuickItem *QQuickDial::handle() const +{ + Q_D(const QQuickDial); + return d->handle; +} + +void QQuickDial::setHandle(QQuickItem *handle) +{ + Q_D(QQuickDial); + if (handle == d->handle) + return; + + QQuickControlPrivate::destroyDelegate(d->handle, this); + d->handle = handle; + if (d->handle && !d->handle->parentItem()) + d->handle->setParentItem(this); + emit handleChanged(); +} + +/*! \since QtQuick.Controls 2.2 (Qt 5.9) \qmlproperty bool QtQuick.Controls::Dial::live @@ -568,34 +596,6 @@ void QQuickDial::decrease() setValue(d->value - step); } -/*! - \qmlproperty Item QtQuick.Controls::Dial::handle - - This property holds the handle of the dial. - - The handle acts as a visual indicator of the position of the dial. - - \sa {Customizing Dial} -*/ -QQuickItem *QQuickDial::handle() const -{ - Q_D(const QQuickDial); - return d->handle; -} - -void QQuickDial::setHandle(QQuickItem *handle) -{ - Q_D(QQuickDial); - if (handle == d->handle) - return; - - QQuickControlPrivate::destroyDelegate(d->handle, this); - d->handle = handle; - if (d->handle && !d->handle->parentItem()) - d->handle->setParentItem(this); - emit handleChanged(); -} - void QQuickDial::keyPressEvent(QKeyEvent *event) { Q_D(QQuickDial); diff --git a/src/quicktemplates2/qquickdial_p.h b/src/quicktemplates2/qquickdial_p.h index 959cb154..296f7986 100644 --- a/src/quicktemplates2/qquickdial_p.h +++ b/src/quicktemplates2/qquickdial_p.h @@ -69,8 +69,9 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDial : public QQuickControl Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged FINAL) Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapChanged FINAL) Q_PROPERTY(bool pressed READ isPressed NOTIFY pressedChanged FINAL) - Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2) Q_PROPERTY(QQuickItem *handle READ handle WRITE setHandle NOTIFY handleChanged FINAL) + // 2.2 (Qt 5.9) + Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2) public: explicit QQuickDial(QQuickItem *parent = nullptr); @@ -107,12 +108,13 @@ public: bool isPressed() const; void setPressed(bool pressed); - bool live() const; - void setLive(bool live); - QQuickItem *handle() const; void setHandle(QQuickItem *handle); + // 2.2 (Qt 5.9) + bool live() const; + void setLive(bool live); + public Q_SLOTS: void increase(); void decrease(); @@ -127,9 +129,10 @@ Q_SIGNALS: void snapModeChanged(); void wrapChanged(); void pressedChanged(); - Q_REVISION(2) void liveChanged(); void handleChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void moved(); + Q_REVISION(2) void liveChanged(); protected: void keyPressEvent(QKeyEvent *event) override; diff --git a/src/quicktemplates2/qquickdialog_p.h b/src/quicktemplates2/qquickdialog_p.h index 8032cf83..d22685b6 100644 --- a/src/quicktemplates2/qquickdialog_p.h +++ b/src/quicktemplates2/qquickdialog_p.h @@ -63,6 +63,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialog : public QQuickPopup Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) Q_PROPERTY(QPlatformDialogHelper::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons NOTIFY standardButtonsChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(int result READ result WRITE setResult NOTIFY resultChanged FINAL REVISION 3) Q_FLAGS(QPlatformDialogHelper::StandardButtons) @@ -82,6 +83,7 @@ public: void setStandardButtons(QPlatformDialogHelper::StandardButtons buttons); Q_REVISION(3) Q_INVOKABLE QQuickAbstractButton *standardButton(QPlatformDialogHelper::StandardButton button) const; + // 2.3 (Qt 5.10) enum StandardCode { Rejected, Accepted }; Q_ENUM(StandardCode) @@ -96,15 +98,15 @@ public Q_SLOTS: Q_SIGNALS: void accepted(); void rejected(); - Q_REVISION(3) void applied(); - Q_REVISION(3) void reset(); - Q_REVISION(3) void discarded(); - Q_REVISION(3) void helpRequested(); - void titleChanged(); void headerChanged(); void footerChanged(); void standardButtonsChanged(); + // 2.3 (Qt 5.10) + Q_REVISION(3) void applied(); + Q_REVISION(3) void reset(); + Q_REVISION(3) void discarded(); + Q_REVISION(3) void helpRequested(); Q_REVISION(3) void resultChanged(); protected: diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index 7c2f17c4..b6a9d757 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -217,7 +217,7 @@ void QQuickDialogButtonBoxPrivate::resizeContent() const int valign = alignment & Qt::AlignVertical_Mask; const qreal cw = !halign ? q->availableWidth() : contentItem->implicitWidth(); - const qreal ch = !valign ? q->availableHeight() : contentItem->implicitWidth(); + const qreal ch = !valign ? q->availableHeight() : contentItem->implicitHeight(); QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding()); if (halign || valign) @@ -238,8 +238,8 @@ void QQuickDialogButtonBoxPrivate::updateLayout() const int valign = alignment & Qt::AlignVertical_Mask; QVector<QQuickAbstractButton *> buttons; - const qreal maxItemWidth = (contentItem->width() - qMax(0, count - 1) * spacing) / count; - const qreal maxItemHeight = contentItem->height(); + const qreal maxItemWidth = ((contentItem ? contentItem->width() : q->availableWidth()) - qMax(0, count - 1) * spacing) / count; + const qreal maxItemHeight = contentItem ? contentItem->height() : q->availableHeight(); for (int i = 0; i < count; ++i) { QQuickItem *item = q->itemAt(i); diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p.h index 5d6e568e..1e3cdeef 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox_p.h +++ b/src/quicktemplates2/qquickdialogbuttonbox_p.h @@ -98,15 +98,15 @@ Q_SIGNALS: void accepted(); void rejected(); void helpRequested(); - Q_REVISION(3) void applied(); - Q_REVISION(3) void reset(); - Q_REVISION(3) void discarded(); void clicked(QQuickAbstractButton *button); - void positionChanged(); void alignmentChanged(); void standardButtonsChanged(); void delegateChanged(); + // 2.3 (Qt 5.10) + Q_REVISION(3) void applied(); + Q_REVISION(3) void reset(); + Q_REVISION(3) void discarded(); protected: void updatePolish() override; diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index 328778ca..022c9dbf 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -153,6 +153,11 @@ QT_BEGIN_NAMESPACE If you would like the application's contents to stay where they are when the drawer is opened, don't apply a translation. + Drawer can be configured as a non-closable persistent side panel by + making the Drawer \l {Popup::modal}{non-modal} and \l {interactive} + {non-interactive}. See the \l {Qt Quick Controls 2 - Side Panel}{Side Panel} + example for more details. + \note On some platforms, certain edges may be reserved for system gestures and therefore cannot be used with Drawer. For example, the top and bottom edges may be reserved for system notifications and diff --git a/src/quicktemplates2/qquickdrawer_p.h b/src/quicktemplates2/qquickdrawer_p.h index 3ec007df..f0fc1b4c 100644 --- a/src/quicktemplates2/qquickdrawer_p.h +++ b/src/quicktemplates2/qquickdrawer_p.h @@ -60,6 +60,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDrawer : public QQuickPopup Q_PROPERTY(Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged FINAL) Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL) Q_PROPERTY(qreal dragMargin READ dragMargin WRITE setDragMargin RESET resetDragMargin NOTIFY dragMarginChanged FINAL) + // 2.2 (Qt 5.9) Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged FINAL REVISION 2) public: @@ -75,6 +76,7 @@ public: void setDragMargin(qreal margin); void resetDragMargin(); + // 2.2 (Qt 5.9) bool isInteractive() const; void setInteractive(bool interactive); @@ -82,6 +84,7 @@ Q_SIGNALS: void edgeChanged(); void positionChanged(); void dragMarginChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void interactiveChanged(); protected: diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp index 6eb04a46..044141f2 100644 --- a/src/quicktemplates2/qquickitemdelegate.cpp +++ b/src/quicktemplates2/qquickitemdelegate.cpp @@ -56,9 +56,8 @@ QT_BEGIN_NAMESPACE in various views and controls, such as \l ListView and \l ComboBox. ItemDelegate inherits its API from AbstractButton. For instance, you can set - \l {AbstractButton::text}{text}, and react to \l {AbstractButton::clicked}{clicks} - using the AbstractButton API. In addition to displaying text, item delegates - can also display an \l [QML]{Button Icons}{icon}. + \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon}, + and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API. \snippet qtquickcontrols2-itemdelegate.qml 1 diff --git a/src/quicktemplates2/qquicklabel_p.h b/src/quicktemplates2/qquicklabel_p.h index a102c89a..937c57eb 100644 --- a/src/quicktemplates2/qquicklabel_p.h +++ b/src/quicktemplates2/qquicklabel_p.h @@ -61,6 +61,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickLabel : public QQuickText Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) public: @@ -72,6 +73,7 @@ public: QQuickItem *background() const; void setBackground(QQuickItem *background); + // 2.3 (Qt 5.10) QPalette palette() const; void setPalette(const QPalette &palette); void resetPalette(); @@ -79,6 +81,7 @@ public: Q_SIGNALS: void fontChanged(); void backgroundChanged(); + // 2.3 (Qt 5.10) Q_REVISION(3) void paletteChanged(); protected: diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 9b196930..7ebeb344 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -661,19 +661,6 @@ QQuickMenu::QQuickMenu(QObject *parent) } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty int QtQuick.Controls::Menu::count - \readonly - - This property holds the number of items. -*/ -int QQuickMenu::count() const -{ - Q_D(const QQuickMenu); - return d->contentModel->count(); -} - -/*! \qmlmethod Item QtQuick.Controls::Menu::itemAt(int index) Returns the item at \a index, or \c null if it does not exist. @@ -1181,6 +1168,19 @@ void QQuickMenu::setCurrentIndex(int index) d->setCurrentIndex(index, Qt::OtherFocusReason); } +/*! + \since QtQuick.Controls 2.3 (Qt 5.10) + \qmlproperty int QtQuick.Controls::Menu::count + \readonly + + This property holds the number of items. +*/ +int QQuickMenu::count() const +{ + Q_D(const QQuickMenu); + return d->contentModel->count(); +} + void QQuickMenu::popup(QQuickItem *menuItem) { Q_D(QQuickMenu); diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h index 80c4c055..01b970f8 100644 --- a/src/quicktemplates2/qquickmenu_p.h +++ b/src/quicktemplates2/qquickmenu_p.h @@ -63,10 +63,11 @@ class QQuickMenuPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenu : public QQuickPopup { Q_OBJECT - Q_PROPERTY(int count READ count NOTIFY countChanged FINAL REVISION 3) Q_PROPERTY(QVariant contentModel READ contentModel CONSTANT FINAL) Q_PROPERTY(QQmlListProperty<QObject> contentData READ contentData FINAL) Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) + // 2.3 (Qt 5.10) + Q_PROPERTY(int count READ count NOTIFY countChanged FINAL REVISION 3) Q_PROPERTY(bool cascade READ cascade WRITE setCascade RESET resetCascade NOTIFY cascadeChanged FINAL REVISION 3) Q_PROPERTY(qreal overlap READ overlap WRITE setOverlap NOTIFY overlapChanged FINAL REVISION 3) Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL REVISION 3) @@ -76,26 +77,12 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenu : public QQuickPopup public: explicit QQuickMenu(QObject *parent = nullptr); - int count() const; Q_INVOKABLE QQuickItem *itemAt(int index) const; Q_INVOKABLE void addItem(QQuickItem *item); Q_INVOKABLE void insertItem(int index, QQuickItem *item); Q_INVOKABLE void moveItem(int from, int to); Q_INVOKABLE void removeItem(const QVariant &item); // ### Qt 6: remove void removeItem(QQuickItem *item); // ### Qt 6: Q_INVOKABLE - Q_REVISION(3) Q_INVOKABLE QQuickItem *takeItem(int index); - - Q_REVISION(3) Q_INVOKABLE QQuickMenu *menuAt(int index) const; - Q_REVISION(3) Q_INVOKABLE void addMenu(QQuickMenu *menu); - Q_REVISION(3) Q_INVOKABLE void insertMenu(int index, QQuickMenu *menu); - Q_REVISION(3) Q_INVOKABLE void removeMenu(QQuickMenu *menu); - Q_REVISION(3) Q_INVOKABLE QQuickMenu *takeMenu(int index); - - Q_REVISION(3) Q_INVOKABLE QQuickAction *actionAt(int index) const; - Q_REVISION(3) Q_INVOKABLE void addAction(QQuickAction *action); - Q_REVISION(3) Q_INVOKABLE void insertAction(int index, QQuickAction *action); - Q_REVISION(3) Q_INVOKABLE void removeAction(QQuickAction *action); - Q_REVISION(3) Q_INVOKABLE QQuickAction *takeAction(int index); QVariant contentModel() const; QQmlListProperty<QObject> contentData(); @@ -116,6 +103,22 @@ public: int currentIndex() const; void setCurrentIndex(int index); + // 2.3 (Qt 5.10) + int count() const; + Q_REVISION(3) Q_INVOKABLE QQuickItem *takeItem(int index); + + Q_REVISION(3) Q_INVOKABLE QQuickMenu *menuAt(int index) const; + Q_REVISION(3) Q_INVOKABLE void addMenu(QQuickMenu *menu); + Q_REVISION(3) Q_INVOKABLE void insertMenu(int index, QQuickMenu *menu); + Q_REVISION(3) Q_INVOKABLE void removeMenu(QQuickMenu *menu); + Q_REVISION(3) Q_INVOKABLE QQuickMenu *takeMenu(int index); + + Q_REVISION(3) Q_INVOKABLE QQuickAction *actionAt(int index) const; + Q_REVISION(3) Q_INVOKABLE void addAction(QQuickAction *action); + Q_REVISION(3) Q_INVOKABLE void insertAction(int index, QQuickAction *action); + Q_REVISION(3) Q_INVOKABLE void removeAction(QQuickAction *action); + Q_REVISION(3) Q_INVOKABLE QQuickAction *takeAction(int index); + void popup(QQuickItem *menuItem = nullptr); void popup(const QPointF &pos, QQuickItem *menuItem = nullptr); @@ -129,8 +132,9 @@ protected: void keyPressEvent(QKeyEvent *event) override; Q_SIGNALS: - Q_REVISION(3) void countChanged(); void titleChanged(const QString &title); + // 2.3 (Qt 5.10) + Q_REVISION(3) void countChanged(); Q_REVISION(3) void cascadeChanged(bool cascade); Q_REVISION(3) void overlapChanged(); Q_REVISION(3) void delegateChanged(); diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp index 3a43dbfa..f71b9c35 100644 --- a/src/quicktemplates2/qquickmenuitem.cpp +++ b/src/quicktemplates2/qquickmenuitem.cpp @@ -57,8 +57,8 @@ QT_BEGIN_NAMESPACE example. MenuItem inherits its API from AbstractButton. For instance, you can set - \l {AbstractButton::text}{text} and \l [QML]{Button Icons}{icon} using the - AbstractButton API + \l {AbstractButton::text}{text} and \l {Icons in Qt Quick Controls 2}{icon} + using the AbstractButton API. \code Button { diff --git a/src/quicktemplates2/qquickmenuitem_p.h b/src/quicktemplates2/qquickmenuitem_p.h index 7c469b6a..8af3cbd1 100644 --- a/src/quicktemplates2/qquickmenuitem_p.h +++ b/src/quicktemplates2/qquickmenuitem_p.h @@ -59,6 +59,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuItem : public QQuickAbstractBut { Q_OBJECT Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(QQuickItem *arrow READ arrow WRITE setArrow NOTIFY arrowChanged FINAL REVISION 3) Q_PROPERTY(QQuickMenu *menu READ menu NOTIFY menuChanged FINAL REVISION 3) Q_PROPERTY(QQuickMenu *subMenu READ subMenu NOTIFY subMenuChanged FINAL REVISION 3) @@ -69,6 +70,7 @@ public: bool isHighlighted() const; void setHighlighted(bool highlighted); + // 2.3 (Qt 5.10) QQuickItem *arrow() const; void setArrow(QQuickItem *arrow); @@ -78,6 +80,7 @@ public: Q_SIGNALS: void triggered(); void highlightedChanged(); + // 2.3 (Qt 5.10) Q_REVISION(3) void arrowChanged(); Q_REVISION(3) void menuChanged(); Q_REVISION(3) void subMenuChanged(); diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index ecc5a9c9..50050df3 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -233,6 +233,51 @@ void QQuickPage::setFooter(QQuickItem *footer) } /*! + \qmlproperty list<Object> QtQuick.Controls::Page::contentData + \default + + This property holds the list of content data. + + The list contains all objects that have been declared in QML as children + of the container. + + \note Unlike \c contentChildren, \c contentData does include non-visual QML + objects. + + \sa Item::data, contentChildren +*/ +QQmlListProperty<QObject> QQuickPage::contentData() +{ + return QQmlListProperty<QObject>(contentItem(), nullptr, + QQuickItemPrivate::data_append, + QQuickItemPrivate::data_count, + QQuickItemPrivate::data_at, + QQuickItemPrivate::data_clear); +} + +/*! + \qmlproperty list<Item> QtQuick.Controls::Page::contentChildren + + This property holds the list of content children. + + The list contains all items that have been declared in QML as children + of the page. + + \note Unlike \c contentData, \c contentChildren does not include non-visual + QML objects. + + \sa Item::children, contentData +*/ +QQmlListProperty<QQuickItem> QQuickPage::contentChildren() +{ + return QQmlListProperty<QQuickItem>(contentItem(), nullptr, + QQuickItemPrivate::children_append, + QQuickItemPrivate::children_count, + QQuickItemPrivate::children_at, + QQuickItemPrivate::children_clear); +} + +/*! \qmlproperty real QtQuick.Controls::Page::contentWidth \since QtQuick.Controls 2.1 (Qt 5.8) @@ -282,51 +327,6 @@ void QQuickPage::setContentHeight(qreal height) emit contentHeightChanged(); } -/*! - \qmlproperty list<Object> QtQuick.Controls::Page::contentData - \default - - This property holds the list of content data. - - The list contains all objects that have been declared in QML as children - of the container. - - \note Unlike \c contentChildren, \c contentData does include non-visual QML - objects. - - \sa Item::data, contentChildren -*/ -QQmlListProperty<QObject> QQuickPage::contentData() -{ - return QQmlListProperty<QObject>(contentItem(), nullptr, - QQuickItemPrivate::data_append, - QQuickItemPrivate::data_count, - QQuickItemPrivate::data_at, - QQuickItemPrivate::data_clear); -} - -/*! - \qmlproperty list<Item> QtQuick.Controls::Page::contentChildren - - This property holds the list of content children. - - The list contains all items that have been declared in QML as children - of the page. - - \note Unlike \c contentData, \c contentChildren does not include non-visual - QML objects. - - \sa Item::children, contentData -*/ -QQmlListProperty<QQuickItem> QQuickPage::contentChildren() -{ - return QQmlListProperty<QQuickItem>(contentItem(), nullptr, - QQuickItemPrivate::children_append, - QQuickItemPrivate::children_count, - QQuickItemPrivate::children_at, - QQuickItemPrivate::children_clear); -} - void QQuickPage::componentComplete() { Q_D(QQuickPage); diff --git a/src/quicktemplates2/qquickpage_p.h b/src/quicktemplates2/qquickpage_p.h index 1b14588a..0789e996 100644 --- a/src/quicktemplates2/qquickpage_p.h +++ b/src/quicktemplates2/qquickpage_p.h @@ -61,10 +61,11 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPage : public QQuickControl Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) - Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL REVISION 1) - Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL REVISION 1) Q_PROPERTY(QQmlListProperty<QObject> contentData READ contentData FINAL) Q_PROPERTY(QQmlListProperty<QQuickItem> contentChildren READ contentChildren NOTIFY contentChildrenChanged FINAL) + // 2.1 (Qt 5.8) + Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL REVISION 1) + Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL REVISION 1) Q_CLASSINFO("DefaultProperty", "contentData") public: @@ -79,22 +80,24 @@ public: QQuickItem *footer() const; void setFooter(QQuickItem *footer); + QQmlListProperty<QObject> contentData(); + QQmlListProperty<QQuickItem> contentChildren(); + + // 2.1 (Qt 5.8) qreal contentWidth() const; void setContentWidth(qreal width); qreal contentHeight() const; void setContentHeight(qreal height); - QQmlListProperty<QObject> contentData(); - QQmlListProperty<QQuickItem> contentChildren(); - Q_SIGNALS: void titleChanged(); void headerChanged(); void footerChanged(); + void contentChildrenChanged(); + // 2.1 (Qt 5.8) Q_REVISION(1) void contentWidthChanged(); Q_REVISION(1) void contentHeightChanged(); - void contentChildrenChanged(); protected: void componentComplete() override; diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 95e3d553..472d2124 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -1505,7 +1505,7 @@ void QQuickPopup::resetFont() } \endcode - \sa Control::palette, ApplicationWindow::palette + \sa Control::palette, ApplicationWindow::palette, {qtquickcontrols2-palette}{palette QML Basic Type} */ QPalette QQuickPopup::palette() const { diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h index a8e6ea11..ada4b649 100644 --- a/src/quicktemplates2/qquickpopup_p.h +++ b/src/quicktemplates2/qquickpopup_p.h @@ -85,7 +85,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopup : public QObject, public QQml Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL) Q_PROPERTY(qreal availableWidth READ availableWidth NOTIFY availableWidthChanged FINAL) Q_PROPERTY(qreal availableHeight READ availableHeight NOTIFY availableHeightChanged FINAL) - Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL REVISION 1) Q_PROPERTY(qreal margins READ margins WRITE setMargins RESET resetMargins NOTIFY marginsChanged FINAL) Q_PROPERTY(qreal topMargin READ topMargin WRITE setTopMargin RESET resetTopMargin NOTIFY topMarginChanged FINAL) Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin RESET resetLeftMargin NOTIFY leftMarginChanged FINAL) @@ -97,9 +96,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopup : public QObject, public QQml Q_PROPERTY(qreal rightPadding READ rightPadding WRITE setRightPadding RESET resetRightPadding NOTIFY rightPaddingChanged FINAL) Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding NOTIFY bottomPaddingChanged FINAL) Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) - Q_PROPERTY(bool mirrored READ isMirrored NOTIFY mirroredChanged FINAL REVISION 3) Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL) - Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem RESET resetParentItem NOTIFY parentChanged FINAL) Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL) @@ -111,14 +108,19 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopup : public QObject, public QQml Q_PROPERTY(bool modal READ isModal WRITE setModal NOTIFY modalChanged FINAL) Q_PROPERTY(bool dim READ dim WRITE setDim RESET resetDim NOTIFY dimChanged FINAL) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL) - Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL REVISION 3) - Q_PROPERTY(bool opened READ isOpened NOTIFY openedChanged FINAL REVISION 3) Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged FINAL) Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged FINAL) Q_PROPERTY(ClosePolicy closePolicy READ closePolicy WRITE setClosePolicy RESET resetClosePolicy NOTIFY closePolicyChanged FINAL) Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin FINAL) Q_PROPERTY(QQuickTransition *enter READ enter WRITE setEnter NOTIFY enterChanged FINAL) Q_PROPERTY(QQuickTransition *exit READ exit WRITE setExit NOTIFY exitChanged FINAL) + // 2.1 (Qt 5.8) + Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL REVISION 1) + // 2.3 (Qt 5.10) + Q_PROPERTY(bool opened READ isOpened NOTIFY openedChanged FINAL REVISION 3) + Q_PROPERTY(bool mirrored READ isMirrored NOTIFY mirroredChanged FINAL REVISION 3) + Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL REVISION 3) + Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) Q_CLASSINFO("DefaultProperty", "contentData") public: @@ -160,10 +162,6 @@ public: qreal availableWidth() const; qreal availableHeight() const; - qreal spacing() const; - void setSpacing(qreal spacing); - void resetSpacing(); - qreal margins() const; void setMargins(qreal margins); void resetMargins(); @@ -208,16 +206,10 @@ public: void setLocale(const QLocale &locale); void resetLocale(); - bool isMirrored() const; - QFont font() const; void setFont(const QFont &font); void resetFont(); - QPalette palette() const; - void setPalette(const QPalette &palette); - void resetPalette(); - QQuickWindow *window() const; QQuickItem *popupItem() const; @@ -252,11 +244,6 @@ public: bool isVisible() const; virtual void setVisible(bool visible); - bool isEnabled() const; - void setEnabled(bool enabled); - - bool isOpened() const; - qreal opacity() const; void setOpacity(qreal opacity); @@ -300,11 +287,31 @@ public: Q_INVOKABLE void forceActiveFocus(Qt::FocusReason reason = Qt::OtherFocusReason); + // 2.1 (Qt 5.8) + qreal spacing() const; + void setSpacing(qreal spacing); + void resetSpacing(); + + // 2.3 (Qt 5.10) + bool isOpened() const; + bool isMirrored() const; + + bool isEnabled() const; + void setEnabled(bool enabled); + + QPalette palette() const; + void setPalette(const QPalette &palette); + void resetPalette(); + public Q_SLOTS: void open(); void close(); Q_SIGNALS: + void opened(); + void closed(); + void aboutToShow(); + void aboutToHide(); void xChanged(); void yChanged(); void zChanged(); @@ -316,7 +323,6 @@ Q_SIGNALS: void contentHeightChanged(); void availableWidthChanged(); void availableHeightChanged(); - Q_REVISION(1) void spacingChanged(); void marginsChanged(); void topMarginChanged(); void leftMarginChanged(); @@ -329,8 +335,6 @@ Q_SIGNALS: void bottomPaddingChanged(); void fontChanged(); void localeChanged(); - Q_REVISION(3) void mirroredChanged(); - Q_REVISION(3) void paletteChanged(); void parentChanged(); void backgroundChanged(); void contentItemChanged(); @@ -341,19 +345,19 @@ Q_SIGNALS: void modalChanged(); void dimChanged(); void visibleChanged(); - Q_REVISION(3) void enabledChanged(); - Q_REVISION(3) void openedChanged(); void opacityChanged(); void scaleChanged(); void closePolicyChanged(); void enterChanged(); void exitChanged(); void windowChanged(QQuickWindow *window); - - void aboutToShow(); - void aboutToHide(); - void opened(); - void closed(); + // 2.1 (Qt 5.8) + Q_REVISION(1) void spacingChanged(); + // 2.3 (Qt 5.10) + Q_REVISION(3) void openedChanged(); + Q_REVISION(3) void mirroredChanged(); + Q_REVISION(3) void enabledChanged(); + Q_REVISION(3) void paletteChanged(); protected: QQuickPopup(QQuickPopupPrivate &dd, QObject *parent); diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 154688b2..d16cd3b4 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -810,63 +810,6 @@ void QQuickRangeSlider::setOrientation(Qt::Orientation orientation) } /*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::RangeSlider::horizontal - \readonly - - This property holds whether the slider is horizontal. - - \sa orientation -*/ -bool QQuickRangeSlider::isHorizontal() const -{ - Q_D(const QQuickRangeSlider); - return d->orientation == Qt::Horizontal; -} - -/*! - \since QtQuick.Controls 2.3 (Qt 5.10) - \qmlproperty bool QtQuick.Controls::RangeSlider::vertical - \readonly - - This property holds whether the slider is vertical. - - \sa orientation -*/ -bool QQuickRangeSlider::isVertical() const -{ - Q_D(const QQuickRangeSlider); - return d->orientation == Qt::Vertical; -} - -/*! - \since QtQuick.Controls 2.2 (Qt 5.9) - \qmlproperty bool QtQuick.Controls::RangeSlider::live - - This property holds whether the slider provides live updates for the \l first.value - and \l second.value properties while the respective handles are dragged. - - The default value is \c true. - - \sa first.value, second.value -*/ -bool QQuickRangeSlider::live() const -{ - Q_D(const QQuickRangeSlider); - return d->live; -} - -void QQuickRangeSlider::setLive(bool live) -{ - Q_D(QQuickRangeSlider); - if (d->live == live) - return; - - d->live = live; - emit liveChanged(); -} - -/*! \qmlmethod void QtQuick.Controls::RangeSlider::setValues(real firstValue, real secondValue) Sets \l first.value and \l second.value with the given arguments. @@ -923,6 +866,63 @@ void QQuickRangeSlider::setValues(qreal firstValue, qreal secondValue) secondPrivate->updatePosition(); } +/*! + \since QtQuick.Controls 2.2 (Qt 5.9) + \qmlproperty bool QtQuick.Controls::RangeSlider::live + + This property holds whether the slider provides live updates for the \l first.value + and \l second.value properties while the respective handles are dragged. + + The default value is \c true. + + \sa first.value, second.value +*/ +bool QQuickRangeSlider::live() const +{ + Q_D(const QQuickRangeSlider); + return d->live; +} + +void QQuickRangeSlider::setLive(bool live) +{ + Q_D(QQuickRangeSlider); + if (d->live == live) + return; + + d->live = live; + emit liveChanged(); +} + +/*! + \since QtQuick.Controls 2.3 (Qt 5.10) + \qmlproperty bool QtQuick.Controls::RangeSlider::horizontal + \readonly + + This property holds whether the slider is horizontal. + + \sa orientation +*/ +bool QQuickRangeSlider::isHorizontal() const +{ + Q_D(const QQuickRangeSlider); + return d->orientation == Qt::Horizontal; +} + +/*! + \since QtQuick.Controls 2.3 (Qt 5.10) + \qmlproperty bool QtQuick.Controls::RangeSlider::vertical + \readonly + + This property holds whether the slider is vertical. + + \sa orientation +*/ +bool QQuickRangeSlider::isVertical() const +{ + Q_D(const QQuickRangeSlider); + return d->orientation == Qt::Vertical; +} + void QQuickRangeSlider::focusInEvent(QFocusEvent *event) { Q_D(QQuickRangeSlider); diff --git a/src/quicktemplates2/qquickrangeslider_p.h b/src/quicktemplates2/qquickrangeslider_p.h index 82d61b37..ef6e5677 100644 --- a/src/quicktemplates2/qquickrangeslider_p.h +++ b/src/quicktemplates2/qquickrangeslider_p.h @@ -65,9 +65,11 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRangeSlider : public QQuickControl Q_PROPERTY(qreal stepSize READ stepSize WRITE setStepSize NOTIFY stepSizeChanged FINAL) Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged FINAL) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL) + // 2.2 (Qt 5.9) + Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2) Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) + // 2.3 (Qt 5.10) Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) - Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2) public: explicit QQuickRangeSlider(QQuickItem *parent = nullptr); @@ -97,13 +99,15 @@ public: Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); - bool isHorizontal() const; - bool isVertical() const; + Q_INVOKABLE void setValues(qreal firstValue, qreal secondValue); + // 2.2 (Qt 5.9) bool live() const; void setLive(bool live); - Q_INVOKABLE void setValues(qreal firstValue, qreal secondValue); + // 2.3 (Qt 5.10) + bool isHorizontal() const; + bool isVertical() const; Q_SIGNALS: void fromChanged(); @@ -111,6 +115,7 @@ Q_SIGNALS: void stepSizeChanged(); void snapModeChanged(); void orientationChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void liveChanged(); protected: @@ -149,6 +154,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRangeSliderNode : public QObject Q_PROPERTY(qreal visualPosition READ visualPosition NOTIFY visualPositionChanged FINAL) Q_PROPERTY(QQuickItem *handle READ handle WRITE setHandle NOTIFY handleChanged FINAL) Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL) + // 2.1 (Qt 5.8) Q_PROPERTY(bool hovered READ isHovered WRITE setHovered NOTIFY hoveredChanged FINAL REVISION 1) public: @@ -167,6 +173,7 @@ public: bool isPressed() const; void setPressed(bool pressed); + // 2.1 (Qt 5.8) bool isHovered() const; void setHovered(bool hovered); @@ -180,6 +187,7 @@ Q_SIGNALS: void visualPositionChanged(); void handleChanged(); void pressedChanged(); + // 2.1 (Qt 5.8) Q_REVISION(1) void hoveredChanged(); private: diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h index 1ac1d306..8f0b835d 100644 --- a/src/quicktemplates2/qquickscrollbar_p.h +++ b/src/quicktemplates2/qquickscrollbar_p.h @@ -64,9 +64,11 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollBar : public QQuickControl Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged FINAL) Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL) + // 2.2 (Qt 5.9) Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged FINAL REVISION 2) Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive RESET resetInteractive NOTIFY interactiveChanged FINAL REVISION 2) Q_PROPERTY(Policy policy READ policy WRITE setPolicy NOTIFY policyChanged FINAL REVISION 2) + // 2.3 (Qt 5.10) Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) Q_PROPERTY(qreal minimumSize READ minimumSize WRITE setMinimumSize NOTIFY minimumSizeChanged FINAL REVISION 4) @@ -93,6 +95,7 @@ public: Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); + // 2.2 (Qt 5.9) enum SnapMode { NoSnap, SnapAlways, @@ -117,6 +120,7 @@ public: Policy policy() const; void setPolicy(Policy policy); + // 2.3 (Qt 5.10) bool isHorizontal() const; bool isVertical() const; @@ -139,6 +143,7 @@ Q_SIGNALS: void activeChanged(); void pressedChanged(); void orientationChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void snapModeChanged(); Q_REVISION(2) void interactiveChanged(); Q_REVISION(2) void policyChanged(); diff --git a/src/quicktemplates2/qquickscrollindicator_p.h b/src/quicktemplates2/qquickscrollindicator_p.h index c1065a3f..d679cf74 100644 --- a/src/quicktemplates2/qquickscrollindicator_p.h +++ b/src/quicktemplates2/qquickscrollindicator_p.h @@ -63,6 +63,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollIndicator : public QQuickCont Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL) Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged FINAL) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) @@ -80,6 +81,7 @@ public: Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); + // 2.3 (Qt 5.10) bool isHorizontal() const; bool isVertical() const; diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index b5bf5e52..8628f981 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -430,33 +430,6 @@ void QQuickSlider::setSnapMode(SnapMode mode) } /*! - \since QtQuick.Controls 2.2 (Qt 5.9) - \qmlproperty bool QtQuick.Controls::Slider::live - - This property holds whether the slider provides live updates for the \l value - property while the handle is dragged. - - The default value is \c true. - - \sa value, valueAt() -*/ -bool QQuickSlider::live() const -{ - Q_D(const QQuickSlider); - return d->live; -} - -void QQuickSlider::setLive(bool live) -{ - Q_D(QQuickSlider); - if (d->live == live) - return; - - d->live = live; - emit liveChanged(); -} - -/*! \qmlproperty bool QtQuick.Controls::Slider::pressed This property holds whether the slider is pressed. @@ -572,7 +545,37 @@ void QQuickSlider::setHandle(QQuickItem *handle) qreal QQuickSlider::valueAt(qreal position) const { Q_D(const QQuickSlider); - return d->from + (d->to - d->from) * position; + const qreal value = d->from + (d->to - d->from) * position; + if (qFuzzyIsNull(d->stepSize)) + return value; + return qRound(value / d->stepSize) * d->stepSize; +} + +/*! + \since QtQuick.Controls 2.2 (Qt 5.9) + \qmlproperty bool QtQuick.Controls::Slider::live + + This property holds whether the slider provides live updates for the \l value + property while the handle is dragged. + + The default value is \c true. + + \sa value, valueAt() +*/ +bool QQuickSlider::live() const +{ + Q_D(const QQuickSlider); + return d->live; +} + +void QQuickSlider::setLive(bool live) +{ + Q_D(QQuickSlider); + if (d->live == live) + return; + + d->live = live; + emit liveChanged(); } /*! diff --git a/src/quicktemplates2/qquickslider_p.h b/src/quicktemplates2/qquickslider_p.h index 21a880f5..b2f4897c 100644 --- a/src/quicktemplates2/qquickslider_p.h +++ b/src/quicktemplates2/qquickslider_p.h @@ -64,12 +64,13 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSlider : public QQuickControl Q_PROPERTY(qreal visualPosition READ visualPosition NOTIFY visualPositionChanged FINAL) Q_PROPERTY(qreal stepSize READ stepSize WRITE setStepSize NOTIFY stepSizeChanged FINAL) Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged FINAL) - Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2) Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL) - Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) - Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL) Q_PROPERTY(QQuickItem *handle READ handle WRITE setHandle NOTIFY handleChanged FINAL) + Q_PROPERTY(bool live READ live WRITE setLive NOTIFY liveChanged FINAL REVISION 2) + // 2.3 (Qt 5.10) + Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) + Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) public: explicit QQuickSlider(QQuickItem *parent = nullptr); @@ -99,23 +100,26 @@ public: SnapMode snapMode() const; void setSnapMode(SnapMode mode); - bool live() const; - void setLive(bool live); - bool isPressed() const; void setPressed(bool pressed); - bool isHorizontal() const; - bool isVertical() const; - Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); QQuickItem *handle() const; void setHandle(QQuickItem *handle); + // 2.1 (Qt 5.8) Q_REVISION(1) Q_INVOKABLE qreal valueAt(qreal position) const; + // 2.2 (Qt 5.9) + bool live() const; + void setLive(bool live); + + // 2.3 (Qt 5.10) + bool isHorizontal() const; + bool isVertical() const; + public Q_SLOTS: void increase(); void decrease(); @@ -128,11 +132,12 @@ Q_SIGNALS: void visualPositionChanged(); void stepSizeChanged(); void snapModeChanged(); - Q_REVISION(2) void liveChanged(); void pressedChanged(); void orientationChanged(); void handleChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void moved(); + Q_REVISION(2) void liveChanged(); protected: void keyPressEvent(QKeyEvent *event) override; diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 4f57c305..588944af 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -197,7 +197,7 @@ void QQuickSpinBoxPrivate::updateValue() } else { val = locale.toInt(text.toString()); } - setValue(val, /* modified = */ true, /* allowWrap = */ false); + setValue(val, /* allowWrap = */ false, /* modified = */ true); } } } @@ -938,7 +938,7 @@ void QQuickSpinBox::componentComplete() { Q_D(QQuickSpinBox); QQuickControl::componentComplete(); - if (!d->setValue(d->value, /* modified = */ false, /* allowWrap = */ false)) { + if (!d->setValue(d->value, /* allowWrap = */ false, /* modified = */ false)) { d->updateDisplayText(); d->updateUpEnabled(); d->updateDownEnabled(); @@ -1040,22 +1040,6 @@ void QQuickSpinButton::setPressed(bool pressed) emit pressedChanged(); } -bool QQuickSpinButton::isHovered() const -{ - Q_D(const QQuickSpinButton); - return d->hovered; -} - -void QQuickSpinButton::setHovered(bool hovered) -{ - Q_D(QQuickSpinButton); - if (d->hovered == hovered) - return; - - d->hovered = hovered; - emit hoveredChanged(); -} - QQuickItem *QQuickSpinButton::indicator() const { Q_D(const QQuickSpinButton); @@ -1078,4 +1062,20 @@ void QQuickSpinButton::setIndicator(QQuickItem *indicator) emit indicatorChanged(); } +bool QQuickSpinButton::isHovered() const +{ + Q_D(const QQuickSpinButton); + return d->hovered; +} + +void QQuickSpinButton::setHovered(bool hovered) +{ + Q_D(QQuickSpinButton); + if (d->hovered == hovered) + return; + + d->hovered = hovered; + emit hoveredChanged(); +} + QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h index 164a5f04..0d911962 100644 --- a/src/quicktemplates2/qquickspinbox_p.h +++ b/src/quicktemplates2/qquickspinbox_p.h @@ -71,8 +71,10 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSpinBox : public QQuickControl Q_PROPERTY(QJSValue valueFromText READ valueFromText WRITE setValueFromText NOTIFY valueFromTextChanged FINAL) Q_PROPERTY(QQuickSpinButton *up READ up CONSTANT FINAL) Q_PROPERTY(QQuickSpinButton *down READ down CONSTANT FINAL) + // 2.2 (Qt 5.9) Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints NOTIFY inputMethodHintsChanged FINAL REVISION 2) Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged FINAL REVISION 2) + // 2.3 (Qt 5.10) Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapChanged FINAL REVISION 3) Q_PROPERTY(QString displayText READ displayText NOTIFY displayTextChanged FINAL REVISION 4) @@ -106,11 +108,13 @@ public: QQuickSpinButton *up() const; QQuickSpinButton *down() const; + // 2.2 (Qt 5.9) Qt::InputMethodHints inputMethodHints() const; void setInputMethodHints(Qt::InputMethodHints hints); bool isInputMethodComposing() const; + // 2.3 (Qt 5.10) bool wrap() const; void setWrap(bool wrap); @@ -129,9 +133,11 @@ Q_SIGNALS: void validatorChanged(); void textFromValueChanged(); void valueFromTextChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void valueModified(); Q_REVISION(2) void inputMethodHintsChanged(); Q_REVISION(2) void inputMethodComposingChanged(); + // 2.3 (Qt 5.10) Q_REVISION(3) void wrapChanged(); Q_REVISION(4) void displayTextChanged(); @@ -169,8 +175,9 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSpinButton : public QObject { Q_OBJECT Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL) - Q_PROPERTY(bool hovered READ isHovered WRITE setHovered NOTIFY hoveredChanged FINAL REVISION 1) Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL) + // 2.1 (Qt 5.8) + Q_PROPERTY(bool hovered READ isHovered WRITE setHovered NOTIFY hoveredChanged FINAL REVISION 1) public: explicit QQuickSpinButton(QQuickSpinBox *parent); @@ -178,16 +185,18 @@ public: bool isPressed() const; void setPressed(bool pressed); - bool isHovered() const; - void setHovered(bool hovered); - QQuickItem *indicator() const; void setIndicator(QQuickItem *indicator); + // 2.1 (Qt 5.8) + bool isHovered() const; + void setHovered(bool hovered); + Q_SIGNALS: void pressedChanged(); - Q_REVISION(1) void hoveredChanged(); void indicatorChanged(); + // 2.1 (Qt 5.8) + Q_REVISION(1) void hoveredChanged(); private: Q_DISABLE_COPY(QQuickSpinButton) diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp index 674e6ee1..2f13b1a1 100644 --- a/src/quicktemplates2/qquickstackview.cpp +++ b/src/quicktemplates2/qquickstackview.cpp @@ -1029,6 +1029,7 @@ void QQuickStackView::componentComplete() element = QQuickStackElement::fromString(d->initialItem.toString(), this, &error); if (!error.isEmpty()) { d->warn(error); + delete element; } else if (d->pushElement(element)) { d->depthChange(d->elements.count(), oldDepth); d->setCurrentItem(element); diff --git a/src/quicktemplates2/qquickstackview_p.h b/src/quicktemplates2/qquickstackview_p.h index 21c20f3a..2cddb800 100644 --- a/src/quicktemplates2/qquickstackview_p.h +++ b/src/quicktemplates2/qquickstackview_p.h @@ -72,6 +72,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackView : public QQuickControl Q_PROPERTY(QQuickTransition *pushExit READ pushExit WRITE setPushExit NOTIFY pushExitChanged FINAL) Q_PROPERTY(QQuickTransition *replaceEnter READ replaceEnter WRITE setReplaceEnter NOTIFY replaceEnterChanged FINAL) Q_PROPERTY(QQuickTransition *replaceExit READ replaceExit WRITE setReplaceExit NOTIFY replaceExitChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged FINAL REVISION 3) public: @@ -135,6 +136,7 @@ public: Q_INVOKABLE void pop(QQmlV4Function *args); Q_INVOKABLE void replace(QQmlV4Function *args); + // 2.3 (Qt 5.10) bool isEmpty() const; public Q_SLOTS: @@ -150,6 +152,7 @@ Q_SIGNALS: void pushExitChanged(); void replaceEnterChanged(); void replaceExitChanged(); + // 2.3 (Qt 5.10) Q_REVISION(3) void emptyChanged(); protected: @@ -172,6 +175,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackViewAttached : public QObject Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) Q_PROPERTY(QQuickStackView *view READ view NOTIFY viewChanged FINAL) Q_PROPERTY(QQuickStackView::Status status READ status NOTIFY statusChanged FINAL) + // 2.2 (Qt 5.9) Q_PROPERTY(bool visible READ isVisible WRITE setVisible RESET resetVisible NOTIFY visibleChanged FINAL) // REVISION 2 public: @@ -182,6 +186,7 @@ public: QQuickStackView *view() const; QQuickStackView::Status status() const; + // 2.2 (Qt 5.9) bool isVisible() const; void setVisible(bool visible); void resetVisible(); @@ -190,13 +195,14 @@ Q_SIGNALS: void indexChanged(); void viewChanged(); void statusChanged(); - /*Q_REVISION(2)*/ void visibleChanged(); - + // 2.1 (Qt 5.8) /*Q_REVISION(1)*/ void activated(); /*Q_REVISION(1)*/ void activating(); /*Q_REVISION(1)*/ void deactivated(); /*Q_REVISION(1)*/ void deactivating(); /*Q_REVISION(1)*/ void removed(); + // 2.2 (Qt 5.9) + /*Q_REVISION(2)*/ void visibleChanged(); private: Q_DISABLE_COPY(QQuickStackViewAttached) diff --git a/src/quicktemplates2/qquickswipe_p.h b/src/quicktemplates2/qquickswipe_p.h index 62b0e903..20e38e90 100644 --- a/src/quicktemplates2/qquickswipe_p.h +++ b/src/quicktemplates2/qquickswipe_p.h @@ -64,13 +64,14 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipe : public QObject Q_OBJECT Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL) Q_PROPERTY(bool complete READ isComplete NOTIFY completeChanged FINAL) - Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL) // REVISION 2 Q_PROPERTY(QQmlComponent *left READ left WRITE setLeft NOTIFY leftChanged FINAL) Q_PROPERTY(QQmlComponent *behind READ behind WRITE setBehind NOTIFY behindChanged FINAL) Q_PROPERTY(QQmlComponent *right READ right WRITE setRight NOTIFY rightChanged FINAL) Q_PROPERTY(QQuickItem *leftItem READ leftItem NOTIFY leftItemChanged FINAL) Q_PROPERTY(QQuickItem *behindItem READ behindItem NOTIFY behindItemChanged FINAL) Q_PROPERTY(QQuickItem *rightItem READ rightItem NOTIFY rightItemChanged FINAL) + // 2.2 (Qt 5.9) + Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL) // REVISION 2 Q_PROPERTY(QQuickTransition *transition READ transition WRITE setTransition NOTIFY transitionChanged FINAL) // REVISION 2 public: @@ -82,9 +83,6 @@ public: bool isComplete() const; void setComplete(bool complete); - bool isEnabled() const; - void setEnabled(bool enabled); - QQmlComponent *left() const; void setLeft(QQmlComponent *left); @@ -103,25 +101,33 @@ public: QQuickItem *rightItem() const; void setRightItem(QQuickItem *item); + // 2.1 (Qt 5.8) + Q_REVISION(1) Q_INVOKABLE void close(); + + // 2.2 (Qt 5.9) + bool isEnabled() const; + void setEnabled(bool enabled); + QQuickTransition *transition() const; void setTransition(QQuickTransition *transition); Q_REVISION(2) Q_INVOKABLE void open(QQuickSwipeDelegate::Side side); - Q_REVISION(1) Q_INVOKABLE void close(); Q_SIGNALS: void positionChanged(); void completeChanged(); - /*Q_REVISION(2)*/ void enabledChanged(); - /*Q_REVISION(1)*/ void completed(); - /*Q_REVISION(2)*/ void opened(); - /*Q_REVISION(2)*/ void closed(); void leftChanged(); void behindChanged(); void rightChanged(); void leftItemChanged(); void behindItemChanged(); void rightItemChanged(); + // 2.1 (Qt 5.8) + /*Q_REVISION(1)*/ void completed(); + // 2.2 (Qt 5.9) + /*Q_REVISION(2)*/ void opened(); + /*Q_REVISION(2)*/ void closed(); + /*Q_REVISION(2)*/ void enabledChanged(); /*Q_REVISION(2)*/ void transitionChanged(); private: diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp index 628f5d47..dcf93437 100644 --- a/src/quicktemplates2/qquickswipedelegate.cpp +++ b/src/quicktemplates2/qquickswipedelegate.cpp @@ -737,7 +737,6 @@ bool QQuickSwipeDelegatePrivate::handleMousePressEvent(QQuickItem *item, QMouseE // so we correct it after calling the base class' mousePressEvent(), rather // than having to duplicate its code just so we can set the pressPoint. setPressPoint(item->mapToItem(q, event->pos())); - q->grabMouse(); return true; } @@ -754,7 +753,6 @@ bool QQuickSwipeDelegatePrivate::handleMousePressEvent(QQuickItem *item, QMouseE attached->setPressed(true); // Stop the event from propagating, as QQuickItem explicitly ignores events. event->accept(); - item->grabMouse(); return true; } diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp index ce586363..5f84f93e 100644 --- a/src/quicktemplates2/qquickswipeview.cpp +++ b/src/quicktemplates2/qquickswipeview.cpp @@ -415,12 +415,6 @@ QQuickSwipeViewAttached::QQuickSwipeViewAttached(QObject *parent) qmlWarning(parent) << "SwipeView: attached properties must be accessed from within a child item"; } -QQuickSwipeView *QQuickSwipeViewAttached::view() const -{ - Q_D(const QQuickSwipeViewAttached); - return d->swipeView; -} - int QQuickSwipeViewAttached::index() const { Q_D(const QQuickSwipeViewAttached); @@ -433,6 +427,12 @@ bool QQuickSwipeViewAttached::isCurrentItem() const return d->index != -1 && d->currentIndex != -1 && d->index == d->currentIndex; } +QQuickSwipeView *QQuickSwipeViewAttached::view() const +{ + Q_D(const QQuickSwipeViewAttached); + return d->swipeView; +} + bool QQuickSwipeViewAttached::isNextItem() const { Q_D(const QQuickSwipeViewAttached); diff --git a/src/quicktemplates2/qquickswipeview_p.h b/src/quicktemplates2/qquickswipeview_p.h index 543cb6aa..03f6cefa 100644 --- a/src/quicktemplates2/qquickswipeview_p.h +++ b/src/quicktemplates2/qquickswipeview_p.h @@ -58,27 +58,35 @@ class QQuickSwipeViewPrivate; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeView : public QQuickContainer { Q_OBJECT + // 2.1 (Qt 5.8) Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged FINAL REVISION 1) + // 2.2 (Qt 5.9) Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL REVISION 2) + // 2.3 (Qt 5.10) Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) public: explicit QQuickSwipeView(QQuickItem *parent = nullptr); + static QQuickSwipeViewAttached *qmlAttachedProperties(QObject *object); + + // 2.1 (Qt 5.8) bool isInteractive() const; void setInteractive(bool interactive); + // 2.2 (Qt 5.9) Qt::Orientation orientation() const; void setOrientation(Qt::Orientation orientation); + // 2.3 (Qt 5.10) bool isHorizontal() const; bool isVertical() const; - static QQuickSwipeViewAttached *qmlAttachedProperties(QObject *object); - Q_SIGNALS: + // 2.1 (Qt 5.8) Q_REVISION(1) void interactiveChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void orientationChanged(); protected: @@ -103,25 +111,29 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeViewAttached : public QObject Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY isCurrentItemChanged FINAL) + Q_PROPERTY(QQuickSwipeView *view READ view NOTIFY viewChanged FINAL) + // 2.1 (Qt 5.8) Q_PROPERTY(bool isNextItem READ isNextItem NOTIFY isNextItemChanged FINAL REVISION 1) Q_PROPERTY(bool isPreviousItem READ isPreviousItem NOTIFY isPreviousItemChanged FINAL REVISION 1) - Q_PROPERTY(QQuickSwipeView *view READ view NOTIFY viewChanged FINAL) public: explicit QQuickSwipeViewAttached(QObject *parent = nullptr); int index() const; bool isCurrentItem() const; + QQuickSwipeView *view() const; + + // 2.1 (Qt 5.8) bool isNextItem() const; bool isPreviousItem() const; - QQuickSwipeView *view() const; Q_SIGNALS: void indexChanged(); void isCurrentItemChanged(); + void viewChanged(); + // 2.1 (Qt 5.8) /*Q_REVISION(1)*/ void isNextItemChanged(); /*Q_REVISION(1)*/ void isPreviousItemChanged(); - void viewChanged(); private: Q_DISABLE_COPY(QQuickSwipeViewAttached) diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp index 52522262..814d14ea 100644 --- a/src/quicktemplates2/qquicktabbar.cpp +++ b/src/quicktemplates2/qquicktabbar.cpp @@ -228,29 +228,27 @@ void QQuickTabBarPrivate::updateLayout() contentHeightChange = true; } - updatingLayout = true; if (contentWidthChange) emit q->contentWidthChanged(); if (contentHeightChange) emit q->contentHeightChanged(); - updatingLayout = false; } -void QQuickTabBarPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) +void QQuickTabBarPrivate::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) { - if (!updatingLayout && change.sizeChange() && QQuickItemPrivate::get(item)->componentComplete) + if (!updatingLayout) updateLayout(); } -void QQuickTabBarPrivate::itemImplicitWidthChanged(QQuickItem *item) +void QQuickTabBarPrivate::itemImplicitWidthChanged(QQuickItem *) { - if (!updatingLayout && !hasContentWidth && QQuickItemPrivate::get(item)->componentComplete) + if (!updatingLayout && !hasContentWidth) updateLayout(); } -void QQuickTabBarPrivate::itemImplicitHeightChanged(QQuickItem *item) +void QQuickTabBarPrivate::itemImplicitHeightChanged(QQuickItem *) { - if (!updatingLayout && !hasContentHeight && QQuickItemPrivate::get(item)->componentComplete) + if (!updatingLayout && !hasContentHeight) updateLayout(); } @@ -399,10 +397,7 @@ void QQuickTabBar::geometryChanged(const QRectF &newGeometry, const QRectF &oldG { Q_D(QQuickTabBar); QQuickContainer::geometryChanged(newGeometry, oldGeometry); - if (!d->updatingLayout) - d->updateLayout(); - else - polish(); + d->updateLayout(); } bool QQuickTabBar::isContent(QQuickItem *item) const diff --git a/src/quicktemplates2/qquicktabbar_p.h b/src/quicktemplates2/qquicktabbar_p.h index 0e4a3c58..f0299bd5 100644 --- a/src/quicktemplates2/qquicktabbar_p.h +++ b/src/quicktemplates2/qquicktabbar_p.h @@ -60,6 +60,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabBar : public QQuickContainer { Q_OBJECT Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL) + // 2.2 (Qt 5.9) Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth RESET resetContentWidth NOTIFY contentWidthChanged FINAL REVISION 2) Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight RESET resetContentHeight NOTIFY contentHeightChanged FINAL REVISION 2) @@ -75,6 +76,7 @@ public: Position position() const; void setPosition(Position position); + // 2.2 (Qt 5.9) qreal contentWidth() const; void setContentWidth(qreal width); void resetContentWidth(); @@ -87,6 +89,7 @@ public: Q_SIGNALS: void positionChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void contentWidthChanged(); Q_REVISION(2) void contentHeightChanged(); diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index 19ede665..02e84a35 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -559,6 +559,14 @@ void QQuickTextArea::setFocusReason(Qt::FocusReason reason) emit focusReasonChanged(); } +bool QQuickTextArea::contains(const QPointF &point) const +{ + Q_D(const QQuickTextArea); + if (d->flickable && !d->flickable->contains(d->flickable->mapFromItem(this, point))) + return false; + return QQuickTextEdit::contains(point); +} + /*! \since QtQuick.Controls 2.1 (Qt 5.8) \qmlproperty bool QtQuick.Controls::TextArea::hovered @@ -635,14 +643,6 @@ void QQuickTextArea::resetHoverEnabled() #endif } -bool QQuickTextArea::contains(const QPointF &point) const -{ - Q_D(const QQuickTextArea); - if (d->flickable && !d->flickable->contains(d->flickable->mapFromItem(this, point))) - return false; - return QQuickTextEdit::contains(point); -} - /*! \since QtQuick.Controls 2.3 (Qt 5.10) \qmlproperty palette QtQuick.Controls::TextArea::palette diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h index 4709d41a..26799532 100644 --- a/src/quicktemplates2/qquicktextarea_p.h +++ b/src/quicktemplates2/qquicktextarea_p.h @@ -68,8 +68,10 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextArea : public QQuickTextEdit Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText NOTIFY placeholderTextChanged FINAL) Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL) + // 2.1 (Qt 5.8) Q_PROPERTY(bool hovered READ isHovered NOTIFY hoveredChanged FINAL REVISION 1) Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled RESET resetHoverEnabled NOTIFY hoverEnabledChanged FINAL REVISION 1) + // 2.3 (Qt 5.10) Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) public: @@ -90,6 +92,9 @@ public: Qt::FocusReason focusReason() const; void setFocusReason(Qt::FocusReason reason); + bool contains(const QPointF &point) const override; + + // 2.1 (Qt 5.8) bool isHovered() const; void setHovered(bool hovered); @@ -97,8 +102,7 @@ public: void setHoverEnabled(bool enabled); void resetHoverEnabled(); - bool contains(const QPointF &point) const override; - + // 2.3 (Qt 5.10) QPalette palette() const; void setPalette(const QPalette &palette); void resetPalette(); @@ -110,11 +114,13 @@ Q_SIGNALS: void backgroundChanged(); void placeholderTextChanged(); void focusReasonChanged(); - Q_REVISION(1) void hoveredChanged(); - Q_REVISION(1) void hoverEnabledChanged(); void pressAndHold(QQuickMouseEvent *event); + // 2.1 (Qt 5.8) Q_REVISION(1) void pressed(QQuickMouseEvent *event); Q_REVISION(1) void released(QQuickMouseEvent *event); + Q_REVISION(1) void hoveredChanged(); + Q_REVISION(1) void hoverEnabledChanged(); + // 2.3 (Qt 5.10) Q_REVISION(3) void paletteChanged(); protected: diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index 189c26be..fba0e67c 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -637,7 +637,8 @@ void QQuickTextField::mousePressEvent(QMouseEvent *event) QQuickTextInput::mousePressEvent(d->pressHandler.delayedMousePressEvent); d->pressHandler.clearDelayedMouseEvent(); } - QQuickTextInput::mousePressEvent(event); + if (event->buttons() != Qt::RightButton) + QQuickTextInput::mousePressEvent(event); } } @@ -650,7 +651,8 @@ void QQuickTextField::mouseMoveEvent(QMouseEvent *event) QQuickTextInput::mousePressEvent(d->pressHandler.delayedMousePressEvent); d->pressHandler.clearDelayedMouseEvent(); } - QQuickTextInput::mouseMoveEvent(event); + if (event->buttons() != Qt::RightButton) + QQuickTextInput::mouseMoveEvent(event); } } @@ -663,7 +665,8 @@ void QQuickTextField::mouseReleaseEvent(QMouseEvent *event) QQuickTextInput::mousePressEvent(d->pressHandler.delayedMousePressEvent); d->pressHandler.clearDelayedMouseEvent(); } - QQuickTextInput::mouseReleaseEvent(event); + if (event->buttons() != Qt::RightButton) + QQuickTextInput::mouseReleaseEvent(event); } } @@ -674,7 +677,8 @@ void QQuickTextField::mouseDoubleClickEvent(QMouseEvent *event) QQuickTextInput::mousePressEvent(d->pressHandler.delayedMousePressEvent); d->pressHandler.clearDelayedMouseEvent(); } - QQuickTextInput::mouseDoubleClickEvent(event); + if (event->buttons() != Qt::RightButton) + QQuickTextInput::mouseDoubleClickEvent(event); } void QQuickTextField::timerEvent(QTimerEvent *event) diff --git a/src/quicktemplates2/qquicktextfield_p.h b/src/quicktemplates2/qquicktextfield_p.h index 0629a158..7dab0caf 100644 --- a/src/quicktemplates2/qquicktextfield_p.h +++ b/src/quicktemplates2/qquicktextfield_p.h @@ -67,8 +67,10 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextField : public QQuickTextInput Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText NOTIFY placeholderTextChanged FINAL) Q_PROPERTY(Qt::FocusReason focusReason READ focusReason WRITE setFocusReason NOTIFY focusReasonChanged FINAL) + // 2.1 (Qt 5.8) Q_PROPERTY(bool hovered READ isHovered NOTIFY hoveredChanged FINAL REVISION 1) Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled RESET resetHoverEnabled NOTIFY hoverEnabledChanged FINAL REVISION 1) + // 2.3 (Qt 5.10) Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) public: @@ -86,6 +88,7 @@ public: Qt::FocusReason focusReason() const; void setFocusReason(Qt::FocusReason reason); + // 2.1 (Qt 5.8) bool isHovered() const; void setHovered(bool hovered); @@ -93,6 +96,7 @@ public: void setHoverEnabled(bool enabled); void resetHoverEnabled(); + // 2.3 (Qt 5.10) QPalette palette() const; void setPalette(const QPalette &palette); void resetPalette(); @@ -104,11 +108,13 @@ Q_SIGNALS: void backgroundChanged(); void placeholderTextChanged(); void focusReasonChanged(); - Q_REVISION(1) void hoveredChanged(); - Q_REVISION(1) void hoverEnabledChanged(); void pressAndHold(QQuickMouseEvent *event); + // 2.1 (Qt 5.8) Q_REVISION(1) void pressed(QQuickMouseEvent *event); Q_REVISION(1) void released(QQuickMouseEvent *event); + Q_REVISION(1) void hoveredChanged(); + Q_REVISION(1) void hoverEnabledChanged(); + // 2.3 (Qt 5.10) Q_REVISION(3) void paletteChanged(); protected: diff --git a/src/quicktemplates2/qquicktoolbutton.cpp b/src/quicktemplates2/qquicktoolbutton.cpp index 8c9e9bca..f87a58b2 100644 --- a/src/quicktemplates2/qquicktoolbutton.cpp +++ b/src/quicktemplates2/qquicktoolbutton.cpp @@ -58,9 +58,8 @@ QT_BEGIN_NAMESPACE \snippet qtquickcontrols2-toolbar.qml 1 ToolButton inherits its API from AbstractButton. For instance, you can set - \l {AbstractButton::text}{text}, and react to \l {AbstractButton::clicked}{clicks} - using the AbstractButton API. In addition to displaying text, tool buttons - can also display an \l [QML]{Button Icons}{icon}. + \l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon}, + and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API. \sa ToolBar, {Customizing ToolButton}, {Button Controls} */ diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index 48edb32e..1bf6ca55 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -36,6 +36,7 @@ #include "qquicktooltip_p.h" #include "qquickpopup_p_p.h" +#include "qquickpopupitem_p_p.h" #include "qquickcontrol_p_p.h" #include <QtCore/qbasictimer.h> @@ -172,6 +173,7 @@ QQuickToolTip::QQuickToolTip(QQuickItem *parent) Q_D(QQuickToolTip); d->allowVerticalFlip = true; d->allowHorizontalFlip = true; + d->popupItem->setHoverEnabled(false); // QTBUG-63644 } /*! diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp index 547380e6..bed3e400 100644 --- a/src/quicktemplates2/qquicktumbler.cpp +++ b/src/quicktemplates2/qquicktumbler.cpp @@ -124,11 +124,13 @@ QQuickItem *QQuickTumblerPrivate::determineViewType(QQuickItem *contentItem) view = contentItem; viewContentItem = contentItem; viewContentItemType = PathViewContentItem; + viewOffset = 0; return contentItem; } else if (contentItem->inherits("QQuickListView")) { view = contentItem; viewContentItem = qobject_cast<QQuickFlickable*>(contentItem)->contentItem(); viewContentItemType = ListViewContentItem; + viewContentY = 0; return contentItem; } else { const auto childItems = contentItem->childItems(); @@ -147,6 +149,10 @@ void QQuickTumblerPrivate::resetViewData() { view = nullptr; viewContentItem = nullptr; + if (viewContentItemType == PathViewContentItem) + viewOffset = 0; + else if (viewContentItemType == ListViewContentItem) + viewContentY = 0; viewContentItemType = UnsupportedContentItemType; } @@ -229,16 +235,52 @@ void QQuickTumblerPrivate::_q_onViewCountChanged() } } -void QQuickTumblerPrivate::itemChildAdded(QQuickItem *, QQuickItem *) +void QQuickTumblerPrivate::_q_onViewOffsetChanged() +{ + viewOffset = view->property("offset").toReal(); + calculateDisplacements(); +} + +void QQuickTumblerPrivate::_q_onViewContentYChanged() +{ + viewContentY = view->property("contentY").toReal(); + calculateDisplacements(); +} + +void QQuickTumblerPrivate::calculateDisplacements() +{ + const auto items = viewContentItemChildItems(); + for (QQuickItem *childItem : items) { + QQuickTumblerAttached *attached = qobject_cast<QQuickTumblerAttached *>(qmlAttachedPropertiesObject<QQuickTumbler>(childItem, false)); + if (attached) + QQuickTumblerAttachedPrivate::get(attached)->calculateDisplacement(); + } +} + +void QQuickTumblerPrivate::itemChildAdded(QQuickItem *, QQuickItem *child) { _q_updateItemWidths(); _q_updateItemHeights(); + + QQuickTumblerAttached *attached = qobject_cast<QQuickTumblerAttached *>(qmlAttachedPropertiesObject<QQuickTumbler>(child, false)); + if (attached) + QQuickTumblerAttachedPrivate::get(attached)->calculateDisplacement(); } -void QQuickTumblerPrivate::itemChildRemoved(QQuickItem *, QQuickItem *) +void QQuickTumblerPrivate::itemChildRemoved(QQuickItem *, QQuickItem *child) { _q_updateItemWidths(); _q_updateItemHeights(); + + QQuickTumblerAttached *attached = qobject_cast<QQuickTumblerAttached *>(qmlAttachedPropertiesObject<QQuickTumbler>(child, false)); + if (attached) + QQuickTumblerAttachedPrivate::get(attached)->calculateDisplacement(); +} + +void QQuickTumblerPrivate::itemGeometryChanged(QQuickItem *, QQuickGeometryChange change, const QRectF &) +{ + if (change.sizeChange()) + calculateDisplacements(); } QQuickTumbler::QQuickTumbler(QQuickItem *parent) @@ -419,6 +461,11 @@ void QQuickTumbler::setVisibleItemCount(int visibleItemCount) emit visibleItemCountChanged(); } +QQuickTumblerAttached *QQuickTumbler::qmlAttachedProperties(QObject *object) +{ + return new QQuickTumblerAttached(object); +} + /*! \qmlproperty bool QtQuick.Controls::Tumbler::wrap \since QtQuick.Controls 2.1 (Qt 5.8) @@ -464,11 +511,6 @@ bool QQuickTumbler::isMoving() const return d->view && d->view->property("moving").toBool(); } -QQuickTumblerAttached *QQuickTumbler::qmlAttachedProperties(QObject *object) -{ - return new QQuickTumblerAttached(object); -} - void QQuickTumbler::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickTumbler); @@ -532,8 +574,13 @@ void QQuickTumblerPrivate::disconnectFromView() QObject::disconnect(view, SIGNAL(countChanged()), q, SLOT(_q_onViewCountChanged())); QObject::disconnect(view, SIGNAL(movingChanged()), q, SIGNAL(movingChanged())); + if (viewContentItemType == PathViewContentItem) + QObject::disconnect(view, SIGNAL(offsetChanged()), q, SLOT(_q_onViewOffsetChanged())); + else + QObject::disconnect(view, SIGNAL(contentYChanged()), q, SLOT(_q_onViewContentYChanged())); + QQuickItemPrivate *oldViewContentItemPrivate = QQuickItemPrivate::get(viewContentItem); - oldViewContentItemPrivate->removeItemChangeListener(this, QQuickItemPrivate::Children); + oldViewContentItemPrivate->removeItemChangeListener(this, QQuickItemPrivate::Children | QQuickItemPrivate::Geometry); resetViewData(); } @@ -557,8 +604,16 @@ void QQuickTumblerPrivate::setupViewData(QQuickItem *newControlContentItem) QObject::connect(view, SIGNAL(countChanged()), q, SLOT(_q_onViewCountChanged())); QObject::connect(view, SIGNAL(movingChanged()), q, SIGNAL(movingChanged())); + if (viewContentItemType == PathViewContentItem) { + QObject::connect(view, SIGNAL(offsetChanged()), q, SLOT(_q_onViewOffsetChanged())); + _q_onViewOffsetChanged(); + } else { + QObject::connect(view, SIGNAL(contentYChanged()), q, SLOT(_q_onViewContentYChanged())); + _q_onViewContentYChanged(); + } + QQuickItemPrivate *viewContentItemPrivate = QQuickItemPrivate::get(viewContentItem); - viewContentItemPrivate->addItemChangeListener(this, QQuickItemPrivate::Children); + viewContentItemPrivate->addItemChangeListener(this, QQuickItemPrivate::Children | QQuickItemPrivate::Geometry); // Sync the view's currentIndex with ours. syncCurrentIndex(); @@ -700,81 +755,36 @@ QPalette QQuickTumbler::defaultPalette() const return QQuickControlPrivate::themePalette(QPlatformTheme::ItemViewPalette); } -class QQuickTumblerAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener -{ - Q_DECLARE_PUBLIC(QQuickTumblerAttached) -public: - QQuickTumblerAttachedPrivate() - : tumbler(nullptr), - index(-1), - displacement(0) - { - } - - void init(QQuickItem *delegateItem) - { - if (!delegateItem->parentItem()) { - qWarning() << "Tumbler: attached properties must be accessed through a delegate item that has a parent"; - return; - } - - QVariant indexContextProperty = qmlContext(delegateItem)->contextProperty(QStringLiteral("index")); - if (!indexContextProperty.isValid()) { - qWarning() << "Tumbler: attempting to access attached property on item without an \"index\" property"; - return; - } - - index = indexContextProperty.toInt(); - - QQuickItem *parentItem = delegateItem; - while ((parentItem = parentItem->parentItem())) { - if ((tumbler = qobject_cast<QQuickTumbler*>(parentItem))) - break; - } - } - - void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override; - void itemChildAdded(QQuickItem *, QQuickItem *) override; - void itemChildRemoved(QQuickItem *, QQuickItem *) override; - - void _q_calculateDisplacement(); - void emitIfDisplacementChanged(qreal oldDisplacement, qreal newDisplacement); - - // The Tumbler that contains the delegate. Required to calculated the displacement. - QPointer<QQuickTumbler> tumbler; - // The index of the delegate. Used to calculate the displacement. - int index; - // The displacement for our delegate. - qreal displacement; -}; - -void QQuickTumblerAttachedPrivate::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) +QQuickTumblerAttachedPrivate::QQuickTumblerAttachedPrivate() + : tumbler(nullptr), + index(-1), + displacement(0) { - _q_calculateDisplacement(); } -void QQuickTumblerAttachedPrivate::itemChildAdded(QQuickItem *, QQuickItem *) +void QQuickTumblerAttachedPrivate::init(QQuickItem *delegateItem) { - _q_calculateDisplacement(); -} + if (!delegateItem->parentItem()) { + qWarning() << "Tumbler: attached properties must be accessed through a delegate item that has a parent"; + return; + } -void QQuickTumblerAttachedPrivate::itemChildRemoved(QQuickItem *item, QQuickItem *child) -{ - _q_calculateDisplacement(); + QVariant indexContextProperty = qmlContext(delegateItem)->contextProperty(QStringLiteral("index")); + if (!indexContextProperty.isValid()) { + qWarning() << "Tumbler: attempting to access attached property on item without an \"index\" property"; + return; + } - if (parent == child) { - // The child that was removed from the contentItem was the delegate - // that our properties are attached to. If we don't remove the change - // listener, the contentItem will attempt to notify a destroyed - // listener, causing a crash. + index = indexContextProperty.toInt(); - // item is the "actual content item" of Tumbler's contentItem, i.e. a PathView or ListView.contentItem - QQuickItemPrivate *p = QQuickItemPrivate::get(item); - p->removeItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Children); + QQuickItem *parentItem = delegateItem; + while ((parentItem = parentItem->parentItem())) { + if ((tumbler = qobject_cast<QQuickTumbler*>(parentItem))) + break; } } -void QQuickTumblerAttachedPrivate::_q_calculateDisplacement() +void QQuickTumblerAttachedPrivate::calculateDisplacement() { const int previousDisplacement = displacement; displacement = 0; @@ -802,7 +812,7 @@ void QQuickTumblerAttachedPrivate::_q_calculateDisplacement() } if (tumblerPrivate->viewContentItemType == QQuickTumblerPrivate::PathViewContentItem) { - const qreal offset = tumblerPrivate->view->property("offset").toReal(); + const qreal offset = tumblerPrivate->viewOffset; displacement = count > 1 ? count - index - offset : 0; // Don't add 1 if count <= visibleItemCount @@ -813,7 +823,7 @@ void QQuickTumblerAttachedPrivate::_q_calculateDisplacement() else if (displacement < -halfVisibleItems) displacement += count; } else { - const qreal contentY = tumblerPrivate->view->property("contentY").toReal(); + const qreal contentY = tumblerPrivate->viewContentY; const qreal delegateH = delegateHeight(tumbler); const qreal preferredHighlightBegin = tumblerPrivate->view->property("preferredHighlightBegin").toReal(); // Tumbler's displacement goes from negative at the top to positive towards the bottom, so we must switch this around. @@ -853,31 +863,10 @@ QQuickTumblerAttached::QQuickTumblerAttached(QObject *parent) if (!tumblerPrivate->viewContentItem) return; - QQuickItemPrivate *p = QQuickItemPrivate::get(tumblerPrivate->viewContentItem); - p->addItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Children); - - const char *contentItemSignal = tumblerPrivate->viewContentItemType == QQuickTumblerPrivate::PathViewContentItem - ? SIGNAL(offsetChanged()) : SIGNAL(contentYChanged()); - connect(tumblerPrivate->view, contentItemSignal, this, SLOT(_q_calculateDisplacement())); - - d->_q_calculateDisplacement(); + d->calculateDisplacement(); } } -QQuickTumblerAttached::~QQuickTumblerAttached() -{ - Q_D(QQuickTumblerAttached); - if (!d->tumbler) - return; - - QQuickTumblerPrivate *tumblerPrivate = QQuickTumblerPrivate::get(d->tumbler); - if (!tumblerPrivate->viewContentItem) - return; - - QQuickItemPrivate *viewContentItemPrivate = QQuickItemPrivate::get(tumblerPrivate->viewContentItem); - viewContentItemPrivate->removeItemChangeListener(d, QQuickItemPrivate::Geometry | QQuickItemPrivate::Children); -} - /*! \qmlattachedproperty Tumbler QtQuick.Controls::Tumbler::tumbler \readonly diff --git a/src/quicktemplates2/qquicktumbler_p.h b/src/quicktemplates2/qquicktumbler_p.h index 71d1bda2..5d4df4a7 100644 --- a/src/quicktemplates2/qquicktumbler_p.h +++ b/src/quicktemplates2/qquicktumbler_p.h @@ -66,7 +66,9 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumbler : public QQuickControl Q_PROPERTY(QQuickItem *currentItem READ currentItem NOTIFY currentItemChanged FINAL) Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) Q_PROPERTY(int visibleItemCount READ visibleItemCount WRITE setVisibleItemCount NOTIFY visibleItemCountChanged FINAL) + // 2.1 (Qt 5.8) Q_PROPERTY(bool wrap READ wrap WRITE setWrap RESET resetWrap NOTIFY wrapChanged FINAL REVISION 1) + // 2.2 (Qt 5.9) Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged FINAL REVISION 2) public: @@ -88,14 +90,16 @@ public: int visibleItemCount() const; void setVisibleItemCount(int visibleItemCount); + static QQuickTumblerAttached *qmlAttachedProperties(QObject *object); + + // 2.1 (Qt 5.8) bool wrap() const; void setWrap(bool wrap); void resetWrap(); + // 2.2 (Qt 5.9) bool isMoving() const; - static QQuickTumblerAttached *qmlAttachedProperties(QObject *object); - Q_SIGNALS: void modelChanged(); void countChanged(); @@ -103,7 +107,9 @@ Q_SIGNALS: void currentItemChanged(); void delegateChanged(); void visibleItemCountChanged(); + // 2.1 (Qt 5.8) Q_REVISION(1) void wrapChanged(); + // 2.2 (Qt 5.9) Q_REVISION(2) void movingChanged(); protected: @@ -124,6 +130,8 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_updateItemHeights()) Q_PRIVATE_SLOT(d_func(), void _q_onViewCurrentIndexChanged()) Q_PRIVATE_SLOT(d_func(), void _q_onViewCountChanged()) + Q_PRIVATE_SLOT(d_func(), void _q_onViewOffsetChanged()) + Q_PRIVATE_SLOT(d_func(), void _q_onViewContentYChanged()) }; class QQuickTumblerAttachedPrivate; @@ -136,7 +144,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerAttached : public QObject public: explicit QQuickTumblerAttached(QObject *parent = nullptr); - ~QQuickTumblerAttached(); QQuickTumbler *tumbler() const; qreal displacement() const; @@ -147,8 +154,6 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QQuickTumblerAttached) Q_DECLARE_PRIVATE(QQuickTumblerAttached) - - Q_PRIVATE_SLOT(d_func(), void _q_calculateDisplacement()) }; QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquicktumbler_p_p.h b/src/quicktemplates2/qquicktumbler_p_p.h index 0dcae762..fe8a4ad2 100644 --- a/src/quicktemplates2/qquicktumbler_p_p.h +++ b/src/quicktemplates2/qquicktumbler_p_p.h @@ -50,11 +50,10 @@ #include <QtQuick/private/qquickitemchangelistener_p.h> #include <QtQuickTemplates2/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates2/private/qquicktumbler_p.h> QT_BEGIN_NAMESPACE -class QQuickTumbler; - class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickTumbler) @@ -84,6 +83,10 @@ public: QQuickItem *view; QQuickItem *viewContentItem; ContentItemType viewContentItemType; + union { + qreal viewOffset; // PathView + qreal viewContentY; // ListView + }; int currentIndex; int pendingCurrentIndex; bool ignoreCurrentIndexChanges; @@ -94,6 +97,10 @@ public: void _q_updateItemWidths(); void _q_onViewCurrentIndexChanged(); void _q_onViewCountChanged(); + void _q_onViewOffsetChanged(); + void _q_onViewContentYChanged(); + + void calculateDisplacements(); void disconnectFromView(); void setupViewData(QQuickItem *newControlContentItem); @@ -107,6 +114,32 @@ public: void itemChildAdded(QQuickItem *, QQuickItem *) override; void itemChildRemoved(QQuickItem *, QQuickItem *) override; + void itemGeometryChanged(QQuickItem *, QQuickGeometryChange , const QRectF &) override; +}; + +class QQuickTumblerAttachedPrivate : public QObjectPrivate +{ + Q_DECLARE_PUBLIC(QQuickTumblerAttached) + +public: + QQuickTumblerAttachedPrivate(); + + static QQuickTumblerAttachedPrivate *get(QQuickTumblerAttached *attached) + { + return attached->d_func(); + } + + void init(QQuickItem *delegateItem); + + void calculateDisplacement(); + void emitIfDisplacementChanged(qreal oldDisplacement, qreal newDisplacement); + + // The Tumbler that contains the delegate. Required to calculated the displacement. + QPointer<QQuickTumbler> tumbler; + // The index of the delegate. Used to calculate the displacement. + int index; + // The displacement for our delegate. + qreal displacement; }; QT_END_NAMESPACE diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml index f4a89367..f71a3725 100644 --- a/tests/auto/controls/data/tst_abstractbutton.qml +++ b/tests/auto/controls/data/tst_abstractbutton.qml @@ -410,7 +410,7 @@ TestCase { verify(control) control.text = "&Hello" - compare(control.text, "Hello") // ### TODO: visualize mnemonics + compare(control.text, "&Hello") var clickSpy = signalSpy.createObject(control, {target: control, signalName: "clicked"}) verify(clickSpy.valid) @@ -427,7 +427,7 @@ TestCase { compare(clickSpy.count, 2) control.text = "Te&st" - compare(control.text, "Test") // ### TODO: visualize mnemonics + compare(control.text, "Te&st") keyClick(Qt.Key_H, Qt.AltModifier) compare(clickSpy.count, 2) diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/controls/data/tst_container.qml index 94f22ad2..c5e74eeb 100644 --- a/tests/auto/controls/data/tst_container.qml +++ b/tests/auto/controls/data/tst_container.qml @@ -128,7 +128,7 @@ TestCase { } Component { - id: repeaterContainer + id: repeaterContainer1 Container { id: container Item { objectName: "0" } @@ -143,9 +143,33 @@ TestCase { } } + Component { + id: repeaterContainer2 + Container { + id: container + contentItem: Item { + Repeater { + model: container.contentModel + } + Rectangle { objectName: "extra" } + } + Rectangle { objectName: "0" } + Rectangle { objectName: "1" } + Rectangle { objectName: "2" } + Rectangle { objectName: "3" } + } + } + + function test_repeater_data() { + return [ + { tag: "1", component: repeaterContainer1 }, + { tag: "2", component: repeaterContainer2 } + ] + } + // don't crash (QTBUG-61310) - function test_repeater() { - var control = createTemporaryObject(repeaterContainer) + function test_repeater(data) { + var control = createTemporaryObject(data.component) verify(control) compare(control.itemAt(0).objectName, "0") diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/controls/data/tst_pageindicator.qml index f3151882..dc411e45 100644 --- a/tests/auto/controls/data/tst_pageindicator.qml +++ b/tests/auto/controls/data/tst_pageindicator.qml @@ -122,18 +122,30 @@ TestCase { // test also clicking outside delegates => the nearest should be selected for (var i = 0; i < control.count; ++i) { var child = control.contentItem.children[i] - for (var x = -2; x <= child.width + 2; ++x) { - for (var y = -2; y <= child.height + 2; ++y) { - control.currentIndex = -1 - compare(control.currentIndex, -1) - - var pos = control.mapFromItem(child, x, y) - if (data.touch) - touch.press(0, control, pos.x, pos.y).commit().release(0, control, pos.x, pos.y).commit() - else - mouseClick(control, pos.x, pos.y, Qt.LeftButton) - compare(control.currentIndex, i) - } + + var points = [ + Qt.point(child.width / 2, -2), // top + Qt.point(-2, child.height / 2), // left + Qt.point(child.width + 2, child.height / 2), // right + Qt.point(child.width / 2, child.height + 2), // bottom + + Qt.point(-2, -2), // top-left + Qt.point(child.width + 2, -2), // top-right + Qt.point(-2, child.height + 2), // bottom-left + Qt.point(child.width + 2, child.height + 2), // bottom-right + ] + + for (var j = 0; j < points.length; ++j) { + control.currentIndex = -1 + compare(control.currentIndex, -1) + + var point = points[j] + var pos = control.mapFromItem(child, x, y) + if (data.touch) + touch.press(0, control, pos.x, pos.y).commit().release(0, control, pos.x, pos.y).commit() + else + mouseClick(control, pos.x, pos.y, Qt.LeftButton) + compare(control.currentIndex, i) } } } diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index a8d33cea..90fe9468 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -704,7 +704,7 @@ TestCase { } function test_overshoot() { - var container = flickable.createObject(testCase) + var container = createTemporaryObject(flickable, testCase) verify(container) waitForRendering(container) @@ -733,8 +733,6 @@ TestCase { horizontal.position = 0.8 compare(horizontal.contentItem.x, horizontal.leftPadding + 0.8 * horizontal.availableWidth) compare(horizontal.contentItem.width, 0.2 * horizontal.availableWidth) - - container.destroy() } function test_orientation() { diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index a1d1b7ba..9568da1a 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -367,6 +367,9 @@ TestCase { var control = createTemporaryObject(spinBox, testCase) verify(control) + var valueModifiedSpy = signalSpy.createObject(control, {target: control, signalName: "valueModified"}) + verify(valueModifiedSpy.valid) + control.contentItem.forceActiveFocus() compare(control.contentItem.activeFocus, true) @@ -375,6 +378,7 @@ TestCase { keyClick(Qt.Key_5) keyClick(Qt.Key_Return) compare(control.value, 0) + compare(valueModifiedSpy.count, 0) control.editable = true compare(control.editable, true) @@ -382,6 +386,7 @@ TestCase { keyClick(Qt.Key_5) keyClick(Qt.Key_Return) compare(control.value, 5) + compare(valueModifiedSpy.count, 1) } function test_wheel_data() { diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index 6a40f053..0fee7363 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -420,4 +420,19 @@ TestCase { mouseClick(control, rect.x + rect.width / 2, rect.y + rect.height / 2) compare(control.selectedText, "Qt Quick Controls 2 TextArea") } + + // QTBUG-64048 + function test_rightClick() { + var control = createTemporaryObject(textField, testCase, {text: "TextField", selectByMouse: true}) + verify(control) + + control.selectAll() + compare(control.selectedText, "TextField") + + mouseClick(control, control.width / 2, control.height / 2, Qt.RightButton) + compare(control.selectedText, "TextField") + + mouseClick(control, control.width / 2, control.height / 2, Qt.LeftButton | Qt.RightButton) + compare(control.selectedText, "") + } } diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml index bd46fabd..e7cc6787 100644 --- a/tests/auto/controls/data/tst_tooltip.qml +++ b/tests/auto/controls/data/tst_tooltip.qml @@ -298,4 +298,35 @@ TestCase { keyPress(Qt.Key_A) compare(shortcutActivatedSpy.count, 1) } + + Component { + id: hoverComponent + MouseArea { + id: hoverArea + property alias tooltip: tooltip + hoverEnabled: true + width: testCase.width + height: testCase.height + ToolTip { + id: tooltip + x: 10; y: 10 + width: 10; height: 10 + visible: hoverArea.containsMouse + } + } + } + + // QTBUG-63644 + function test_hover() { + var root = createTemporaryObject(hoverComponent, testCase) + verify(root) + + var tooltip = root.tooltip + verify(tooltip) + + for (var pos = 0; pos <= 25; pos += 5) { + mouseMove(root, pos, pos) + verify(tooltip.visible) + } + } } diff --git a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml index 3589439e..a992e0be 100644 --- a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml +++ b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml @@ -1,12 +1,22 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are diff --git a/tests/auto/qquickdrawer/BLACKLIST b/tests/auto/qquickdrawer/BLACKLIST deleted file mode 100644 index b302c76b..00000000 --- a/tests/auto/qquickdrawer/BLACKLIST +++ /dev/null @@ -1,14 +0,0 @@ -# See qtbase/src/testlib/qtestblacklist.cpp for format - -# https://bugreports.qt.io/browse/QTBUG-62628 -[multiple] -* - -[touch] -* - -[multiTouch] -* - -[grabber] -* diff --git a/tests/auto/qquickiconimage/data/imageProvider.qml b/tests/auto/qquickiconimage/data/imageProvider.qml new file mode 100644 index 00000000..0d7d3033 --- /dev/null +++ b/tests/auto/qquickiconimage/data/imageProvider.qml @@ -0,0 +1,9 @@ +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Controls.impl 2.3 +import QtQuick.Templates 2.3 as T + +IconLabel { + icon.color: "transparent" + icon.source: "image://provider/red" +} diff --git a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp index 4e4afb13..77b860a2 100644 --- a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp +++ b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp @@ -35,6 +35,7 @@ #include <QtQml/qqmlfileselector.h> #include <QtQuick/qquickitem.h> #include <QtQuick/qquickview.h> +#include <QtQuick/qquickimageprovider.h> #include <QtQuick/qquickitemgrabresult.h> #include <QtQuick/private/qquickimage_p.h> #include <QtQuickControls2/private/qquickiconimage_p.h> @@ -67,6 +68,7 @@ private slots: void svgSourceBindingSourceSize(); void color(); void fileSelectors(); + void imageProvider(); private: void setTheme(); @@ -480,6 +482,43 @@ void tst_qquickiconimage::fileSelectors() QCOMPARE(iconImageWindowGrab.pixelColor(iconImageWindowGrab.width() / 2, iconImageWindowGrab.height() / 2), QColor(Qt::blue)); } +class TestImageProvider : public QQuickImageProvider +{ +public: + TestImageProvider() : QQuickImageProvider(QQuickImageProvider::Pixmap) { } + + QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) + { + QSize defaultSize(32, 32); + if (size) + *size = defaultSize; + + QPixmap pixmap(requestedSize.width() > 0 ? requestedSize.width() : defaultSize.width(), + requestedSize.height() > 0 ? requestedSize.height() : defaultSize.height()); + pixmap.fill(QColor(id).rgba()); + return pixmap; + } +}; + +// don't crash (QTBUG-63959) +void tst_qquickiconimage::imageProvider() +{ + QQuickView view; + view.engine()->addImageProvider("provider", new TestImageProvider); + view.setSource(testFileUrl("imageProvider.qml")); + QCOMPARE(view.status(), QQuickView::Ready); + view.show(); + view.requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(&view)); + + QQuickIconImage *iconImage = qobject_cast<QQuickIconImage*>(view.rootObject()->findChild<QQuickIconImage *>()); + QVERIFY(iconImage); + + QImage image = grabItemToImage(iconImage); + QVERIFY(!image.isNull()); + QCOMPARE(image.pixelColor(image.width() / 2, image.height() / 2), QColor(Qt::red)); +} + int main(int argc, char *argv[]) { QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); diff --git a/tests/auto/qquickpopup/BLACKLIST b/tests/auto/qquickpopup/BLACKLIST deleted file mode 100644 index 47795a8b..00000000 --- a/tests/auto/qquickpopup/BLACKLIST +++ /dev/null @@ -1,10 +0,0 @@ -[overlay] -# QTBUG-62668 -* - -[closePolicy] -# QTBUG-62668 -* - - - diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index 25e118e3..f6e1c78b 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -139,7 +139,7 @@ private: void tst_Sanity::initTestCase() { QDirIterator it(QQC2_IMPORT_PATH, QStringList() << "*.qml" << "*.js", QDir::Files, QDirIterator::Subdirectories); - const QStringList excludeDirs = QStringList() << QStringLiteral("snippets") << QStringLiteral("designer"); + const QStringList excludeDirs = QStringList() << QStringLiteral("snippets") << QStringLiteral("designer") << QStringLiteral("Sketch"); while (it.hasNext()) { it.next(); QFileInfo info = it.fileInfo(); @@ -280,9 +280,12 @@ static void addTestRows(QQmlEngine *engine, const QString &sourcePath, const QSt if (QFile::exists(filePath)) { QTest::newRow(qPrintable(name)) << QUrl::fromLocalFile(filePath); break; - } else if (QFile::exists(QQmlFile::urlToLocalFileOrQrc(filePath))) { - QTest::newRow(qPrintable(name)) << QUrl(filePath); - break; + } else { + filePath = QQmlFile::urlToLocalFileOrQrc(filePath); + if (!filePath.isEmpty() && QFile::exists(filePath)) { + QTest::newRow(qPrintable(name)) << QUrl(filePath); + break; + } } } } @@ -313,7 +316,7 @@ void tst_Sanity::attachedObjects_data() { QTest::addColumn<QUrl>("url"); addTestRows(&engine, "calendar", "Qt/labs/calendar"); - addTestRows(&engine, "controls", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "controls", "QtQuick/Controls.2"); addTestRows(&engine, "controls/fusion", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); addTestRows(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); addTestRows(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); diff --git a/tests/auto/snippets/tst_snippets.cpp b/tests/auto/snippets/tst_snippets.cpp index 852c98e9..107759ce 100644 --- a/tests/auto/snippets/tst_snippets.cpp +++ b/tests/auto/snippets/tst_snippets.cpp @@ -103,8 +103,8 @@ void tst_Snippets::verify() QUrl url = QUrl::fromLocalFile(input); component.loadUrl(url); - QObject *root = component.create(); - QVERIFY(root); + QScopedPointer<QObject> root(component.create()); + QVERIFY2(!root.isNull(), qPrintable(component.errorString())); QCOMPARE(component.status(), QQmlComponent::Ready); QVERIFY(component.errors().isEmpty()); @@ -132,10 +132,10 @@ void tst_Snippets::verify() output.insert(index, "-" + applicationStyle.toLower()); } - QQuickWindow *window = qobject_cast<QQuickWindow *>(root); + QQuickWindow *window = qobject_cast<QQuickWindow *>(root.data()); if (!window) { QQuickView *view = new QQuickView; - view->setContent(url, &component, root); + view->setContent(url, &component, root.data()); window = view; } diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index c584b9a5..1d300b1c 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -131,7 +131,7 @@ void tst_CreationTime::controls() void tst_CreationTime::controls_data() { QTest::addColumn<QUrl>("url"); - addTestRows(&engine, "controls", "QtQuick/Controls.2", QStringList() << "ApplicationWindow" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(&engine, "controls", "QtQuick/Controls.2", QStringList() << "ApplicationWindow"); } void tst_CreationTime::fusion() diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index 748cc1c1..fcb6be5b 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -126,7 +126,7 @@ static void addTestRows(QQmlEngine *engine, const QString &sourcePath, const QSt static void initTestRows(QQmlEngine *engine) { - addTestRows(engine, "controls", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator"); + addTestRows(engine, "controls", "QtQuick/Controls.2"); addTestRows(engine, "controls/fusion", "QtQuick/Controls.2/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator"); addTestRows(engine, "controls/imagine", "QtQuick/Controls.2/Imagine"); addTestRows(engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate"); diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index d81ea32f..d23b4494 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -7,4 +7,6 @@ SUBDIRS += \ styles \ testbench +qtConfig(systemtrayicon): SUBDIRS += systemtrayicon + qtHaveModule(widgets): SUBDIRS += viewinqwidget diff --git a/tests/manual/systemtrayicon/images/qt_logo_green_256.png b/tests/manual/systemtrayicon/images/qt_logo_green_256.png Binary files differnew file mode 100644 index 00000000..92243fd5 --- /dev/null +++ b/tests/manual/systemtrayicon/images/qt_logo_green_256.png diff --git a/tests/manual/systemtrayicon/systemtrayicon.cpp b/tests/manual/systemtrayicon/systemtrayicon.cpp new file mode 100644 index 00000000..1866a269 --- /dev/null +++ b/tests/manual/systemtrayicon/systemtrayicon.cpp @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QGuiApplication> +#include <QQmlApplicationEngine> + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + + QQmlApplicationEngine engine; + engine.load(QUrl("qrc:/files/systemtrayicon.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + + return app.exec(); +} diff --git a/tests/manual/systemtrayicon/systemtrayicon.pro b/tests/manual/systemtrayicon/systemtrayicon.pro new file mode 100644 index 00000000..24b9caa0 --- /dev/null +++ b/tests/manual/systemtrayicon/systemtrayicon.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +TARGET = systemtrayicon +QT += quick quickcontrols2 + +SOURCES += \ + systemtrayicon.cpp + +RESOURCES += \ + systemtrayicon.qrc diff --git a/tests/manual/systemtrayicon/systemtrayicon.qml b/tests/manual/systemtrayicon/systemtrayicon.qml new file mode 100644 index 00000000..8431ab30 --- /dev/null +++ b/tests/manual/systemtrayicon/systemtrayicon.qml @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import Qt.labs.platform 1.0 + +ApplicationWindow { + id: window + + visible: true + title: "Qt Quick Controls 2 - System Tray Icon" + + MenuBar { + id: menuBar + + Menu { + id: fileMenu + title: qsTr("File") + + MenuItem { + id : quitItem + text : "Quit" + onTriggered: Qt.quit() + } + } + } + + SystemTrayIcon { + visible: true + iconSource: "qrc:/files/images/qt_logo_green_256.png" + + menu: Menu { + MenuItem { + text: qsTr("Quit") + onTriggered: Qt.quit() + } + } + + onActivated: console.log("Activated") + } +} diff --git a/tests/manual/systemtrayicon/systemtrayicon.qrc b/tests/manual/systemtrayicon/systemtrayicon.qrc new file mode 100644 index 00000000..656476d9 --- /dev/null +++ b/tests/manual/systemtrayicon/systemtrayicon.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/files"> + <file>systemtrayicon.qml</file> + <file>images/qt_logo_green_256.png</file> + </qresource> +</RCC> diff --git a/tests/manual/viewinqwidget/main.cpp b/tests/manual/viewinqwidget/main.cpp index c7050bc1..80cbb415 100644 --- a/tests/manual/viewinqwidget/main.cpp +++ b/tests/manual/viewinqwidget/main.cpp @@ -39,6 +39,7 @@ #include <QVBoxLayout> #include <QDebug> #include <QDesktopWidget> +#include <QDir> #include <QGroupBox> #include <QQmlApplicationEngine> #include <QQmlError> @@ -66,8 +67,9 @@ int main(int argc, char *argv[]) } hLayout->addWidget(groupBox); - const QUrl gallerySource(QLatin1String("qrc:/gallery.qml")); - QQmlApplicationEngine engine(gallerySource); + const QString gallerySource = + QDir::cleanPath(QLatin1String(SRCDIR"../../../examples/quickcontrols2/gallery/gallery.qml")); + QQmlApplicationEngine engine(QUrl::fromLocalFile(gallerySource)); QObject *root = engine.rootObjects().value(0, nullptr); if (!root || !root->isWindowType()) { qWarning() << "Load error" << gallerySource; diff --git a/tests/manual/viewinqwidget/viewinqwidget.pro b/tests/manual/viewinqwidget/viewinqwidget.pro index 9b7cba00..649829d4 100644 --- a/tests/manual/viewinqwidget/viewinqwidget.pro +++ b/tests/manual/viewinqwidget/viewinqwidget.pro @@ -2,5 +2,5 @@ QT += qml quick widgets quickwidgets TARGET = viewinqwidget SOURCES += $$PWD/main.cpp OTHER_FILES += main.qml -RESOURCES += viewinqwidget.qrc \ - ../../../examples/controls/gallery/gallery.qrc +RESOURCES += viewinqwidget.qrc +DEFINES += SRCDIR=\\\"$$PWD/\\\" |
