[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [kde-runtime/KDE/4.9] nepomuk/kioslaves/nepomuk: Fixed the delete action.
From:       Sebastian_Trüg <trueg () kde ! org>
Date:       2012-08-22 16:18:49
Message-ID: 50350669.6060200 () kde ! org
[Download RAW message or body]

Ideally, I suppose so.

On 08/22/2012 06:06 PM, André Wöbbeking wrote:
> On Wednesday 22 August 2012 13:35:21 Sebastian Trueg wrote:
>> Git commit 8a71f3765bd5fd5dd09cc34cf114c9424e7c7dd7 by Sebastian Trueg.
>> Committed on 22/08/2012 at 11:54.
>> Pushed by trueg into branch 'KDE/4.9'.
>>
>> Fixed the delete action.
>>
>> M  +15   -15   nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
>> M  +1    -1    nepomuk/kioslaves/nepomuk/resourcepagegenerator.cpp
>>
>> http://commits.kde.org/kde-runtime/8a71f3765bd5fd5dd09cc34cf114c9424e7c7dd7
>>
>> diff --git a/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
>> b/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp index f350110..2ef666f 100644
>> --- a/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
>> +++ b/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp
>> @@ -111,7 +111,18 @@ void Nepomuk2::NepomukProtocol::get( const KUrl& url )
>>       const bool noFollow = noFollowSet( url );
>>
>>       Nepomuk2::Resource res = splitNepomukUrl( url );
>> -    if ( !noFollow && Nepomuk2::isRemovableMediaFile( res ) ) {
>> +
>> +    if ( url.hasQueryItem( QLatin1String( "action") ) &&
>> +         url.queryItem( QLatin1String( "action" ) ) == QLatin1String(
>> "delete" ) && +         messageBox( i18n( "Do you really want to delete the
>> resource and all relations " +                           "to and from it?"
>> ),
>> +                     KIO::SlaveBase::QuestionYesNo,
>> +                     i18n( "Delete Resource" ) ) == KMessageBox::Yes )
>
> Shouldn't the buttons be labeled "Delete" and "Cancel"?
>
[prev in list] [next in list] [prev in thread] [next in thread]