kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show delete/trash/cut/rename when parent dir isn't writable.

Browse source 
Can someone (Michael, Alexx) set the flag from the listview? Getting
hold of the parent KFileItem there isn't obvious.

CCMAIL: kfm-devel@kde.org

svn path=/trunk/kdebase/libkonq/; revision=356068
This commit is contained in:
David Faure 2004-10-19 20:37:45 +00:00
parent 32faf37e11
commit ece2b7079c
2 changed files with 51 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
konqueror/iconview/konq_iconview.cc
View file

@ -141,7 +141,7 @@ void IconViewBrowserExtension::reparseConfiguration()
void IconViewBrowserExtension::trash()
{
if (sender() && sender()->inherits( "KAction" ) &&
if (sender() && sender()->inherits( "KAction" ) &&
(static_cast<KAction*>(const_cast<QObject*>(sender()))->activationReason()==KAction::PopupMenuActivation) &&
(KApplication::keyboardMouseState() & Qt::ShiftButton))
KonqOperations::del(m_iconView->iconViewWidget(),
@ -789,51 +789,65 @@ void KonqKfmIconView::slotDragFinished()
void KonqKfmIconView::slotContextMenuRequested(QIconViewItem* _item, const QPoint& _global)
{
if ( m_pIconView->selectedFileItems().count() == 0 )
const KFileItemList items = m_pIconView->selectedFileItems();
if ( items.isEmpty() )
return;
KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems;
KFileIVI* i = static_cast<KFileIVI*>(_item);
if (i)
i->setSelected( true, true /* don't touch other items */ );
emit m_extension->popupMenu( 0L, _global, m_pIconView->selectedFileItems(), KParts::URLArgs(), popupFlags);
KFileItem * rootItem = m_dirLister->rootItem();
KURL parentDirURL = rootItem->url();
// Check if parentDirURL applies to the selected items (usually yes, but not with search results)
QPtrListIterator<KFileItem> kit( items );
for ( ; kit.current(); ++kit )
if ( kit.current()->url().directory( 1 ) != rootItem->url().path() )
parentDirURL = KURL();
// If rootItem is the parent of the selected items, then we can use isWritable() on it.
if ( !parentDirURL.isEmpty() && !rootItem->isWritable() )
popupFlags |= KParts::BrowserExtension::NoDeletion;
emit m_extension->popupMenu( 0L, _global, items, KParts::URLArgs(), popupFlags);
}
void KonqKfmIconView::slotMouseButtonPressed(int _button, QIconViewItem* _item, const QPoint&)
{
if ( _button == RightButton )
if(!_item)
if ( _button == RightButton && !_item )
{
// Right click on viewport
KFileItem * item = m_dirLister->rootItem();
bool delRootItem = false;
if ( ! item )
{
// Right click on viewport
KFileItem * item = m_dirLister->rootItem();
bool delRootItem = false;
if ( ! item )
if ( m_bLoading )
{
if ( m_bLoading )
{
kdDebug(1202) << "slotViewportRightClicked : still loading and no root item -> dismissed" << endl;
return; // too early, '.' not yet listed
}
else
{
// We didn't get a root item (e.g. over FTP)
// We have to create a dummy item. I tried using KonqOperations::statURL,
// but this was leading to a huge delay between the RMB and the popup. Bad.
// But KonqPopupMenu now takes care of stating before opening properties.
item = new KFileItem( S_IFDIR, (mode_t)-1, url() );
delRootItem = true;
}
kdDebug(1202) << "slotViewportRightClicked : still loading and no root item -> dismissed" << endl;
return; // too early, '.' not yet listed
}
else
{
// We didn't get a root item (e.g. over FTP)
// We have to create a dummy item. I tried using KonqOperations::statURL,
// but this was leading to a huge delay between the RMB and the popup. Bad.
// But KonqPopupMenu now takes care of stating before opening properties.
item = new KFileItem( S_IFDIR, (mode_t)-1, url() );
delRootItem = true;
}
KFileItemList items;
items.append( item );
KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
emit m_extension->popupMenu( 0L, QCursor::pos(), items, KParts::URLArgs(), popupFlags );
if ( delRootItem )
delete item; // we just created it
}
KFileItemList items;
items.append( item );
KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
emit m_extension->popupMenu( 0L, QCursor::pos(), items, KParts::URLArgs(), popupFlags );
if ( delRootItem )
delete item; // we just created it
}
}
void KonqKfmIconView::slotMouseButtonClicked(int _button, QIconViewItem* _item, const QPoint& )

8
lib/konq/konq_popupmenu.cc
View file

@ -335,8 +335,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
bool currentDir = false;
bool sReading = true;
bool sWriting = true;
bool sDeleting = true;
bool sMoving = true;
bool sDeleting = ( d->m_itemFlags & KParts::BrowserExtension::NoDeletion ) == 0;
bool sMoving = sDeleting;
m_sMimeType = m_lstItems.first()->mimetype();
QString mimeGroup = m_sMimeType.left(m_sMimeType.find('/'));
mode_t mode = m_lstItems.first()->mode();
@ -534,8 +534,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
if (!currentDir )
{
if ( m_lstItems.count() == 1 && sWriting && !isIntoTrash )
addAction("rename");
if ( m_lstItems.count() == 1 && sWriting && sDeleting && !isIntoTrash )
addAction( "rename" );
if ( sMoving && !isIntoTrash )
addAction( "trash" );