Added trash size limit property page link to trash folder right click

popup menu and trash applet panel.
Added a new konqueror side bar button to directly display the contents
of the trash bin.
This relates to bug 1923.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

4 files changed, 20 insertions, 5 deletions

diff --git a/konqueror/sidebar/.version b/konqueror/sidebar/.version
index 9cb17c334..f16e714bc 100644
--- a/konqueror/sidebar/.version
+++ b/konqueror/sidebar/.version
@@ -1 +1 @@
-Version=3
+Version=4
diff --git a/konqueror/sidebar/trees/init/CMakeLists.txt b/konqueror/sidebar/trees/init/CMakeLists.txt
index 02df2aba3..bf320041b 100644
--- a/konqueror/sidebar/trees/init/CMakeLists.txt
+++ b/konqueror/sidebar/trees/init/CMakeLists.txt
@@ -17,12 +17,12 @@ add_subdirectory( services )
 
 install( FILES
     home.desktop root.desktop history.desktop bookmarks.desktop
-    services.desktop remote.desktop system.desktop
+    services.desktop remote.desktop system.desktop trash.desktop
   DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries )
 
 install( FILES
     home.desktop root.desktop history.desktop bookmarks.desktop
-    services.desktop remote.desktop
+    services.desktop remote.desktop trash.desktop
   DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/kicker_entries )
 
 install( FILES
diff --git a/konqueror/sidebar/trees/init/Makefile.am b/konqueror/sidebar/trees/init/Makefile.am
index 58c6186b0..85ba97637 100644
--- a/konqueror/sidebar/trees/init/Makefile.am
+++ b/konqueror/sidebar/trees/init/Makefile.am
@@ -1,11 +1,11 @@
 SUBDIRS = remote services
 
 dataEntry_DATA = home.desktop root.desktop history.desktop bookmarks.desktop \
-                 services.desktop remote.desktop system.desktop
+                 services.desktop remote.desktop system.desktop trash.desktop
 dataEntrydir = $(kde_datadir)/konqsidebartng/entries
 
 dataKickerEntries_DATA = home.desktop root.desktop history.desktop bookmarks.desktop \
-                 services.desktop remote.desktop
+                 services.desktop remote.desktop trash.desktop
 dataKickerEntriesdir = $(kde_datadir)/konqsidebartng/kicker_entries
 
 
diff --git a/konqueror/sidebar/trees/init/trash.desktop b/konqueror/sidebar/trees/init/trash.desktop
new file mode 100644
index 000000000..147638122
--- /dev/null
+++ b/konqueror/sidebar/trees/init/trash.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Link
+URL=trash:/
+Icon=trashcan_empty
+Open=true
+X-TDE-TreeModule=Directory
+X-TDE-KonqSidebarModule=konqsidebar_tree
+
+Name=Trash Folder
+Name[cz]=Složka koše
+Name[it]=Cartella Cestino
+
+Comment=This folder displays the contents of your Trash Bin
+Comment[cz]=Tato složka zobrazuje obsah vašeho koše
+Comment[it]=Questa cartella visualizza il contenuto del tuo Cestino