Changeset 1497 for trunk/eraser6

Timestamp:

1/11/2010 3:52:47 AM (3 years ago)

Author:

lowjoel

Message:

fixes #295: Tasks name excessive when alot of files selected to be removed in one go

The new behaviour is to list only the file name bit (ignoring the full path), and listing all only if there are less than 5 entries. After the task contains 5 or more targets, we will only use the file names of the first, the median and the last element, followed by the number of other targets not included in the summary.

Location:

trunk/eraser6/Eraser.Manager

Files:

• Strings.en.resx (modified) (1 diff)
• Strings.it.resx (modified) (1 diff)
• Strings.nl.resx (modified) (1 diff)
• Strings.resx (modified) (1 diff)
• Task.cs (modified) (2 diffs)

trunk/eraser6/Eraser.Manager/Strings.en.resx

@@ -283 +283 @@
     <value>An invalid type was found when loading the task schedule</value>
   </data>
+  <data name="{0} and {1} other files" xml:space="preserve">
+    <value>{0} and {1} other files</value>
+  </data>
   <data name="The schedule provided can only belong to one task at a time" xml:space="preserve">
     <value>The schedule provided can only belong to one task at a time</value>

trunk/eraser6/Eraser.Manager/Strings.it.resx

@@ -283 +283 @@
     <value>Un tipo non valido è stato trovato durante il caricamento della pianificazione dell'operazione</value>
   </data>
+  <data name="{0} and {1} other files" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="The schedule provided can only belong to one task at a time" xml:space="preserve">
     <value>La pianificazione definita può riferirsi solo ad un operazione alla volta</value>

trunk/eraser6/Eraser.Manager/Strings.nl.resx

@@ -283 +283 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="{0} and {1} other files" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="The schedule provided can only belong to one task at a time" xml:space="preserve">
     <value>(Untranslated)</value>

trunk/eraser6/Eraser.Manager/Strings.resx

@@ -283 +283 @@
     <value>An invalid type was found when loading the task schedule</value>
   </data>
+  <data name="{0} and {1} other files" xml:space="preserve">
+    <value>{0} and {1} other files</value>
+  </data>
   <data name="The schedule provided can only belong to one task at a time" xml:space="preserve">
     <value>The schedule provided can only belong to one task at a time</value>

trunk/eraser6/Eraser.Manager/Task.cs

@@ -118 +118 @@
 
                 string result = string.Empty;
-                if (Targets.Count < 3)
+                if (Targets.Count < 5)
+                {
                     //Simpler case, small set of data.
                     foreach (ErasureTarget tgt in Targets)
                         result += tgt.UIText + ", ";
+
+                    return result.Remove(result.Length - 2);
+                }
                 else
+                {
                     //Ok, we've quite a few entries, get the first, the mid and the end.
-                    for (int i = 0; i < Targets.Count; i += Targets.Count / 3)
-                        result += Targets[i].UIText + ", ";
-                return result.Substring(0, result.Length - 2);
+                    result = Targets[0].UIText + ", ";
+                    result += Targets[Targets.Count / 2].UIText + ", ";
+                    result += Targets[Targets.Count - 1].UIText;
+
+                    return S._("{0} and {1} other files", result, Targets.Count - 3);
+                }
             }
         }
@@ -456 +464 @@
         public override string UIText
         {
-            get { return Path; }
+            get { return System.IO.Path.GetFileName(Path); }
         }