QCommonStyle: add missing standard icons
Even though there are png files for SP_DirOpen/Closed/LinkIcon, SP_DriveFD/HD/NetIcon, SP_CommandLink and SP_Desktop/ComputerIcon they were not used within QCommonStyle::standardIcon() so the fallback from standardPixmap() with 16x16 pixels were used. As a drive-by use addIconFiles() for the creation of other standard icons. Task-number: QTBUG-118122 Change-Id: Ib651cefd31d1de84721fe11712e51980220ee9e2 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>bb10
parent
37b6f941ee
commit
910f884593
|
|
@ -5984,6 +5984,7 @@ QIcon QCommonStylePrivate::iconFromResourceTheme(QCommonStyle::StandardPixmap st
|
|||
case QStyle::SP_DialogNoButton:
|
||||
addIconFiles(u"standardbutton-no-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_CommandLink:
|
||||
case QStyle::SP_ArrowForward:
|
||||
return q->proxy()->standardIcon(rtl(option) ? QStyle::SP_ArrowLeft
|
||||
: QStyle::SP_ArrowRight,
|
||||
|
|
@ -6009,9 +6010,21 @@ QIcon QCommonStylePrivate::iconFromResourceTheme(QCommonStyle::StandardPixmap st
|
|||
addIconFiles(u"dirclosed-", pngIconSizes, icon, QIcon::Normal, QIcon::Off);
|
||||
addIconFiles(u"diropen-", pngIconSizes, icon, QIcon::Normal, QIcon::On);
|
||||
break;
|
||||
case QStyle::SP_DirOpenIcon:
|
||||
addIconFiles(u"diropen-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_DirClosedIcon:
|
||||
addIconFiles(u"dirclosed-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_DirLinkIcon:
|
||||
addIconFiles(u"dirlink-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_DriveCDIcon:
|
||||
addIconFiles(u"cdr-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_DriveFDIcon:
|
||||
addIconFiles(u"floppy-", pngIconSizes, icon);
|
||||
break;
|
||||
case QStyle::SP_DriveHDIcon:
|
||||
addIconFiles(u"harddrive-", pngIconSizes, icon);
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in New Issue