diff options
| author | Jonathan Riddell <jr@jriddell.org> | 2007-02-04 21:15:59 +0000 |
|---|---|---|
| committer | Jonathan Riddell <jr@jriddell.org> | 2007-02-04 21:15:59 +0000 |
| commit | 9167e36c456be36bf92cf3891eaa39d850f87924 (patch) | |
| tree | a69e3b3fc39e9f48d7f225b791438c90a32ee2b1 | |
| parent | 484044c21b3818033c7e2bd589e6c42130dfbe36 (diff) | |
| download | extra-cmake-modules-9167e36c456be36bf92cf3891eaa39d850f87924.tar.gz extra-cmake-modules-9167e36c456be36bf92cf3891eaa39d850f87924.tar.bz2 | |
Change filesystem icon category to places, complies with icon name spec, compatible with gnome
change icon name categories to match directory names, with backwards compatibilty for KDE 3
mime -> mimetypes
device -> devices
app -> apps
filesys -> places
places -> places
add categories and emblems
svn path=/trunk/KDE/kdelibs/; revision=630247
The following changes were in SVN, but were removed from git:
M pics/crystalsvg/index.theme
| -rw-r--r-- | modules/KDE4Macros.cmake | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 357e00b3..f3165df2 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -278,12 +278,13 @@ MACRO (_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NA IF (NOT ${_group} STREQUAL ${_install_NAME} ) SET(_icon_GROUP "actions") + # KDE 3 compatibility IF (${_group} STREQUAL "mime") SET(_icon_GROUP "mimetypes") ENDIF (${_group} STREQUAL "mime") IF (${_group} STREQUAL "filesys") - SET(_icon_GROUP "filesystems") + SET(_icon_GROUP "places") ENDIF (${_group} STREQUAL "filesys") IF (${_group} STREQUAL "device") @@ -298,6 +299,35 @@ MACRO (_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NA SET(_icon_GROUP "actions") ENDIF (${_group} STREQUAL "action") + # KDE 4 + IF (${_group} STREQUAL "mimetypes") + SET(_icon_GROUP "mimetypes") + ENDIF (${_group} STREQUAL "mimetypes") + + IF (${_group} STREQUAL "places") + SET(_icon_GROUP "places") + ENDIF (${_group} STREQUAL "places") + + IF (${_group} STREQUAL "devices") + SET(_icon_GROUP "devices") + ENDIF (${_group} STREQUAL "devices") + + IF (${_group} STREQUAL "apps") + SET(_icon_GROUP "apps") + ENDIF (${_group} STREQUAL "apps") + + IF (${_group} STREQUAL "actions") + SET(_icon_GROUP "actions") + ENDIF (${_group} STREQUAL "actions") + + IF (${_group} STREQUAL "categories") + SET(_icon_GROUP "categories") + ENDIF (${_group} STREQUAL "categories") + + IF (${_group} STREQUAL "emblems") + SET(_icon_GROUP "emblems") + ENDIF (${_group} STREQUAL "emblems") + # message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" ) INSTALL(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/ RENAME ${_install_NAME} ) ENDIF (NOT ${_group} STREQUAL ${_install_NAME} ) |