Changeset 128

Timestamp:

3/8/2008 1:10:30 AM (5 years ago)

Author:

lowjoel

Message:

-Implement the Public API for the TaskDataSelectionForm?
-Populate the Erase Unused Space drive combobox

Location:

branches/eraser6/Eraser

Files:

• Eraser.csproj (modified) (1 diff)
• TaskDataSelectionForm.Designer.cs (modified) (1 diff)
• TaskDataSelectionForm.cs (modified) (3 diffs)
• TaskPropertiesForm.Designer.cs (modified) (1 diff)
• TaskPropertiesForm.cs (modified) (2 diffs)

branches/eraser6/Eraser/Eraser.csproj

@@ -177 +177 @@
       <Name>Manager</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Util\Util.csproj">
+      <Project>{D083E1A8-3A4C-4683-9B3F-D5FEDE61B9C9}</Project>
+      <Name>Util</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

branches/eraser6/Eraser/TaskDataSelectionForm.Designer.cs

@@ -212 +212 @@
             this.ok.Text = "OK";
             this.ok.UseVisualStyleBackColor = true;
+            this.ok.Click += new System.EventHandler(this.ok_Click);
             // 
             // cancel

branches/eraser6/Eraser/TaskDataSelectionForm.cs

@@ -7 +7 @@
 using System.Windows.Forms;
 
+using Eraser.Manager;
+using Eraser.Util;
+
 namespace Eraser
 {
@@ -13 +16 @@
         public TaskDataSelectionForm()
         {
+            //Create the UI
             InitializeComponent();
             file.Checked = true;
+
+            //Populate the drives list
+            string[] drives = Environment.GetLogicalDrives();
+            foreach (string drive in drives)
+            {
+                DriveTypes driveType = Drives.GetDriveType(drive);
+                if (driveType != DriveTypes.DRIVE_UNKNOWN &&
+                    driveType != DriveTypes.DRIVE_NO_ROOT_DIR &&
+                    driveType != DriveTypes.DRIVE_CDROM &&
+                    driveType != DriveTypes.DRIVE_REMOTE)
+                {
+                    unusedDisk.Items.Add(File.GetFileDescription(drive));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the settings on the property page as the Eraser Manager API equivalent.
+        /// </summary>
+        /// <returns>An Eraser.Manager.Task.Data or Eraser.Manager.Task.FreeSpace object
+        /// or any of its inherited classes, depending on the task selected</returns>
+        public Task.EraseTarget GetTaskEntry()
+        {
+            Task.EraseTarget result = null;
+            if (file.Checked)
+            {
+                Manager.Task.File fileTask = new Task.File();
+                result = fileTask;
+
+                fileTask.Path = filePath.Text;
+            }
+            else if (folder.Checked)
+            {
+                Manager.Task.Folder folderTask = new Task.Folder();
+                result = folderTask;
+
+                folderTask.Path = folderPath.Text;
+                folderTask.IncludeMask = folderInclude.Text;
+                folderTask.ExcludeMask = folderExclude.Text;
+                folderTask.DeleteIfEmpty = folderDelete.Checked;
+            }
+            else
+            {
+                Task.FreeSpace freeSpaceTask = new Task.FreeSpace();
+                result = freeSpaceTask;
+
+                freeSpaceTask.Drive = (string)unusedDisk.SelectedValue;
+            }
+
+            return result;
         }
 
@@ -39 +93 @@
                 folderPath.Text = folderDialog.SelectedPath;
         }
+
+        private void ok_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.OK;
+            Close();
+        }
     }
 }

branches/eraser6/Eraser/TaskPropertiesForm.Designer.cs

@@ -109 +109 @@
             this.dataColData,
             this.dataColMethod});
+            this.data.FullRowSelect = true;
             this.data.Location = new System.Drawing.Point(15, 77);
             this.data.Name = "data";

branches/eraser6/Eraser/TaskPropertiesForm.cs

@@ -6 +6 @@
 using System.Text;
 using System.Windows.Forms;
+
+using Eraser.Manager;
 
 namespace Eraser
@@ -22 +24 @@
                 if (form.ShowDialog() == DialogResult.OK)
                 {
-                    ;
+                    Task.EraseTarget entry = form.GetTaskEntry();
+                    ListViewItem item = null;
+                    if (entry is Task.FilesystemObject)
+                        item = data.Items.Add((entry as Task.FilesystemObject).Path);
+                    else if (entry is Task.FreeSpace)
+                        data.Items.Add("Unused space on " + (entry as Task.FreeSpace).Drive);
+                    else
+                        throw new NotImplementedException("Unimplemented data erasure type.");
+                    item.SubItems[0].Text = entry.Method.Name;
+                    task.Entries.Add(entry);
                 }
             }
         }
+
+        private Task task = new Task();
     }
 }