diff --git a/examples/iotdashboard/GraphicProvider.cpp b/examples/iotdashboard/GraphicProvider.cpp index 45e777de..acdec602 100644 --- a/examples/iotdashboard/GraphicProvider.cpp +++ b/examples/iotdashboard/GraphicProvider.cpp @@ -6,10 +6,8 @@ #include "GraphicProvider.h" #include +#include -#include -#include -#include #include const inline QString pathName( const QString& baseName, const QString& suffix ) @@ -23,7 +21,7 @@ const inline QString pathName( const QString& baseName, const QString& suffix ) const QskGraphic* GraphicProvider::loadGraphic( const QString& id ) const { - static QString scope = QStringLiteral( ":/images/" ); + static QString scope = QStringLiteral( ":/images/qvg/" ); QString baseName = scope; baseName += id.toLower().replace( ' ', '-' ); @@ -31,30 +29,12 @@ const QskGraphic* GraphicProvider::loadGraphic( const QString& id ) const auto path = pathName( baseName, QString() ); if ( path.isEmpty() ) - path = pathName( baseName, ".png" ); - - if ( path.isEmpty() ) - path = pathName( baseName, ".svg" ); + path = pathName( baseName, ".qvg" ); QskGraphic graphic; if ( !path.isEmpty() ) - { - if ( path.endsWith( ".png" ) ) - { - graphic = QskGraphic::fromImage( QImage( path ) ); - } - else - { - QSvgRenderer renderer; - if ( renderer.load( path ) ) - { - QPainter painter( &graphic ); - renderer.render( &painter ); - painter.end(); - } - } - } + graphic = QskGraphicIO::read( path ); return graphic.isNull() ? nullptr : new QskGraphic( graphic ); } diff --git a/examples/iotdashboard/images.qrc b/examples/iotdashboard/images.qrc index 38a9148a..8026b261 100644 --- a/examples/iotdashboard/images.qrc +++ b/examples/iotdashboard/images.qrc @@ -1,20 +1,20 @@ - - images/main-icon.svg - images/dashboard.svg - images/rooms.svg - images/devices.svg - images/statistics.svg - images/storage.svg - images/members.svg - images/logout.svg - images/indoor-temperature.svg - images/humidity.svg - images/up.svg - images/down.svg - images/lamps.svg - images/music-system.svg - images/ac.svg - images/router.svg + + images/qvg/main-icon.qvg + images/qvg/dashboard.qvg + images/qvg/rooms.qvg + images/qvg/devices.qvg + images/qvg/statistics.qvg + images/qvg/storage.qvg + images/qvg/members.qvg + images/qvg/logout.qvg + images/qvg/indoor-temperature.qvg + images/qvg/humidity.qvg + images/qvg/up.qvg + images/qvg/down.qvg + images/qvg/lamps.qvg + images/qvg/music-system.qvg + images/qvg/ac.qvg + images/qvg/router.qvg diff --git a/examples/iotdashboard/images/qvg/ac.qvg b/examples/iotdashboard/images/qvg/ac.qvg new file mode 100644 index 00000000..56ba5116 Binary files /dev/null and b/examples/iotdashboard/images/qvg/ac.qvg differ diff --git a/examples/iotdashboard/images/qvg/dashboard.qvg b/examples/iotdashboard/images/qvg/dashboard.qvg new file mode 100644 index 00000000..85ae5e05 Binary files /dev/null and b/examples/iotdashboard/images/qvg/dashboard.qvg differ diff --git a/examples/iotdashboard/images/qvg/devices.qvg b/examples/iotdashboard/images/qvg/devices.qvg new file mode 100644 index 00000000..aefe5935 Binary files /dev/null and b/examples/iotdashboard/images/qvg/devices.qvg differ diff --git a/examples/iotdashboard/images/qvg/down.qvg b/examples/iotdashboard/images/qvg/down.qvg new file mode 100644 index 00000000..71e37f4e Binary files /dev/null and b/examples/iotdashboard/images/qvg/down.qvg differ diff --git a/examples/iotdashboard/images/qvg/humidity.qvg b/examples/iotdashboard/images/qvg/humidity.qvg new file mode 100644 index 00000000..f71f332c Binary files /dev/null and b/examples/iotdashboard/images/qvg/humidity.qvg differ diff --git a/examples/iotdashboard/images/qvg/indoor-temperature.qvg b/examples/iotdashboard/images/qvg/indoor-temperature.qvg new file mode 100644 index 00000000..34d9e6d5 Binary files /dev/null and b/examples/iotdashboard/images/qvg/indoor-temperature.qvg differ diff --git a/examples/iotdashboard/images/qvg/lamps.qvg b/examples/iotdashboard/images/qvg/lamps.qvg new file mode 100644 index 00000000..42adabc6 Binary files /dev/null and b/examples/iotdashboard/images/qvg/lamps.qvg differ diff --git a/examples/iotdashboard/images/qvg/logout.qvg b/examples/iotdashboard/images/qvg/logout.qvg new file mode 100644 index 00000000..9213e3c3 Binary files /dev/null and b/examples/iotdashboard/images/qvg/logout.qvg differ diff --git a/examples/iotdashboard/images/qvg/main-icon.qvg b/examples/iotdashboard/images/qvg/main-icon.qvg new file mode 100644 index 00000000..067c743a Binary files /dev/null and b/examples/iotdashboard/images/qvg/main-icon.qvg differ diff --git a/examples/iotdashboard/images/qvg/members.qvg b/examples/iotdashboard/images/qvg/members.qvg new file mode 100644 index 00000000..b6170fdc Binary files /dev/null and b/examples/iotdashboard/images/qvg/members.qvg differ diff --git a/examples/iotdashboard/images/qvg/music-system.qvg b/examples/iotdashboard/images/qvg/music-system.qvg new file mode 100644 index 00000000..365c6090 Binary files /dev/null and b/examples/iotdashboard/images/qvg/music-system.qvg differ diff --git a/examples/iotdashboard/images/qvg/rooms.qvg b/examples/iotdashboard/images/qvg/rooms.qvg new file mode 100644 index 00000000..d0bb7001 Binary files /dev/null and b/examples/iotdashboard/images/qvg/rooms.qvg differ diff --git a/examples/iotdashboard/images/qvg/router.qvg b/examples/iotdashboard/images/qvg/router.qvg new file mode 100644 index 00000000..5d413904 Binary files /dev/null and b/examples/iotdashboard/images/qvg/router.qvg differ diff --git a/examples/iotdashboard/images/qvg/statistics.qvg b/examples/iotdashboard/images/qvg/statistics.qvg new file mode 100644 index 00000000..c43fb548 Binary files /dev/null and b/examples/iotdashboard/images/qvg/statistics.qvg differ diff --git a/examples/iotdashboard/images/qvg/storage.qvg b/examples/iotdashboard/images/qvg/storage.qvg new file mode 100644 index 00000000..1313ee76 Binary files /dev/null and b/examples/iotdashboard/images/qvg/storage.qvg differ diff --git a/examples/iotdashboard/images/qvg/up.qvg b/examples/iotdashboard/images/qvg/up.qvg new file mode 100644 index 00000000..58c142f6 Binary files /dev/null and b/examples/iotdashboard/images/qvg/up.qvg differ diff --git a/examples/iotdashboard/iotdashboard.pro b/examples/iotdashboard/iotdashboard.pro index 46c2c6c8..67a11908 100644 --- a/examples/iotdashboard/iotdashboard.pro +++ b/examples/iotdashboard/iotdashboard.pro @@ -1,8 +1,5 @@ CONFIG += qskexample -QT += svg -QT += quick_private # TODO: examples should not use private headers - SOURCES += \ Box.cpp \ BoxWithButtons.cpp \