Changeset 1996 for trunk/eraser

Timestamp:

5/1/2010 9:12:41 AM (3 years ago)

Author:

lowjoel

Message:

When dragging and dropping files into Eraser, use a Task Dialog to ask whether the user wants to erase the file now, create a new task, or do nothing. XP computers will display a simple message box.

Location:

trunk/eraser

Files:

• Dependencies/TaskDialog.XML (added)
• Dependencies/TaskDialog.dll (added)
• Dependencies/TaskDialog.pdb (added)
• Eraser/Eraser.csproj (modified) (1 diff)
• Eraser/SchedulerPanel.cs (modified) (3 diffs)
• Eraser/Strings.en.resx (modified) (1 diff)
• Eraser/Strings.it.resx (modified) (1 diff)
• Eraser/Strings.nl.resx (modified) (1 diff)
• Eraser/Strings.pl.resx (modified) (1 diff)
• Eraser/Strings.resx (modified) (1 diff)
• Installer/DirectoryStructure.wxs (modified) (1 diff)

trunk/eraser/Eraser/Eraser.csproj

@@ -79 +79 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="TaskDialog, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3ac89a0351e689b6, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Dependencies\TaskDialog.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>

trunk/eraser/Eraser/SchedulerPanel.cs

@@ -27 +27 @@
 using System.Windows.Forms;
 
-using Eraser.Manager;
-using Eraser.Util;
 using System.Globalization;
 using System.Runtime.InteropServices;
@@ -35 +33 @@
 using System.Runtime.Serialization;
 using System.ComponentModel;
+
+using Eraser.Manager;
+using Eraser.Util;
+using Microsoft.Samples;
 using ProgressChangedEventArgs = Eraser.Util.ProgressChangedEventArgs;
 
@@ -421 +423 @@
             if (!e.Data.GetDataPresent(DataFormats.FileDrop))
                 e.Effect = DragDropEffects.None;
-            else
-            {
-                string[] files = (string[])e.Data.GetData(DataFormats.FileDrop, false);
-
-                //Determine whether we are importing a task list or dragging files for
-                //erasure.
-                if (e.Effect == DragDropEffects.Copy)
-                {
-                    foreach (string file in files)
-                        using (FileStream stream = new FileStream(file, FileMode.Open,
-                            FileAccess.Read, FileShare.Read))
+            DropTargetHelper.Drop(e.Data, new Point(e.X, e.Y), e.Effect);
+
+            //Schedule the task dialog to be shown (to get to the event loop so that
+            //ComCtl32.dll v6 is used.)
+            BeginInvoke((Action<DragDropEffects, string[]>)scheduler_DragDropConfirm,
+                e.Effect, e.Data.GetData(DataFormats.FileDrop, false));
+        }
+
+        /// <summary>
+        /// Called after the files have been dropped into Eraser.
+        /// </summary>
+        /// <param name="effect">The Drag/drop effect of the operation.</param>
+        /// <param name="files">The files which were dropped into the program.</param>
+        private void scheduler_DragDropConfirm(DragDropEffects effect, string[] files)
+        {
+            //Determine whether we are importing a task list or dragging files for
+            //erasure.
+            if (effect == DragDropEffects.Copy)
+            {
+                foreach (string file in files)
+                    using (FileStream stream = new FileStream(file, FileMode.Open,
+                        FileAccess.Read, FileShare.Read))
+                    {
+                        try
                         {
-                            try
-                            {
-                                Program.eraserClient.Tasks.LoadFromStream(stream);
-                            }
-                            catch (InvalidDataException ex)
-                            {
-                                MessageBox.Show(S._("Could not import task list from {0}. The " +
-                                    "error returned was: {1}", file, ex.Message), S._("Eraser"),
-                                    MessageBoxButtons.OK, MessageBoxIcon.Error,
-                                    MessageBoxDefaultButton.Button1,
-                                    Localisation.IsRightToLeft(this) ?
-                                        MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : 0);
-                            }
+                            Program.eraserClient.Tasks.LoadFromStream(stream);
                         }
-                }
-                else if (e.Effect == DragDropEffects.Move)
-                {
-                    //Create a task with the default settings
-                    Task task = new Task();
-                    foreach (string file in files)
-                    {
-                        FileSystemObjectTarget target;
-                        if (Directory.Exists(file))
-                            target = new FolderTarget();
-                        else
-                            target = new FileTarget();
-                        target.Path = file;
-
-                        task.Targets.Add(target);
+                        catch (InvalidDataException ex)
+                        {
+                            MessageBox.Show(S._("Could not import task list from {0}. The " +
+                                "error returned was: {1}", file, ex.Message), S._("Eraser"),
+                                MessageBoxButtons.OK, MessageBoxIcon.Error,
+                                MessageBoxDefaultButton.Button1,
+                                Localisation.IsRightToLeft(this) ?
+                                    MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : 0);
+                        }
                     }
-
-                    //Add the task.
-                    Program.eraserClient.Tasks.Add(task);
-                }
-            }
-
-            DropTargetHelper.Drop(e.Data, new Point(e.X, e.Y), e.Effect);
+            }
+            else if (effect == DragDropEffects.Move)
+            {
+                //Create a task with the default settings
+                Task task = new Task();
+                foreach (string file in files)
+                {
+                    FileSystemObjectTarget target;
+                    if (Directory.Exists(file))
+                        target = new FolderTarget();
+                    else
+                        target = new FileTarget();
+                    target.Path = file;
+
+                    task.Targets.Add(target);
+                }
+
+                //Add the task, asking the user for his intent.
+                DialogResult action = DialogResult.No;
+                if (TaskDialog.IsAvailableOnThisOS)
+                {
+                    TaskDialog dialog = new TaskDialog();
+                    dialog.WindowTitle = S._("Eraser");
+                    dialog.MainIcon = TaskDialogIcon.Information;
+                    dialog.MainInstruction = S._("You have dropped a set of files and folders into Eraser. What do you want to do with them?");
+                    dialog.AllowDialogCancellation = true;
+                    dialog.Buttons = new TaskDialogButton[] {
+                        new TaskDialogButton((int)DialogResult.Yes, S._("Erase the selected items\nSchedules the selected items for immediate erasure.")),
+                        new TaskDialogButton((int)DialogResult.OK, S._("Create a new Task\nA task will be created containing the selected items.")),
+                        new TaskDialogButton((int)DialogResult.No, S._("Cancel the drag-and-drop operation"))
+                    };
+                    dialog.RightToLeftLayout = Localisation.IsRightToLeft(this);
+                    dialog.UseCommandLinks = true;
+                    action = (DialogResult)dialog.Show(this);
+                }
+                else
+                {
+                    action = MessageBox.Show(S._("Are you sure you wish to erase the selected "
+                        + "items?"), S._("Eraser"), MessageBoxButtons.YesNo,
+                        MessageBoxIcon.Question, MessageBoxDefaultButton.Button2,
+                        Localisation.IsRightToLeft(this) ?
+                            MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : 0);
+                }
+
+                switch (action)
+                {
+                    case DialogResult.OK:
+                        task.Schedule = Schedule.RunManually;
+                        goto case DialogResult.Yes;
+
+                    case DialogResult.Yes:
+                        Program.eraserClient.Tasks.Add(task);
+                        break;
+                }
+            }
         }
 

trunk/eraser/Eraser/Strings.en.resx

@@ -232 +232 @@
     <value>Could not import task list from {0}. The error returned was: {1}</value>
   </data>
+  <data name="You have dropped a set of files and folders into Eraser. What do you want to do with them?" xml:space="preserve">
+    <value>You have dropped a set of files and folders into Eraser. What do you want to do with them?</value>
+  </data>
+  <data name="Erase the selected items\nSchedules the selected items for immediate erasure." xml:space="preserve">
+    <value>Erase the selected items\nSchedules the selected items for immediate erasure.</value>
+  </data>
+  <data name="Create a new Task\nA task will be created containing the selected items." xml:space="preserve">
+    <value>Create a new Task\nA task will be created containing the selected items.</value>
+  </data>
+  <data name="Cancel the drag-and-drop operation" xml:space="preserve">
+    <value>Cancel the drag-and-drop operation</value>
+  </data>
+  <data name="Are you sure you wish to erase the selected items?" xml:space="preserve">
+    <value>Are you sure you wish to erase the selected items?</value>
+  </data>
   <data name="Could not load the setting {0}\\{1} for plugin {2}. The setting has been lost." xml:space="preserve">
     <value>Could not load the setting {0}\\{1} for plugin {2}. The setting has been lost.</value>

trunk/eraser/Eraser/Strings.it.resx

@@ -232 +232 @@
     <value>Importazione della lista di operazioni da {0} non riuscita. L'errore è stato: {1}</value>
   </data>
+  <data name="You have dropped a set of files and folders into Eraser. What do you want to do with them?" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Erase the selected items\nSchedules the selected items for immediate erasure." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Create a new Task\nA task will be created containing the selected items." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Cancel the drag-and-drop operation" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Are you sure you wish to erase the selected items?" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Could not load the setting {0}\\{1} for plugin {2}. The setting has been lost." xml:space="preserve">
     <value>Impossibile caricare l'impostazione {0}\\{1} per il plugin {2}. L'impostazione è stata persa.</value>

trunk/eraser/Eraser/Strings.nl.resx

@@ -232 +232 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="You have dropped a set of files and folders into Eraser. What do you want to do with them?" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Erase the selected items\nSchedules the selected items for immediate erasure." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Create a new Task\nA task will be created containing the selected items." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Cancel the drag-and-drop operation" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Are you sure you wish to erase the selected items?" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Could not load the setting {0}\\{1} for plugin {2}. The setting has been lost." xml:space="preserve">
     <value>(Untranslated)</value>

trunk/eraser/Eraser/Strings.pl.resx

@@ -228 +228 @@
   <data name="Erase {0}" xml:space="preserve">
     <value>Wymazywanie {0}</value>
-    <comment>Maybe "Wymaż" is more appropriate, it depends on its context</comment>
   </data>
   <data name="Could not import task list from {0}. The error returned was: {1}" xml:space="preserve">
     <value>Nie można było zaimportować listy zadań z {0}. Wystąpił błąd: {1}</value>
   </data>
+  <data name="You have dropped a set of files and folders into Eraser. What do you want to do with them?" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Erase the selected items\nSchedules the selected items for immediate erasure." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Create a new Task\nA task will be created containing the selected items." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Cancel the drag-and-drop operation" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
+  <data name="Are you sure you wish to erase the selected items?" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Could not load the setting {0}\\{1} for plugin {2}. The setting has been lost." xml:space="preserve">
     <value>Nie można było załadować ustawień {0}\\{1} dla wtyczki {2}. Ustawienia wtyczki zostały utracone.</value>

trunk/eraser/Eraser/Strings.resx

@@ -232 +232 @@
     <value>Could not import task list from {0}. The error returned was: {1}</value>
   </data>
+  <data name="You have dropped a set of files and folders into Eraser. What do you want to do with them?" xml:space="preserve">
+    <value>You have dropped a set of files and folders into Eraser. What do you want to do with them?</value>
+  </data>
+  <data name="Erase the selected items\nSchedules the selected items for immediate erasure." xml:space="preserve">
+    <value>Erase the selected items\nSchedules the selected items for immediate erasure.</value>
+  </data>
+  <data name="Create a new Task\nA task will be created containing the selected items." xml:space="preserve">
+    <value>Create a new Task\nA task will be created containing the selected items.</value>
+  </data>
+  <data name="Cancel the drag-and-drop operation" xml:space="preserve">
+    <value>Cancel the drag-and-drop operation</value>
+  </data>
+  <data name="Are you sure you wish to erase the selected items?" xml:space="preserve">
+    <value>Are you sure you wish to erase the selected items?</value>
+  </data>
   <data name="Could not load the setting {0}\\{1} for plugin {2}. The setting has been lost." xml:space="preserve">
     <value>Could not load the setting {0}\\{1} for plugin {2}. The setting has been lost.</value>

trunk/eraser/Installer/DirectoryStructure.wxs

@@ -65 +65 @@
                     <File Id="SharpZipLib" Name="ICSharpCode.SharpZipLib.dll"
                         Source="..\bin\Release\Plugins\ICSharpCode.SharpZipLib.dll" ProcessorArchitecture="msil" />
-                    
+                    <File Id="TaskDialog" Name="TaskDialog.dll"
+                        Source="..\bin\Release\TaskDialog.dll" ProcessorArchitecture="msil" />
+
                     <File Id="EraserManager" Name="Eraser.Manager.dll"
                         Source="..\bin\Release\Eraser.Manager.dll" ProcessorArchitecture="msil" />