Changeset 2485

Timestamp:

3/13/2012 11:05:24 PM (15 months ago)

Author:

lowjoel

Message:

Replace the UIText property with ToString?(). Fix the resulting compile errors, too.

Location:

branches/eraser6/pluginsRewrite

Files:

• Eraser.Manager/Task.cs (modified) (1 diff)
• Eraser/LogForm.cs (modified) (1 diff)
• Eraser/MainForm.cs (modified) (1 diff)
• Eraser/ProgressForm.cs (modified) (1 diff)
• Eraser/SchedulerPanel.cs (modified) (4 diffs)

branches/eraser6/pluginsRewrite/Eraser.Manager/Task.cs

@@ -126 +126 @@
         /// The name of the task, used for display in UI elements.
         /// </summary>
-        public string ToString()
+        public override string ToString()
         {
             //Simple case, the task name was given by the user.

branches/eraser6/pluginsRewrite/Eraser/LogForm.cs

@@ -43 +43 @@
 
             //Update the title
-            Text = string.Format(CultureInfo.InvariantCulture, "{0} - {1}", Text, task.UIText);
+            Text = string.Format(CultureInfo.InvariantCulture, "{0} - {1}", Text, task);
 
             //Populate the list of sessions

branches/eraser6/pluginsRewrite/Eraser/MainForm.cs

@@ -365 +365 @@
 
             Task task = (Task)sender;
-            string iconText = S._("Eraser") + " - " + S._("Processing:") + ' ' + task.UIText;
+            string iconText = S._("Eraser") + " - " + S._("Processing:") + ' ' + task.ToString();
             if (iconText.Length >= 64)
                 iconText = iconText.Remove(60) + "...";

branches/eraser6/pluginsRewrite/Eraser/ProgressForm.cs

@@ -49 +49 @@
 
             //Register the event handlers
-            jobTitle.Text = task.UIText;
+            jobTitle.Text = task.ToString();
             task.ProgressChanged += task_ProgressChanged;
             task.TaskFinished += task_TaskFinished;

branches/eraser6/pluginsRewrite/Eraser/SchedulerPanel.cs

@@ -65 +65 @@
         {
             //Add the item to the list view
-            ListViewItem item = scheduler.Items.Add(task.UIText);
+            ListViewItem item = scheduler.Items.Add(task.ToString());
             item.SubItems.Add(string.Empty);
             item.SubItems.Add(string.Empty);
@@ -92 +92 @@
 
             //Set the task name
-            item.Text = task.UIText;
+            item.Text = task.ToString();
 
             //Set the next run time of the task
@@ -144 +144 @@
             {
                 parent.ShowNotificationBalloon(S._("New task added"), S._("{0} " +
-                    "has just been added to the list of tasks.", e.Task.UIText),
+                    "has just been added to the list of tasks.", e.Task.ToString()),
                     ToolTipIcon.Info);
             }
@@ -277 +277 @@
                 {
                     case LogLevel.Warning:
-                        message = S._("The task {0} has completed with warnings.", task.UIText);
+                        message = S._("The task {0} has completed with warnings.", task);
                         icon = ToolTipIcon.Warning;
                         break;
                     case LogLevel.Error:
-                        message = S._("The task {0} has completed with errors.", task.UIText);
+                        message = S._("The task {0} has completed with errors.", task);
                         icon = ToolTipIcon.Error;
                         break;
                     case LogLevel.Fatal:
-                        message = S._("The task {0} did not complete.", task.UIText);
+                        message = S._("The task {0} did not complete.", task);
                         icon = ToolTipIcon.Error;
                         break;
                     default:
-                        message = S._("The task {0} has completed.", task.UIText);
+                        message = S._("The task {0} has completed.", task);
                         icon = ToolTipIcon.Info;
                         break;