diff options
author | Christian Ehrlicher <[email protected]> | 2024-09-26 19:12:18 +0200 |
---|---|---|
committer | Christian Ehrlicher <[email protected]> | 2025-05-11 21:13:51 +0200 |
commit | 7951eba61ef45ef1e0e0b6645f242f42ac6128f6 (patch) | |
tree | 3401aa70060fa21634b84e6622241707586c5730 | |
parent | 9eddf930a274757c91290d56d10177f4ff94c4bb (diff) |
QCommonStyle: use media icons from Qt Icon Library
Replace all standard media icons with the icons from Figma/Qt Icon
Library.
Pick-to: 6.8
Task-number: QTBUG-128665
Change-Id: I8e3944f6536cac81a415e4891dcd2e0203fc2863
Reviewed-by: Axel Spoerl <[email protected]>
Reviewed-by: Richard Moe Gustavsen <[email protected]>
38 files changed, 129 insertions, 435 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 631bc3f59ee..421bd460651 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -173,7 +173,11 @@ set(qstyle_resource_files "styles/images/media-stop-16.png" "styles/images/media-stop-32.png" "styles/images/media-volume-16.png" + "styles/images/media-volume-32.png" + "styles/images/media-volume-128.png" "styles/images/media-volume-muted-16.png" + "styles/images/media-volume-muted-32.png" + "styles/images/media-volume-muted-128.png" "styles/images/networkdrive-128.png" "styles/images/networkdrive-16.png" "styles/images/networkdrive-32.png" diff --git a/src/widgets/styles/images/media-pause-128.png b/src/widgets/styles/images/media-pause-128.png Binary files differindex 897ad3c80f3..f2759055b9b 100644 --- a/src/widgets/styles/images/media-pause-128.png +++ b/src/widgets/styles/images/media-pause-128.png diff --git a/src/widgets/styles/images/media-pause-16.png b/src/widgets/styles/images/media-pause-16.png Binary files differindex 862fd497467..46dde13934c 100644 --- a/src/widgets/styles/images/media-pause-16.png +++ b/src/widgets/styles/images/media-pause-16.png diff --git a/src/widgets/styles/images/media-pause-32.png b/src/widgets/styles/images/media-pause-32.png Binary files differindex ce9b7066742..4fafa07fcdd 100644 --- a/src/widgets/styles/images/media-pause-32.png +++ b/src/widgets/styles/images/media-pause-32.png diff --git a/src/widgets/styles/images/media-pause.svg b/src/widgets/styles/images/media-pause.svg index c13a4ef4006..d5766a0084a 100644 --- a/src/widgets/styles/images/media-pause.svg +++ b/src/widgets/styles/images/media-pause.svg @@ -1,67 +1,6 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<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="Layer_1" - x="0px" - y="0px" - viewBox="0 0 16 16" - style="enable-background:new 0 0 16 16;" - xml:space="preserve" - sodipodi:docname="media-pause.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" - inkscape:export-filename="/home/chehrlic/kde/qt.src/qtbase/src/widgets/styles/images/media-pause-128.png" - inkscape:export-xdpi="768" - inkscape:export-ydpi="768"><metadata - id="metadata15"><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="defs13" /><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="918" - id="namedview11" - showgrid="true" - inkscape:zoom="16.572815" - inkscape:cx="13.411945" - inkscape:cy="7.5009653" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" - inkscape:document-rotation="0"><inkscape:grid - type="xygrid" - id="grid925" /></sodipodi:namedview> -<style - type="text/css" - id="style2"> - .st0{fill:none;} -</style> - -<g - id="g1774"><rect - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.0575" - id="rect1755" - width="3" - height="10" - x="3.5" - y="3" /><rect - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.0575" - id="rect1755-3" - width="3" - height="10" - x="9.5" - y="3" /></g></svg> +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g id="Player / pause-symbol"> +<path id="Layer01" fill-rule="evenodd" clip-rule="evenodd" d="M9 4C10.1046 4 11 4.89543 11 6V18C11 19.1046 10.1046 20 9 20C7.89543 20 7 19.1046 7 18V6C7 4.89543 7.89543 4 9 4Z" fill="#0D0D0D"/> +<path id="Layer02" fill-rule="evenodd" clip-rule="evenodd" d="M15 4C16.1046 4 17 4.89543 17 6V18C17 19.1046 16.1046 20 15 20C13.8954 20 13 19.1046 13 18V6C13 4.89543 13.8954 4 15 4Z" fill="#0D0D0D"/> +</g> +</svg> diff --git a/src/widgets/styles/images/media-play-128.png b/src/widgets/styles/images/media-play-128.png Binary files differindex 22b260891fd..6b1537a307e 100644 --- a/src/widgets/styles/images/media-play-128.png +++ b/src/widgets/styles/images/media-play-128.png diff --git a/src/widgets/styles/images/media-play-16.png b/src/widgets/styles/images/media-play-16.png Binary files differindex 60e86d7fe88..fdadb43b755 100644 --- a/src/widgets/styles/images/media-play-16.png +++ b/src/widgets/styles/images/media-play-16.png diff --git a/src/widgets/styles/images/media-play-32.png b/src/widgets/styles/images/media-play-32.png Binary files differindex d51e130fec5..1246c4ed071 100644 --- a/src/widgets/styles/images/media-play-32.png +++ b/src/widgets/styles/images/media-play-32.png diff --git a/src/widgets/styles/images/media-play.svg b/src/widgets/styles/images/media-play.svg index b0130735f1e..960504cbbdc 100644 --- a/src/widgets/styles/images/media-play.svg +++ b/src/widgets/styles/images/media-play.svg @@ -1,57 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<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="Layer_1" - x="0px" - y="0px" - viewBox="0 0 16 16" - style="enable-background:new 0 0 16 16;" - xml:space="preserve" - sodipodi:docname="media-play.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" - inkscape:export-filename="/home/chehrlic/kde/qt.src/qtbase/src/widgets/styles/images/media-play-128.png" - inkscape:export-xdpi="768" - inkscape:export-ydpi="768"><metadata - id="metadata15"><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="defs13" /><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="918" - id="namedview11" - showgrid="true" - inkscape:zoom="33.14563" - inkscape:cx="11.425943" - inkscape:cy="9.1913339" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" - inkscape:document-rotation="0"><inkscape:grid - type="xygrid" - id="grid925" /></sodipodi:namedview> -<style - type="text/css" - id="style2"> - .st0{fill:none;} -</style> - -<path - id="rect873" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.93347" - d="M 3 3 L 3 13 L 12.896484 8 L 3 3 z " /></svg> +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M7 17.5803L16.9205 12L7 6.41971V17.5803ZM18.47 12.8716C18.4696 12.8714 18.4692 12.8712 18.4688 12.8709L18.47 12.8716ZM5 4.70986V19.2902C5 20.055 5.82366 20.5367 6.49026 20.1617L19.4505 12.8716C20.1302 12.4893 20.1302 11.5107 19.4505 11.1284L6.49026 3.83828C5.82366 3.46332 5 3.94503 5 4.70986Z" fill="#0D0D0D"/> +<path d="M5 19.2902V4.70986C5 3.94503 5.82366 3.46332 6.49026 3.83828L19.4505 11.1284C20.1302 11.5107 20.1302 12.4893 19.4505 12.8716L6.49026 20.1617C5.82366 20.5367 5 20.055 5 19.2902Z" fill="#0D0D0D"/> +</svg> diff --git a/src/widgets/styles/images/media-seek-backward-128.png b/src/widgets/styles/images/media-seek-backward-128.png Binary files differindex 3d4470bd5c1..a078ef75bc6 100644 --- a/src/widgets/styles/images/media-seek-backward-128.png +++ b/src/widgets/styles/images/media-seek-backward-128.png diff --git a/src/widgets/styles/images/media-seek-backward-16.png b/src/widgets/styles/images/media-seek-backward-16.png Binary files differindex 8bfba869e0e..cba813fe01e 100644 --- a/src/widgets/styles/images/media-seek-backward-16.png +++ b/src/widgets/styles/images/media-seek-backward-16.png diff --git a/src/widgets/styles/images/media-seek-backward-32.png b/src/widgets/styles/images/media-seek-backward-32.png Binary files differindex 9148f8a0c64..036af9f990e 100644 --- a/src/widgets/styles/images/media-seek-backward-32.png +++ b/src/widgets/styles/images/media-seek-backward-32.png diff --git a/src/widgets/styles/images/media-seek-backward.svg b/src/widgets/styles/images/media-seek-backward.svg index 13e1e67e6b7..684ea0e10da 100644 --- a/src/widgets/styles/images/media-seek-backward.svg +++ b/src/widgets/styles/images/media-seek-backward.svg @@ -1,62 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<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="Layer_1" - x="0px" - y="0px" - viewBox="0 0 16 16" - style="enable-background:new 0 0 16 16;" - xml:space="preserve" - sodipodi:docname="media-seek-backward.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" - inkscape:export-filename="/home/chehrlic/kde/qt.src/qtbase/src/widgets/styles/images/media-seek-backward-128.png" - inkscape:export-xdpi="768" - inkscape:export-ydpi="768"><metadata - id="metadata15"><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="defs13" /><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="918" - id="namedview11" - showgrid="true" - inkscape:zoom="33.14563" - inkscape:cx="12.532344" - inkscape:cy="7.584329" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" - inkscape:document-rotation="0"><inkscape:grid - type="xygrid" - id="grid925" /></sodipodi:namedview> -<style - type="text/css" - id="style2"> - .st0{fill:none;} -</style> - -<g - id="g1560" - transform="rotate(180,8,7.9999997)"><path - id="rect873" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.45442" - d="m 2,4 v 8 L 9,7.9999998 Z" /><path - id="rect873-5" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.45442" - d="m 7,4 v 8 l 7,-4.0000002 z" /></g></svg> +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M12 16.1315C12 16.9302 11.1099 17.4066 10.4453 16.9635L4.24808 12.8321C3.65434 12.4362 3.65434 11.5638 4.24808 11.1679L10.4453 7.03647C11.1099 6.59343 12 7.06982 12 7.86852V16.1315Z" fill="#0D0D0D"/> +<path d="M20 16.1315C20 16.9302 19.1099 17.4066 18.4453 16.9635L12.2481 12.8321C11.6543 12.4362 11.6543 11.5638 12.2481 11.1679L18.4453 7.03647C19.1099 6.59343 20 7.06982 20 7.86852V16.1315Z" fill="#0D0D0D"/> +</svg> diff --git a/src/widgets/styles/images/media-seek-forward-128.png b/src/widgets/styles/images/media-seek-forward-128.png Binary files differindex 786136b0144..e2ed9a307da 100644 --- a/src/widgets/styles/images/media-seek-forward-128.png +++ b/src/widgets/styles/images/media-seek-forward-128.png diff --git a/src/widgets/styles/images/media-seek-forward-16.png b/src/widgets/styles/images/media-seek-forward-16.png Binary files differindex 1ddd379adc7..d521db8479d 100644 --- a/src/widgets/styles/images/media-seek-forward-16.png +++ b/src/widgets/styles/images/media-seek-forward-16.png diff --git a/src/widgets/styles/images/media-seek-forward-32.png b/src/widgets/styles/images/media-seek-forward-32.png Binary files differindex aa0e4b36bd0..b123e1a40e7 100644 --- a/src/widgets/styles/images/media-seek-forward-32.png +++ b/src/widgets/styles/images/media-seek-forward-32.png diff --git a/src/widgets/styles/images/media-seek-forward.svg b/src/widgets/styles/images/media-seek-forward.svg index f3753b49a64..09c3cee55f2 100644 --- a/src/widgets/styles/images/media-seek-forward.svg +++ b/src/widgets/styles/images/media-seek-forward.svg @@ -1,61 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<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="Layer_1" - x="0px" - y="0px" - viewBox="0 0 16 16" - style="enable-background:new 0 0 16 16;" - xml:space="preserve" - sodipodi:docname="media-seek-forward.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" - inkscape:export-filename="/home/chehrlic/kde/qt.src/qtbase/src/widgets/styles/images/media-seek-forward-128.png" - inkscape:export-xdpi="768" - inkscape:export-ydpi="768"><metadata - id="metadata15"><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="defs13" /><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="918" - id="namedview11" - showgrid="true" - inkscape:zoom="33.14563" - inkscape:cx="12.532344" - inkscape:cy="7.584329" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" - inkscape:document-rotation="0"><inkscape:grid - type="xygrid" - id="grid925" /></sodipodi:namedview> -<style - type="text/css" - id="style2"> - .st0{fill:none;} -</style> - -<g - id="g1560"><path - id="rect873" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.45442" - d="m 2,4 v 8 L 9,7.9999998 Z" /><path - id="rect873-5" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.45442" - d="m 7,4 v 8 l 7,-4.0000002 z" /></g></svg> +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M4 7.86852C4 7.06982 4.89015 6.59343 5.5547 7.03647L11.7519 11.1679C12.3457 11.5638 12.3457 12.4362 11.7519 12.8321L5.5547 16.9635C4.89015 17.4066 4 16.9302 4 16.1315L4 7.86852Z" fill="#0D0D0D"/> +<path d="M12 7.86852C12 7.06982 12.8901 6.59343 13.5547 7.03647L19.7519 11.1679C20.3457 11.5638 20.3457 12.4362 19.7519 12.8321L13.5547 16.9635C12.8901 17.4066 12 16.9302 12 16.1315L12 7.86852Z" fill="#0D0D0D"/> +</svg> diff --git a/src/widgets/styles/images/media-skip-backward-128.png b/src/widgets/styles/images/media-skip-backward-128.png Binary files differindex f286da77693..d4f28539281 100644 --- a/src/widgets/styles/images/media-skip-backward-128.png +++ b/src/widgets/styles/images/media-skip-backward-128.png diff --git a/src/widgets/styles/images/media-skip-backward-16.png b/src/widgets/styles/images/media-skip-backward-16.png Binary files differindex 644dc4cc015..3cec0df3e67 100644 --- a/src/widgets/styles/images/media-skip-backward-16.png +++ b/src/widgets/styles/images/media-skip-backward-16.png diff --git a/src/widgets/styles/images/media-skip-backward-32.png b/src/widgets/styles/images/media-skip-backward-32.png Binary files differindex ca405e3c016..f0d16efe0fb 100644 --- a/src/widgets/styles/images/media-skip-backward-32.png +++ b/src/widgets/styles/images/media-skip-backward-32.png diff --git a/src/widgets/styles/images/media-skip-backward.svg b/src/widgets/styles/images/media-skip-backward.svg index 083a0a477e9..04e5e31ec69 100644 --- a/src/widgets/styles/images/media-skip-backward.svg +++ b/src/widgets/styles/images/media-skip-backward.svg @@ -1,67 +1,51 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <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="24" + height="24" + viewBox="0 0 24 24" + fill="none" version="1.1" - id="Layer_1" - x="0px" - y="0px" - viewBox="0 0 16 16" - style="enable-background:new 0 0 16 16;" - xml:space="preserve" + id="svg2" sodipodi:docname="media-skip-backward.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" - inkscape:export-filename="/home/chehrlic/kde/qt.src/qtbase/src/widgets/styles/images/media-skip-backward-128.png" - inkscape:export-xdpi="768" - inkscape:export-ydpi="768"><metadata - id="metadata15"><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="defs13" /><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="918" - id="namedview11" - showgrid="true" - inkscape:zoom="33.14563" - inkscape:cx="5.5133468" - inkscape:cy="10.107665" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" - inkscape:document-rotation="0"><inkscape:grid - type="xygrid" - id="grid925" /></sodipodi:namedview> -<style - type="text/css" - id="style2"> - .st0{fill:none;} -</style> - -<g - id="g1687"><path - id="rect873" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.45442" - d="M 14,11.999999 V 3.9999994 L 7,7.9999996 Z" /><path - id="rect873-5" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.45442" - d="M 9,11.999999 V 3.9999994 L 2,7.9999996 Z" /><rect - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.13809" - id="rect1594" - width="1" - height="8" - x="2" - y="4" /></g></svg> + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs2" /> + <sodipodi:namedview + id="namedview2" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="34.208333" + inkscape:cx="11.985384" + inkscape:cy="12" + inkscape:window-width="1920" + inkscape:window-height="1017" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <path + d="m 12.997225,16.1315 c 0,0.7987 -0.8901,1.2751 -1.5547,0.832 l -6.19722,-4.1314 c -0.59374,-0.3959 -0.59374,-1.2683 0,-1.6642 l 6.19722,-4.13143 c 0.6646,-0.44304 1.5547,0.03335 1.5547,0.83205 z" + fill="#0d0d0d" + id="path1" /> + <path + d="m 20.997225,16.1315 c 0,0.7987 -0.8901,1.2751 -1.5547,0.832 l -6.1972,-4.1314 c -0.5938,-0.3959 -0.5938,-1.2683 0,-1.6642 l 6.1972,-4.13143 c 0.6646,-0.44304 1.5547,0.03335 1.5547,0.83205 z" + fill="#0d0d0d" + id="path2" /> + <path + id="Layer01" + fill-rule="evenodd" + clip-rule="evenodd" + d="m 4,6.867 c 0.5523,0 1,0.5745303 1,1.28325 v 7.6995 C 5,16.558489 4.5523,17.133 4,17.133 3.447715,17.133 3,16.558489 3,15.84975 V 8.15025 C 3,7.4415303 3.447715,6.867 4,6.867 Z" + fill="#0d0d0d" + style="stroke-width:0.566403" /> +</svg> diff --git a/src/widgets/styles/images/media-skip-forward-128.png b/src/widgets/styles/images/media-skip-forward-128.png Binary files differindex d28fbc1708b..ff188cda47e 100644 --- a/src/widgets/styles/images/media-skip-forward-128.png +++ b/src/widgets/styles/images/media-skip-forward-128.png diff --git a/src/widgets/styles/images/media-skip-forward-16.png b/src/widgets/styles/images/media-skip-forward-16.png Binary files differindex 7e921f9a06c..826a84b6335 100644 --- a/src/widgets/styles/images/media-skip-forward-16.png +++ b/src/widgets/styles/images/media-skip-forward-16.png diff --git a/src/widgets/styles/images/media-skip-forward-32.png b/src/widgets/styles/images/media-skip-forward-32.png Binary files differindex 19b22a54208..75e87339d66 100644 --- a/src/widgets/styles/images/media-skip-forward-32.png +++ b/src/widgets/styles/images/media-skip-forward-32.png diff --git a/src/widgets/styles/images/media-skip-forward.svg b/src/widgets/styles/images/media-skip-forward.svg index f2f3c56a8ec..0a1c6cb8bc1 100644 --- a/src/widgets/styles/images/media-skip-forward.svg +++ b/src/widgets/styles/images/media-skip-forward.svg @@ -1,67 +1,51 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <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="24" + height="24" + viewBox="0 0 24 24" + fill="none" version="1.1" - id="Layer_1" - x="0px" - y="0px" - viewBox="0 0 16 16" - style="enable-background:new 0 0 16 16;" - xml:space="preserve" + id="svg2" sodipodi:docname="media-skip-forward.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" - inkscape:export-filename="/home/chehrlic/kde/qt.src/qtbase/src/widgets/styles/images/media-skip-forward-128.png" - inkscape:export-xdpi="768" - inkscape:export-ydpi="768"><metadata - id="metadata15"><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="defs13" /><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="918" - id="namedview11" - showgrid="true" - inkscape:zoom="33.14563" - inkscape:cx="12.532344" - inkscape:cy="7.584329" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" - inkscape:document-rotation="0"><inkscape:grid - type="xygrid" - id="grid925" /></sodipodi:namedview> -<style - type="text/css" - id="style2"> - .st0{fill:none;} -</style> - -<g - id="g1659"><path - id="rect873" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.45442" - d="m 2,4 v 8 L 9,7.9999998 Z" /><path - id="rect873-5" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.45442" - d="m 7,4 v 8 l 7,-4.0000002 z" /><rect - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2" - id="rect1633" - width="1" - height="8" - x="13" - y="4" /></g></svg> + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs2" /> + <sodipodi:namedview + id="namedview2" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="34.208333" + inkscape:cx="11.985384" + inkscape:cy="12" + inkscape:window-width="1920" + inkscape:window-height="1017" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <path + d="m 11,16.1315 c 0,0.7987 0.8901,1.2751 1.5547,0.832 l 6.19722,-4.1314 c 0.59374,-0.3959 0.59374,-1.2683 0,-1.6642 L 12.5547,7.03647 C 11.8901,6.59343 11,7.06982 11,7.86852 Z" + fill="#0d0d0d" + id="path1" /> + <path + d="m 3,16.1315 c 0,0.7987 0.8901,1.2751 1.5547,0.832 l 6.1972,-4.1314 c 0.5938,-0.3959 0.5938,-1.2683 0,-1.6642 L 4.5547,7.03647 C 3.8901,6.59343 3,7.06982 3,7.86852 Z" + fill="#0d0d0d" + id="path2" /> + <path + id="Layer01" + fill-rule="evenodd" + clip-rule="evenodd" + d="m 19.997225,6.867 c -0.5523,0 -1,0.5745303 -1,1.28325 v 7.6995 c 0,0.708739 0.4477,1.28325 1,1.28325 0.552285,0 1,-0.574511 1,-1.28325 v -7.6995 c 0,-0.7087197 -0.447715,-1.28325 -1,-1.28325 z" + fill="#0d0d0d" + style="stroke-width:0.566403" /> +</svg> diff --git a/src/widgets/styles/images/media-stop-128.png b/src/widgets/styles/images/media-stop-128.png Binary files differindex 680d40697ca..45a79af2cb3 100644 --- a/src/widgets/styles/images/media-stop-128.png +++ b/src/widgets/styles/images/media-stop-128.png diff --git a/src/widgets/styles/images/media-stop-16.png b/src/widgets/styles/images/media-stop-16.png Binary files differindex e047c2bf6b6..c7b45649474 100644 --- a/src/widgets/styles/images/media-stop-16.png +++ b/src/widgets/styles/images/media-stop-16.png diff --git a/src/widgets/styles/images/media-stop-32.png b/src/widgets/styles/images/media-stop-32.png Binary files differindex 6ba9d25d4b4..e9b8b110548 100644 --- a/src/widgets/styles/images/media-stop-32.png +++ b/src/widgets/styles/images/media-stop-32.png diff --git a/src/widgets/styles/images/media-stop.svg b/src/widgets/styles/images/media-stop.svg index 755755ab9a8..b5c89b159fb 100644 --- a/src/widgets/styles/images/media-stop.svg +++ b/src/widgets/styles/images/media-stop.svg @@ -1,60 +1,3 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<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="Layer_1" - x="0px" - y="0px" - viewBox="0 0 16 16" - style="enable-background:new 0 0 16 16;" - xml:space="preserve" - sodipodi:docname="media-stop.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" - inkscape:export-filename="/home/chehrlic/kde/qt.src/qtbase/src/widgets/styles/images/media-stop-128.png" - inkscape:export-xdpi="768" - inkscape:export-ydpi="768"><metadata - id="metadata15"><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="defs13" /><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="918" - id="namedview11" - showgrid="true" - inkscape:zoom="33.14563" - inkscape:cx="5.5133468" - inkscape:cy="10.107665" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" - inkscape:document-rotation="0"><inkscape:grid - type="xygrid" - id="grid925" /></sodipodi:namedview> -<style - type="text/css" - id="style2"> - .st0{fill:none;} -</style> - -<rect - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.06992" - id="rect1703" - width="12" - height="12" - x="2" - y="2" /></svg> +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<rect x="5" y="5" width="14" height="14" rx="1" fill="#0D0D0D"/> +</svg> diff --git a/src/widgets/styles/images/media-volume-128.png b/src/widgets/styles/images/media-volume-128.png Binary files differnew file mode 100644 index 00000000000..db2c2e53c68 --- /dev/null +++ b/src/widgets/styles/images/media-volume-128.png diff --git a/src/widgets/styles/images/media-volume-16.png b/src/widgets/styles/images/media-volume-16.png Binary files differindex ad258340f22..453b9590fc6 100644 --- a/src/widgets/styles/images/media-volume-16.png +++ b/src/widgets/styles/images/media-volume-16.png diff --git a/src/widgets/styles/images/media-volume-32.png b/src/widgets/styles/images/media-volume-32.png Binary files differnew file mode 100644 index 00000000000..3cba10abaec --- /dev/null +++ b/src/widgets/styles/images/media-volume-32.png diff --git a/src/widgets/styles/images/media-volume-muted-128.png b/src/widgets/styles/images/media-volume-muted-128.png Binary files differnew file mode 100644 index 00000000000..ffb3e1d4e8b --- /dev/null +++ b/src/widgets/styles/images/media-volume-muted-128.png diff --git a/src/widgets/styles/images/media-volume-muted-16.png b/src/widgets/styles/images/media-volume-muted-16.png Binary files differindex 06bded21e7d..7ad25f34179 100644 --- a/src/widgets/styles/images/media-volume-muted-16.png +++ b/src/widgets/styles/images/media-volume-muted-16.png diff --git a/src/widgets/styles/images/media-volume-muted-32.png b/src/widgets/styles/images/media-volume-muted-32.png Binary files differnew file mode 100644 index 00000000000..9f955a7d0a5 --- /dev/null +++ b/src/widgets/styles/images/media-volume-muted-32.png diff --git a/src/widgets/styles/images/media-volume-muted.svg b/src/widgets/styles/images/media-volume-muted.svg new file mode 100644 index 00000000000..f9e62f1a95b --- /dev/null +++ b/src/widgets/styles/images/media-volume-muted.svg @@ -0,0 +1,4 @@ +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M13 6.1416V17.8584C13 19.6824 10.7582 20.5544 9.52569 19.2098L7.17784 16.6486C6.79902 16.2353 6.26414 16 5.70353 16H4C2.89543 16 2 15.1046 2 14V10C2 8.89543 2.89543 8 4 8H5.70353C6.26414 8 6.79902 7.76471 7.17784 7.35145L9.52569 4.79016C10.7582 3.44557 13 4.31759 13 6.1416Z" fill="#0D0D0D"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M15.7071 8.29289C15.3166 7.90237 14.6834 7.90237 14.2929 8.29289C13.9024 8.68342 13.9024 9.31658 14.2929 9.70711L16.5858 12L14.2929 14.2929C13.9024 14.6834 13.9024 15.3166 14.2929 15.7071C14.6834 16.0976 15.3166 16.0976 15.7071 15.7071L18 13.4142L20.2929 15.7071C20.6834 16.0976 21.3166 16.0976 21.7071 15.7071C22.0976 15.3166 22.0976 14.6834 21.7071 14.2929L19.4142 12L21.7071 9.70711C22.0976 9.31658 22.0976 8.68342 21.7071 8.29289C21.3166 7.90237 20.6834 7.90237 20.2929 8.29289L18 10.5858L15.7071 8.29289Z" fill="#0D0D0D"/> +</svg> diff --git a/src/widgets/styles/images/media-volume.svg b/src/widgets/styles/images/media-volume.svg new file mode 100644 index 00000000000..72821fd1317 --- /dev/null +++ b/src/widgets/styles/images/media-volume.svg @@ -0,0 +1,4 @@ +<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M12 6.1416V17.8584C12 18.7704 10.8791 19.2064 10.2628 18.5341L7.91499 15.9728C7.34676 15.3529 6.54445 15 5.70353 15H4C3.44772 15 3 14.5523 3 14V10C3 9.44772 3.44772 9 4 9H5.70353C6.54445 9 7.34676 8.64706 7.91499 8.02717L10.2628 5.46588C10.8791 4.79359 12 5.2296 12 6.1416Z" fill="#0D0D0D" stroke="#0D0D0D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M18.7782 4.29289C18.3877 3.90237 17.7545 3.90237 17.364 4.29289C16.9734 4.68342 16.9734 5.31658 17.364 5.70711C20.8787 9.22183 20.8787 14.9203 17.364 18.435C16.9734 18.8256 16.9734 19.4587 17.364 19.8492C17.7545 20.2398 18.3877 20.2398 18.7782 19.8492C23.0739 15.5535 23.0739 8.58866 18.7782 4.29289ZM15.9498 7.29292C15.5592 6.9024 14.9261 6.9024 14.5355 7.29292C14.145 7.68344 14.145 8.31661 14.5355 8.70713C16.4882 10.6598 16.4882 13.8256 14.5355 15.7782C14.145 16.1687 14.145 16.8019 14.5355 17.1924C14.9261 17.5829 15.5592 17.5829 15.9498 17.1924C18.6834 14.4587 18.6834 10.0266 15.9498 7.29292Z" fill="#0D0D0D"/> +</svg> diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index ba2b7148514..7a95e590211 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -6052,10 +6052,10 @@ QIcon QCommonStylePrivate::iconFromResourceTheme(QCommonStyle::StandardPixmap st addIconFiles(u"media-skip-backward-", pngIconSizes, icon); break; case QStyle::SP_MediaVolume: - addIconFiles(u"media-volume-", {16}, icon); + addIconFiles(u"media-volume-", pngIconSizes, icon); break; case QStyle::SP_MediaVolumeMuted: - addIconFiles(u"media-volume-muted-", {16}, icon); + addIconFiles(u"media-volume-muted-", pngIconSizes, icon); break; case QStyle::SP_TitleBarCloseButton: case QStyle::SP_DockWidgetCloseButton: |