diff --git a/LICENSES b/LICENSES index 92682268..6c7da6d7 100644 --- a/LICENSES +++ b/LICENSES @@ -24,3 +24,8 @@ c) Material3 Icons Code: https://github.com/marella/material-design-icons SPDX-License-Identifier: Apache License 2.0 + +d) Fluent2 Icons + + Code: https://github.com/microsoft/fluentui-system-icons + SPDX-License-Identifier: MIT License diff --git a/designsystems/fluent2/icons/qvg/checkmark.qvg b/designsystems/fluent2/icons/qvg/checkmark.qvg index 07216854..dea06251 100644 Binary files a/designsystems/fluent2/icons/qvg/checkmark.qvg and b/designsystems/fluent2/icons/qvg/checkmark.qvg differ diff --git a/designsystems/fluent2/icons/qvg/combo-box-arrow-closed.qvg b/designsystems/fluent2/icons/qvg/combo-box-arrow-closed.qvg index 72e1f95f..83f33a45 100644 Binary files a/designsystems/fluent2/icons/qvg/combo-box-arrow-closed.qvg and b/designsystems/fluent2/icons/qvg/combo-box-arrow-closed.qvg differ diff --git a/designsystems/fluent2/icons/qvg/combo-box-arrow-open.qvg b/designsystems/fluent2/icons/qvg/combo-box-arrow-open.qvg index e2a8dd51..1e757789 100644 Binary files a/designsystems/fluent2/icons/qvg/combo-box-arrow-open.qvg and b/designsystems/fluent2/icons/qvg/combo-box-arrow-open.qvg differ diff --git a/designsystems/fluent2/icons/qvg/segmented-button-check.qvg b/designsystems/fluent2/icons/qvg/segmented-button-check.qvg index c3d2df1a..1b0148e3 100644 Binary files a/designsystems/fluent2/icons/qvg/segmented-button-check.qvg and b/designsystems/fluent2/icons/qvg/segmented-button-check.qvg differ diff --git a/designsystems/fluent2/icons/qvg/spin-box-arrow-down.qvg b/designsystems/fluent2/icons/qvg/spin-box-arrow-down.qvg index 7536d52c..376094d9 100644 Binary files a/designsystems/fluent2/icons/qvg/spin-box-arrow-down.qvg and b/designsystems/fluent2/icons/qvg/spin-box-arrow-down.qvg differ diff --git a/designsystems/fluent2/icons/qvg/spin-box-arrow-up.qvg b/designsystems/fluent2/icons/qvg/spin-box-arrow-up.qvg index 08c62e59..c45983f9 100644 Binary files a/designsystems/fluent2/icons/qvg/spin-box-arrow-up.qvg and b/designsystems/fluent2/icons/qvg/spin-box-arrow-up.qvg differ diff --git a/designsystems/material3/icons/qvg/add.qvg b/designsystems/material3/icons/qvg/add.qvg index fbb711f9..de7e62c6 100644 Binary files a/designsystems/material3/icons/qvg/add.qvg and b/designsystems/material3/icons/qvg/add.qvg differ diff --git a/designsystems/material3/icons/qvg/arrow_drop_down.qvg b/designsystems/material3/icons/qvg/arrow_drop_down.qvg index 9ab42f6d..496378d6 100644 Binary files a/designsystems/material3/icons/qvg/arrow_drop_down.qvg and b/designsystems/material3/icons/qvg/arrow_drop_down.qvg differ diff --git a/designsystems/material3/icons/qvg/arrow_drop_up.qvg b/designsystems/material3/icons/qvg/arrow_drop_up.qvg index 34e4ed77..09b1976e 100644 Binary files a/designsystems/material3/icons/qvg/arrow_drop_up.qvg and b/designsystems/material3/icons/qvg/arrow_drop_up.qvg differ diff --git a/designsystems/material3/icons/qvg/check.qvg b/designsystems/material3/icons/qvg/check.qvg index fad6dbcc..8fb73515 100644 Binary files a/designsystems/material3/icons/qvg/check.qvg and b/designsystems/material3/icons/qvg/check.qvg differ diff --git a/designsystems/material3/icons/qvg/check_small.qvg b/designsystems/material3/icons/qvg/check_small.qvg index 5f84fa5f..4b92ce5b 100644 Binary files a/designsystems/material3/icons/qvg/check_small.qvg and b/designsystems/material3/icons/qvg/check_small.qvg differ diff --git a/designsystems/material3/icons/qvg/combo-box-arrow-closed.qvg b/designsystems/material3/icons/qvg/combo-box-arrow-closed.qvg index 72e1f95f..83f33a45 100644 Binary files a/designsystems/material3/icons/qvg/combo-box-arrow-closed.qvg and b/designsystems/material3/icons/qvg/combo-box-arrow-closed.qvg differ diff --git a/designsystems/material3/icons/qvg/combo-box-arrow-open.qvg b/designsystems/material3/icons/qvg/combo-box-arrow-open.qvg index e2a8dd51..1e757789 100644 Binary files a/designsystems/material3/icons/qvg/combo-box-arrow-open.qvg and b/designsystems/material3/icons/qvg/combo-box-arrow-open.qvg differ diff --git a/designsystems/material3/icons/qvg/remove.qvg b/designsystems/material3/icons/qvg/remove.qvg index 6f0efadd..6598d5b0 100644 Binary files a/designsystems/material3/icons/qvg/remove.qvg and b/designsystems/material3/icons/qvg/remove.qvg differ diff --git a/designsystems/material3/icons/qvg/segmented-button-check.qvg b/designsystems/material3/icons/qvg/segmented-button-check.qvg index c3d2df1a..1b0148e3 100644 Binary files a/designsystems/material3/icons/qvg/segmented-button-check.qvg and b/designsystems/material3/icons/qvg/segmented-button-check.qvg differ diff --git a/examples/gallery/icons/qvg/airport_shuttle.qvg b/examples/gallery/icons/qvg/airport_shuttle.qvg index a2df7d1a..fc2feaa8 100644 Binary files a/examples/gallery/icons/qvg/airport_shuttle.qvg and b/examples/gallery/icons/qvg/airport_shuttle.qvg differ diff --git a/examples/gallery/icons/qvg/flight.qvg b/examples/gallery/icons/qvg/flight.qvg index d776378b..7980008b 100644 Binary files a/examples/gallery/icons/qvg/flight.qvg and b/examples/gallery/icons/qvg/flight.qvg differ diff --git a/examples/gallery/icons/qvg/local_pizza.qvg b/examples/gallery/icons/qvg/local_pizza.qvg index e2fc29d0..bea68757 100644 Binary files a/examples/gallery/icons/qvg/local_pizza.qvg and b/examples/gallery/icons/qvg/local_pizza.qvg differ diff --git a/examples/gallery/icons/qvg/sports_soccer.qvg b/examples/gallery/icons/qvg/sports_soccer.qvg index f7094360..ff3876b8 100644 Binary files a/examples/gallery/icons/qvg/sports_soccer.qvg and b/examples/gallery/icons/qvg/sports_soccer.qvg differ diff --git a/examples/iotdashboard/images/qvg/ac.qvg b/examples/iotdashboard/images/qvg/ac.qvg index 1daace16..dfb13034 100644 Binary files a/examples/iotdashboard/images/qvg/ac.qvg 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 index c1c4e66c..f1d86e56 100644 Binary files a/examples/iotdashboard/images/qvg/dashboard.qvg 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 index 211beb98..c3d323d6 100644 Binary files a/examples/iotdashboard/images/qvg/devices.qvg 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 index 7a8552c3..e4cc9906 100644 Binary files a/examples/iotdashboard/images/qvg/down.qvg 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 index 36b6b36f..c7f96afe 100644 Binary files a/examples/iotdashboard/images/qvg/humidity.qvg 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 index 6050e4b8..e90a7c38 100644 Binary files a/examples/iotdashboard/images/qvg/indoor-temperature.qvg 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 index 0230c4fd..4bf3df10 100644 Binary files a/examples/iotdashboard/images/qvg/lamps.qvg 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 index b241e980..ede8a8c1 100644 Binary files a/examples/iotdashboard/images/qvg/logout.qvg 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 index d9a1a08a..7fc15101 100644 Binary files a/examples/iotdashboard/images/qvg/main-icon.qvg 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 index 76b34637..4102ee76 100644 Binary files a/examples/iotdashboard/images/qvg/members.qvg 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 index f1aed287..600f2184 100644 Binary files a/examples/iotdashboard/images/qvg/music-system.qvg 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 index 59cc7a82..6671862f 100644 Binary files a/examples/iotdashboard/images/qvg/rooms.qvg and b/examples/iotdashboard/images/qvg/rooms.qvg differ diff --git a/examples/iotdashboard/images/qvg/statistics.qvg b/examples/iotdashboard/images/qvg/statistics.qvg index 7f827176..1adc83f3 100644 Binary files a/examples/iotdashboard/images/qvg/statistics.qvg 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 index 1a043c97..4a1f4a9b 100644 Binary files a/examples/iotdashboard/images/qvg/storage.qvg 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 index b28fc66e..6c379e34 100644 Binary files a/examples/iotdashboard/images/qvg/up.qvg and b/examples/iotdashboard/images/qvg/up.qvg differ diff --git a/examples/qvgviewer/qvg/Tux.qvg b/examples/qvgviewer/qvg/Tux.qvg index dc5a231d..f37fe99b 100644 Binary files a/examples/qvgviewer/qvg/Tux.qvg and b/examples/qvgviewer/qvg/Tux.qvg differ diff --git a/tools/svg2qvg/main.cpp b/tools/svg2qvg/main.cpp index e4afa0dc..3988076a 100644 --- a/tools/svg2qvg/main.cpp +++ b/tools/svg2qvg/main.cpp @@ -25,6 +25,22 @@ static void usage( const char* appName ) qWarning() << "usage: " << appName << "svgfile qvgfile"; } +static QRectF viewBox( QSvgRenderer& renderer ) +{ + /* + QSvgRenderer::viewBoxF() returns a bounding box when no viewBox + has been defined. So we clear the viewBox and compare the result with + the initial value - assuming, that there was a viewBox when they differ. + */ + const auto viewBox = renderer.viewBoxF(); + + renderer.setViewBox( QRectF() ); + const bool hasViewBox = ( viewBox != renderer.viewBoxF() ); + renderer.setViewBox( viewBox ); + + return hasViewBox ? viewBox : QRectF( 0.0, 0.0, -1.0, -1.0 ); +} + int main( int argc, char* argv[] ) { if ( argc != 3 ) @@ -56,21 +72,7 @@ int main( int argc, char* argv[] ) return -2; QskGraphic graphic; - - { - /* - QSvgRenderer::viewBoxF() returns a bounding box when no viewBox - has been defined. So we clear the viewBox and compare the result with - the initial value - assuming, that there was a viewBox when they differ. - - */ - const auto viewBox = renderer.viewBoxF(); - renderer.setViewBox( QRectF() ); - - if ( viewBox != renderer.viewBoxF() ) - graphic.setViewBox( viewBox ); - } - + graphic.setViewBox( ::viewBox( renderer ) ); QPainter painter( &graphic ); renderer.render( &painter );