Attachment 1926 Details for Bug 1923 – Non working patch to add trash configuration dialog

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Non working patch to add trash configuration dialog

tdebase-trash-limits.diff (text/plain), 26.72 KB, created by Darrell on 2014-02-10 19:09:32 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2014-02-10 19:09:32 CST

Size: 26.72 KB

patch

obsolete

>diff -urNa tdebase/konqueror/konq_mainwindow.cc tdebase.new/konqueror/konq_mainwindow.cc
>--- tdebase/konqueror/konq_mainwindow.cc	2014-01-31 13:59:22.000000000 -0600
>+++ tdebase.new/konqueror/konq_mainwindow.cc	2014-02-10 17:47:18.602083592 -0600
>@@ -3881,7 +3881,8 @@
>       "tde-kcmhistory.desktop" << "tde-cookies.desktop" <<
>       "tde-cache.desktop" << "tde-proxy.desktop" << "tde-kcmcss.desktop" <<
>       "tde-kcmcgi.desktop" << "tde-crypto.desktop" << "tde-useragent.desktop" <<
>-      "tde-tdehtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop";
>+      "tde-tdehtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop" <<
>+      "kde-ktrashpropsdlgplugin.desktop";
> 
> 
>   if (!kapp->authorizeControlModules(configModules()).isEmpty())
>diff -urNa tdebase/tdeioslave/trash/CMakeLists.txt tdebase.new/tdeioslave/trash/CMakeLists.txt
>--- tdebase/tdeioslave/trash/CMakeLists.txt	2013-03-02 15:56:50.000000000 -0600
>+++ tdebase.new/tdeioslave/trash/CMakeLists.txt	2014-02-10 18:38:29.918096086 -0600
>@@ -25,7 +25,7 @@
> 
> ##### other data ################################
> 
>-install( FILES trash.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
>+install( FILES ktrashpropsdlgplugin.desktop trash.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
> 
> 
> ##### trashcommon (static) ######################
>@@ -33,7 +33,7 @@
> set( target trashcommon )
> 
> tde_add_library( ${target} STATIC_PIC AUTOMOC
>-  SOURCES trashimpl.cpp
>+  SOURCES trashimpl.cpp discspaceutil.cpp
> )
> 
> 
>@@ -42,7 +42,7 @@
> set( target tdeio_trash )
> 
> tde_add_kpart( ${target} AUTOMOC
>-  SOURCES tdeio_trash.cpp
>+  SOURCES tdeio_trash.cpp ktrashpropsdlgplugin.cpp
>   LINK trashcommon-static tdeio-shared
>   DESTINATION ${PLUGIN_INSTALL_DIR}
> )
>@@ -53,7 +53,7 @@
> set( target ktrash )
> 
> tde_add_executable( ${target}
>-  SOURCES ktrash.cpp
>+  SOURCES discspaceutil.cpp ktrash.cpp ktrashpropsdlgplugin.cpp
>   LINK tdeio-shared
>   DESTINATION ${BIN_INSTALL_DIR}
> )
>diff -urNa tdebase/tdeioslave/trash/Makefile.am tdebase.new/tdeioslave/trash/Makefile.am
>--- tdebase/tdeioslave/trash/Makefile.am	2013-09-04 12:46:46.000000000 -0500
>+++ tdebase.new/tdeioslave/trash/Makefile.am	2014-02-10 17:47:18.605083577 -0600
>@@ -3,7 +3,7 @@
> 
> SUBDIRS = . tdefile-plugin
> 
>-kde_module_LTLIBRARIES = tdeio_trash.la
>+kde_module_LTLIBRARIES = tdeio_trash.la ktrashpropsdlgplugin.la
> 
> tdeio_trash_la_SOURCES = tdeio_trash.cpp
> tdeio_trash_la_LIBADD  = libtrashcommon.la $(LIB_TDEIO)
>@@ -17,7 +17,7 @@
> kde_services_DATA = trash.protocol
> 
> noinst_LTLIBRARIES = libtrashcommon.la
>-libtrashcommon_la_SOURCES = trashimpl.cpp
>+libtrashcommon_la_SOURCES = trashimpl.cpp discspaceutil.cpp
> 
> check_PROGRAMS = testtrash
> testtrash_SOURCES = testtrash.cpp
>@@ -29,3 +29,12 @@
> messages:
> 	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_trash.pot
> 
>+# ktrashpropsdlgplugin target
>+noinst_HEADERS = ktrashpropsdlgplugin.h discspaceutil.h
>+
>+ktrashpropsdlgplugin_la_SOURCES = ktrashpropsdlgplugin.cpp discspaceutil.cpp trashimpl.cpp
>+ktrashpropsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
>+ktrashpropsdlgplugin_la_LIBADD = $(LIB_TDEIO)
>+
>+services_DATA = ktrashpropsdlgplugin.desktop
>+servicesdir = $(kde_servicesdir)
>diff -urNa tdebase/tdeioslave/trash/discspaceutil.cpp tdebase.new/tdeioslave/trash/discspaceutil.cpp
>--- tdebase/tdeioslave/trash/discspaceutil.cpp	1969-12-31 19:00:00.000000000 -0500
>+++ tdebase.new/tdeioslave/trash/discspaceutil.cpp	2014-02-10 17:47:18.606083572 -0600
>@@ -0,0 +1,112 @@
>+/*
>+   This file is part of the KDE project
>+
>+   Copyright (C) 2008 Tobias Koenig <tokoe@kde.org>
>+
>+   This library is free software; you can redistribute it and/or
>+   modify it under the terms of the GNU Library General Public
>+   License as published by the Free Software Foundation; either
>+   version 2 of the License, or (at your option) any later version.
>+
>+   This library is distributed in the hope that it will be useful,
>+   but WITHOUT ANY WARRANTY; without even the implied warranty of
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+   Library General Public License for more details.
>+
>+   You should have received a copy of the GNU Library General Public License
>+   along with this library; see the file COPYING.LIB.  If not, write to
>+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+   Boston, MA 02110-1301, USA.
>+*/
>+
>+#include <tqapplication.h>
>+#include <tqdir.h>
>+#include <tqeventloop.h>
>+#include <tqfileinfo.h>
>+
>+#include <kdiskfreesp.h>
>+#include <kdebug.h>
>+
>+#include "discspaceutil.h"
>+
>+DiscSpaceUtil::DiscSpaceUtil( const TQString &directory, TQObject *parent )
>+  : TQObject( parent ),
>+    mDirectory( directory ),
>+    mFullSize( 0 )
>+{
>+  calculateFullSize();
>+}
>+
>+unsigned long DiscSpaceUtil::sizeOfPath( const TQString &path )
>+{
>+  TQFileInfo info( path );
>+  if ( !info.exists() ) {
>+    return 0;
>+  }
>+
>+  if ( info.isFile() ) {
>+    return info.size();
>+  } else if ( info.isDir() ) {
>+    TQDir dir( path );
>+    const TQFileInfoList *infos = dir.entryInfoList( TQDir::Files | TQDir::Dirs | TQDir::NoSymLinks );
>+    TQFileInfoListIterator it( *infos );
>+
>+    unsigned long sum = 0;
>+    TQFileInfo *info = 0;
>+    while ( (info = it.current()) != 0 ) {
>+      if ( info->fileName() != "." && info->fileName() != ".." )
>+      sum += sizeOfPath( info->absFilePath() );
>+      ++it;
>+    }
>+
>+    return sum;
>+  } else {
>+    return 0;
>+  }
>+}
>+
>+double DiscSpaceUtil::usage( unsigned long additional ) const
>+{
>+  if ( mFullSize == 0 )
>+    return 0;
>+
>+  unsigned long sum = sizeOfPath( mDirectory );
>+  sum += additional;
>+
>+  sum = sum/1024; // convert to kB
>+
>+  return (((double)sum*100)/(double)mFullSize);
>+}
>+
>+unsigned long DiscSpaceUtil::size() const
>+{
>+  return mFullSize;
>+}
>+
>+TQString DiscSpaceUtil::mountPoint() const
>+{
>+  return mMountPoint;
>+}
>+
>+void DiscSpaceUtil::foundMountPoint( const TQString &mountPoint, unsigned long kbSize, unsigned long, unsigned long )
>+{
>+  mFullSize = kbSize;
>+  mMountPoint = mountPoint;
>+}
>+
>+void DiscSpaceUtil::done()
>+{
>+  tqApp->eventLoop()->exitLoop();
>+}
>+
>+void DiscSpaceUtil::calculateFullSize()
>+{
>+  KDiskFreeSp *sp = KDiskFreeSp::findUsageInfo( mDirectory );
>+  connect( sp, SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ),
>+           this, SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) );
>+  connect( sp, SIGNAL( done() ), this, SLOT( done() ) );
>+
>+  tqApp->eventLoop()->enterLoop();
>+}
>+
>+#include "discspaceutil.moc"
>diff -urNa tdebase/tdeioslave/trash/discspaceutil.h tdebase.new/tdeioslave/trash/discspaceutil.h
>--- tdebase/tdeioslave/trash/discspaceutil.h	1969-12-31 19:00:00.000000000 -0500
>+++ tdebase.new/tdeioslave/trash/discspaceutil.h	2014-02-10 17:47:18.606083572 -0600
>@@ -0,0 +1,81 @@
>+/*
>+   This file is part of the KDE project
>+
>+   Copyright (C) 2008 Tobias Koenig <tokoe@kde.org>
>+
>+   This library is free software; you can redistribute it and/or
>+   modify it under the terms of the GNU Library General Public
>+   License as published by the Free Software Foundation; either
>+   version 2 of the License, or (at your option) any later version.
>+
>+   This library is distributed in the hope that it will be useful,
>+   but WITHOUT ANY WARRANTY; without even the implied warranty of
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+   Library General Public License for more details.
>+
>+   You should have received a copy of the GNU Library General Public License
>+   along with this library; see the file COPYING.LIB.  If not, write to
>+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+   Boston, MA 02110-1301, USA.
>+*/
>+
>+#ifndef DISCSPACEUTIL_H
>+#define DISCSPACEUTIL_H
>+
>+#include <tqobject.h>
>+#include <tqstring.h>
>+
>+/**
>+ * A small utility class to access and calculate
>+ * size and usage of mount points.
>+ */
>+class DiscSpaceUtil : public QObject
>+{
>+  Q_OBJECT
>+
>+  public:
>+    /**
>+     * Creates a new disc space util.
>+     *
>+     * @param directory A directory the util shall work on.
>+     * @param parent The parent object.
>+     */
>+    explicit DiscSpaceUtil( const TQString &directory, TQObject *parent = 0 );
>+
>+    /**
>+     * Returns the usage of the directory pass in the constructor on this
>+     * mount point in percent.
>+     *
>+     * @param additional An additional amount of bytes that is added to the
>+     *                   directory size before the usage is calculated.
>+     */
>+    double usage( unsigned long additional = 0 ) const;
>+
>+    /**
>+     * Returns the size of the partition in kilo bytes.
>+     */
>+    unsigned long size() const;
>+
>+    /**
>+     * Returns the mount point of the directory.
>+     */
>+    TQString mountPoint() const;
>+
>+    /**
>+     * Returns the size of the given path in bytes.
>+     */
>+    static unsigned long sizeOfPath( const TQString &path );
>+
>+  private slots:
>+    void foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long );
>+    void done();
>+
>+  private:
>+    void calculateFullSize();
>+
>+    TQString mDirectory;
>+    unsigned long mFullSize;
>+    TQString mMountPoint;
>+};
>+
>+#endif
>diff -urNa tdebase/tdeioslave/trash/ktrashpropsdlgplugin.cpp tdebase.new/tdeioslave/trash/ktrashpropsdlgplugin.cpp
>--- tdebase/tdeioslave/trash/ktrashpropsdlgplugin.cpp	1969-12-31 19:00:00.000000000 -0500
>+++ tdebase.new/tdeioslave/trash/ktrashpropsdlgplugin.cpp	2014-02-10 17:47:18.608083560 -0600
>@@ -0,0 +1,287 @@
>+/*
>+   This file is part of the KDE project
>+
>+   Copyright (C) 2008 Tobias Koenig <tokoe@kde.org>
>+
>+   This library is free software; you can redistribute it and/or
>+   modify it under the terms of the GNU Library General Public
>+   License as published by the Free Software Foundation; either
>+   version 2 of the License, or (at your option) any later version.
>+
>+   This library is distributed in the hope that it will be useful,
>+   but WITHOUT ANY WARRANTY; without even the implied warranty of
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+   Library General Public License for more details.
>+
>+   You should have received a copy of the GNU Library General Public License
>+   along with this library; see the file COPYING.LIB.  If not, write to
>+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+   Boston, MA 02110-1301, USA.
>+*/
>+
>+#include "ktrashpropsdlgplugin.h"
>+#include "discspaceutil.h"
>+#include "trashimpl.h"
>+
>+#include <tqcheckbox.h>
>+#include <tqcombobox.h>
>+#include <tqlabel.h>
>+#include <tqlayout.h>
>+#include <tqlistbox.h>
>+#include <tqspinbox.h>
>+
>+#include <kdesktopfile.h>
>+#include <kgenericfactory.h>
>+#include <tdeglobal.h>
>+#include <kiconloader.h>
>+#include <tdelocale.h>
>+#include <knuminput.h>
>+
>+typedef KGenericFactory<KTrashPropsDlgPlugin, KPropertiesDialog> Factory;
>+K_EXPORT_COMPONENT_FACTORY( ktrashpropsdlgplugin, Factory( "ktrashpropsdlgplugin" ) )
>+
>+KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const char*, const TQStringList& )
>+  : KPropsDlgPlugin( dialog )
>+{
>+  if ( dialog->items().count() != 1 )
>+    return;
>+
>+  KFileItem *item = dialog->items().first();
>+
>+  if ( !KPropsDlgPlugin::isDesktopFile( item ) )
>+    return;
>+
>+  KDesktopFile deskFile( item->url().path(), true /* readonly */ );
>+
>+  if ( deskFile.readURL() != "trash:/" )
>+    return;
>+
>+  TDEGlobal::locale()->insertCatalogue( "tdeio_trash" );
>+
>+  mTrashImpl = new TrashImpl();
>+  mTrashImpl->init();
>+
>+  readConfig();
>+
>+  TQFrame *frame = dialog->addPage( i18n( "Size Limits" ) );
>+  setupGui( frame );
>+
>+  useTypeChanged();
>+
>+  connect( mUseTimeLimit, SIGNAL( toggled( bool ) ),
>+           this, SLOT( setDirty() ) );
>+  connect( mUseTimeLimit, SIGNAL( toggled( bool ) ),
>+           this, SLOT( useTypeChanged() ) );
>+  connect( mDays, SIGNAL( valueChanged( int ) ),
>+           this, SLOT( setDirty() ) );
>+  connect( mUseSizeLimit, SIGNAL( toggled( bool ) ),
>+           this, SLOT( setDirty() ) );
>+  connect( mUseSizeLimit, SIGNAL( toggled( bool ) ),
>+           this, SLOT( useTypeChanged() ) );
>+  connect( mPercent, SIGNAL( valueChanged( double ) ),
>+           this, SLOT( percentChanged( double ) ) );
>+  connect( mPercent, SIGNAL( valueChanged( double ) ),
>+           this, SLOT( setDirty() ) );
>+  connect( mLimitReachedAction, SIGNAL( activated( int ) ),
>+           this, SLOT( setDirty() ) );
>+
>+  trashChanged( 0 );
>+}
>+
>+KTrashPropsDlgPlugin::~KTrashPropsDlgPlugin()
>+{
>+}
>+
>+void KTrashPropsDlgPlugin::applyChanges()
>+{
>+  if ( !mCurrentTrash.isEmpty() ) {
>+    ConfigEntry entry;
>+    entry.useTimeLimit = mUseTimeLimit->isChecked();
>+    entry.days = mDays->value();
>+    entry.useSizeLimit = mUseSizeLimit->isChecked();
>+    entry.percent = mPercent->value(),
>+    entry.actionType = mLimitReachedAction->currentItem();
>+    mConfigMap.insert( mCurrentTrash, entry );
>+  }
>+
>+  writeConfig();
>+}
>+
>+void KTrashPropsDlgPlugin::percentChanged( double percent )
>+{
>+  DiscSpaceUtil util( mCurrentTrash );
>+
>+  double partitionSize = util.size() * 1024.0; // convert to byte
>+
>+  double size = partitionSize*(percent/100.0);
>+
>+  TQString unit = i18n( "Byte" );
>+  if ( size > 1024 ) {
>+    unit = i18n( "KByte" );
>+    size = size/1024.0;
>+  }
>+  if ( size > 1024 ) {
>+    unit = i18n( "MByte" );
>+    size = size/1024.0;
>+  }
>+  if ( size > 1024 ) {
>+    unit = i18n( "GByte" );
>+    size = size/1024.0;
>+  }
>+  if ( size > 1024 ) {
>+    unit = i18n( "TByte" );
>+    size = size/1024.0;
>+  }
>+
>+  mSizeLabel->setText( i18n( "(%1 %2)" ).arg( TQString::number( size, 'f', 2 ) ).arg( unit ) );
>+}
>+
>+void KTrashPropsDlgPlugin::trashChanged( int value )
>+{
>+  const TrashImpl::TrashDirMap map = mTrashImpl->trashDirectories();
>+
>+  if ( !mCurrentTrash.isEmpty() ) {
>+    ConfigEntry entry;
>+    entry.useTimeLimit = mUseTimeLimit->isChecked();
>+    entry.days = mDays->value();
>+    entry.useSizeLimit = mUseSizeLimit->isChecked();
>+    entry.percent = mPercent->value(),
>+    entry.actionType = mLimitReachedAction->currentItem();
>+    mConfigMap.insert( mCurrentTrash, entry );
>+  }
>+
>+  mCurrentTrash = map[ value ];
>+
>+  if ( mConfigMap.contains( mCurrentTrash ) ) {
>+    const ConfigEntry entry = mConfigMap[ mCurrentTrash ];
>+    mUseTimeLimit->setChecked( entry.useTimeLimit );
>+    mDays->setValue( entry.days );
>+    mUseSizeLimit->setChecked( entry.useSizeLimit );
>+    mPercent->setValue( entry.percent );
>+    mLimitReachedAction->setCurrentItem( entry.actionType );
>+  } else {
>+    mUseTimeLimit->setChecked( false );
>+    mDays->setValue( 7 );
>+    mUseSizeLimit->setChecked( true );
>+    mPercent->setValue( 10.0 );
>+    mLimitReachedAction->setCurrentItem( 0 );
>+  }
>+
>+  percentChanged( mPercent->value() );
>+}
>+
>+void KTrashPropsDlgPlugin::useTypeChanged()
>+{
>+  mDays->setEnabled( mUseTimeLimit->isChecked() );
>+  mSizeWidget->setEnabled( mUseSizeLimit->isChecked() );
>+}
>+
>+void KTrashPropsDlgPlugin::readConfig()
>+{
>+  TDEConfig config( "ktrashrc" );
>+  mConfigMap.clear();
>+
>+  const TQStringList groups = config.groupList();
>+  for ( uint i = 0; i < groups.count(); ++i ) {
>+    if ( groups[ i ].startsWith( "/" ) ) {
>+      config.setGroup( groups[ i ] );
>+      ConfigEntry entry;
>+      entry.useTimeLimit = config.readBoolEntry( "UseTimeLimit", false );
>+      entry.days = config.readNumEntry( "Days", 7 );
>+      entry.useSizeLimit = config.readBoolEntry( "UseSizeLimit", true );
>+      entry.percent = config.readDoubleNumEntry( "Percent", 10 );
>+      entry.actionType = config.readNumEntry( "LimitReachedAction", 0 );
>+      mConfigMap.insert( groups[ i ], entry );
>+    }
>+  }
>+}
>+
>+void KTrashPropsDlgPlugin::writeConfig()
>+{
>+  TDEConfig config( "ktrashrc" );
>+
>+  // first delete all existing groups
>+  const TQStringList groups = config.groupList();
>+  for ( uint i = 0; i < groups.count(); ++i )
>+    if ( groups[ i ].startsWith( "/" ) )
>+      config.deleteGroup( groups[ i ] );
>+
>+  TQMapConstIterator<TQString, ConfigEntry> it;
>+  for ( it = mConfigMap.begin(); it != mConfigMap.end(); ++it ) {
>+    config.setGroup( it.key() );
>+    config.writeEntry( "UseTimeLimit", it.data().useTimeLimit );
>+    config.writeEntry( "Days", it.data().days );
>+    config.writeEntry( "UseSizeLimit", it.data().useSizeLimit );
>+    config.writeEntry( "Percent", it.data().percent );
>+    config.writeEntry( "LimitReachedAction", it.data().actionType );
>+  }
>+
>+  config.sync();
>+}
>+
>+void KTrashPropsDlgPlugin::setupGui( TQFrame *frame )
>+{
>+  TQVBoxLayout *layout = new TQVBoxLayout( frame, 11, 6 );
>+
>+  TrashImpl::TrashDirMap map = mTrashImpl->trashDirectories();
>+  if ( map.count() != 1 ) {
>+    // If we have multiple trashes, we setup a widget to choose
>+    // which trash to configure
>+    TQListBox *mountPoints = new TQListBox( frame );
>+    layout->addWidget( mountPoints );
>+
>+    const TQPixmap folderPixmap = TDEGlobal::iconLoader()->loadIcon( "folder", TDEIcon::Small );
>+    TQMapConstIterator<int, TQString> it;
>+    for ( it = map.begin(); it != map.end(); ++it ) {
>+      DiscSpaceUtil util( it.data() );
>+      mountPoints->insertItem( folderPixmap, util.mountPoint(), it.key() ); 
>+    }
>+
>+    mountPoints->setCurrentItem( 0 );
>+
>+    connect( mountPoints, SIGNAL( highlighted( int ) ), SLOT( trashChanged( int ) ) );
>+  } else {
>+    mCurrentTrash = map[0];
>+  }
>+
>+  TQHBoxLayout *daysLayout = new TQHBoxLayout( layout );
>+
>+  mUseTimeLimit = new TQCheckBox( i18n( "Delete files older than:" ), frame );
>+  daysLayout->addWidget( mUseTimeLimit );
>+  mDays = new TQSpinBox( 1, 365, 1, frame );
>+  mDays->setSuffix( " days" );
>+  daysLayout->addWidget( mDays );
>+
>+  TQGridLayout *sizeLayout = new TQGridLayout( layout, 2, 2 );
>+  mUseSizeLimit = new TQCheckBox( i18n( "Limit to maximum size" ), frame );
>+  sizeLayout->addMultiCellWidget( mUseSizeLimit, 0, 0, 0, 1 );
>+
>+  mSizeWidget = new TQWidget( frame );
>+  sizeLayout->setColSpacing( 0, 30 );
>+  sizeLayout->addWidget( mSizeWidget, 1, 1 );
>+
>+  TQGridLayout *sizeWidgetLayout = new TQGridLayout( mSizeWidget, 2, 3, 11, 6 );
>+
>+  TQLabel *label = new TQLabel( i18n( "Maximum Size:" ), mSizeWidget );
>+  sizeWidgetLayout->addWidget( label, 0, 0 );
>+
>+  mPercent = new KDoubleSpinBox( 0.001, 100, 1, 10, 3, mSizeWidget );
>+  mPercent->setSuffix( " %" );
>+  sizeWidgetLayout->addWidget( mPercent, 0, 1 );
>+
>+  mSizeLabel = new TQLabel( mSizeWidget );
>+  sizeWidgetLayout->addWidget( mSizeLabel, 0, 2 );
>+
>+  label = new TQLabel( i18n( "When limit reached:" ), mSizeWidget );
>+  sizeWidgetLayout->addWidget( label, 1, 0 );
>+
>+  mLimitReachedAction = new TQComboBox( mSizeWidget );
>+  mLimitReachedAction->insertItem( i18n( "Warn me" ) );
>+  mLimitReachedAction->insertItem( i18n( "Delete oldest files from trash" ) );
>+  mLimitReachedAction->insertItem( i18n( "Delete biggest files from trash" ) );
>+  sizeWidgetLayout->addMultiCellWidget( mLimitReachedAction, 1, 1, 1, 2 );
>+
>+  layout->addStretch();
>+}
>+
>+#include "ktrashpropsdlgplugin.moc"
>diff -urNa tdebase/tdeioslave/trash/ktrashpropsdlgplugin.desktop tdebase.new/tdeioslave/trash/ktrashpropsdlgplugin.desktop
>--- tdebase/tdeioslave/trash/ktrashpropsdlgplugin.desktop	1969-12-31 19:00:00.000000000 -0500
>+++ tdebase.new/tdeioslave/trash/ktrashpropsdlgplugin.desktop	2014-02-10 17:47:18.608083560 -0600
>@@ -0,0 +1,6 @@
>+[Desktop Entry]
>+Type=Service
>+Name=Trash Properties Page
>+Name[x-test]=xxTrash Properties Pagexx
>+X-TDE-Library=ktrashpropsdlgplugin
>+ServiceTypes=KPropsDlg/Plugin,application/x-desktop
>diff -urNa tdebase/tdeioslave/trash/ktrashpropsdlgplugin.h tdebase.new/tdeioslave/trash/ktrashpropsdlgplugin.h
>--- tdebase/tdeioslave/trash/ktrashpropsdlgplugin.h	1969-12-31 19:00:00.000000000 -0500
>+++ tdebase.new/tdeioslave/trash/ktrashpropsdlgplugin.h	2014-02-10 17:47:18.609083554 -0600
>@@ -0,0 +1,78 @@
>+/*
>+   This file is part of the KDE project
>+
>+   Copyright (C) 2008 Tobias Koenig <tokoe@kde.org>
>+
>+   This library is free software; you can redistribute it and/or
>+   modify it under the terms of the GNU Library General Public
>+   License as published by the Free Software Foundation; either
>+   version 2 of the License, or (at your option) any later version.
>+
>+   This library is distributed in the hope that it will be useful,
>+   but WITHOUT ANY WARRANTY; without even the implied warranty of
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+   Library General Public License for more details.
>+
>+   You should have received a copy of the GNU Library General Public License
>+   along with this library; see the file COPYING.LIB.  If not, write to
>+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+   Boston, MA 02110-1301, USA.
>+*/
>+
>+#ifndef KTRASHPROPSDLGPLUGIN_H
>+#define KTRASHPROPSDLGPLUGIN_H
>+
>+#include <kpropertiesdialog.h>
>+
>+class KDoubleSpinBox;
>+class TQCheckBox;
>+class TQComboBox;
>+class TQFrame;
>+class TQLabel;
>+class TQSpinBox;
>+class TrashImpl;
>+
>+class KTrashPropsDlgPlugin : public KPropsDlgPlugin
>+{
>+  Q_OBJECT
>+
>+  public:
>+    KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const char*, const TQStringList& );
>+    ~KTrashPropsDlgPlugin();
>+
>+    virtual void applyChanges();
>+
>+  private slots:
>+    void percentChanged( double );
>+    void trashChanged( int );
>+    void useTypeChanged();
>+
>+  private:
>+    void readConfig();
>+    void writeConfig();
>+    void setupGui( TQFrame *frame );
>+
>+    TQCheckBox *mUseTimeLimit;
>+    TQSpinBox *mDays;
>+    TQCheckBox *mUseSizeLimit;
>+    TQWidget *mSizeWidget;
>+    KDoubleSpinBox *mPercent;
>+    TQLabel *mSizeLabel;
>+    TQComboBox *mLimitReachedAction;
>+
>+    TrashImpl *mTrashImpl;
>+    TQString mCurrentTrash;
>+
>+    typedef struct {
>+      bool useTimeLimit;
>+      int days;
>+      bool useSizeLimit;
>+      double percent;
>+      int actionType;
>+    } ConfigEntry;
>+
>+    typedef TQMap<TQString, ConfigEntry> ConfigMap;
>+    ConfigMap mConfigMap;
>+};
>+
>+#endif
>diff -urNa tdebase/tdeioslave/trash/trashimpl.cpp tdebase.new/tdeioslave/trash/trashimpl.cpp
>--- tdebase/tdeioslave/trash/trashimpl.cpp	2013-09-04 12:46:46.000000000 -0500
>+++ tdebase.new/tdeioslave/trash/trashimpl.cpp	2014-02-10 17:47:18.610083548 -0600
>@@ -18,6 +18,8 @@
> */
> 
> #include "trashimpl.h"
>+#include "discspaceutil.h"
>+
> #include <tdelocale.h>
> #include <klargefile.h>
> #include <tdeio/global.h>
>@@ -322,6 +324,9 @@
> bool TrashImpl::moveToTrash( const TQString& origPath, int trashId, const TQString& fileId )
> {
>     kdDebug() << k_funcinfo << endl;
>+    if ( !adaptTrashSize( origPath, trashId ) )
>+        return false;
>+
>     const TQString dest = filesPath( trashId, fileId );
>     if ( !move( origPath, dest ) ) {
>         // Maybe the move failed due to no permissions to delete source.
>@@ -387,6 +392,9 @@
> bool TrashImpl::copyToTrash( const TQString& origPath, int trashId, const TQString& fileId )
> {
>     kdDebug() << k_funcinfo << endl;
>+    if ( !adaptTrashSize( origPath, trashId ) )
>+        return false;
>+
>     const TQString dest = filesPath( trashId, fileId );
>     if ( !copy( origPath, dest ) )
>         return false;
>@@ -959,4 +967,91 @@
>     return true;
> }
> 
>+bool TrashImpl::adaptTrashSize( const TQString& origPath, int trashId )
>+{
>+    TDEConfig config( "ktrashrc" );
>+
>+    const TQString trashPath = trashDirectoryPath( trashId );
>+    config.setGroup( trashPath );
>+
>+    bool useTimeLimit = config.readBoolEntry( "UseTimeLimit", false );
>+    bool useSizeLimit = config.readBoolEntry( "UseSizeLimit", true );
>+    double percent = config.readDoubleNumEntry( "Percent", 10 );
>+    int actionType = config.readNumEntry( "LimitReachedAction", 0 );
>+
>+    if ( useTimeLimit ) { // delete all files in trash older than X days
>+        const int maxDays = config.readNumEntry( "Days", 7 );
>+        const TQDateTime currentDate = TQDateTime::currentDateTime();
>+
>+        const TrashedFileInfoList trashedFiles = list();
>+        for ( uint i = 0; i < trashedFiles.count(); ++i ) {
>+            struct TrashedFileInfo info = trashedFiles[ i ];
>+            if ( info.trashId != trashId )
>+                continue;
>+
>+            if ( info.deletionDate.daysTo( currentDate ) > maxDays )
>+              del( info.trashId, info.fileId );
>+        }
>+
>+        return true;
>+
>+    }
>+
>+    if ( useSizeLimit ) { // check if size limit exceeded
>+
>+        // calculate size of the files to be put into the trash
>+        unsigned long additionalSize = DiscSpaceUtil::sizeOfPath( origPath );
>+
>+        DiscSpaceUtil util( trashPath + "/files/" );
>+        if ( util.usage( additionalSize ) >= percent ) {
>+            if ( actionType == 0 ) { // warn the user only
>+                m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED;
>+                m_lastErrorMessage = i18n( "The trash has reached its maximum size!\nClean the trash manually." );
>+                return false;
>+            } else {
>+                // before we start to remove any files from the trash,
>+                // check whether the new file will fit into the trash
>+                // at all...
>+
>+                unsigned long partitionSize = util.size(); // in kB
>+                unsigned long fileSize = additionalSize/1024; // convert to kB
>+
>+                if ( ((double)fileSize*100/(double)partitionSize) >= percent ) {
>+                    m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED;
>+                    m_lastErrorMessage = i18n( "The file is too large to be trashed." );
>+                    return false;
>+                }
>+
>+                // the size of the to be trashed file is ok, so lets start removing
>+                // some other files from the trash
>+
>+                TQDir dir( trashPath + "/files" );
>+                const TQFileInfoList *infos = 0;
>+                if ( actionType == 1 )  // delete oldest files first
>+                    infos = dir.entryInfoList( TQDir::Files | TQDir::Dirs, TQDir::Time | TQDir::Reversed );
>+                else if ( actionType == 2 ) // delete biggest files first
>+                    infos = dir.entryInfoList( TQDir::Files | TQDir::Dirs, TQDir::Size );
>+                else
>+                    tqWarning( "Should never happen!" );
>+
>+                TQFileInfoListIterator it( *infos );
>+                TQFileInfo *info;
>+                bool deleteFurther = true;
>+                while ( ((info = it.current()) != 0) && deleteFurther ) {
>+
>+                    if ( info->fileName() != "." && info->fileName() != ".." ) {
>+                        del( trashId, info->fileName() ); // delete trashed file
>+
>+                        if ( util.usage( additionalSize ) < percent ) // check whether we have enough space now
>+                            deleteFurther = false;
>+                    }
>+                    ++it;
>+                }
>+            }
>+        }
>+    }
>+
>+    return true;
>+}
>+
> #include "trashimpl.moc"
>diff -urNa tdebase/tdeioslave/trash/trashimpl.h tdebase.new/tdeioslave/trash/trashimpl.h
>--- tdebase/tdeioslave/trash/trashimpl.h	2013-09-04 12:46:46.000000000 -0500
>+++ tdebase.new/tdeioslave/trash/trashimpl.h	2014-02-10 17:47:18.611083542 -0600
>@@ -123,6 +123,8 @@
>     void fileAdded();
>     void fileRemoved();
> 
>+    bool adaptTrashSize( const TQString& origPath, int trashId );
>+
>     // Warning, returns error code, not a bool
>     int testDir( const TQString& name ) const;
>     void error( int e, const TQString& s );

Actions: View | Diff

Attachments on bug 1923: 1926 | 2692 | 2693 | 2697 | 2698 | 2699 | 2701