whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCommonStyle: add 128px icons for standardbutton-closetab 

Add 128px version of standardbutton-closetab/-down/-hover and the source
svg file.

Task-number: QTBUG-118122
Change-Id: I8146f022cf440fc43d8c72aa08bd778ffdc64a78
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Christian Ehrlicher 2023-10-14 20:28:08 +02:00
parent 4acbfd47be
commit 37b6f941ee
14 changed files with 266 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/CMakeLists.txt
View File

@ -205,12 +205,15 @@ set(qstyle_resource_files
"styles/images/standardbutton-close-128.png"
"styles/images/standardbutton-close-16.png"
"styles/images/standardbutton-close-32.png"
"styles/images/standardbutton-closetab-32.png"
"styles/images/standardbutton-closetab-128.png"
"styles/images/standardbutton-closetab-16.png"
"styles/images/standardbutton-closetab-down-32.png"
"styles/images/standardbutton-closetab-32.png"
"styles/images/standardbutton-closetab-down-128.png"
"styles/images/standardbutton-closetab-down-16.png"
"styles/images/standardbutton-closetab-hover-32.png"
"styles/images/standardbutton-closetab-down-32.png"
"styles/images/standardbutton-closetab-hover-128.png"
"styles/images/standardbutton-closetab-hover-16.png"
"styles/images/standardbutton-closetab-hover-32.png"
"styles/images/standardbutton-delete-128.png"
"styles/images/standardbutton-delete-16.png"
"styles/images/standardbutton-delete-32.png"

BIN
src/widgets/styles/images/standardbutton-closetab-128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/widgets/styles/images/standardbutton-closetab-16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 406 B

After

Width:  |  Height:  |  Size: 674 B

BIN
src/widgets/styles/images/standardbutton-closetab-32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 819 B

BIN
src/widgets/styles/images/standardbutton-closetab-down-128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/widgets/styles/images/standardbutton-closetab-down-16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 666 B

BIN
src/widgets/styles/images/standardbutton-closetab-down-32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 810 B

85
src/widgets/styles/images/standardbutton-closetab-down.svg Normal file
View File

@ -0,0 +1,85 @@
<?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"
width="32px"
height="32px"
viewBox="0 0 32 32"
style="enable-background:new 0 0 32 32;"
xml:space="preserve"
sodipodi:docname="standardbutton-closetab-down.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><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></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="false"
inkscape:zoom="16.572815"
inkscape:cx="28.732573"
inkscape:cy="14.492458"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g8" />
<style
type="text/css"
id="style2">
.st0{fill:#46A2DA;}
.st1{fill:none;}
</style>
<g
id="g8">
<rect
style="fill:#b17153;stroke:#b17153;stroke-width:1.99804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
id="rect17-3"
width="22.001965"
height="22.001963"
x="4.9990177"
y="4.9990177"
rx="0"
ry="0" /><rect
style="fill:none;stroke:#ab493f;stroke-width:1.99992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect17"
width="26.000072"
height="26.000076"
x="2.9999642"
y="2.9999642"
rx="1.792347"
ry="1.7923476" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.76951;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1031"
width="3"
height="16"
x="21.127417"
y="-8"
transform="rotate(45)" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.76951;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1031-6"
width="3"
height="16"
x="-1.5"
y="14.627417"
transform="rotate(-45)" /></g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
src/widgets/styles/images/standardbutton-closetab-hover-128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/widgets/styles/images/standardbutton-closetab-hover-16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 675 B

BIN
src/widgets/styles/images/standardbutton-closetab-hover-32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 822 B

86
src/widgets/styles/images/standardbutton-closetab-hover.svg Normal file
View File

@ -0,0 +1,86 @@
<?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"
width="32px"
height="32px"
viewBox="0 0 32 32"
style="enable-background:new 0 0 32 32;"
xml:space="preserve"
sodipodi:docname="standardbutton-closetab-hover.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><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></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="false"
inkscape:zoom="16.572815"
inkscape:cx="33.318396"
inkscape:cy="14.492458"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g8"
inkscape:document-rotation="0" />
<style
type="text/css"
id="style2">
.st0{fill:#46A2DA;}
.st1{fill:none;}
</style>
<g
id="g8">
<rect
style="fill:#ea8f60;stroke:#f2b7a7;stroke-width:1.99804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
id="rect17-3"
width="22.001965"
height="22.001963"
x="4.9990177"
y="4.9990177"
rx="0"
ry="0" /><rect
style="fill:none;stroke:#d73727;stroke-width:1.99992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect17"
width="26.000072"
height="26.000076"
x="2.9999642"
y="2.9999642"
rx="1.792347"
ry="1.7923476" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.76951;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1031"
width="3"
height="16"
x="21.127417"
y="-8"
transform="rotate(45)" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.76951;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1031-6"
width="3"
height="16"
x="-1.5"
y="14.627417"
transform="rotate(-45)" /></g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

86
src/widgets/styles/images/standardbutton-closetab.svg Normal file
View File

@ -0,0 +1,86 @@
<?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"
width="32px"
height="32px"
viewBox="0 0 32 32"
style="enable-background:new 0 0 32 32;"
xml:space="preserve"
sodipodi:docname="standardbutton-closetab.svg"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><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="false"
inkscape:zoom="16.572815"
inkscape:cx="33.318396"
inkscape:cy="14.492458"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g8"
inkscape:document-rotation="0" />
<style
type="text/css"
id="style2">
.st0{fill:#46A2DA;}
.st1{fill:none;}
</style>
<g
id="g8">
<rect
style="fill:#ea8f60;stroke:#ef9d8e;stroke-width:1.99804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
id="rect17-3"
width="22.001965"
height="22.001963"
x="4.9990177"
y="4.9990177"
rx="0"
ry="0" /><rect
style="fill:none;stroke:#d73727;stroke-width:1.99992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect17"
width="26.000072"
height="26.000076"
x="2.9999642"
y="2.9999642"
rx="1.792347"
ry="1.7923476" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.76951;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1031"
width="3"
height="16"
x="21.127417"
y="-8"
transform="rotate(45)" /><rect
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.76951;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1031-6"
width="3"
height="16"
x="-1.5"
y="14.627417"
transform="rotate(-45)" /></g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

6
src/widgets/styles/qcommonstyle.cpp
View File

@ -6089,9 +6089,9 @@ QIcon QCommonStylePrivate::iconFromResourceTheme(QCommonStyle::StandardPixmap st
addIconFiles(u"toolbar-ext-v-", toolBarExtVSizes, icon);
break;
case QStyle::SP_TabCloseButton:
addIconFiles(u"standardbutton-closetab-", {16, 32}, icon, QIcon::Normal, QIcon::Off);
addIconFiles(u"standardbutton-closetab-down-", {16, 32}, icon, QIcon::Normal, QIcon::On);
addIconFiles(u"standardbutton-closetab-hover-", {16, 32}, icon, QIcon::Active, QIcon::Off);
addIconFiles(u"standardbutton-closetab-", pngIconSizes, icon, QIcon::Normal, QIcon::Off);
addIconFiles(u"standardbutton-closetab-down-", pngIconSizes, icon, QIcon::Normal, QIcon::On);
addIconFiles(u"standardbutton-closetab-hover-", pngIconSizes, icon, QIcon::Active, QIcon::Off);
break;
case QStyle::SP_LineEditClearButton:
addIconFiles(u"cleartext-", pngIconSizes, icon);