KDE/kdebase/runtime/kioslave/trash

[Christian Ehrlicher]

SVN commit 933759 by chehrlic:

first implementation of native trash folder for windows.
-> move to trash works
-> show trash works
-> restore is in progress

We also need to inform e.g. dolphin that there are new entries in trash:/ when another (non-kde) application deletes files.

CCMAIL: kde-windows at kde.org

 M  +24 -15    CMakeLists.txt  
 AM            kio_trash_win.cpp   [License: LGPL (v2+)]
 AM            kio_trash_win.h   [License: LGPL (v2+)]


--- trunk/KDE/kdebase/runtime/kioslave/trash/CMakeLists.txt #933758:933759
@@ -12,7 +12,11 @@
 
 ########### next target ###############
 
-set(kio_trash_PART_SRCS kio_trash.cpp ${trashcommon_PART_SRCS})
+if(WIN32)
+  set(kio_trash_PART_SRCS kio_trash_win.cpp kio_trash_win.h)
+else(WIN32)
+  set(kio_trash_PART_SRCS kio_trash.cpp ${trashcommon_PART_SRCS})
+endif(WIN32)
 
 
 kde4_add_plugin(kio_trash ${kio_trash_PART_SRCS})
@@ -24,16 +28,18 @@
 
 ########### next target ###############
 
-kde4_add_library(trash MODULE trashthroughanalyzer.cpp ${trashcommon_PART_SRCS})
-target_link_libraries(trash
-   ${KDE4_KIO_LIBS}
-   ${STRIGI_STREAMANALYZER_LIBRARY}
-   ${KDE4_SOLID_LIBS}
-)
-set_target_properties(trash PROPERTIES
-    PREFIX strigita_)
-#install(TARGETS trash LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
-
+# currently not on win32, TODO!
+if(NOT WIN32)
+    kde4_add_library(trash MODULE trashthroughanalyzer.cpp ${trashcommon_PART_SRCS})
+    target_link_libraries(trash
+       ${KDE4_KIO_LIBS}
+       ${STRIGI_STREAMANALYZER_LIBRARY}
+       ${KDE4_SOLID_LIBS}
+    )
+    set_target_properties(trash PROPERTIES
+        PREFIX strigita_)
+    #install(TARGETS trash LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
+endif(NOT WIN32)
 ########### next target ###############
 
 set(ktrash_SRCS ktrash.cpp )
@@ -47,11 +53,14 @@
 
 ########### next target ###############
 
-set(kcm_trash_PART_SRCS kcmtrash.cpp ${trashcommon_PART_SRCS})
-kde4_add_plugin(kcm_trash ${kcm_trash_PART_SRCS})
-target_link_libraries(kcm_trash  ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
+# currently not on win32, TODO!
+if(NOT WIN32)
+    set(kcm_trash_PART_SRCS kcmtrash.cpp ${trashcommon_PART_SRCS})
+    kde4_add_plugin(kcm_trash ${kcm_trash_PART_SRCS})
+    target_link_libraries(kcm_trash  ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
 
-install(TARGETS kcm_trash DESTINATION ${PLUGIN_INSTALL_DIR})
+    install(TARGETS kcm_trash DESTINATION ${PLUGIN_INSTALL_DIR})
+endif(NOT WIN32)
 
 ########### install files ###############
 
** trunk/KDE/kdebase/runtime/kioslave/trash/kio_trash_win.cpp #property svn:eol-style
   + native
** trunk/KDE/kdebase/runtime/kioslave/trash/kio_trash_win.h #property svn:eol-style
   + native