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

List:       kde-commits
Subject:    KDE/kdebase/libkonq
From:       Kévin Ottens <ervin () ipsquad ! net>
Date:       2005-06-03 13:54:30
Message-ID: 1117806870.424389.11532.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 421585 by ervin:

Now the context menu used in system:/ or media:/ is on par with what
you would obtain if you use it for file:/. Moreover it permit to empty
the trashbin from system:/.

This commit also fix BR95662 (which was only adressing system:/ root).

"approved by dfaure"(tm)

BUG:95662


 M  +11 -5     konq_popupmenu.cc  


--- trunk/KDE/kdebase/libkonq/konq_popupmenu.cc #421584:421585
@@ -343,7 +343,9 @@
     bool isDirectory    = S_ISDIR(mode);
     bool bTrashIncluded = false;
     bool mediaFiles     = false;
-    bool isLocal        = m_lstItems.first()->isLocalFile();
+    bool isLocal        = m_lstItems.first()->isLocalFile()
+                       || m_lstItems.first()->url().protocol()=="media"
+                       || m_lstItems.first()->url().protocol()=="system";
     bool isTrashLink     = false;
     m_lstPopupURLs.clear();
     int id = 0;
@@ -384,7 +386,8 @@
         if ( mimeTypeList.findIndex( (*it)->mimetype() ) == -1 )
             mimeTypeList << (*it)->mimetype();
 
-        if ( isLocal && !url.isLocalFile() )
+        if ( isLocal && !url.isLocalFile() 
+	  && url.protocol()!="media" && url.protocol()!="system")
             isLocal = false;
 
         if ( !bTrashIncluded &&
@@ -421,10 +424,13 @@
             KSimpleConfig cfg( firstPopupURL.path(), true );
             cfg.setDesktopGroup();
             isTrashLink = ( cfg.readEntry("Type") == "Link" && cfg.readEntry("URL") == "trash:/" );
-            if ( isTrashLink ) {
-                sDeleting = false;
-            }
+        } else {
+            isTrashLink = (firstPopupURL==KURL("system:/trash"));
         }
+
+        if ( isTrashLink ) {
+            sDeleting = false;
+        }
     }
     const bool isSingleLocal = m_lstItems.count() == 1 && isLocal;
 
[prev in list] [next in list] [prev in thread] [next in thread]