From eb8038e7104c036163d2967e3658fa3b29dbeff4 Mon Sep 17 00:00:00 2001 From: Jakob Petsovits Date: Fri, 4 Jan 2008 03:28:27 +0000 Subject: [PATCH] ARGH! No, but really, we can't ship Dolphin with a missing toolbar icon. And no, I have no clue why it won't use that "pics" folder that I was generating for that icon. Apologies? svn path=/trunk/KDE/kdebase/apps/; revision=757082 --- src/CMakeLists.txt | 1 - src/icons/CMakeLists.txt | 1 - src/pics/CMakeLists.txt | 1 + .../ox16-actions-view-file-columns.png | Bin .../ox22-actions-view-file-columns.png | Bin .../ox32-actions-view-file-columns.png | Bin .../ox48-actions-view-file-columns.png | Bin .../oxsc-actions-view-file-columns.svgz | Bin .../small/ox16-actions-view-file-columns.svgz | Bin .../small/ox22-actions-view-file-columns.svgz | Bin 10 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 src/icons/CMakeLists.txt rename src/{icons => pics}/ox16-actions-view-file-columns.png (100%) rename src/{icons => pics}/ox22-actions-view-file-columns.png (100%) rename src/{icons => pics}/ox32-actions-view-file-columns.png (100%) rename src/{icons => pics}/ox48-actions-view-file-columns.png (100%) rename src/{icons => pics}/oxsc-actions-view-file-columns.svgz (100%) rename src/{icons => pics}/small/ox16-actions-view-file-columns.svgz (100%) rename src/{icons => pics}/small/ox22-actions-view-file-columns.svgz (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 128dc5cf2..f9902dc66 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,5 @@ add_subdirectory( pics ) -add_subdirectory( icons ) add_subdirectory( tests ) include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${BLITZ_INCLUDES} ) diff --git a/src/icons/CMakeLists.txt b/src/icons/CMakeLists.txt deleted file mode 100644 index 5c92450fd..000000000 --- a/src/icons/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -kde4_install_icons( ${DATA_INSTALL_DIR}/dolphin/pics ) diff --git a/src/pics/CMakeLists.txt b/src/pics/CMakeLists.txt index 9d48b652d..f8f43a473 100644 --- a/src/pics/CMakeLists.txt +++ b/src/pics/CMakeLists.txt @@ -6,3 +6,4 @@ add_subdirectory( 32x32 ) add_subdirectory( 22x22 ) add_subdirectory( 16x16 ) +kde4_install_icons( ${DATA_INSTALL_DIR}/dolphin/icons ) diff --git a/src/icons/ox16-actions-view-file-columns.png b/src/pics/ox16-actions-view-file-columns.png similarity index 100% rename from src/icons/ox16-actions-view-file-columns.png rename to src/pics/ox16-actions-view-file-columns.png diff --git a/src/icons/ox22-actions-view-file-columns.png b/src/pics/ox22-actions-view-file-columns.png similarity index 100% rename from src/icons/ox22-actions-view-file-columns.png rename to src/pics/ox22-actions-view-file-columns.png diff --git a/src/icons/ox32-actions-view-file-columns.png b/src/pics/ox32-actions-view-file-columns.png similarity index 100% rename from src/icons/ox32-actions-view-file-columns.png rename to src/pics/ox32-actions-view-file-columns.png diff --git a/src/icons/ox48-actions-view-file-columns.png b/src/pics/ox48-actions-view-file-columns.png similarity index 100% rename from src/icons/ox48-actions-view-file-columns.png rename to src/pics/ox48-actions-view-file-columns.png diff --git a/src/icons/oxsc-actions-view-file-columns.svgz b/src/pics/oxsc-actions-view-file-columns.svgz similarity index 100% rename from src/icons/oxsc-actions-view-file-columns.svgz rename to src/pics/oxsc-actions-view-file-columns.svgz diff --git a/src/icons/small/ox16-actions-view-file-columns.svgz b/src/pics/small/ox16-actions-view-file-columns.svgz similarity index 100% rename from src/icons/small/ox16-actions-view-file-columns.svgz rename to src/pics/small/ox16-actions-view-file-columns.svgz diff --git a/src/icons/small/ox22-actions-view-file-columns.svgz b/src/pics/small/ox22-actions-view-file-columns.svgz similarity index 100% rename from src/icons/small/ox22-actions-view-file-columns.svgz rename to src/pics/small/ox22-actions-view-file-columns.svgz -- 2.47.3