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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase
From:       David Faure <faure () kde ! org>
Date:       2005-08-29 21:49:51
Message-ID: 1125352191.295109.7386.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 454773 by dfaure:

Fixed error message when trashing a directory from media:/, as coolo showed me.
Only now he tells me that it's not a KDE bugzilla bug, but a SUSE one. Damn ;)


 M  +1 -0      kdesktop/kdiconview.cc  
 M  +0 -1      kdesktop/kdiconview.h  
 M  +2 -16     konqueror/iconview/konq_iconview.cc  
 M  +10 -3     libkonq/konq_iconviewwidget.cc  
 M  +3 -1      libkonq/konq_iconviewwidget.h  


--- branches/KDE/3.5/kdebase/kdesktop/kdiconview.cc #454772:454773
@@ -533,6 +533,7 @@
     KDesktopSettings::writeConfig();
 }
 
+// Only used for DCOP
 QStringList KDIconView::selectedURLs()
 {
     QStringList seq;
--- branches/KDE/3.5/kdebase/kdesktop/kdiconview.h #454772:454773
@@ -72,7 +72,6 @@
     void setAutoAlign( bool b );
 
     void refreshIcons();
-    QStringList selectedURLs();
 
     /**
      * Save the icon positions
--- branches/KDE/3.5/kdebase/konqueror/iconview/konq_iconview.cc #454772:454773
@@ -139,7 +139,7 @@
 {
    KonqOperations::del(m_iconView->iconViewWidget(),
                        KonqOperations::TRASH,
-                       m_iconView->iconViewWidget()->selectedUrls());
+                       m_iconView->iconViewWidget()->selectedUrls( \
KonqIconViewWidget::MostLocalUrls ));  }
 
 void IconViewBrowserExtension::properties()
@@ -716,21 +716,7 @@
     KFileItem *fileItem = (static_cast<KFileIVI*>(item))->item();
     if ( !fileItem )
         return;
-    KURL url = fileItem->url();
-    url.cleanPath();
-#if 0 // We now allow to open files from the trash. They are readonly, it's up to \
                the apps to handle that correctly...
-    bool isIntoTrash = url.protocol() == "trash";
-    if ( !isIntoTrash || (isIntoTrash && fileItem->isDir()) )
-    {
-#endif
-        lmbClicked( fileItem );
-#if 0
-    }
-    else
-    {
-        KMessageBox::information(0L, i18n("You must take the file out of the trash \
                before being able to use it."));
-    }
-#endif
+    lmbClicked( fileItem );
 }
 
 void KonqKfmIconView::slotDragHeld( QIconViewItem *item )
--- branches/KDE/3.5/kdebase/libkonq/konq_iconviewwidget.cc #454772:454773
@@ -1148,11 +1148,18 @@
 
 KURL::List KonqIconViewWidget::selectedUrls()
 {
+    return selectedUrls( UserVisibleUrls );
+}
+
+KURL::List KonqIconViewWidget::selectedUrls( UrlFlags flags ) const
+{
     KURL::List lstURLs;
-
+    bool dummy;
     for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() )
-        if ( it->isSelected() )
-            lstURLs.append( (static_cast<KFileIVI *>( it ))->item()->url() );
+        if ( it->isSelected() ) {
+            KFileItem* item = (static_cast<KFileIVI *>( it ))->item();
+            lstURLs.append( flags == MostLocalUrls ? item->mostLocalURL( dummy ) : \
item->url() ); +        }
     return lstURLs;
 }
 
--- branches/KDE/3.5/kdebase/libkonq/konq_iconviewwidget.h #454772:454773
@@ -184,7 +184,9 @@
     virtual void cutSelection();
     virtual void copySelection();
     virtual void pasteSelection();
-    virtual KURL::List selectedUrls();
+    virtual KURL::List selectedUrls(); // KDE4: remove virtual + add const
+    enum UrlFlags { UserVisibleUrls = 0, MostLocalUrls = 1 };
+    KURL::List selectedUrls( UrlFlags flags ) const; // KDE4: merge with above, \
default is == UserVisibleUrls  void paste( const KURL &url );
 
     bool sortDirectoriesFirst() const;


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