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

List:       kde-commits
Subject:    kdebase/libkonq
From:       Stephan Binner <binner () kde ! org>
Date:       2005-04-05 15:13:18
Message-ID: 20050405151318.10B5C63E () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

If Shift is pressed when menu opens show 'Delete' instead of 'Trash' (#100394)


  M +15 -3     konq_popupmenu.cc   1.215


--- kdebase/libkonq/konq_popupmenu.cc  #1.214:1.215
@@ -541,16 +541,28 @@ void KonqPopupMenu::setup(KonqPopupFlags
                 addAction( "rename" );
 
+            bool addTrash = false;
+            bool addDel = false;
+
             if ( sMoving && !isIntoTrash && !isTrashLink )
-                addAction( "trash" );
+                addTrash = true;
 
             if ( sDeleting ) {
                 if ( !isLocal )
-                    addAction( "del" );
+                    addDel = true;
+                else if (KApplication::keyboardMouseState() & Qt::ShiftButton) {
+                    addTrash = false;
+                    addDel = true;
+                }
                 else {
                     KConfigGroup configGroup( kapp->config(), "KDE" );
                     if ( configGroup.readBoolEntry( "ShowDeleteCommand", false ) )
-                        addAction( "del" );
+                        addDel = true;
                 }
             }
+
+            if ( addTrash )
+                addAction( "trash" );
+            if ( addDel )
+                addAction( "del" );
         }
     }


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