1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QIcon: remove unmapped ThemeIcon enum values

Browse Source 
The ThemeIcon enum provides symbolic names of icons for which most
engines provide an icon. We couldn't find a matching icon for several of
the XDG icon names, so remove those enum values for which we don't have
at least two matches.

Also remove names that are too specific for a desktop environment,
like icons for certain applications or system-wide actions.

Change-Id: I5a6c74256bda66d9fde7513f834a8361858605c4
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 0de09beee54f715e4d2b1e739cf75c8c8d78db16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2024-02-20 10:38:17 +01:00 committed by Qt Cherry-pick Bot
parent b2b3a08dbd
commit cb24a119b9
2 changed files with 0 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
src/gui/image/qicon.cpp
View File

@ -1425,7 +1425,6 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"edit-cut", "edit-cut",
"edit-delete", "edit-delete",
"edit-find", "edit-find",
"edit-find-replace",
"edit-paste", "edit-paste",
"edit-redo", "edit-redo",
"edit-select-all", "edit-select-all",
@ -1443,36 +1442,26 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"format-text-italic", "format-text-italic",
"format-text-underline", "format-text-underline",
"format-text-strikethrough", "format-text-strikethrough",
"go-bottom",
"go-down", "go-down",
"go-first",
"go-home", "go-home",
"go-jump",
"go-last",
"go-next", "go-next",
"go-previous", "go-previous",
"go-top",
"go-up", "go-up",
"help-about", "help-about",
"help-contents",
"help-faq", "help-faq",
"insert-image", "insert-image",
"insert-link", "insert-link",
"insert-object",
"insert-text", "insert-text",
"list-add", "list-add",
"list-remove", "list-remove",
"mail-forward", "mail-forward",
"mail-mark-important", "mail-mark-important",
"mail-mark-junk",
"mail-mark-notjunk",
"mail-mark-read", "mail-mark-read",
"mail-mark-unread", "mail-mark-unread",
"mail-message-new", "mail-message-new",
"mail-reply-all", "mail-reply-all",
"mail-reply-sender", "mail-reply-sender",
"mail-send", "mail-send",
"mail-send-receive",
"media-eject", "media-eject",
"media-playback-pause", "media-playback-pause",
"media-playback-start", "media-playback-start",
@ -1482,14 +1471,11 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"media-seek-forward", "media-seek-forward",
"media-skip-backward", "media-skip-backward",
"media-skip-forward", "media-skip-forward",
"object-flip-horizontal",
"object-flip-vertical",
"object-rotate-left", "object-rotate-left",
"object-rotate-right", "object-rotate-right",
"process-stop", "process-stop",
"system-lock-screen", "system-lock-screen",
"system-log-out", "system-log-out",
"system-run",
"system-search", "system-search",
"system-reboot", "system-reboot",
"system-shutdown", "system-shutdown",
@ -1497,57 +1483,12 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"view-fullscreen", "view-fullscreen",
"view-refresh", "view-refresh",
"view-restore", "view-restore",
"view-sort-ascending",
"view-sort-descending",
"window-close", "window-close",
"window-new", "window-new",
"zoom-fit-best", "zoom-fit-best",
"zoom-in", "zoom-in",
"zoom-original",
"zoom-out", "zoom-out",
"process-working",
"accessories-calculator",
"accessories-character-map",
"accessories-dictionary",
"accessories-text-editor",
"help-browser",
"multimedia-volume-control",
"preferences-desktop-accessibility",
"preferences-desktop-font",
"preferences-desktop-keyboard",
"preferences-desktop-locale",
"preferences-desktop-multimedia",
"preferences-desktop-screensaver",
"preferences-desktop-theme",
"preferences-desktop-wallpaper",
"system-file-manager",
"system-software-install",
"system-software-update",
"utilities-system-monitor",
"utilities-terminal",
"applications-accessories",
"applications-development",
"applications-engineering",
"applications-games",
"applications-graphics",
"applications-internet",
"applications-multimedia",
"applications-office",
"applications-other",
"applications-science",
"applications-system",
"applications-utilities",
"preferences-desktop",
"preferences-desktop-peripherals",
"preferences-desktop-personal",
"preferences-other",
"preferences-system",
"preferences-system-network",
"system-help",
"audio-card", "audio-card",
"audio-input-microphone", "audio-input-microphone",
"battery", "battery",
@ -1557,39 +1498,21 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"computer", "computer",
"drive-harddisk", "drive-harddisk",
"drive-optical", "drive-optical",
"drive-removable-media",
"input-gaming", "input-gaming",
"input-keyboard", "input-keyboard",
"input-mouse", "input-mouse",
"input-tablet", "input-tablet",
"media-flash", "media-flash",
"media-floppy",
"media-optical", "media-optical",
"media-tape", "media-tape",
"modem",
"multimedia-player", "multimedia-player",
"network-wired", "network-wired",
"network-wireless", "network-wireless",
"pda",
"phone", "phone",
"printer", "printer",
"scanner", "scanner",
"video-display", "video-display",
"emblem-default",
"emblem-documents",
"emblem-downloads",
"emblem-favorite",
"emblem-important",
"emblem-mail",
"emblem-photos",
"emblem-readonly",
"emblem-shared",
"emblem-symbolic-link",
"emblem-synchronized",
"emblem-system",
"emblem-unreadable",
"appointment-missed", "appointment-missed",
"appointment-soon", "appointment-soon",
"audio-volume-high", "audio-volume-high",
@ -1612,41 +1535,24 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"mail-unread", "mail-unread",
"mail-read", "mail-read",
"mail-replied", "mail-replied",
"mail-signed",
"mail-signed-verified",
"media-playlist-repeat", "media-playlist-repeat",
"media-playlist-shuffle", "media-playlist-shuffle",
"network-error",
"network-idle",
"network-offline", "network-offline",
"network-receive",
"network-transmit",
"network-transmit-receive",
"printer-error",
"printer-printing", "printer-printing",
"security-high", "security-high",
"security-medium",
"security-low", "security-low",
"software-update-available", "software-update-available",
"software-update-urgent", "software-update-urgent",
"sync-error", "sync-error",
"sync-synchronizing", "sync-synchronizing",
"task-due",
"task-past-due",
"user-available", "user-available",
"user-away",
"user-idle",
"user-offline", "user-offline",
"user-trash-full",
"weather-clear", "weather-clear",
"weather-clear-night", "weather-clear-night",
"weather-few-clouds", "weather-few-clouds",
"weather-few-clouds-night", "weather-few-clouds-night",
"weather-fog", "weather-fog",
"weather-overcast",
"weather-severe-alert",
"weather-showers", "weather-showers",
"weather-showers-scattered",
"weather-snow", "weather-snow",
"weather-storm" "weather-storm"
); );
@ -1686,7 +1592,6 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value EditCut \value EditCut
\value EditDelete \value EditDelete
\value EditFind \value EditFind
\value EditFindReplace
\value EditPaste \value EditPaste
\value EditRedo \value EditRedo
\value EditSelectAll \value EditSelectAll
@ -1704,36 +1609,26 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value FormatTextItalic \value FormatTextItalic
\value FormatTextUnderline \value FormatTextUnderline
\value FormatTextStrikethrough \value FormatTextStrikethrough
\value GoBottom
\value GoDown \value GoDown
\value GoFirst
\value GoHome \value GoHome
\value GoJump
\value GoLast
\value GoNext \value GoNext
\value GoPrevious \value GoPrevious
\value GoTop
\value GoUp \value GoUp
\value HelpAbout \value HelpAbout
\value HelpContents
\value HelpFaq \value HelpFaq
\value InsertImage \value InsertImage
\value InsertLink \value InsertLink
\value InsertObject
\value InsertText \value InsertText
\value ListAdd \value ListAdd
\value ListRemove \value ListRemove
\value MailForward \value MailForward
\value MailMarkImportant \value MailMarkImportant
\value MailMarkJunk
\value MailMarkNotjunk
\value MailMarkRead \value MailMarkRead
\value MailMarkUnread \value MailMarkUnread
\value MailMessageNew \value MailMessageNew
\value MailReplyAll \value MailReplyAll
\value MailReplySender \value MailReplySender
\value MailSend \value MailSend
\value MailSendReceive
\value MediaEject \value MediaEject
\value MediaPlaybackPause \value MediaPlaybackPause
\value MediaPlaybackStart \value MediaPlaybackStart
@ -1743,14 +1638,11 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value MediaSeekForward \value MediaSeekForward
\value MediaSkipBackward \value MediaSkipBackward
\value MediaSkipForward \value MediaSkipForward
\value ObjectFlipHorizontal
\value ObjectFlipVertical
\value ObjectRotateLeft \value ObjectRotateLeft
\value ObjectRotateRight \value ObjectRotateRight
\value ProcessStop \value ProcessStop
\value SystemLockScreen \value SystemLockScreen
\value SystemLogOut \value SystemLogOut
\value SystemRun
\value SystemSearch \value SystemSearch
\value SystemReboot \value SystemReboot
\value SystemShutdown \value SystemShutdown
@ -1758,57 +1650,12 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value ViewFullscreen \value ViewFullscreen
\value ViewRefresh \value ViewRefresh
\value ViewRestore \value ViewRestore
\value ViewSortAscending
\value ViewSortDescending
\value WindowClose \value WindowClose
\value WindowNew \value WindowNew
\value ZoomFitBest \value ZoomFitBest
\value ZoomIn \value ZoomIn
\value ZoomOriginal
\value ZoomOut \value ZoomOut
\value ProcessWorking
\value AccessoriesCalculator
\value AccessoriesCharacterMap
\value AccessoriesDictionary
\value AccessoriesTextEditor
\value HelpBrowser
\value MultimediaVolumeControl
\value PreferencesDesktopAccessibility
\value PreferencesDesktopFont
\value PreferencesDesktopKeyboard
\value PreferencesDesktopLocale
\value PreferencesDesktopMultimedia
\value PreferencesDesktopScreensaver
\value PreferencesDesktopTheme
\value PreferencesDesktopWallpaper
\value SystemFileManager
\value SystemSoftwareInstall
\value SystemSoftwareUpdate
\value UtilitiesSystemMonitor
\value UtilitiesTerminal
\value ApplicationsAccessories
\value ApplicationsDevelopment
\value ApplicationsEngineering
\value ApplicationsGames
\value ApplicationsGraphics
\value ApplicationsInternet
\value ApplicationsMultimedia
\value ApplicationsOffice
\value ApplicationsOther
\value ApplicationsScience
\value ApplicationsSystem
\value ApplicationsUtilities
\value PreferencesDesktop
\value PreferencesDesktopPeripherals
\value PreferencesDesktopPersonal
\value PreferencesOther
\value PreferencesSystem
\value PreferencesSystemNetwork
\value SystemHelp
\value AudioCard \value AudioCard
\value AudioInputMicrophone \value AudioInputMicrophone
\value Battery \value Battery
@ -1818,39 +1665,21 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value Computer \value Computer
\value DriveHarddisk \value DriveHarddisk
\value DriveOptical \value DriveOptical
\value DriveRemovableMedia
\value InputGaming \value InputGaming
\value InputKeyboard \value InputKeyboard
\value InputMouse \value InputMouse
\value InputTablet \value InputTablet
\value MediaFlash \value MediaFlash
\value MediaFloppy
\value MediaOptical \value MediaOptical
\value MediaTape \value MediaTape
\value Modem
\value MultimediaPlayer \value MultimediaPlayer
\value NetworkWired \value NetworkWired
\value NetworkWireless \value NetworkWireless
\value Pda
\value Phone \value Phone
\value Printer \value Printer
\value Scanner \value Scanner
\value VideoDisplay \value VideoDisplay
\value EmblemDefault
\value EmblemDocuments
\value EmblemDownloads
\value EmblemFavorite
\value EmblemImportant
\value EmblemMail
\value EmblemPhotos
\value EmblemReadonly
\value EmblemShared
\value EmblemSymbolicLink
\value EmblemSynchronized
\value EmblemSystem
\value EmblemUnreadable
\value AppointmentMissed \value AppointmentMissed
\value AppointmentSoon \value AppointmentSoon
\value AudioVolumeHigh \value AudioVolumeHigh
@ -1873,41 +1702,24 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value MailUnread \value MailUnread
\value MailRead \value MailRead
\value MailReplied \value MailReplied
\value MailSigned
\value MailSignedVerified
\value MediaPlaylistRepeat \value MediaPlaylistRepeat
\value MediaPlaylistShuffle \value MediaPlaylistShuffle
\value NetworkError
\value NetworkIdle
\value NetworkOffline \value NetworkOffline
\value NetworkReceive
\value NetworkTransmit
\value NetworkTransmitReceive
\value PrinterError
\value PrinterPrinting \value PrinterPrinting
\value SecurityHigh \value SecurityHigh
\value SecurityMedium
\value SecurityLow \value SecurityLow
\value SoftwareUpdateAvailable \value SoftwareUpdateAvailable
\value SoftwareUpdateUrgent \value SoftwareUpdateUrgent
\value SyncError \value SyncError
\value SyncSynchronizing \value SyncSynchronizing
\value TaskDue
\value TaskPastDue
\value UserAvailable \value UserAvailable
\value UserAway
\value UserIdle
\value UserOffline \value UserOffline
\value UserTrashFull
\value WeatherClear \value WeatherClear
\value WeatherClearNight \value WeatherClearNight
\value WeatherFewClouds \value WeatherFewClouds
\value WeatherFewCloudsNight \value WeatherFewCloudsNight
\value WeatherFog \value WeatherFog
\value WeatherOvercast
\value WeatherSevereAlert
\value WeatherShowers \value WeatherShowers
\value WeatherShowersScattered
\value WeatherSnow \value WeatherSnow
\value WeatherStorm \value WeatherStorm

94
src/gui/image/qicon.h
View File

@ -45,7 +45,6 @@ public:
EditCut, EditCut,
EditDelete, EditDelete,
EditFind, EditFind,
EditFindReplace,
EditPaste, EditPaste,
EditRedo, EditRedo,
EditSelectAll, EditSelectAll,
@ -63,36 +62,26 @@ public:
FormatTextItalic, FormatTextItalic,
FormatTextUnderline, FormatTextUnderline,
FormatTextStrikethrough, FormatTextStrikethrough,
GoBottom,
GoDown, GoDown,
GoFirst,
GoHome, GoHome,
GoJump,
GoLast,
GoNext, GoNext,
GoPrevious, GoPrevious,
GoTop,
GoUp, GoUp,
HelpAbout, HelpAbout,
HelpContents,
HelpFaq, HelpFaq,
InsertImage, InsertImage,
InsertLink, InsertLink,
InsertObject,
InsertText, InsertText,
ListAdd, ListAdd,
ListRemove, ListRemove,
MailForward, MailForward,
MailMarkImportant, MailMarkImportant,
MailMarkJunk,
MailMarkNotjunk,
MailMarkRead, MailMarkRead,
MailMarkUnread, MailMarkUnread,
MailMessageNew, MailMessageNew,
MailReplyAll, MailReplyAll,
MailReplySender, MailReplySender,
MailSend, MailSend,
MailSendReceive,
MediaEject, MediaEject,
MediaPlaybackPause, MediaPlaybackPause,
MediaPlaybackStart, MediaPlaybackStart,
@ -102,14 +91,11 @@ public:
MediaSeekForward, MediaSeekForward,
MediaSkipBackward, MediaSkipBackward,
MediaSkipForward, MediaSkipForward,
ObjectFlipHorizontal,
ObjectFlipVertical,
ObjectRotateLeft, ObjectRotateLeft,
ObjectRotateRight, ObjectRotateRight,
ProcessStop, ProcessStop,
SystemLockScreen, SystemLockScreen,
SystemLogOut, SystemLogOut,
SystemRun,
SystemSearch, SystemSearch,
SystemReboot, SystemReboot,
SystemShutdown, SystemShutdown,
@ -117,57 +103,12 @@ public:
ViewFullscreen, ViewFullscreen,
ViewRefresh, ViewRefresh,
ViewRestore, ViewRestore,
ViewSortAscending,
ViewSortDescending,
WindowClose, WindowClose,
WindowNew, WindowNew,
ZoomFitBest, ZoomFitBest,
ZoomIn, ZoomIn,
ZoomOriginal,
ZoomOut, ZoomOut,
ProcessWorking,
AccessoriesCalculator,
AccessoriesCharacterMap,
AccessoriesDictionary,
AccessoriesTextEditor,
HelpBrowser,
MultimediaVolumeControl,
PreferencesDesktopAccessibility,
PreferencesDesktopFont,
PreferencesDesktopKeyboard,
PreferencesDesktopLocale,
PreferencesDesktopMultimedia,
PreferencesDesktopScreensaver,
PreferencesDesktopTheme,
PreferencesDesktopWallpaper,
SystemFileManager,
SystemSoftwareInstall,
SystemSoftwareUpdate,
UtilitiesSystemMonitor,
UtilitiesTerminal,
ApplicationsAccessories,
ApplicationsDevelopment,
ApplicationsEngineering,
ApplicationsGames,
ApplicationsGraphics,
ApplicationsInternet,
ApplicationsMultimedia,
ApplicationsOffice,
ApplicationsOther,
ApplicationsScience,
ApplicationsSystem,
ApplicationsUtilities,
PreferencesDesktop,
PreferencesDesktopPeripherals,
PreferencesDesktopPersonal,
PreferencesOther,
PreferencesSystem,
PreferencesSystemNetwork,
SystemHelp,
AudioCard, AudioCard,
AudioInputMicrophone, AudioInputMicrophone,
Battery, Battery,
@ -177,39 +118,21 @@ public:
Computer, Computer,
DriveHarddisk, DriveHarddisk,
DriveOptical, DriveOptical,
DriveRemovableMedia,
InputGaming, InputGaming,
InputKeyboard, InputKeyboard,
InputMouse, InputMouse,
InputTablet, InputTablet,
MediaFlash, MediaFlash,
MediaFloppy,
MediaOptical, MediaOptical,
MediaTape, MediaTape,
Modem,
MultimediaPlayer, MultimediaPlayer,
NetworkWired, NetworkWired,
NetworkWireless, NetworkWireless,
Pda,
Phone, Phone,
Printer, Printer,
Scanner, Scanner,
VideoDisplay, VideoDisplay,
EmblemDefault,
EmblemDocuments,
EmblemDownloads,
EmblemFavorite,
EmblemImportant,
EmblemMail,
EmblemPhotos,
EmblemReadonly,
EmblemShared,
EmblemSymbolicLink,
EmblemSynchronized,
EmblemSystem,
EmblemUnreadable,
AppointmentMissed, AppointmentMissed,
AppointmentSoon, AppointmentSoon,
AudioVolumeHigh, AudioVolumeHigh,
@ -232,41 +155,24 @@ public:
MailUnread, MailUnread,
MailRead, MailRead,
MailReplied, MailReplied,
MailSigned,
MailSignedVerified,
MediaPlaylistRepeat, MediaPlaylistRepeat,
MediaPlaylistShuffle, MediaPlaylistShuffle,
NetworkError,
NetworkIdle,
NetworkOffline, NetworkOffline,
NetworkReceive,
NetworkTransmit,
NetworkTransmitReceive,
PrinterError,
PrinterPrinting, PrinterPrinting,
SecurityHigh, SecurityHigh,
SecurityMedium,
SecurityLow, SecurityLow,
SoftwareUpdateAvailable, SoftwareUpdateAvailable,
SoftwareUpdateUrgent, SoftwareUpdateUrgent,
SyncError, SyncError,
SyncSynchronizing, SyncSynchronizing,
TaskDue,
TaskPastDue,
UserAvailable, UserAvailable,
UserAway,
UserIdle,
UserOffline, UserOffline,
UserTrashFull,
WeatherClear, WeatherClear,
WeatherClearNight, WeatherClearNight,
WeatherFewClouds, WeatherFewClouds,
WeatherFewCloudsNight, WeatherFewCloudsNight,
WeatherFog, WeatherFog,
WeatherOvercast,
WeatherSevereAlert,
WeatherShowers, WeatherShowers,
WeatherShowersScattered,
WeatherSnow, WeatherSnow,
WeatherStorm, WeatherStorm,