summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2024-02-20 10:38:17 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2024-02-21 18:03:30 +0100
commit0de09beee54f715e4d2b1e739cf75c8c8d78db16 (patch)
tree1f20363092cca093398e287e03029ffbf26e30a6 /src/gui/image
parent2f1a564e15f316a354d955591751b328020cecc8 (diff)
QIcon: remove unmapped ThemeIcon enum values
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. Pick-to: 6.7 Change-Id: I5a6c74256bda66d9fde7513f834a8361858605c4 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qicon.cpp188
-rw-r--r--src/gui/image/qicon.h94
2 files changed, 0 insertions, 282 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 8a83ebea8b..3cdf7b1422 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -1428,7 +1428,6 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"edit-cut",
"edit-delete",
"edit-find",
- "edit-find-replace",
"edit-paste",
"edit-redo",
"edit-select-all",
@@ -1446,36 +1445,26 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"format-text-italic",
"format-text-underline",
"format-text-strikethrough",
- "go-bottom",
"go-down",
- "go-first",
"go-home",
- "go-jump",
- "go-last",
"go-next",
"go-previous",
- "go-top",
"go-up",
"help-about",
- "help-contents",
"help-faq",
"insert-image",
"insert-link",
- "insert-object",
"insert-text",
"list-add",
"list-remove",
"mail-forward",
"mail-mark-important",
- "mail-mark-junk",
- "mail-mark-notjunk",
"mail-mark-read",
"mail-mark-unread",
"mail-message-new",
"mail-reply-all",
"mail-reply-sender",
"mail-send",
- "mail-send-receive",
"media-eject",
"media-playback-pause",
"media-playback-start",
@@ -1485,14 +1474,11 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"media-seek-forward",
"media-skip-backward",
"media-skip-forward",
- "object-flip-horizontal",
- "object-flip-vertical",
"object-rotate-left",
"object-rotate-right",
"process-stop",
"system-lock-screen",
"system-log-out",
- "system-run",
"system-search",
"system-reboot",
"system-shutdown",
@@ -1500,57 +1486,12 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"view-fullscreen",
"view-refresh",
"view-restore",
- "view-sort-ascending",
- "view-sort-descending",
"window-close",
"window-new",
"zoom-fit-best",
"zoom-in",
- "zoom-original",
"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-input-microphone",
"battery",
@@ -1560,39 +1501,21 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"computer",
"drive-harddisk",
"drive-optical",
- "drive-removable-media",
"input-gaming",
"input-keyboard",
"input-mouse",
"input-tablet",
"media-flash",
- "media-floppy",
"media-optical",
"media-tape",
- "modem",
"multimedia-player",
"network-wired",
"network-wireless",
- "pda",
"phone",
"printer",
"scanner",
"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-soon",
"audio-volume-high",
@@ -1615,41 +1538,24 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
"mail-unread",
"mail-read",
"mail-replied",
- "mail-signed",
- "mail-signed-verified",
"media-playlist-repeat",
"media-playlist-shuffle",
- "network-error",
- "network-idle",
"network-offline",
- "network-receive",
- "network-transmit",
- "network-transmit-receive",
- "printer-error",
"printer-printing",
"security-high",
- "security-medium",
"security-low",
"software-update-available",
"software-update-urgent",
"sync-error",
"sync-synchronizing",
- "task-due",
- "task-past-due",
"user-available",
- "user-away",
- "user-idle",
"user-offline",
- "user-trash-full",
"weather-clear",
"weather-clear-night",
"weather-few-clouds",
"weather-few-clouds-night",
"weather-fog",
- "weather-overcast",
- "weather-severe-alert",
"weather-showers",
- "weather-showers-scattered",
"weather-snow",
"weather-storm"
);
@@ -1689,7 +1595,6 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value EditCut
\value EditDelete
\value EditFind
- \value EditFindReplace
\value EditPaste
\value EditRedo
\value EditSelectAll
@@ -1707,36 +1612,26 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value FormatTextItalic
\value FormatTextUnderline
\value FormatTextStrikethrough
- \value GoBottom
\value GoDown
- \value GoFirst
\value GoHome
- \value GoJump
- \value GoLast
\value GoNext
\value GoPrevious
- \value GoTop
\value GoUp
\value HelpAbout
- \value HelpContents
\value HelpFaq
\value InsertImage
\value InsertLink
- \value InsertObject
\value InsertText
\value ListAdd
\value ListRemove
\value MailForward
\value MailMarkImportant
- \value MailMarkJunk
- \value MailMarkNotjunk
\value MailMarkRead
\value MailMarkUnread
\value MailMessageNew
\value MailReplyAll
\value MailReplySender
\value MailSend
- \value MailSendReceive
\value MediaEject
\value MediaPlaybackPause
\value MediaPlaybackStart
@@ -1746,14 +1641,11 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value MediaSeekForward
\value MediaSkipBackward
\value MediaSkipForward
- \value ObjectFlipHorizontal
- \value ObjectFlipVertical
\value ObjectRotateLeft
\value ObjectRotateRight
\value ProcessStop
\value SystemLockScreen
\value SystemLogOut
- \value SystemRun
\value SystemSearch
\value SystemReboot
\value SystemShutdown
@@ -1761,57 +1653,12 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value ViewFullscreen
\value ViewRefresh
\value ViewRestore
- \value ViewSortAscending
- \value ViewSortDescending
\value WindowClose
\value WindowNew
\value ZoomFitBest
\value ZoomIn
- \value ZoomOriginal
\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 AudioInputMicrophone
\value Battery
@@ -1821,39 +1668,21 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value Computer
\value DriveHarddisk
\value DriveOptical
- \value DriveRemovableMedia
\value InputGaming
\value InputKeyboard
\value InputMouse
\value InputTablet
\value MediaFlash
- \value MediaFloppy
\value MediaOptical
\value MediaTape
- \value Modem
\value MultimediaPlayer
\value NetworkWired
\value NetworkWireless
- \value Pda
\value Phone
\value Printer
\value Scanner
\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 AppointmentSoon
\value AudioVolumeHigh
@@ -1876,41 +1705,24 @@ static constexpr QLatin1StringView themeIconName(QIcon::ThemeIcon icon)
\value MailUnread
\value MailRead
\value MailReplied
- \value MailSigned
- \value MailSignedVerified
\value MediaPlaylistRepeat
\value MediaPlaylistShuffle
- \value NetworkError
- \value NetworkIdle
\value NetworkOffline
- \value NetworkReceive
- \value NetworkTransmit
- \value NetworkTransmitReceive
- \value PrinterError
\value PrinterPrinting
\value SecurityHigh
- \value SecurityMedium
\value SecurityLow
\value SoftwareUpdateAvailable
\value SoftwareUpdateUrgent
\value SyncError
\value SyncSynchronizing
- \value TaskDue
- \value TaskPastDue
\value UserAvailable
- \value UserAway
- \value UserIdle
\value UserOffline
- \value UserTrashFull
\value WeatherClear
\value WeatherClearNight
\value WeatherFewClouds
\value WeatherFewCloudsNight
\value WeatherFog
- \value WeatherOvercast
- \value WeatherSevereAlert
\value WeatherShowers
- \value WeatherShowersScattered
\value WeatherSnow
\value WeatherStorm
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h
index 1a5c47731f..5100ada548 100644
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@@ -45,7 +45,6 @@ public:
EditCut,
EditDelete,
EditFind,
- EditFindReplace,
EditPaste,
EditRedo,
EditSelectAll,
@@ -63,36 +62,26 @@ public:
FormatTextItalic,
FormatTextUnderline,
FormatTextStrikethrough,
- GoBottom,
GoDown,
- GoFirst,
GoHome,
- GoJump,
- GoLast,
GoNext,
GoPrevious,
- GoTop,
GoUp,
HelpAbout,
- HelpContents,
HelpFaq,
InsertImage,
InsertLink,
- InsertObject,
InsertText,
ListAdd,
ListRemove,
MailForward,
MailMarkImportant,
- MailMarkJunk,
- MailMarkNotjunk,
MailMarkRead,
MailMarkUnread,
MailMessageNew,
MailReplyAll,
MailReplySender,
MailSend,
- MailSendReceive,
MediaEject,
MediaPlaybackPause,
MediaPlaybackStart,
@@ -102,14 +91,11 @@ public:
MediaSeekForward,
MediaSkipBackward,
MediaSkipForward,
- ObjectFlipHorizontal,
- ObjectFlipVertical,
ObjectRotateLeft,
ObjectRotateRight,
ProcessStop,
SystemLockScreen,
SystemLogOut,
- SystemRun,
SystemSearch,
SystemReboot,
SystemShutdown,
@@ -117,57 +103,12 @@ public:
ViewFullscreen,
ViewRefresh,
ViewRestore,
- ViewSortAscending,
- ViewSortDescending,
WindowClose,
WindowNew,
ZoomFitBest,
ZoomIn,
- ZoomOriginal,
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,
AudioInputMicrophone,
Battery,
@@ -177,39 +118,21 @@ public:
Computer,
DriveHarddisk,
DriveOptical,
- DriveRemovableMedia,
InputGaming,
InputKeyboard,
InputMouse,
InputTablet,
MediaFlash,
- MediaFloppy,
MediaOptical,
MediaTape,
- Modem,
MultimediaPlayer,
NetworkWired,
NetworkWireless,
- Pda,
Phone,
Printer,
Scanner,
VideoDisplay,
- EmblemDefault,
- EmblemDocuments,
- EmblemDownloads,
- EmblemFavorite,
- EmblemImportant,
- EmblemMail,
- EmblemPhotos,
- EmblemReadonly,
- EmblemShared,
- EmblemSymbolicLink,
- EmblemSynchronized,
- EmblemSystem,
- EmblemUnreadable,
-
AppointmentMissed,
AppointmentSoon,
AudioVolumeHigh,
@@ -232,41 +155,24 @@ public:
MailUnread,
MailRead,
MailReplied,
- MailSigned,
- MailSignedVerified,
MediaPlaylistRepeat,
MediaPlaylistShuffle,
- NetworkError,
- NetworkIdle,
NetworkOffline,
- NetworkReceive,
- NetworkTransmit,
- NetworkTransmitReceive,
- PrinterError,
PrinterPrinting,
SecurityHigh,
- SecurityMedium,
SecurityLow,
SoftwareUpdateAvailable,
SoftwareUpdateUrgent,
SyncError,
SyncSynchronizing,
- TaskDue,
- TaskPastDue,
UserAvailable,
- UserAway,
- UserIdle,
UserOffline,
- UserTrashFull,
WeatherClear,
WeatherClearNight,
WeatherFewClouds,
WeatherFewCloudsNight,
WeatherFog,
- WeatherOvercast,
- WeatherSevereAlert,
WeatherShowers,
- WeatherShowersScattered,
WeatherSnow,
WeatherStorm,