diff options
Diffstat (limited to 'konqueror')
37 files changed, 41 insertions, 19 deletions
diff --git a/konqueror/about/box-centre-konqueror.png b/konqueror/about/box-centre-konqueror.png Binary files differindex d8dde840f..aeeb11625 100755..100644 --- a/konqueror/about/box-centre-konqueror.png +++ b/konqueror/about/box-centre-konqueror.png diff --git a/konqueror/about/lightning.png b/konqueror/about/lightning.png Binary files differindex 40bfbcfbb..c0434fad5 100644 --- a/konqueror/about/lightning.png +++ b/konqueror/about/lightning.png diff --git a/konqueror/about/top-right-konqueror.png b/konqueror/about/top-right-konqueror.png Binary files differindex 453de1f6a..f685d4a3c 100644 --- a/konqueror/about/top-right-konqueror.png +++ b/konqueror/about/top-right-konqueror.png diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 595c02948..5efc1e751 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -557,10 +557,15 @@ void KonqKfmIconView::slotSelect() m_pIconView->blockSignals( true ); TQIconViewItem *it = m_pIconView->firstItem(); - while ( it ) - { - if ( re.exactMatch( it->text() ) ) - it->setSelected( true, true ); + while ( it ) { + if ( it->isVisible() ) { + if ( re.exactMatch( it->text() ) ) { + it->setSelected( true, true ); + } + } + else { + it->setSelected( false, true ); + } it = it->nextItem(); } @@ -584,10 +589,15 @@ void KonqKfmIconView::slotUnselect() m_pIconView->blockSignals( true ); TQIconViewItem *it = m_pIconView->firstItem(); - while ( it ) - { - if ( re.exactMatch( it->text() ) ) - it->setSelected( false, true ); + while ( it ) { + if ( it->isVisible() ) { + if ( re.exactMatch( it->text() ) ) { + it->setSelected( false, true ); + } + } + else { + it->setSelected( false, true ); + } it = it->nextItem(); } diff --git a/konqueror/keditbookmarks/cr16-app-keditbookmarks.png b/konqueror/keditbookmarks/cr16-app-keditbookmarks.png Binary files differindex 6a3fc5efe..79b941ae5 100644 --- a/konqueror/keditbookmarks/cr16-app-keditbookmarks.png +++ b/konqueror/keditbookmarks/cr16-app-keditbookmarks.png diff --git a/konqueror/keditbookmarks/cr32-app-keditbookmarks.png b/konqueror/keditbookmarks/cr32-app-keditbookmarks.png Binary files differindex b7e10c47f..6515c682b 100644 --- a/konqueror/keditbookmarks/cr32-app-keditbookmarks.png +++ b/konqueror/keditbookmarks/cr32-app-keditbookmarks.png diff --git a/konqueror/keditbookmarks/cr48-app-keditbookmarks.png b/konqueror/keditbookmarks/cr48-app-keditbookmarks.png Binary files differindex d1f5e91cc..73f0dfd24 100644 --- a/konqueror/keditbookmarks/cr48-app-keditbookmarks.png +++ b/konqueror/keditbookmarks/cr48-app-keditbookmarks.png diff --git a/konqueror/keditbookmarks/cr64-app-keditbookmarks.png b/konqueror/keditbookmarks/cr64-app-keditbookmarks.png Binary files differindex 8f2504942..d1147a86d 100644 --- a/konqueror/keditbookmarks/cr64-app-keditbookmarks.png +++ b/konqueror/keditbookmarks/cr64-app-keditbookmarks.png diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 8c9369a4c..67da49c6d 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -389,17 +389,22 @@ void KonqListView::slotSelect() for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ ) { - if ((m_pListView->automaticSelection()) && (it->isSelected())) - { + if ((m_pListView->automaticSelection()) && (it->isSelected())) { it->setSelected(FALSE); //the following line is to prevent that more than one item were selected //and now get deselected and automaticSelection() was true, this shouldn't happen //but who knows, aleXXX m_pListView->deactivateAutomaticSelection(); - }; - if ( re.exactMatch( it->text(0) ) ) - it->setSelected( TRUE); - }; + } + if ( it->isVisible() ) { + if ( re.exactMatch( it->text(0) ) ) { + it->setSelected(TRUE); + } + } + else { + it->setSelected(FALSE); + } + } m_pListView->blockSignals( false ); m_pListView->deactivateAutomaticSelection(); emit m_pListView->selectionChanged(); @@ -418,9 +423,16 @@ void KonqListView::slotUnselect() m_pListView->blockSignals(TRUE); - for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ ) - if ( re.exactMatch( it->text(0) ) ) + for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ ) { + if ( it->isVisible() ) { + if ( re.exactMatch( it->text(0) ) ) { + it->setSelected(FALSE); + } + } + else { it->setSelected(FALSE); + } + } m_pListView->blockSignals(FALSE); m_pListView->deactivateAutomaticSelection(); diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index b7dd24c4b..4c1198325 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -987,7 +987,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 ); } @@ -1008,7 +1008,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; } @@ -1019,7 +1019,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; } diff --git a/konqueror/pics/actions/cr16-action-trinity1.png b/konqueror/pics/actions/cr16-action-trinity1.png Binary files differindex 86a3d1237..55b79eedb 100644 --- a/konqueror/pics/actions/cr16-action-trinity1.png +++ b/konqueror/pics/actions/cr16-action-trinity1.png diff --git a/konqueror/pics/actions/cr16-action-trinity2.png b/konqueror/pics/actions/cr16-action-trinity2.png Binary files differindex 15bf0ae76..526ab9776 100644 --- a/konqueror/pics/actions/cr16-action-trinity2.png +++ b/konqueror/pics/actions/cr16-action-trinity2.png diff --git a/konqueror/pics/actions/cr16-action-trinity3.png b/konqueror/pics/actions/cr16-action-trinity3.png Binary files differindex 86a3d1237..55b79eedb 100644 --- a/konqueror/pics/actions/cr16-action-trinity3.png +++ b/konqueror/pics/actions/cr16-action-trinity3.png diff --git a/konqueror/pics/actions/cr16-action-trinity4.png b/konqueror/pics/actions/cr16-action-trinity4.png Binary files differindex 15bf0ae76..526ab9776 100644 --- a/konqueror/pics/actions/cr16-action-trinity4.png +++ b/konqueror/pics/actions/cr16-action-trinity4.png diff --git a/konqueror/pics/actions/cr16-action-trinity5.png b/konqueror/pics/actions/cr16-action-trinity5.png Binary files differindex 86a3d1237..55b79eedb 100644 --- a/konqueror/pics/actions/cr16-action-trinity5.png +++ b/konqueror/pics/actions/cr16-action-trinity5.png diff --git a/konqueror/pics/actions/cr16-action-trinity6.png b/konqueror/pics/actions/cr16-action-trinity6.png Binary files differindex 15bf0ae76..526ab9776 100644 --- a/konqueror/pics/actions/cr16-action-trinity6.png +++ b/konqueror/pics/actions/cr16-action-trinity6.png diff --git a/konqueror/pics/hi128-app-konqueror.png b/konqueror/pics/hi128-app-konqueror.png Binary files differindex c032a6e06..276f79cb8 100644 --- a/konqueror/pics/hi128-app-konqueror.png +++ b/konqueror/pics/hi128-app-konqueror.png diff --git a/konqueror/pics/hi16-app-kfm.png b/konqueror/pics/hi16-app-kfm.png Binary files differindex 4969259fc..1b46cc322 100644 --- a/konqueror/pics/hi16-app-kfm.png +++ b/konqueror/pics/hi16-app-kfm.png diff --git a/konqueror/pics/hi16-app-konqueror.png b/konqueror/pics/hi16-app-konqueror.png Binary files differindex 013f78bc4..9ba23b471 100644 --- a/konqueror/pics/hi16-app-konqueror.png +++ b/konqueror/pics/hi16-app-konqueror.png diff --git a/konqueror/pics/hi22-app-konqueror.png b/konqueror/pics/hi22-app-konqueror.png Binary files differindex 1413af913..eda89cf70 100644 --- a/konqueror/pics/hi22-app-konqueror.png +++ b/konqueror/pics/hi22-app-konqueror.png diff --git a/konqueror/pics/hi32-app-kfm.png b/konqueror/pics/hi32-app-kfm.png Binary files differindex 699c0ddd4..c15dbb83b 100644 --- a/konqueror/pics/hi32-app-kfm.png +++ b/konqueror/pics/hi32-app-kfm.png diff --git a/konqueror/pics/hi32-app-konqueror.png b/konqueror/pics/hi32-app-konqueror.png Binary files differindex ed21ceb5e..de0c8ecc7 100644 --- a/konqueror/pics/hi32-app-konqueror.png +++ b/konqueror/pics/hi32-app-konqueror.png diff --git a/konqueror/pics/hi48-app-kfm.png b/konqueror/pics/hi48-app-kfm.png Binary files differindex bb0b2a7f8..e345e15a1 100644 --- a/konqueror/pics/hi48-app-kfm.png +++ b/konqueror/pics/hi48-app-kfm.png diff --git a/konqueror/pics/hi48-app-konqueror.png b/konqueror/pics/hi48-app-konqueror.png Binary files differindex 11d84db32..91b48a468 100644 --- a/konqueror/pics/hi48-app-konqueror.png +++ b/konqueror/pics/hi48-app-konqueror.png diff --git a/konqueror/pics/hi64-app-kfm.png b/konqueror/pics/hi64-app-kfm.png Binary files differindex 4d2b58bcc..478510127 100644 --- a/konqueror/pics/hi64-app-kfm.png +++ b/konqueror/pics/hi64-app-kfm.png diff --git a/konqueror/pics/hi64-app-konqueror.png b/konqueror/pics/hi64-app-konqueror.png Binary files differindex 637751f61..9215cfe37 100644 --- a/konqueror/pics/hi64-app-konqueror.png +++ b/konqueror/pics/hi64-app-konqueror.png diff --git a/konqueror/pics/indicators/indicator_connect.png b/konqueror/pics/indicators/indicator_connect.png Binary files differindex feff45c6a..f089d424b 100644 --- a/konqueror/pics/indicators/indicator_connect.png +++ b/konqueror/pics/indicators/indicator_connect.png diff --git a/konqueror/pics/indicators/indicator_empty.png b/konqueror/pics/indicators/indicator_empty.png Binary files differindex dcb847550..449392dcc 100644 --- a/konqueror/pics/indicators/indicator_empty.png +++ b/konqueror/pics/indicators/indicator_empty.png diff --git a/konqueror/pics/indicators/indicator_noconnect.png b/konqueror/pics/indicators/indicator_noconnect.png Binary files differindex 5f14df0a0..fb8253fb1 100644 --- a/konqueror/pics/indicators/indicator_noconnect.png +++ b/konqueror/pics/indicators/indicator_noconnect.png diff --git a/konqueror/pics/indicators/indicator_viewactive.png b/konqueror/pics/indicators/indicator_viewactive.png Binary files differindex f8af065d8..ec5b78782 100644 --- a/konqueror/pics/indicators/indicator_viewactive.png +++ b/konqueror/pics/indicators/indicator_viewactive.png diff --git a/konqueror/pics/tiles/bluemorning.png b/konqueror/pics/tiles/bluemorning.png Binary files differindex 99a4945b2..9f0c52210 100644 --- a/konqueror/pics/tiles/bluemorning.png +++ b/konqueror/pics/tiles/bluemorning.png diff --git a/konqueror/pics/tiles/canvas.png b/konqueror/pics/tiles/canvas.png Binary files differindex 9dd8010a0..b4227ee71 100644 --- a/konqueror/pics/tiles/canvas.png +++ b/konqueror/pics/tiles/canvas.png diff --git a/konqueror/pics/tiles/kde4ever.png b/konqueror/pics/tiles/kde4ever.png Binary files differindex 0ff7b8e9a..7386433a9 100644 --- a/konqueror/pics/tiles/kde4ever.png +++ b/konqueror/pics/tiles/kde4ever.png diff --git a/konqueror/pics/tiles/kenwimer.png b/konqueror/pics/tiles/kenwimer.png Binary files differindex 7642a294e..760c810ca 100644 --- a/konqueror/pics/tiles/kenwimer.png +++ b/konqueror/pics/tiles/kenwimer.png diff --git a/konqueror/pics/tiles/noise.png b/konqueror/pics/tiles/noise.png Binary files differindex c39730093..ad17aef1f 100644 --- a/konqueror/pics/tiles/noise.png +++ b/konqueror/pics/tiles/noise.png diff --git a/konqueror/pics/tiles/paper_flieder.png b/konqueror/pics/tiles/paper_flieder.png Binary files differindex a1a014bab..85825a303 100644 --- a/konqueror/pics/tiles/paper_flieder.png +++ b/konqueror/pics/tiles/paper_flieder.png diff --git a/konqueror/pics/tiles/redfiber.png b/konqueror/pics/tiles/redfiber.png Binary files differindex 3618ca783..6e9f1a32a 100644 --- a/konqueror/pics/tiles/redfiber.png +++ b/konqueror/pics/tiles/redfiber.png |
