This commit is contained in:
2025-08-15 20:31:40 +02:00
parent 6865e6aaaa
commit c87da2802a
14 changed files with 235 additions and 293 deletions

View File

@@ -32,7 +32,7 @@ namespace XQAppData
class XQAppIconMap : public QMap<QString,QIcon>
class XQAppIconMap : public QMap<QString,XQIcon>
{
public:
@@ -40,85 +40,85 @@ namespace XQAppData
void init()
{
insert( "DirIcon" , QApplication::style()->standardIcon(QStyle::SP_DirIcon));
insert( "FileDialogBack", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack));
insert( "FileDialogContentsView", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView));
insert( "FileDialogDetailedView", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView));
insert( "icn05Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd));
insert( "icn06Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView));
insert( "icn07Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView));
insert( "icn08Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder));
insert( "icn09Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart));
insert( "icn10Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent));
insert( "icn11Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowBack));
insert( "icn12Dummy", QApplication::style()->standardIcon(QStyle::SP_DirIcon));
insert( "icn13Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipBackward));
insert( "icn14Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowDown));
insert( "icn15Dummy", QApplication::style()->standardIcon(QStyle::SP_DirLinkIcon));
insert( "icn16Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSkipForward));
insert( "icn17Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowForward));
insert( "icn18Dummy", QApplication::style()->standardIcon(QStyle::SP_DirOpenIcon));
insert( "icn19Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaStop));
insert( "icn20Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowLeft));
insert( "icn21Dummy", QApplication::style()->standardIcon(QStyle::SP_DockWidgetCloseButton));
insert( "icn22Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolume));
insert( "icn23Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowRight));
insert( "icn24Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveCDIcon));
insert( "icn25Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaVolumeMuted));
insert( "icn26Dummy", QApplication::style()->standardIcon(QStyle::SP_ArrowUp));
insert( "icn27Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveDVDIcon));
insert( "icn28Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical));
insert( "icn29Dummy", QApplication::style()->standardIcon(QStyle::SP_BrowserReload));
insert( "icn30Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveFDIcon));
insert( "icn31Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation));
insert( "BrowserStop", QApplication::style()->standardIcon(QStyle::SP_BrowserStop));
insert( "icn33Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveHDIcon));
insert( "icn34Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxQuestion));
insert( "icn35Dummy", QApplication::style()->standardIcon(QStyle::SP_CommandLink));
insert( "icn36Dummy", QApplication::style()->standardIcon(QStyle::SP_DriveNetIcon));
insert( "icn37Dummy", QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning));
insert( "icn38Dummy", QApplication::style()->standardIcon(QStyle::SP_ComputerIcon));
insert( "icn39Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogBack));
insert( "icn40Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarCloseButton));
insert( "icn41Dummy", QApplication::style()->standardIcon(QStyle::SP_CustomBase));
insert( "icn42Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogContentsView));
insert( "icn43Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarContextHelpButton));
insert( "icn44Dummy", QApplication::style()->standardIcon(QStyle::SP_DesktopIcon));
insert( "icn45Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogDetailedView));
insert( "icn46Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMaxButton));
insert( "icn47Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogApplyButton));
insert( "icn48Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogEnd));
insert( "icn49Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMenuButton));
insert( "icn50Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCancelButton));
insert( "icn51Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogInfoView));
insert( "icn52Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarMinButton));
insert( "icn53Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogCloseButton));
insert( "icn54Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogListView));
insert( "icn55Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarNormalButton));
insert( "icn56Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogDiscardButton));
insert( "icn57Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogNewFolder));
insert( "icn58Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarShadeButton));
insert( "icn59Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogHelpButton));
insert( "icn60Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogStart));
insert( "icn61Dummy", QApplication::style()->standardIcon(QStyle::SP_TitleBarUnshadeButton));
insert( "icn62Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogNoButton));
insert( "icn63Dummy", QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent));
insert( "icn64Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton));
insert( "icn65Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogOkButton));
insert( "FileIcon", QApplication::style()->standardIcon(QStyle::SP_FileIcon));
insert( "icn67Dummy", QApplication::style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton));
insert( "icn68Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogResetButton));
insert( "icn70Dummy", QApplication::style()->standardIcon(QStyle::SP_FileLinkIcon));
insert( "TrashIcon", QApplication::style()->standardIcon(QStyle::SP_TrashIcon));
insert( "icn72Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogSaveButton));
insert( "icn73Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPause));
insert( "icn74Dummy", QApplication::style()->standardIcon(QStyle::SP_VistaShield));
insert( "icn75Dummy", QApplication::style()->standardIcon(QStyle::SP_DialogYesButton));
insert( "icn76Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaPlay));
insert( "icn77Dummy", QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon));
insert( "icn79Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSeekBackward));
insert( "DirHomeIcon", QApplication::style()->standardIcon(QStyle::SP_DirHomeIcon));
insert( "icn81Dummy", QApplication::style()->standardIcon(QStyle::SP_MediaSeekForward));
namedInsert( "DirIcon" , QStyle::SP_DirIcon );
namedInsert( "FileDialogBack", QStyle::SP_FileDialogBack );
namedInsert( "FileDialogContentsView", QStyle::SP_FileDialogContentsView );
namedInsert( "FileDialogDetailedView", QStyle::SP_FileDialogDetailedView );
namedInsert( "icn05Dummy", QStyle::SP_FileDialogEnd );
namedInsert( "icn06Dummy", QStyle::SP_FileDialogInfoView );
namedInsert( "icn07Dummy", QStyle::SP_FileDialogListView );
namedInsert( "icn08Dummy", QStyle::SP_FileDialogNewFolder );
namedInsert( "icn09Dummy", QStyle::SP_FileDialogStart );
namedInsert( "icn10Dummy", QStyle::SP_FileDialogToParent );
namedInsert( "icn11Dummy", QStyle::SP_ArrowBack );
namedInsert( "icn12Dummy", QStyle::SP_DirIcon );
namedInsert( "icn13Dummy", QStyle::SP_MediaSkipBackward );
namedInsert( "icn14Dummy", QStyle::SP_ArrowDown );
namedInsert( "icn15Dummy", QStyle::SP_DirLinkIcon );
namedInsert( "icn16Dummy", QStyle::SP_MediaSkipForward );
namedInsert( "icn17Dummy", QStyle::SP_ArrowForward );
namedInsert( "icn18Dummy", QStyle::SP_DirOpenIcon );
namedInsert( "icn19Dummy", QStyle::SP_MediaStop );
namedInsert( "icn20Dummy", QStyle::SP_ArrowLeft );
namedInsert( "icn21Dummy", QStyle::SP_DockWidgetCloseButton );
namedInsert( "icn22Dummy", QStyle::SP_MediaVolume );
namedInsert( "icn23Dummy", QStyle::SP_ArrowRight );
namedInsert( "icn24Dummy", QStyle::SP_DriveCDIcon );
namedInsert( "icn25Dummy", QStyle::SP_MediaVolumeMuted );
namedInsert( "icn26Dummy", QStyle::SP_ArrowUp );
namedInsert( "icn27Dummy", QStyle::SP_DriveDVDIcon );
namedInsert( "icn28Dummy", QStyle::SP_MessageBoxCritical );
namedInsert( "icn29Dummy", QStyle::SP_BrowserReload );
namedInsert( "icn30Dummy", QStyle::SP_DriveFDIcon );
namedInsert( "icn31Dummy", QStyle::SP_MessageBoxInformation );
namedInsert( "BrowserStop", QStyle::SP_BrowserStop );
namedInsert( "icn33Dummy", QStyle::SP_DriveHDIcon );
namedInsert( "icn34Dummy", QStyle::SP_MessageBoxQuestion );
namedInsert( "icn35Dummy", QStyle::SP_CommandLink );
namedInsert( "icn36Dummy", QStyle::SP_DriveNetIcon );
namedInsert( "icn37Dummy", QStyle::SP_MessageBoxWarning );
namedInsert( "icn38Dummy", QStyle::SP_ComputerIcon );
namedInsert( "icn39Dummy", QStyle::SP_FileDialogBack );
namedInsert( "icn40Dummy", QStyle::SP_TitleBarCloseButton );
namedInsert( "icn41Dummy", QStyle::SP_CustomBase );
namedInsert( "icn42Dummy", QStyle::SP_FileDialogContentsView );
namedInsert( "icn43Dummy", QStyle::SP_TitleBarContextHelpButton );
namedInsert( "DesktopIcon", QStyle::SP_DesktopIcon );
namedInsert( "icn45Dummy", QStyle::SP_FileDialogDetailedView );
namedInsert( "icn46Dummy", QStyle::SP_TitleBarMaxButton );
namedInsert( "icn47Dummy", QStyle::SP_DialogApplyButton );
namedInsert( "icn48Dummy", QStyle::SP_FileDialogEnd );
namedInsert( "icn49Dummy", QStyle::SP_TitleBarMenuButton );
namedInsert( "icn50Dummy", QStyle::SP_DialogCancelButton );
namedInsert( "icn51Dummy", QStyle::SP_FileDialogInfoView );
namedInsert( "icn52Dummy", QStyle::SP_TitleBarMinButton );
namedInsert( "icn53Dummy", QStyle::SP_DialogCloseButton );
namedInsert( "icn54Dummy", QStyle::SP_FileDialogListView );
namedInsert( "icn55Dummy", QStyle::SP_TitleBarNormalButton );
namedInsert( "icn56Dummy", QStyle::SP_DialogDiscardButton );
namedInsert( "icn57Dummy", QStyle::SP_FileDialogNewFolder );
namedInsert( "icn58Dummy", QStyle::SP_TitleBarShadeButton );
namedInsert( "icn59Dummy", QStyle::SP_DialogHelpButton );
namedInsert( "icn60Dummy", QStyle::SP_FileDialogStart );
namedInsert( "icn61Dummy", QStyle::SP_TitleBarUnshadeButton );
namedInsert( "icn62Dummy", QStyle::SP_DialogNoButton );
namedInsert( "icn63Dummy", QStyle::SP_FileDialogToParent );
namedInsert( "icn64Dummy", QStyle::SP_ToolBarHorizontalExtensionButton );
namedInsert( "icn65Dummy", QStyle::SP_DialogOkButton );
namedInsert( "FileIcon", QStyle::SP_FileIcon );
namedInsert( "icn67Dummy", QStyle::SP_ToolBarVerticalExtensionButton );
namedInsert( "icn68Dummy", QStyle::SP_DialogResetButton );
namedInsert( "icn70Dummy", QStyle::SP_FileLinkIcon );
namedInsert( "TrashIcon", QStyle::SP_TrashIcon );
namedInsert( "icn72Dummy", QStyle::SP_DialogSaveButton );
namedInsert( "icn73Dummy", QStyle::SP_MediaPause );
namedInsert( "icn74Dummy", QStyle::SP_VistaShield );
namedInsert( "icn75Dummy", QStyle::SP_DialogYesButton );
namedInsert( "icn76Dummy", QStyle::SP_MediaPlay );
namedInsert( "icn77Dummy", QStyle::SP_DirClosedIcon );
namedInsert( "icn79Dummy", QStyle::SP_MediaSeekBackward );
namedInsert( "DirHomeIcon", QStyle::SP_DirHomeIcon );
namedInsert( "icn81Dummy", QStyle::SP_MediaSeekForward );
/*
auto from = to_underlying(QIcon::ThemeIcon::AddressBookNew);
auto to = to_underlying(QIcon::ThemeIcon::NThemeIcons);
@@ -134,8 +134,17 @@ namespace XQAppData
}
};
void namedInsert( const QString& key, QStyle::StandardPixmap pixmapID )
{
QIcon icon = QApplication::style()->standardIcon( pixmapID );
insert( key, XQIcon( icon, key ) );
//_keysToNames.insert()
}
protected:
QMap<qint64,QString> _keysToNames;
};
@@ -150,18 +159,15 @@ namespace XQAppData
static XQAppIconMap s_IconMap;
bool hasTypeIcon(const QString& key )
XQIcon typeIcon(const QString& key )
{
if(s_IconMap.isEmpty())
s_IconMap.init();
return !key.isEmpty() && s_IconMap.contains(key);
}
QIcon typeIcon(const QString& key )
{
if( hasTypeIcon(key) )
if( s_IconMap.contains(key) )
return s_IconMap[key];
return QApplication::style()->standardIcon(QStyle::SP_TrashIcon);
static XQIcon s_FallBackIcon( QApplication::style()->standardIcon( QStyle::SP_TrashIcon), "NoIcon" );
return s_FallBackIcon;
}