Move some icon code from WindowsStyle to CommonStyle
Fusion style only depends on CommonStyle and it seems the autotest for tst_QFileSystemModel:iconProvider assumes an icon will be returned from standardPixmap. Since we dont want the icons to depend on style in this case we should move all this to commonstyle. Change-Id: I3a26367e5c0aefe2a39838f0c2cadc4f7afad89d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
This commit is contained in:
Jens Bache-Wiig
The Qt Project
parent
33d9b9f326
commit
11566de014
@ -5336,6 +5336,41 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
#ifndef QT_NO_IMAGEFORMAT_XPM
|
||||
switch (sp) {
|
||||
case SP_TitleBarMenuButton:
|
||||
return QPixmap(qt_menu_xpm);
|
||||
case SP_TitleBarShadeButton:
|
||||
return QPixmap(qt_shade_xpm);
|
||||
case SP_TitleBarUnshadeButton:
|
||||
return QPixmap(qt_unshade_xpm);
|
||||
case SP_TitleBarNormalButton:
|
||||
return QPixmap(qt_normalizeup_xpm);
|
||||
case SP_TitleBarMinButton:
|
||||
return QPixmap(qt_minimize_xpm);
|
||||
case SP_TitleBarMaxButton:
|
||||
return QPixmap(qt_maximize_xpm);
|
||||
case SP_TitleBarCloseButton:
|
||||
return QPixmap(qt_close_xpm);
|
||||
case SP_TitleBarContextHelpButton:
|
||||
return QPixmap(qt_help_xpm);
|
||||
case SP_DockWidgetCloseButton:
|
||||
return QPixmap(dock_widget_close_xpm);
|
||||
case SP_MessageBoxInformation:
|
||||
return QPixmap(information_xpm);
|
||||
case SP_MessageBoxWarning:
|
||||
return QPixmap(warning_xpm);
|
||||
case SP_MessageBoxCritical:
|
||||
return QPixmap(critical_xpm);
|
||||
case SP_MessageBoxQuestion:
|
||||
return QPixmap(question_xpm);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
#endif //QT_NO_IMAGEFORMAT_XPM
|
||||
|
||||
|
||||
return QPixmap();
|
||||
}
|
||||
|
||||
@ -5346,6 +5381,55 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
|
||||
const QWidget *widget) const
|
||||
{
|
||||
QIcon icon;
|
||||
#ifdef Q_OS_WIN
|
||||
switch (standardIcon) {
|
||||
case SP_DriveCDIcon:
|
||||
case SP_DriveDVDIcon:
|
||||
case SP_DriveNetIcon:
|
||||
case SP_DriveHDIcon:
|
||||
case SP_DriveFDIcon:
|
||||
case SP_FileIcon:
|
||||
case SP_FileLinkIcon:
|
||||
case SP_DesktopIcon:
|
||||
case SP_ComputerIcon:
|
||||
if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
|
||||
QPlatformTheme::StandardPixmap sp = static_cast<QPlatformTheme::StandardPixmap>(standardIcon);
|
||||
for (int size = 16 ; size <= 32 ; size += 16) {
|
||||
QPixmap pixmap = theme->standardPixmap(sp, QSizeF(size, size));
|
||||
icon.addPixmap(pixmap, QIcon::Normal);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case SP_DirIcon:
|
||||
case SP_DirLinkIcon:
|
||||
if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
|
||||
QPlatformTheme::StandardPixmap spOff = static_cast<QPlatformTheme::StandardPixmap>(standardIcon);
|
||||
QPlatformTheme::StandardPixmap spOn = standardIcon == SP_DirIcon ? QPlatformTheme::DirOpenIcon :
|
||||
QPlatformTheme::DirLinkOpenIcon;
|
||||
for (int size = 16 ; size <= 32 ; size += 16) {
|
||||
QSizeF pixSize(size, size);
|
||||
QPixmap pixmap = theme->standardPixmap(spOff, pixSize);
|
||||
icon.addPixmap(pixmap, QIcon::Normal, QIcon::Off);
|
||||
pixmap = theme->standardPixmap(spOn, pixSize);
|
||||
icon.addPixmap(pixmap, QIcon::Normal, QIcon::On);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case SP_VistaShield:
|
||||
if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
|
||||
QPlatformTheme::StandardPixmap sp = static_cast<QPlatformTheme::StandardPixmap>(standardIcon);
|
||||
QPixmap pixmap = theme->standardPixmap(sp, QSizeF(32, 32));
|
||||
icon.addPixmap(pixmap);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (!icon.isNull())
|
||||
return icon;
|
||||
|
||||
#endif
|
||||
|
||||
const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft());
|
||||
if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) {
|
||||
switch (standardIcon) {
|
||||
|
||||
@ -156,4 +156,374 @@ static const char * const filedialog_end_xpm[]={
|
||||
"aaa.............",
|
||||
"aaaaaaaaaaaaaaaa"};
|
||||
|
||||
#endif // QT_NO_IMAGEFORMAT_XPM
|
||||
|
||||
/* XPM */
|
||||
static const char * const qt_menu_xpm[] = {
|
||||
"16 16 72 1",
|
||||
" c None",
|
||||
". c #65AF36",
|
||||
"+ c #66B036",
|
||||
"@ c #77B94C",
|
||||
"# c #A7D28C",
|
||||
"$ c #BADBA4",
|
||||
"% c #A4D088",
|
||||
"& c #72B646",
|
||||
"* c #9ACB7A",
|
||||
"= c #7FBD56",
|
||||
"- c #85C05F",
|
||||
"; c #F4F9F0",
|
||||
"> c #FFFFFF",
|
||||
", c #E5F1DC",
|
||||
"' c #ECF5E7",
|
||||
") c #7ABA50",
|
||||
"! c #83BF5C",
|
||||
"~ c #AED595",
|
||||
"{ c #D7EACA",
|
||||
"] c #A9D28D",
|
||||
"^ c #BCDDA8",
|
||||
"/ c #C4E0B1",
|
||||
"( c #81BE59",
|
||||
"_ c #D0E7C2",
|
||||
": c #D4E9C6",
|
||||
"< c #6FB542",
|
||||
"[ c #6EB440",
|
||||
"} c #88C162",
|
||||
"| c #98CA78",
|
||||
"1 c #F4F9F1",
|
||||
"2 c #8FC56C",
|
||||
"3 c #F1F8EC",
|
||||
"4 c #E8F3E1",
|
||||
"5 c #D4E9C7",
|
||||
"6 c #74B748",
|
||||
"7 c #80BE59",
|
||||
"8 c #73B747",
|
||||
"9 c #6DB43F",
|
||||
"0 c #CBE4BA",
|
||||
"a c #80BD58",
|
||||
"b c #6DB33F",
|
||||
"c c #FEFFFE",
|
||||
"d c #68B138",
|
||||
"e c #F9FCF7",
|
||||
"f c #91C66F",
|
||||
"g c #E8F3E0",
|
||||
"h c #DCEDD0",
|
||||
"i c #91C66E",
|
||||
"j c #A3CF86",
|
||||
"k c #C9E3B8",
|
||||
"l c #B0D697",
|
||||
"m c #E3F0DA",
|
||||
"n c #95C873",
|
||||
"o c #E6F2DE",
|
||||
"p c #9ECD80",
|
||||
"q c #BEDEAA",
|
||||
"r c #C7E2B6",
|
||||
"s c #79BA4F",
|
||||
"t c #6EB441",
|
||||
"u c #BCDCA7",
|
||||
"v c #FAFCF8",
|
||||
"w c #F6FAF3",
|
||||
"x c #84BF5D",
|
||||
"y c #EDF6E7",
|
||||
"z c #FAFDF9",
|
||||
"A c #88C263",
|
||||
"B c #98CA77",
|
||||
"C c #CDE5BE",
|
||||
"D c #67B037",
|
||||
"E c #D9EBCD",
|
||||
"F c #6AB23C",
|
||||
"G c #77B94D",
|
||||
" .++++++++++++++",
|
||||
".+++++++++++++++",
|
||||
"+++@#$%&+++*=+++",
|
||||
"++-;>,>')+!>~+++",
|
||||
"++{>]+^>/(_>:~<+",
|
||||
"+[>>}+|>123>456+",
|
||||
"+7>>8+->>90>~+++",
|
||||
"+a>>b+a>c[0>~+++",
|
||||
"+de>=+f>g+0>~+++",
|
||||
"++h>i+j>k+0>~+++",
|
||||
"++l>mno>p+q>rst+",
|
||||
"++duv>wl++xy>zA+",
|
||||
"++++B>Cb++++&D++",
|
||||
"+++++0zE++++++++",
|
||||
"++++++FG+++++++.",
|
||||
"++++++++++++++. "};
|
||||
|
||||
static const char * const qt_close_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"..........",
|
||||
".##....##.",
|
||||
"..##..##..",
|
||||
"...####...",
|
||||
"....##....",
|
||||
"...####...",
|
||||
"..##..##..",
|
||||
".##....##.",
|
||||
"..........",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_maximize_xpm[]={
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"#########.",
|
||||
"#########.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#########.",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_minimize_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
".#######..",
|
||||
".#######..",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_normalizeup_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"...######.",
|
||||
"...######.",
|
||||
"...#....#.",
|
||||
".######.#.",
|
||||
".######.#.",
|
||||
".#....###.",
|
||||
".#....#...",
|
||||
".#....#...",
|
||||
".######...",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_help_xpm[] = {
|
||||
"10 10 2 1",
|
||||
". c None",
|
||||
"# c #000000",
|
||||
"..........",
|
||||
"..######..",
|
||||
".##....##.",
|
||||
"......##..",
|
||||
".....##...",
|
||||
"....##....",
|
||||
"....##....",
|
||||
"..........",
|
||||
"....##....",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_shade_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"....#.....",
|
||||
"...###....",
|
||||
"..#####...",
|
||||
".#######..",
|
||||
"..........",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_unshade_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
".#######..",
|
||||
"..#####...",
|
||||
"...###....",
|
||||
"....#.....",
|
||||
"..........",
|
||||
"..........",
|
||||
".........."};
|
||||
|
||||
static const char * dock_widget_close_xpm[] = {
|
||||
"8 8 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"........",
|
||||
".##..##.",
|
||||
"..####..",
|
||||
"...##...",
|
||||
"..####..",
|
||||
".##..##.",
|
||||
"........",
|
||||
"........"};
|
||||
|
||||
/* XPM */
|
||||
static const char * const information_xpm[]={
|
||||
"32 32 5 1",
|
||||
". c None",
|
||||
"c c #000000",
|
||||
"* c #999999",
|
||||
"a c #ffffff",
|
||||
"b c #0000ff",
|
||||
"...........********.............",
|
||||
"........***aaaaaaaa***..........",
|
||||
"......**aaaaaaaaaaaaaa**........",
|
||||
".....*aaaaaaaaaaaaaaaaaa*.......",
|
||||
"....*aaaaaaaabbbbaaaaaaaac......",
|
||||
"...*aaaaaaaabbbbbbaaaaaaaac.....",
|
||||
"..*aaaaaaaaabbbbbbaaaaaaaaac....",
|
||||
".*aaaaaaaaaaabbbbaaaaaaaaaaac...",
|
||||
".*aaaaaaaaaaaaaaaaaaaaaaaaaac*..",
|
||||
"*aaaaaaaaaaaaaaaaaaaaaaaaaaaac*.",
|
||||
"*aaaaaaaaaabbbbbbbaaaaaaaaaaac*.",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
".*aaaaaaaaaaabbbbbaaaaaaaaaac***",
|
||||
".*aaaaaaaaaaabbbbbaaaaaaaaaac***",
|
||||
"..*aaaaaaaaaabbbbbaaaaaaaaac***.",
|
||||
"...caaaaaaabbbbbbbbbaaaaaac****.",
|
||||
"....caaaaaaaaaaaaaaaaaaaac****..",
|
||||
".....caaaaaaaaaaaaaaaaaac****...",
|
||||
"......ccaaaaaaaaaaaaaacc****....",
|
||||
".......*cccaaaaaaaaccc*****.....",
|
||||
"........***cccaaaac*******......",
|
||||
"..........****caaac*****........",
|
||||
".............*caaac**...........",
|
||||
"...............caac**...........",
|
||||
"................cac**...........",
|
||||
".................cc**...........",
|
||||
"..................***...........",
|
||||
"...................**..........."};
|
||||
/* XPM */
|
||||
static const char* const warning_xpm[]={
|
||||
"32 32 4 1",
|
||||
". c None",
|
||||
"a c #ffff00",
|
||||
"* c #000000",
|
||||
"b c #999999",
|
||||
".............***................",
|
||||
"............*aaa*...............",
|
||||
"...........*aaaaa*b.............",
|
||||
"...........*aaaaa*bb............",
|
||||
"..........*aaaaaaa*bb...........",
|
||||
"..........*aaaaaaa*bb...........",
|
||||
".........*aaaaaaaaa*bb..........",
|
||||
".........*aaaaaaaaa*bb..........",
|
||||
"........*aaaaaaaaaaa*bb.........",
|
||||
"........*aaaa***aaaa*bb.........",
|
||||
".......*aaaa*****aaaa*bb........",
|
||||
".......*aaaa*****aaaa*bb........",
|
||||
"......*aaaaa*****aaaaa*bb.......",
|
||||
"......*aaaaa*****aaaaa*bb.......",
|
||||
".....*aaaaaa*****aaaaaa*bb......",
|
||||
".....*aaaaaa*****aaaaaa*bb......",
|
||||
"....*aaaaaaaa***aaaaaaaa*bb.....",
|
||||
"....*aaaaaaaa***aaaaaaaa*bb.....",
|
||||
"...*aaaaaaaaa***aaaaaaaaa*bb....",
|
||||
"...*aaaaaaaaaa*aaaaaaaaaa*bb....",
|
||||
"..*aaaaaaaaaaa*aaaaaaaaaaa*bb...",
|
||||
"..*aaaaaaaaaaaaaaaaaaaaaaa*bb...",
|
||||
".*aaaaaaaaaaaa**aaaaaaaaaaa*bb..",
|
||||
".*aaaaaaaaaaa****aaaaaaaaaa*bb..",
|
||||
"*aaaaaaaaaaaa****aaaaaaaaaaa*bb.",
|
||||
"*aaaaaaaaaaaaa**aaaaaaaaaaaa*bb.",
|
||||
"*aaaaaaaaaaaaaaaaaaaaaaaaaaa*bbb",
|
||||
"*aaaaaaaaaaaaaaaaaaaaaaaaaaa*bbb",
|
||||
".*aaaaaaaaaaaaaaaaaaaaaaaaa*bbbb",
|
||||
"..*************************bbbbb",
|
||||
"....bbbbbbbbbbbbbbbbbbbbbbbbbbb.",
|
||||
".....bbbbbbbbbbbbbbbbbbbbbbbbb.."};
|
||||
/* XPM */
|
||||
static const char* const critical_xpm[]={
|
||||
"32 32 4 1",
|
||||
". c None",
|
||||
"a c #999999",
|
||||
"* c #ff0000",
|
||||
"b c #ffffff",
|
||||
"...........********.............",
|
||||
".........************...........",
|
||||
".......****************.........",
|
||||
"......******************........",
|
||||
".....********************a......",
|
||||
"....**********************a.....",
|
||||
"...************************a....",
|
||||
"..*******b**********b*******a...",
|
||||
"..******bbb********bbb******a...",
|
||||
".******bbbbb******bbbbb******a..",
|
||||
".*******bbbbb****bbbbb*******a..",
|
||||
"*********bbbbb**bbbbb*********a.",
|
||||
"**********bbbbbbbbbb**********a.",
|
||||
"***********bbbbbbbb***********aa",
|
||||
"************bbbbbb************aa",
|
||||
"************bbbbbb************aa",
|
||||
"***********bbbbbbbb***********aa",
|
||||
"**********bbbbbbbbbb**********aa",
|
||||
"*********bbbbb**bbbbb*********aa",
|
||||
".*******bbbbb****bbbbb*******aa.",
|
||||
".******bbbbb******bbbbb******aa.",
|
||||
"..******bbb********bbb******aaa.",
|
||||
"..*******b**********b*******aa..",
|
||||
"...************************aaa..",
|
||||
"....**********************aaa...",
|
||||
"....a********************aaa....",
|
||||
".....a******************aaa.....",
|
||||
"......a****************aaa......",
|
||||
".......aa************aaaa.......",
|
||||
".........aa********aaaaa........",
|
||||
"...........aaaaaaaaaaa..........",
|
||||
".............aaaaaaa............"};
|
||||
/* XPM */
|
||||
static const char *const question_xpm[] = {
|
||||
"32 32 5 1",
|
||||
". c None",
|
||||
"c c #000000",
|
||||
"* c #999999",
|
||||
"a c #ffffff",
|
||||
"b c #0000ff",
|
||||
"...........********.............",
|
||||
"........***aaaaaaaa***..........",
|
||||
"......**aaaaaaaaaaaaaa**........",
|
||||
".....*aaaaaaaaaaaaaaaaaa*.......",
|
||||
"....*aaaaaaaaaaaaaaaaaaaac......",
|
||||
"...*aaaaaaaabbbbbbaaaaaaaac.....",
|
||||
"..*aaaaaaaabaaabbbbaaaaaaaac....",
|
||||
".*aaaaaaaabbaaaabbbbaaaaaaaac...",
|
||||
".*aaaaaaaabbbbaabbbbaaaaaaaac*..",
|
||||
"*aaaaaaaaabbbbaabbbbaaaaaaaaac*.",
|
||||
"*aaaaaaaaaabbaabbbbaaaaaaaaaac*.",
|
||||
"*aaaaaaaaaaaaabbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaaabbbaaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaaabbaaaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaaabbaaaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaaaaaaaaaaaaaaaaaac**",
|
||||
".*aaaaaaaaaaaabbaaaaaaaaaaaac***",
|
||||
".*aaaaaaaaaaabbbbaaaaaaaaaaac***",
|
||||
"..*aaaaaaaaaabbbbaaaaaaaaaac***.",
|
||||
"...caaaaaaaaaabbaaaaaaaaaac****.",
|
||||
"....caaaaaaaaaaaaaaaaaaaac****..",
|
||||
".....caaaaaaaaaaaaaaaaaac****...",
|
||||
"......ccaaaaaaaaaaaaaacc****....",
|
||||
".......*cccaaaaaaaaccc*****.....",
|
||||
"........***cccaaaac*******......",
|
||||
"..........****caaac*****........",
|
||||
".............*caaac**...........",
|
||||
"...............caac**...........",
|
||||
"................cac**...........",
|
||||
".................cc**...........",
|
||||
"..................***...........",
|
||||
"...................**..........."};
|
||||
|
||||
#endif //QT_NO_IMAGEFORMAT_XPM
|
||||
|
||||
@ -470,379 +470,6 @@ int QWindowsStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const QW
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifndef QT_NO_IMAGEFORMAT_XPM
|
||||
|
||||
/* XPM */
|
||||
static const char * const qt_menu_xpm[] = {
|
||||
"16 16 72 1",
|
||||
" c None",
|
||||
". c #65AF36",
|
||||
"+ c #66B036",
|
||||
"@ c #77B94C",
|
||||
"# c #A7D28C",
|
||||
"$ c #BADBA4",
|
||||
"% c #A4D088",
|
||||
"& c #72B646",
|
||||
"* c #9ACB7A",
|
||||
"= c #7FBD56",
|
||||
"- c #85C05F",
|
||||
"; c #F4F9F0",
|
||||
"> c #FFFFFF",
|
||||
", c #E5F1DC",
|
||||
"' c #ECF5E7",
|
||||
") c #7ABA50",
|
||||
"! c #83BF5C",
|
||||
"~ c #AED595",
|
||||
"{ c #D7EACA",
|
||||
"] c #A9D28D",
|
||||
"^ c #BCDDA8",
|
||||
"/ c #C4E0B1",
|
||||
"( c #81BE59",
|
||||
"_ c #D0E7C2",
|
||||
": c #D4E9C6",
|
||||
"< c #6FB542",
|
||||
"[ c #6EB440",
|
||||
"} c #88C162",
|
||||
"| c #98CA78",
|
||||
"1 c #F4F9F1",
|
||||
"2 c #8FC56C",
|
||||
"3 c #F1F8EC",
|
||||
"4 c #E8F3E1",
|
||||
"5 c #D4E9C7",
|
||||
"6 c #74B748",
|
||||
"7 c #80BE59",
|
||||
"8 c #73B747",
|
||||
"9 c #6DB43F",
|
||||
"0 c #CBE4BA",
|
||||
"a c #80BD58",
|
||||
"b c #6DB33F",
|
||||
"c c #FEFFFE",
|
||||
"d c #68B138",
|
||||
"e c #F9FCF7",
|
||||
"f c #91C66F",
|
||||
"g c #E8F3E0",
|
||||
"h c #DCEDD0",
|
||||
"i c #91C66E",
|
||||
"j c #A3CF86",
|
||||
"k c #C9E3B8",
|
||||
"l c #B0D697",
|
||||
"m c #E3F0DA",
|
||||
"n c #95C873",
|
||||
"o c #E6F2DE",
|
||||
"p c #9ECD80",
|
||||
"q c #BEDEAA",
|
||||
"r c #C7E2B6",
|
||||
"s c #79BA4F",
|
||||
"t c #6EB441",
|
||||
"u c #BCDCA7",
|
||||
"v c #FAFCF8",
|
||||
"w c #F6FAF3",
|
||||
"x c #84BF5D",
|
||||
"y c #EDF6E7",
|
||||
"z c #FAFDF9",
|
||||
"A c #88C263",
|
||||
"B c #98CA77",
|
||||
"C c #CDE5BE",
|
||||
"D c #67B037",
|
||||
"E c #D9EBCD",
|
||||
"F c #6AB23C",
|
||||
"G c #77B94D",
|
||||
" .++++++++++++++",
|
||||
".+++++++++++++++",
|
||||
"+++@#$%&+++*=+++",
|
||||
"++-;>,>')+!>~+++",
|
||||
"++{>]+^>/(_>:~<+",
|
||||
"+[>>}+|>123>456+",
|
||||
"+7>>8+->>90>~+++",
|
||||
"+a>>b+a>c[0>~+++",
|
||||
"+de>=+f>g+0>~+++",
|
||||
"++h>i+j>k+0>~+++",
|
||||
"++l>mno>p+q>rst+",
|
||||
"++duv>wl++xy>zA+",
|
||||
"++++B>Cb++++&D++",
|
||||
"+++++0zE++++++++",
|
||||
"++++++FG+++++++.",
|
||||
"++++++++++++++. "};
|
||||
|
||||
static const char * const qt_close_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"..........",
|
||||
".##....##.",
|
||||
"..##..##..",
|
||||
"...####...",
|
||||
"....##....",
|
||||
"...####...",
|
||||
"..##..##..",
|
||||
".##....##.",
|
||||
"..........",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_maximize_xpm[]={
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"#########.",
|
||||
"#########.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#.......#.",
|
||||
"#########.",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_minimize_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
".#######..",
|
||||
".#######..",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_normalizeup_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"...######.",
|
||||
"...######.",
|
||||
"...#....#.",
|
||||
".######.#.",
|
||||
".######.#.",
|
||||
".#....###.",
|
||||
".#....#...",
|
||||
".#....#...",
|
||||
".######...",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_help_xpm[] = {
|
||||
"10 10 2 1",
|
||||
". c None",
|
||||
"# c #000000",
|
||||
"..........",
|
||||
"..######..",
|
||||
".##....##.",
|
||||
"......##..",
|
||||
".....##...",
|
||||
"....##....",
|
||||
"....##....",
|
||||
"..........",
|
||||
"....##....",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_shade_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
"....#.....",
|
||||
"...###....",
|
||||
"..#####...",
|
||||
".#######..",
|
||||
"..........",
|
||||
".........."};
|
||||
|
||||
static const char * const qt_unshade_xpm[] = {
|
||||
"10 10 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"..........",
|
||||
"..........",
|
||||
"..........",
|
||||
".#######..",
|
||||
"..#####...",
|
||||
"...###....",
|
||||
"....#.....",
|
||||
"..........",
|
||||
"..........",
|
||||
".........."};
|
||||
|
||||
static const char * dock_widget_close_xpm[] = {
|
||||
"8 8 2 1",
|
||||
"# c #000000",
|
||||
". c None",
|
||||
"........",
|
||||
".##..##.",
|
||||
"..####..",
|
||||
"...##...",
|
||||
"..####..",
|
||||
".##..##.",
|
||||
"........",
|
||||
"........"};
|
||||
|
||||
/* XPM */
|
||||
static const char * const information_xpm[]={
|
||||
"32 32 5 1",
|
||||
". c None",
|
||||
"c c #000000",
|
||||
"* c #999999",
|
||||
"a c #ffffff",
|
||||
"b c #0000ff",
|
||||
"...........********.............",
|
||||
"........***aaaaaaaa***..........",
|
||||
"......**aaaaaaaaaaaaaa**........",
|
||||
".....*aaaaaaaaaaaaaaaaaa*.......",
|
||||
"....*aaaaaaaabbbbaaaaaaaac......",
|
||||
"...*aaaaaaaabbbbbbaaaaaaaac.....",
|
||||
"..*aaaaaaaaabbbbbbaaaaaaaaac....",
|
||||
".*aaaaaaaaaaabbbbaaaaaaaaaaac...",
|
||||
".*aaaaaaaaaaaaaaaaaaaaaaaaaac*..",
|
||||
"*aaaaaaaaaaaaaaaaaaaaaaaaaaaac*.",
|
||||
"*aaaaaaaaaabbbbbbbaaaaaaaaaaac*.",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaabbbbbaaaaaaaaaaac**",
|
||||
".*aaaaaaaaaaabbbbbaaaaaaaaaac***",
|
||||
".*aaaaaaaaaaabbbbbaaaaaaaaaac***",
|
||||
"..*aaaaaaaaaabbbbbaaaaaaaaac***.",
|
||||
"...caaaaaaabbbbbbbbbaaaaaac****.",
|
||||
"....caaaaaaaaaaaaaaaaaaaac****..",
|
||||
".....caaaaaaaaaaaaaaaaaac****...",
|
||||
"......ccaaaaaaaaaaaaaacc****....",
|
||||
".......*cccaaaaaaaaccc*****.....",
|
||||
"........***cccaaaac*******......",
|
||||
"..........****caaac*****........",
|
||||
".............*caaac**...........",
|
||||
"...............caac**...........",
|
||||
"................cac**...........",
|
||||
".................cc**...........",
|
||||
"..................***...........",
|
||||
"...................**..........."};
|
||||
/* XPM */
|
||||
static const char* const warning_xpm[]={
|
||||
"32 32 4 1",
|
||||
". c None",
|
||||
"a c #ffff00",
|
||||
"* c #000000",
|
||||
"b c #999999",
|
||||
".............***................",
|
||||
"............*aaa*...............",
|
||||
"...........*aaaaa*b.............",
|
||||
"...........*aaaaa*bb............",
|
||||
"..........*aaaaaaa*bb...........",
|
||||
"..........*aaaaaaa*bb...........",
|
||||
".........*aaaaaaaaa*bb..........",
|
||||
".........*aaaaaaaaa*bb..........",
|
||||
"........*aaaaaaaaaaa*bb.........",
|
||||
"........*aaaa***aaaa*bb.........",
|
||||
".......*aaaa*****aaaa*bb........",
|
||||
".......*aaaa*****aaaa*bb........",
|
||||
"......*aaaaa*****aaaaa*bb.......",
|
||||
"......*aaaaa*****aaaaa*bb.......",
|
||||
".....*aaaaaa*****aaaaaa*bb......",
|
||||
".....*aaaaaa*****aaaaaa*bb......",
|
||||
"....*aaaaaaaa***aaaaaaaa*bb.....",
|
||||
"....*aaaaaaaa***aaaaaaaa*bb.....",
|
||||
"...*aaaaaaaaa***aaaaaaaaa*bb....",
|
||||
"...*aaaaaaaaaa*aaaaaaaaaa*bb....",
|
||||
"..*aaaaaaaaaaa*aaaaaaaaaaa*bb...",
|
||||
"..*aaaaaaaaaaaaaaaaaaaaaaa*bb...",
|
||||
".*aaaaaaaaaaaa**aaaaaaaaaaa*bb..",
|
||||
".*aaaaaaaaaaa****aaaaaaaaaa*bb..",
|
||||
"*aaaaaaaaaaaa****aaaaaaaaaaa*bb.",
|
||||
"*aaaaaaaaaaaaa**aaaaaaaaaaaa*bb.",
|
||||
"*aaaaaaaaaaaaaaaaaaaaaaaaaaa*bbb",
|
||||
"*aaaaaaaaaaaaaaaaaaaaaaaaaaa*bbb",
|
||||
".*aaaaaaaaaaaaaaaaaaaaaaaaa*bbbb",
|
||||
"..*************************bbbbb",
|
||||
"....bbbbbbbbbbbbbbbbbbbbbbbbbbb.",
|
||||
".....bbbbbbbbbbbbbbbbbbbbbbbbb.."};
|
||||
/* XPM */
|
||||
static const char* const critical_xpm[]={
|
||||
"32 32 4 1",
|
||||
". c None",
|
||||
"a c #999999",
|
||||
"* c #ff0000",
|
||||
"b c #ffffff",
|
||||
"...........********.............",
|
||||
".........************...........",
|
||||
".......****************.........",
|
||||
"......******************........",
|
||||
".....********************a......",
|
||||
"....**********************a.....",
|
||||
"...************************a....",
|
||||
"..*******b**********b*******a...",
|
||||
"..******bbb********bbb******a...",
|
||||
".******bbbbb******bbbbb******a..",
|
||||
".*******bbbbb****bbbbb*******a..",
|
||||
"*********bbbbb**bbbbb*********a.",
|
||||
"**********bbbbbbbbbb**********a.",
|
||||
"***********bbbbbbbb***********aa",
|
||||
"************bbbbbb************aa",
|
||||
"************bbbbbb************aa",
|
||||
"***********bbbbbbbb***********aa",
|
||||
"**********bbbbbbbbbb**********aa",
|
||||
"*********bbbbb**bbbbb*********aa",
|
||||
".*******bbbbb****bbbbb*******aa.",
|
||||
".******bbbbb******bbbbb******aa.",
|
||||
"..******bbb********bbb******aaa.",
|
||||
"..*******b**********b*******aa..",
|
||||
"...************************aaa..",
|
||||
"....**********************aaa...",
|
||||
"....a********************aaa....",
|
||||
".....a******************aaa.....",
|
||||
"......a****************aaa......",
|
||||
".......aa************aaaa.......",
|
||||
".........aa********aaaaa........",
|
||||
"...........aaaaaaaaaaa..........",
|
||||
".............aaaaaaa............"};
|
||||
/* XPM */
|
||||
static const char *const question_xpm[] = {
|
||||
"32 32 5 1",
|
||||
". c None",
|
||||
"c c #000000",
|
||||
"* c #999999",
|
||||
"a c #ffffff",
|
||||
"b c #0000ff",
|
||||
"...........********.............",
|
||||
"........***aaaaaaaa***..........",
|
||||
"......**aaaaaaaaaaaaaa**........",
|
||||
".....*aaaaaaaaaaaaaaaaaa*.......",
|
||||
"....*aaaaaaaaaaaaaaaaaaaac......",
|
||||
"...*aaaaaaaabbbbbbaaaaaaaac.....",
|
||||
"..*aaaaaaaabaaabbbbaaaaaaaac....",
|
||||
".*aaaaaaaabbaaaabbbbaaaaaaaac...",
|
||||
".*aaaaaaaabbbbaabbbbaaaaaaaac*..",
|
||||
"*aaaaaaaaabbbbaabbbbaaaaaaaaac*.",
|
||||
"*aaaaaaaaaabbaabbbbaaaaaaaaaac*.",
|
||||
"*aaaaaaaaaaaaabbbbaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaaabbbaaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaaabbaaaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaaabbaaaaaaaaaaaaac**",
|
||||
"*aaaaaaaaaaaaaaaaaaaaaaaaaaaac**",
|
||||
".*aaaaaaaaaaaabbaaaaaaaaaaaac***",
|
||||
".*aaaaaaaaaaabbbbaaaaaaaaaaac***",
|
||||
"..*aaaaaaaaaabbbbaaaaaaaaaac***.",
|
||||
"...caaaaaaaaaabbaaaaaaaaaac****.",
|
||||
"....caaaaaaaaaaaaaaaaaaaac****..",
|
||||
".....caaaaaaaaaaaaaaaaaac****...",
|
||||
"......ccaaaaaaaaaaaaaacc****....",
|
||||
".......*cccaaaaaaaaccc*****.....",
|
||||
"........***cccaaaac*******......",
|
||||
"..........****caaac*****........",
|
||||
".............*caaac**...........",
|
||||
"...............caac**...........",
|
||||
"................cac**...........",
|
||||
".................cc**...........",
|
||||
"..................***...........",
|
||||
"...................**..........."};
|
||||
|
||||
#endif //QT_NO_IMAGEFORMAT_XPM
|
||||
|
||||
/*!
|
||||
\reimp
|
||||
*/
|
||||
@ -889,38 +516,6 @@ QPixmap QWindowsStyle::standardPixmap(StandardPixmap standardPixmap, const QStyl
|
||||
return desktopIcon;
|
||||
}
|
||||
#endif
|
||||
#ifndef QT_NO_IMAGEFORMAT_XPM
|
||||
switch (standardPixmap) {
|
||||
case SP_TitleBarMenuButton:
|
||||
return QPixmap(qt_menu_xpm);
|
||||
case SP_TitleBarShadeButton:
|
||||
return QPixmap(qt_shade_xpm);
|
||||
case SP_TitleBarUnshadeButton:
|
||||
return QPixmap(qt_unshade_xpm);
|
||||
case SP_TitleBarNormalButton:
|
||||
return QPixmap(qt_normalizeup_xpm);
|
||||
case SP_TitleBarMinButton:
|
||||
return QPixmap(qt_minimize_xpm);
|
||||
case SP_TitleBarMaxButton:
|
||||
return QPixmap(qt_maximize_xpm);
|
||||
case SP_TitleBarCloseButton:
|
||||
return QPixmap(qt_close_xpm);
|
||||
case SP_TitleBarContextHelpButton:
|
||||
return QPixmap(qt_help_xpm);
|
||||
case SP_DockWidgetCloseButton:
|
||||
return QPixmap(dock_widget_close_xpm);
|
||||
case SP_MessageBoxInformation:
|
||||
return QPixmap(information_xpm);
|
||||
case SP_MessageBoxWarning:
|
||||
return QPixmap(warning_xpm);
|
||||
case SP_MessageBoxCritical:
|
||||
return QPixmap(critical_xpm);
|
||||
case SP_MessageBoxQuestion:
|
||||
return QPixmap(question_xpm);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
#endif //QT_NO_IMAGEFORMAT_XPM
|
||||
return QCommonStyle::standardPixmap(standardPixmap, opt, widget);
|
||||
}
|
||||
|
||||
@ -2854,56 +2449,7 @@ QSize QWindowsStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
|
||||
QIcon QWindowsStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option,
|
||||
const QWidget *widget) const
|
||||
{
|
||||
QIcon icon;
|
||||
#ifdef Q_OS_WIN
|
||||
QPixmap pixmap;
|
||||
switch (standardIcon) {
|
||||
case SP_DriveCDIcon:
|
||||
case SP_DriveDVDIcon:
|
||||
case SP_DriveNetIcon:
|
||||
case SP_DriveHDIcon:
|
||||
case SP_DriveFDIcon:
|
||||
case SP_FileIcon:
|
||||
case SP_FileLinkIcon:
|
||||
case SP_DesktopIcon:
|
||||
case SP_ComputerIcon:
|
||||
if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
|
||||
QPlatformTheme::StandardPixmap sp = static_cast<QPlatformTheme::StandardPixmap>(standardIcon);
|
||||
for (int size = 16 ; size <= 32 ; size += 16) {
|
||||
pixmap = theme->standardPixmap(sp, QSizeF(size, size));
|
||||
icon.addPixmap(pixmap, QIcon::Normal);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case SP_DirIcon:
|
||||
case SP_DirLinkIcon:
|
||||
if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
|
||||
QPlatformTheme::StandardPixmap spOff = static_cast<QPlatformTheme::StandardPixmap>(standardIcon);
|
||||
QPlatformTheme::StandardPixmap spOn = standardIcon == SP_DirIcon ? QPlatformTheme::DirOpenIcon :
|
||||
QPlatformTheme::DirLinkOpenIcon;
|
||||
for (int size = 16 ; size <= 32 ; size += 16) {
|
||||
QSizeF pixSize(size, size);
|
||||
pixmap = theme->standardPixmap(spOff, pixSize);
|
||||
icon.addPixmap(pixmap, QIcon::Normal, QIcon::Off);
|
||||
pixmap = theme->standardPixmap(spOn, pixSize);
|
||||
icon.addPixmap(pixmap, QIcon::Normal, QIcon::On);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case SP_VistaShield:
|
||||
if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
|
||||
QPlatformTheme::StandardPixmap sp = static_cast<QPlatformTheme::StandardPixmap>(standardIcon);
|
||||
pixmap = theme->standardPixmap(sp, QSizeF(32, 32));
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (icon.isNull())
|
||||
icon = QCommonStyle::standardIcon(standardIcon, option, widget);
|
||||
return icon;
|
||||
return QCommonStyle::standardIcon(standardIcon, option, widget);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user