Konqueror: Do not include items that are selected but hidden by the filter

for operations such as copying, moving, deleting,...

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e69e2fb930)
pull/182/head
Slávek Banko 7 years ago
parent c623f1cf8d
commit 1bff22f051

@ -961,7 +961,7 @@ void KonqBaseListViewWidget::selectedItems( TQPtrList<KonqBaseListViewItem> *_li
{
iterator it = begin();
for ( ; it != end(); it++ )
if ( it->isSelected() )
if ( it->isVisible() && it->isSelected() )
_list->append( &*it );
}
@ -982,7 +982,7 @@ KFileItemList KonqBaseListViewWidget::selectedFileItems()
KFileItemList list;
iterator it = begin();
for ( ; it != end(); it++ )
if ( it->isSelected() )
if ( it->isVisible() && it->isSelected() )
list.append( it->item() );
return list;
}
@ -993,7 +993,7 @@ KURL::List KonqBaseListViewWidget::selectedUrls( bool mostLocal )
KURL::List list;
iterator it = begin();
for ( ; it != end(); it++ )
if ( it->isSelected() )
if ( it->isVisible() && it->isSelected() )
list.append( mostLocal ? it->item()->mostLocalURL( dummy ) : it->item()->url() );
return list;
}

@ -902,7 +902,7 @@ KFileItemList KonqIconViewWidget::selectedFileItems()
TQIconViewItem *it = firstItem();
for (; it; it = it->nextItem() )
if ( it->isSelected() ) {
if ( it->isVisible() && it->isSelected() ) {
KFileItem *fItem = (static_cast<KFileIVI *>(it))->item();
lstItems.append( fItem );
}
@ -969,7 +969,7 @@ KonqIconDrag * KonqIconViewWidget::konqDragObject( TQWidget * dragSource )
TQIconViewItem *primaryItem = currentItem();
// Append all items to the drag object
for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) {
if ( it->isSelected() ) {
if ( it->isVisible() && it->isSelected() ) {
if (!primaryItem)
primaryItem = it;
KFileItem* fileItem = (static_cast<KFileIVI *>(it))->item();
@ -1094,7 +1094,7 @@ void KonqIconViewWidget::slotSelectionChanged()
for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() )
{
if ( it->isSelected() )
if ( it->isVisible() && it->isSelected() )
{
iCount++;
canCopy++;
@ -1136,7 +1136,7 @@ void KonqIconViewWidget::renameSelectedItem()
TQIconViewItem * item = 0L;
TQIconViewItem *it = firstItem();
for (; it; it = it->nextItem() )
if ( it->isSelected() && !item )
if ( it->isVisible() && it->isSelected() && !item )
{
item = it;
break;
@ -1184,7 +1184,7 @@ KURL::List KonqIconViewWidget::selectedUrls( UrlFlags flags ) const
KURL::List lstURLs;
bool dummy;
for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() )
if ( it->isSelected() ) {
if ( it->isVisible() && it->isSelected() ) {
KFileItem* item = (static_cast<KFileIVI *>( it ))->item();
lstURLs.append( flags == MostLocalUrls ? item->mostLocalURL( dummy ) : item->url() );
}

Loading…
Cancel
Save