* use cmake macro to install preview icon

* install icons to global icon dir, otherwise it seems not to work when using dolpin part in konqueror

svn path=/trunk/KDE/kdebase/apps/; revision=817991

diff --git a/src/pics/128x128/CMakeLists.txt b/src/pics/128x128/CMakeLists.txt
deleted file mode 100644 (file)
index 0c44352..0000000
--- a/src/pics/128x128/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-install( FILES  preview.png DESTINATION ${DATA_INSTALL_DIR}/dolphin/icons/hicolor/128x128/actions )

diff --git a/src/pics/16x16/CMakeLists.txt b/src/pics/16x16/CMakeLists.txt
deleted file mode 100644 (file)
index a3fb5e5..0000000
--- a/src/pics/16x16/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-install( FILES  preview.png DESTINATION ${DATA_INSTALL_DIR}/dolphin/icons/hicolor/16x16/actions )

diff --git a/src/pics/22x22/CMakeLists.txt b/src/pics/22x22/CMakeLists.txt
deleted file mode 100644 (file)
index 0b9bbd0..0000000
--- a/src/pics/22x22/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-install( FILES  preview.png DESTINATION ${DATA_INSTALL_DIR}/dolphin/icons/hicolor/22x22/actions )

diff --git a/src/pics/32x32/CMakeLists.txt b/src/pics/32x32/CMakeLists.txt
deleted file mode 100644 (file)
index 524a4d3..0000000
--- a/src/pics/32x32/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-install( FILES  preview.png DESTINATION ${DATA_INSTALL_DIR}/dolphin/icons/hicolor/32x32/actions )

diff --git a/src/pics/48x48/CMakeLists.txt b/src/pics/48x48/CMakeLists.txt
deleted file mode 100644 (file)
index b2a21e2..0000000
--- a/src/pics/48x48/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-install( FILES  preview.png DESTINATION ${DATA_INSTALL_DIR}/dolphin/icons/hicolor/48x48/actions )

diff --git a/src/pics/64x64/CMakeLists.txt b/src/pics/64x64/CMakeLists.txt
deleted file mode 100644 (file)
index 56f1d91..0000000
--- a/src/pics/64x64/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-install( FILES  preview.png DESTINATION ${DATA_INSTALL_DIR}/dolphin/icons/hicolor/64x64/actions )

diff --git a/src/pics/CMakeLists.txt b/src/pics/CMakeLists.txt
index f8f43a47303ee6888bdcf35ecf3d3abc257e4dfc..179275be71078f4ac1af33fa9b7dcd1f6f4b3380 100644 (file)
--- a/src/pics/CMakeLists.txt
+++ b/src/pics/CMakeLists.txt
@@ -1,9 +1 @@
-
-add_subdirectory( 128x128 )
-add_subdirectory( 64x64 )
-add_subdirectory( 48x48 )
-add_subdirectory( 32x32 )
-add_subdirectory( 22x22 )
-add_subdirectory( 16x16 )
-
-kde4_install_icons( ${DATA_INSTALL_DIR}/dolphin/icons )
+kde4_install_icons(${ICON_INSTALL_DIR}) # TODO: check if {DATA_INSTALL_DIR}/dolphin/icons will work (-> when used from Konqueror)..

diff --git a/src/pics/128x128/preview.png b/src/pics/hi128-actions-preview.png
similarity index 100%
rename from src/pics/128x128/preview.png
rename to src/pics/hi128-actions-preview.png

diff --git a/src/pics/16x16/preview.png b/src/pics/hi16-actions-preview.png
similarity index 100%
rename from src/pics/16x16/preview.png
rename to src/pics/hi16-actions-preview.png

diff --git a/src/pics/22x22/preview.png b/src/pics/hi22-actions-preview.png
similarity index 100%
rename from src/pics/22x22/preview.png
rename to src/pics/hi22-actions-preview.png

diff --git a/src/pics/32x32/preview.png b/src/pics/hi32-actions-preview.png
similarity index 100%
rename from src/pics/32x32/preview.png
rename to src/pics/hi32-actions-preview.png

diff --git a/src/pics/48x48/preview.png b/src/pics/hi48-actions-preview.png
similarity index 100%
rename from src/pics/48x48/preview.png
rename to src/pics/hi48-actions-preview.png

diff --git a/src/pics/64x64/preview.png b/src/pics/hi64-actions-preview.png
similarity index 100%
rename from src/pics/64x64/preview.png
rename to src/pics/hi64-actions-preview.png