diff options
| author | Michele Calgaro <[email protected]> | 2019-04-08 12:16:10 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2019-04-08 12:16:10 +0900 |
| commit | 48635e6343601457bb1ae1e1a489ebce81266fab (patch) | |
| tree | a31bdb968ebe7d837990cdd9314d508ede8d955e /tdeioslave | |
| parent | dee02ac31a8b5da841f2453a054b6336690d51a2 (diff) | |
| download | tdebase-48635e6343601457bb1ae1e1a489ebce81266fab.tar.gz tdebase-48635e6343601457bb1ae1e1a489ebce81266fab.zip | |
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 <[email protected]>
Diffstat (limited to 'tdeioslave')
| -rw-r--r-- | tdeioslave/trash/ktrashpropsdlgplugin.cpp | 17 | ||||
| -rw-r--r-- | tdeioslave/trash/ktrashpropsdlgplugin.desktop | 5 |
2 files changed, 13 insertions, 9 deletions
diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.cpp b/tdeioslave/trash/ktrashpropsdlgplugin.cpp index 87a70ae45..1677c282a 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 39782d602..76ed40daf 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 |