summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-04-08 12:16:10 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-04-08 12:16:10 +0900
commit48635e6343601457bb1ae1e1a489ebce81266fab (patch)
treea31bdb968ebe7d837990cdd9314d508ede8d955e
parentdee02ac31a8b5da841f2453a054b6336690d51a2 (diff)
downloadtdebase-48635e6343601457bb1ae1e1a489ebce81266fab.zip
tdebase-48635e6343601457bb1ae1e1a489ebce81266fab.tar.gz
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>
-rw-r--r--konqueror/sidebar/.version2
-rw-r--r--konqueror/sidebar/trees/init/CMakeLists.txt4
-rw-r--r--konqueror/sidebar/trees/init/Makefile.am4
-rw-r--r--konqueror/sidebar/trees/init/trash.desktop15
-rw-r--r--tdeioslave/trash/ktrashpropsdlgplugin.cpp17
-rw-r--r--tdeioslave/trash/ktrashpropsdlgplugin.desktop5
6 files changed, 33 insertions, 14 deletions
diff --git a/konqueror/sidebar/.version b/konqueror/sidebar/.version
index 9cb17c3..f16e714 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 02df2ab..bf32004 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 58c6186..85ba976 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 0000000..1476381
--- /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
diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.cpp b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
index 87a70ae..1677c28 100644
--- a/tdeioslave/trash/ktrashpropsdlgplugin.cpp
+++ b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
@@ -55,14 +55,17 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha
return;
KFileItem *item = dialog->items().first();
+ KURL itemUrl = item->url();
+ if (!(itemUrl.protocol() == "trash" && item->name() == "."))
+ {
+ // Check for a desktop file in case the protocol is not "trash"
+ if (!KPropsDlgPlugin::isDesktopFile(item))
+ return;
- if ( !KPropsDlgPlugin::isDesktopFile( item ) )
- return;
-
- KDesktopFile deskFile( item->url().path(), true /* readonly */ );
-
- if ( deskFile.readURL() != "trash:/" )
- return;
+ KDesktopFile deskFile( itemUrl.path(), true /* readonly */ );
+ if ( deskFile.readURL() != "trash:/" )
+ return;
+ }
TDEGlobal::locale()->insertCatalogue( "tdeio_trash" );
diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.desktop b/tdeioslave/trash/ktrashpropsdlgplugin.desktop
index 39782d6..76ed40d 100644
--- a/tdeioslave/trash/ktrashpropsdlgplugin.desktop
+++ b/tdeioslave/trash/ktrashpropsdlgplugin.desktop
@@ -1,7 +1,8 @@
[Desktop Entry]
Type=Service
-Name=Trash Properties Page
+Name=Trash Properties
Name[bg]=Свойства на кошчето
+Name[cz]=Vlastnosti koše
Name[it]=Proprietà del cestino
X-TDE-Library=ktrashpropsdlgplugin
-X-TDE-ServiceTypes=KPropsDlg/Plugin,media/builtin-trash
+X-TDE-ServiceTypes=KPropsDlg/Plugin,media/builtin-trash,inode/directory