Changeset 2059 for trunk/eraser

Timestamp:

5/4/2010 8:13:48 AM (3 years ago)

Author:

lowjoel

Message:

Handle cases where other shell folders, other than the recycle bin, is dropped into Eraser. Display a proper message to indicate why the drag and drop operation cannot succeed.

File:

• trunk/eraser/Eraser/SchedulerPanel.cs (modified) (4 diffs)

trunk/eraser/Eraser/SchedulerPanel.cs

@@ -379 +379 @@
                     for (int i = 1; i <= cida.cidl; ++i)
                     {
-                        if (cida.aoffset[i].Guid != Guid.Empty)
+                        if (!string.IsNullOrEmpty(cida.aoffset[i].Path))
+                        {
+                            files.Add(cida.aoffset[i].Path);
+                        }
+                        else if (cida.aoffset[i].Guid != Guid.Empty)
                         {
                             if (cida.aoffset[i].Guid == Shell.KnownFolderIDs.RecycleBin)
@@ -387 +391 @@
                                 recycleBinIncluded = true;
                             }
-                        }
-                        else
-                        {
-                            files.Add(cida.aoffset[i].Path);
                         }
                     }
@@ -417 +417 @@
                     isTaskList = false;
             }
-            descriptionInsert = descriptionInsert.Remove(descriptionInsert.Length - 2);
+
+            if (!string.IsNullOrEmpty(descriptionInsert))
+                descriptionInsert = descriptionInsert.Remove(descriptionInsert.Length - 2);
 
             if (!recycleBinIncluded && files.Count == 0)
+            {
                 e.Effect = DragDropEffects.None;
+                descriptionMessage = "Cannot erase the selected items";
+            }
             else if (isTaskList)
             {
@@ -471 +476 @@
                     for (int i = 1; i <= cida.cidl; ++i)
                     {
-                        if (cida.aoffset[i].Guid != Guid.Empty)
+                        if (!string.IsNullOrEmpty(cida.aoffset[i].Path))
+                        {
+                            files.Add(cida.aoffset[i].Path);
+                        }
+                        else if (cida.aoffset[i].Guid != Guid.Empty)
                         {
                             if (cida.aoffset[i].Guid == Shell.KnownFolderIDs.RecycleBin)
                                 recycleBinIncluded = true;
-                        }
-                        else
-                        {
-                            files.Add(cida.aoffset[i].Path);
                         }
                     }