QCommonStyle: add missing png icons derived from svg ones
There are svg icons for information/warning/critical/question/ filedialog_start and filedialog_end but no corresponding png icons. Therefore create those from the svg files and add them. Task-number: QTBUG-118122 Change-Id: I2b0eb6450319ba64c41593a1f7705d995187f6b8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>bb10
|
|
@ -93,6 +93,9 @@ set(qstyle_resource_files
|
|||
"styles/images/closedock-64.png"
|
||||
"styles/images/computer-16.png"
|
||||
"styles/images/computer-32.png"
|
||||
"styles/images/critical-128.png"
|
||||
"styles/images/critical-16.png"
|
||||
"styles/images/critical-32.png"
|
||||
"styles/images/desktop-16.png"
|
||||
"styles/images/desktop-32.png"
|
||||
"styles/images/dirclosed-128.png"
|
||||
|
|
@ -116,6 +119,12 @@ set(qstyle_resource_files
|
|||
"styles/images/filecontents-128.png"
|
||||
"styles/images/filecontents-16.png"
|
||||
"styles/images/filecontents-32.png"
|
||||
"styles/images/filedialog_end-128.png"
|
||||
"styles/images/filedialog_end-16.png"
|
||||
"styles/images/filedialog_end-32.png"
|
||||
"styles/images/filedialog_start-128.png"
|
||||
"styles/images/filedialog_start-16.png"
|
||||
"styles/images/filedialog_start-32.png"
|
||||
"styles/images/fileinfo-128.png"
|
||||
"styles/images/fileinfo-16.png"
|
||||
"styles/images/fileinfo-32.png"
|
||||
|
|
@ -131,6 +140,9 @@ set(qstyle_resource_files
|
|||
"styles/images/harddrive-128.png"
|
||||
"styles/images/harddrive-16.png"
|
||||
"styles/images/harddrive-32.png"
|
||||
"styles/images/information-128.png"
|
||||
"styles/images/information-16.png"
|
||||
"styles/images/information-32.png"
|
||||
"styles/images/left-128.png"
|
||||
"styles/images/left-16.png"
|
||||
"styles/images/left-32.png"
|
||||
|
|
@ -165,6 +177,9 @@ set(qstyle_resource_files
|
|||
"styles/images/parentdir-128.png"
|
||||
"styles/images/parentdir-16.png"
|
||||
"styles/images/parentdir-32.png"
|
||||
"styles/images/question-128.png"
|
||||
"styles/images/question-16.png"
|
||||
"styles/images/question-32.png"
|
||||
"styles/images/refresh-24.png"
|
||||
"styles/images/refresh-32.png"
|
||||
"styles/images/right-128.png"
|
||||
|
|
@ -247,6 +262,9 @@ set(qstyle_resource_files
|
|||
"styles/images/viewlist-128.png"
|
||||
"styles/images/viewlist-16.png"
|
||||
"styles/images/viewlist-32.png"
|
||||
"styles/images/warning-128.png"
|
||||
"styles/images/warning-16.png"
|
||||
"styles/images/warning-32.png"
|
||||
)
|
||||
|
||||
qt_internal_add_resource(Widgets "qstyle"
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 835 B |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 686 B |
|
After Width: | Height: | Size: 787 B |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 677 B |
|
After Width: | Height: | Size: 761 B |
|
After Width: | Height: | Size: 2.0 KiB |
|
After Width: | Height: | Size: 697 B |
|
After Width: | Height: | Size: 874 B |
|
After Width: | Height: | Size: 2.7 KiB |
|
After Width: | Height: | Size: 797 B |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 660 B |
|
After Width: | Height: | Size: 799 B |
|
|
@ -5900,6 +5900,24 @@ QIcon QCommonStylePrivate::iconFromResourceTheme(QCommonStyle::StandardPixmap st
|
|||
QIcon icon;
|
||||
#ifndef QT_NO_IMAGEFORMAT_PNG
|
||||
switch (standardIcon) {
|
||||
case QStyle::SP_MessageBoxInformation:
|
||||
addIconFiles(u"information-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_MessageBoxWarning:
|
||||
addIconFiles(u"warning-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_MessageBoxCritical:
|
||||
addIconFiles(u"critical-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_MessageBoxQuestion:
|
||||
addIconFiles(u"question-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_FileDialogStart:
|
||||
addIconFiles(u"filedialog_start-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_FileDialogEnd:
|
||||
addIconFiles(u"filedialog_end-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_TitleBarMinButton:
|
||||
addIconFiles(u"titlebar-min-", titleBarSizes, icon);
|
||||
break;
|
||||
|
|
|
|||