TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Trash limit: clean up previous patch (KDE -> TDE conversion, debug messages, TQt

Browse Source 
signals/slots...). Improved error message when a file is too big to fit
within the max trash size limit.
This relates to bug 1923.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 8 years ago
parent ee3091bc41
commit 6110a523f9
14 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File

8
tdeioslave/trash/discspaceutil.cpp
Unescape View File

@ -1,5 +1,5 @@
/* /*
This file is part of the KDE project This file is part of the TDE project
Copyright (C) 2008 Tobias Koenig <tokoe@kde.org> Copyright (C) 2008 Tobias Koenig <tokoe@kde.org>
@ -102,9 +102,9 @@ void DiscSpaceUtil::done()
void DiscSpaceUtil::calculateFullSize() void DiscSpaceUtil::calculateFullSize()
{ {
KDiskFreeSp *sp = KDiskFreeSp::findUsageInfo( mDirectory ); KDiskFreeSp *sp = KDiskFreeSp::findUsageInfo( mDirectory );
connect( sp, SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ), connect( sp, TQT_SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ),
this, SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) ); this, TQT_SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) );
connect( sp, SIGNAL( done() ), this, SLOT( done() ) ); connect( sp, TQT_SIGNAL( done() ), this, TQT_SLOT( done() ) );
tqApp->eventLoop()->enterLoop(); tqApp->eventLoop()->enterLoop();
} }

2
tdeioslave/trash/discspaceutil.h
Unescape View File

@ -1,5 +1,5 @@
/* /*
This file is part of the KDE project This file is part of the TDE project
Copyright (C) 2008 Tobias Koenig <tokoe@kde.org> Copyright (C) 2008 Tobias Koenig <tokoe@kde.org>

2
tdeioslave/trash/ktrash.cpp
Unescape View File

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
Copyright (C) 2004 David Faure <faure@kde.org> Copyright (C) 2004 David Faure <faure@kde.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or

46
tdeioslave/trash/ktrashpropsdlgplugin.cpp
Unescape View File

@ -1,5 +1,5 @@
/* /*
This file is part of the KDE project This file is part of the TDE project
Copyright (C) 2008 Tobias Koenig <tokoe@kde.org> Copyright (C) 2008 Tobias Koenig <tokoe@kde.org>
Copyright (C) 2016 Emanoil Kotsev <deloptes@yahoo.com> Copyright (C) 2016 Emanoil Kotsev <deloptes@yahoo.com>
@ -46,7 +46,6 @@ K_EXPORT_COMPONENT_FACTORY( ktrashpropsdlgplugin, Factory( "ktrashpropsdlgplugin
KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const char*, const TQStringList& ) KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const char*, const TQStringList& )
: KPropsDlgPlugin( dialog ) : KPropsDlgPlugin( dialog )
{ {
kdDebug() << "KTrashPropsDlgPlugin::KTrashPropsDlgPlugin called" << endl;
if ( dialog->items().count() != 1 ) if ( dialog->items().count() != 1 )
return; return;
@ -55,13 +54,11 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha
if ( !KPropsDlgPlugin::isDesktopFile( item ) ) if ( !KPropsDlgPlugin::isDesktopFile( item ) )
return; return;
kdDebug() << "KPropsDlgPlugin::isDesktopFile( item ) passed" << endl;
KDesktopFile deskFile( item->url().path(), true /* readonly */ ); KDesktopFile deskFile( item->url().path(), true /* readonly */ );
if ( deskFile.readURL() != "trash:/" ) if ( deskFile.readURL() != "trash:/" )
return; return;
kdDebug() << "deskFile.readURL() != \"trash:/\") passed" << endl;
TDEGlobal::locale()->insertCatalogue( "tdeio_trash" ); TDEGlobal::locale()->insertCatalogue( "tdeio_trash" );
mTrashImpl = new TrashImpl(); mTrashImpl = new TrashImpl();
@ -83,22 +80,22 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha
useTypeChanged(); useTypeChanged();
connect( mUseTimeLimit, SIGNAL( toggled( bool ) ), connect( mUseTimeLimit, TQT_SIGNAL( toggled( bool ) ),
this, SLOT( setDirty() ) ); this, TQT_SLOT( setDirty() ) );
connect( mUseTimeLimit, SIGNAL( toggled( bool ) ), connect( mUseTimeLimit, TQT_SIGNAL( toggled( bool ) ),
this, SLOT( useTypeChanged() ) ); this, TQT_SLOT( useTypeChanged() ) );
connect( mDays, SIGNAL( valueChanged( int ) ), connect( mDays, TQT_SIGNAL( valueChanged( int ) ),
this, SLOT( setDirty() ) ); this, TQT_SLOT( setDirty() ) );
connect( mUseSizeLimit, SIGNAL( toggled( bool ) ), connect( mUseSizeLimit, TQT_SIGNAL( toggled( bool ) ),
this, SLOT( setDirty() ) ); this, TQT_SLOT( setDirty() ) );
connect( mUseSizeLimit, SIGNAL( toggled( bool ) ), connect( mUseSizeLimit, TQT_SIGNAL( toggled( bool ) ),
this, SLOT( useTypeChanged() ) ); this, TQT_SLOT( useTypeChanged() ) );
connect( mPercent, SIGNAL( valueChanged( double ) ), connect( mPercent, TQT_SIGNAL( valueChanged( double ) ),
this, SLOT( percentChanged( double ) ) ); this, TQT_SLOT( percentChanged( double ) ) );
connect( mPercent, SIGNAL( valueChanged( double ) ), connect( mPercent, TQT_SIGNAL( valueChanged( double ) ),
this, SLOT( setDirty() ) ); this, TQT_SLOT( setDirty() ) );
connect( mLimitReachedAction, SIGNAL( activated( int ) ), connect( mLimitReachedAction, TQT_SIGNAL( activated( int ) ),
this, SLOT( setDirty() ) ); this, TQT_SLOT( setDirty() ) );
trashChanged( 0 ); trashChanged( 0 );
} }
@ -130,9 +127,7 @@ void KTrashPropsDlgPlugin::percentChanged( double percent )
double size = partitionSize*(percent/100.0); double size = partitionSize*(percent/100.0);
// Step should be depending on size // FIXME It would be good if precision step depended on max HD size
// https://api.kde.org/3.5-api/kdelibs-apidocs/kdeui/html/classKDoubleSpinBox.html
// https://api.kde.org/3.5-api/kdelibs-apidocs/kdeui/html/knuminput_8cpp_source.html
mPercent->setPrecision(3); mPercent->setPrecision(3);
TQString unit = i18n( "Byte" ); TQString unit = i18n( "Byte" );
@ -203,7 +198,6 @@ void KTrashPropsDlgPlugin::useTypeChanged()
void KTrashPropsDlgPlugin::readConfig() void KTrashPropsDlgPlugin::readConfig()
{ {
kdDebug() << "KTrashPropsDlgPlugin::readConfig() called" << endl;
TDEConfig config( "trashrc" ); TDEConfig config( "trashrc" );
mConfigMap.clear(); mConfigMap.clear();
@ -224,7 +218,6 @@ void KTrashPropsDlgPlugin::readConfig()
void KTrashPropsDlgPlugin::writeConfig() void KTrashPropsDlgPlugin::writeConfig()
{ {
kdDebug() << "KTrashPropsDlgPlugin::writeConfig() called" << endl;
TDEConfig config( "trashrc" ); TDEConfig config( "trashrc" );
// first delete all existing groups // first delete all existing groups
@ -248,7 +241,6 @@ void KTrashPropsDlgPlugin::writeConfig()
void KTrashPropsDlgPlugin::setupGui( TQFrame *frame ) void KTrashPropsDlgPlugin::setupGui( TQFrame *frame )
{ {
kdDebug() << "KTrashPropsDlgPlugin::setupGui( TQFrame *frame )" << endl;
TQVBoxLayout *layout = new TQVBoxLayout( frame, 11, 6 ); TQVBoxLayout *layout = new TQVBoxLayout( frame, 11, 6 );
TrashImpl::TrashDirMap map = mTrashImpl->trashDirectories(); TrashImpl::TrashDirMap map = mTrashImpl->trashDirectories();
@ -267,7 +259,7 @@ void KTrashPropsDlgPlugin::setupGui( TQFrame *frame )
mountPoints->setCurrentItem( 0 ); mountPoints->setCurrentItem( 0 );
connect( mountPoints, SIGNAL( highlighted( int ) ), SLOT( trashChanged( int ) ) ); connect( mountPoints, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( trashChanged( int ) ) );
} else { } else {
mCurrentTrash = map[0]; mCurrentTrash = map[0];
} }

1
tdeioslave/trash/ktrashpropsdlgplugin.desktop
Unescape View File

@ -2,5 +2,6 @@
Type=Service Type=Service
Name=Trash Properties Page Name=Trash Properties Page
Name[bg]=Свойства на кошчето Name[bg]=Свойства на кошчето
Name[it]=Proprietà del cestino
X-TDE-Library=ktrashpropsdlgplugin X-TDE-Library=ktrashpropsdlgplugin
X-TDE-ServiceTypes=KPropsDlg/Plugin,media/builtin-trash X-TDE-ServiceTypes=KPropsDlg/Plugin,media/builtin-trash

2
tdeioslave/trash/ktrashpropsdlgplugin.h
Unescape View File

@ -1,5 +1,5 @@
/* /*
This file is part of the KDE project This file is part of the TDE project
Copyright (C) 2008 Tobias Koenig <tokoe@kde.org> Copyright (C) 2008 Tobias Koenig <tokoe@kde.org>

2
tdeioslave/trash/tdefile-plugin/tdefile_trash.cpp
Unescape View File

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
* Copyright (C) 2004 David Faure <faure@kde.org> * Copyright (C) 2004 David Faure <faure@kde.org>
* Based on tdefile_txt.cpp by Nadeem Hasan <nhasan@kde.org> * Based on tdefile_txt.cpp by Nadeem Hasan <nhasan@kde.org>
* *

2
tdeioslave/trash/tdefile-plugin/tdefile_trash.h
Unescape View File

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
* Copyright (C) 2004 David Faure <faure@kde.org> * Copyright (C) 2004 David Faure <faure@kde.org>
* Based on tdefile_txt.h by Nadeem Hasan <nhasan@kde.org> * Based on tdefile_txt.h by Nadeem Hasan <nhasan@kde.org>
* *

2
tdeioslave/trash/tdeio_trash.cpp
Unescape View File

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
Copyright (C) 2004 David Faure <faure@kde.org> Copyright (C) 2004 David Faure <faure@kde.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or

2
tdeioslave/trash/tdeio_trash.h
Unescape View File

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
Copyright (C) 2004 David Faure <faure@kde.org> Copyright (C) 2004 David Faure <faure@kde.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or

4
tdeioslave/trash/testtrash.cpp
Unescape View File

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
Copyright (C) 2004 David Faure <faure@kde.org> Copyright (C) 2004 David Faure <faure@kde.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
@ -24,8 +24,6 @@
#include "tdeio_trash.h" #include "tdeio_trash.h"
#include "testtrash.h" #include "testtrash.h"
// #include <config.h>
#include <kurl.h> #include <kurl.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <tdeapplication.h> #include <tdeapplication.h>

2
tdeioslave/trash/testtrash.h
Unescape View File

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
Copyright (C) 2004 David Faure <faure@kde.org> Copyright (C) 2004 David Faure <faure@kde.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or

4
tdeioslave/trash/trashimpl.cpp
Unescape View File

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
Copyright (C) 2004 David Faure <faure@kde.org> Copyright (C) 2004 David Faure <faure@kde.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
@ -1018,7 +1018,7 @@ bool TrashImpl::adaptTrashSize( const TQString& origPath, int trashId )
if ( ((double)fileSize*100/(double)partitionSize) >= percent ) { if ( ((double)fileSize*100/(double)partitionSize) >= percent ) {
m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED; m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED;
m_lastErrorMessage = i18n( "The file is too large to be trashed." ); m_lastErrorMessage = i18n( "The file is too big to be trashed because it exceeds the maximum size set for the trash bin." );
return false; return false;
} }

2
tdeioslave/trash/trashimpl.h
Unescape View File

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
Copyright (C) 2004 David Faure <faure@kde.org> Copyright (C) 2004 David Faure <faure@kde.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or

Write Preview
Loading…
Cancel
Save