Changeset 2485


Ignore:
Timestamp:
03/13/12 23:05:24 (2 years ago)
Author:
lowjoel
Message:

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

Location:
branches/eraser6/pluginsRewrite
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/eraser6/pluginsRewrite/Eraser.Manager/Task.cs

    r2484 r2485  
    126126        /// The name of the task, used for display in UI elements. 
    127127        /// </summary> 
    128         public string ToString() 
     128        public override string ToString() 
    129129        { 
    130130            //Simple case, the task name was given by the user. 
  • branches/eraser6/pluginsRewrite/Eraser/LogForm.cs

    r1886 r2485  
    4343 
    4444            //Update the title 
    45             Text = string.Format(CultureInfo.InvariantCulture, "{0} - {1}", Text, task.UIText); 
     45            Text = string.Format(CultureInfo.InvariantCulture, "{0} - {1}", Text, task); 
    4646 
    4747            //Populate the list of sessions 
  • branches/eraser6/pluginsRewrite/Eraser/MainForm.cs

    r2344 r2485  
    365365 
    366366            Task task = (Task)sender; 
    367             string iconText = S._("Eraser") + " - " + S._("Processing:") + ' ' + task.UIText; 
     367            string iconText = S._("Eraser") + " - " + S._("Processing:") + ' ' + task.ToString(); 
    368368            if (iconText.Length >= 64) 
    369369                iconText = iconText.Remove(60) + "..."; 
  • branches/eraser6/pluginsRewrite/Eraser/ProgressForm.cs

    r2445 r2485  
    4949 
    5050            //Register the event handlers 
    51             jobTitle.Text = task.UIText; 
     51            jobTitle.Text = task.ToString(); 
    5252            task.ProgressChanged += task_ProgressChanged; 
    5353            task.TaskFinished += task_TaskFinished; 
  • branches/eraser6/pluginsRewrite/Eraser/SchedulerPanel.cs

    r2452 r2485  
    6565        { 
    6666            //Add the item to the list view 
    67             ListViewItem item = scheduler.Items.Add(task.UIText); 
     67            ListViewItem item = scheduler.Items.Add(task.ToString()); 
    6868            item.SubItems.Add(string.Empty); 
    6969            item.SubItems.Add(string.Empty); 
     
    9292 
    9393            //Set the task name 
    94             item.Text = task.UIText; 
     94            item.Text = task.ToString(); 
    9595 
    9696            //Set the next run time of the task 
     
    144144            { 
    145145                parent.ShowNotificationBalloon(S._("New task added"), S._("{0} " + 
    146                     "has just been added to the list of tasks.", e.Task.UIText), 
     146                    "has just been added to the list of tasks.", e.Task.ToString()), 
    147147                    ToolTipIcon.Info); 
    148148            } 
     
    277277                { 
    278278                    case LogLevel.Warning: 
    279                         message = S._("The task {0} has completed with warnings.", task.UIText); 
     279                        message = S._("The task {0} has completed with warnings.", task); 
    280280                        icon = ToolTipIcon.Warning; 
    281281                        break; 
    282282                    case LogLevel.Error: 
    283                         message = S._("The task {0} has completed with errors.", task.UIText); 
     283                        message = S._("The task {0} has completed with errors.", task); 
    284284                        icon = ToolTipIcon.Error; 
    285285                        break; 
    286286                    case LogLevel.Fatal: 
    287                         message = S._("The task {0} did not complete.", task.UIText); 
     287                        message = S._("The task {0} did not complete.", task); 
    288288                        icon = ToolTipIcon.Error; 
    289289                        break; 
    290290                    default: 
    291                         message = S._("The task {0} has completed.", task.UIText); 
     291                        message = S._("The task {0} has completed.", task); 
    292292                        icon = ToolTipIcon.Info; 
    293293                        break; 
Note: See TracChangeset for help on using the changeset viewer.