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

List:       kde-commits
Subject:    kdebase/konqueror/listview
From:       Pascal Létourneau <pletourn () globetrotter ! net>
Date:       2005-03-18 22:04:24
Message-ID: 20050318220424.A544516DE8 () office ! kde ! org
[Download RAW message or body]

CVS commit by pletourn: 

Enable the trash action inside media:/


  M +6 -5      konq_listview.cc   1.225


--- kdebase/konqueror/listview/konq_listview.cc  #1.224:1.225
@@ -57,7 +57,5 @@ KonqListViewFactory::KonqListViewFactory
 KonqListViewFactory::~KonqListViewFactory()
 {
-  if ( s_instance )
     delete s_instance;
-  if ( s_defaultViewProps )
     delete s_defaultViewProps;
 
@@ -119,4 +117,5 @@ void ListViewBrowserExtension::updateAct
   int canCopy = 0;
   int canDel = 0;
+  int canTrash = 0;
   bool bInTrash = false;
   KFileItemList lstItems = m_listView->selectedFileItems();
@@ -130,9 +129,11 @@ void ListViewBrowserExtension::updateAct
     if (  KProtocolInfo::supportsDeleting(  url ) )
       canDel++;
+    if ( !item->localPath().isEmpty() )
+      canTrash++;
   }
 
   emit enableAction( "copy", canCopy > 0 );
   emit enableAction( "cut", canDel > 0 );
-  emit enableAction( "trash", canDel > 0 && !bInTrash && m_listView->url().isLocalFile() );
+  emit enableAction( "trash", canDel > 0 && !bInTrash && canDel == canTrash );
   emit enableAction( "del", canDel > 0 );
   emit enableAction( "properties", lstItems.count() > 0 && KPropertiesDialog::canDisplay( lstItems ) );


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