mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 08:51:24 +00:00
Repair "Send File" so that it only sends the selected files, like in kde3.
Fixed for: 4.4 rc1 BUG: 218388 svn path=/trunk/KDE/kdebase/apps/; revision=1065134
This commit is contained in:
parent
8690dc7900
commit
3b82b1bcf2
|
@ -2697,15 +2697,8 @@ KUrl::List KonqMainWindow::currentURLs() const
|
|||
KUrl::List urls;
|
||||
if ( m_currentView ) {
|
||||
urls.append( m_currentView->url() );
|
||||
#if 0
|
||||
KonqDirPart* dirPart = ::qobject_cast<KonqDirPart *>(m_currentView->part());
|
||||
if ( dirPart ) {
|
||||
const KFileItemList itemList = dirPart->selectedFileItems();
|
||||
if (!itemList.isEmpty()) { // Return list of selected items only if we have a selection
|
||||
urls = itemList.urlList();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (!m_currentView->selectedItems().isEmpty()) // Return list of selected items only if we have a selection
|
||||
urls = m_currentView->selectedItems().urlList();
|
||||
}
|
||||
return urls;
|
||||
}
|
||||
|
|
|
@ -625,6 +625,7 @@ void KonqView::slotCanceled( const QString & errorMsg )
|
|||
|
||||
void KonqView::slotSelectionInfo( const KFileItemList &items )
|
||||
{
|
||||
m_selectedItems = items;
|
||||
KonqFileSelectionEvent ev( items, m_pPart );
|
||||
QApplication::sendEvent( m_pMainWindow, &ev );
|
||||
}
|
||||
|
|
|
@ -341,6 +341,8 @@ public:
|
|||
void enablePopupMenu( bool b );
|
||||
bool isPopupMenuEnabled() const { return m_bPopupMenuEnabled; }
|
||||
|
||||
KFileItemList selectedItems() const { return m_selectedItems; }
|
||||
|
||||
void reparseConfiguration();
|
||||
|
||||
void disableScrolling();
|
||||
|
@ -471,6 +473,7 @@ private:
|
|||
QString m_sLocationBarURL;
|
||||
QString m_sTypedURL;
|
||||
KonqMainWindow::PageSecurity m_pageSecurity;
|
||||
KFileItemList m_selectedItems;
|
||||
|
||||
/**
|
||||
* The full history (back + current + forward)
|
||||
|
|
Loading…
Reference in a new issue