Changeset 1418 for branches/eraser6/BlackBox

Timestamp:

12/23/2009 6:15:52 AM (3 years ago)

Author:

lowjoel

Message:

Allow users to cancel the submission of the report.

Location:

branches/eraser6/BlackBox/Eraser

Files:

• BlackBoxUploadForm.cs (modified) (5 diffs)
• Strings.NL.resx (modified) (1 diff)
• Strings.en.resx (modified) (1 diff)
• Strings.it.resx (modified) (1 diff)
• Strings.resx (modified) (1 diff)

branches/eraser6/BlackBox/Eraser/BlackBoxUploadForm.cs

@@ -67 +67 @@
                 if (!uploader.ReportIsNew())
                     continue;
-                
+
+                if (UploadWorker.CancellationPending)
+                    throw new OperationCanceledException();
+
                 //No similar reports have been uploaded. Compress the report.
                 UploadWorker.ReportProgress(baseProgress,
@@ -77 +80 @@
                             S._("Compressing Report {0}: {1}%",
                                 reports[i].Name, progress.ProgressPercentage));
+
+                        if (UploadWorker.CancellationPending)
+                            throw new OperationCanceledException();
                     });
 
@@ -88 +94 @@
                             S._("Uploading Report {0}: {1}%",
                                 reports[i].Name, progress.ProgressPercentage));
+
+                        if (UploadWorker.CancellationPending)
+                            throw new OperationCanceledException();
                     });
             }
@@ -104 +113 @@
             {
                 ProgressLbl.Text = S._("Reports submitted successfully.");
+                ProgressPb.Value = ProgressPb.Maximum;
+                CancelBtn.Text = S._("Close");
+            }
+            else if (e.Error is OperationCanceledException)
+            {
+                ProgressLbl.Text = S._("Submission was cancelled.");
                 ProgressPb.Value = ProgressPb.Maximum;
                 CancelBtn.Text = S._("Close");
@@ -258 +273 @@
                 reportRequest.ContentType = "multipart/form-data; boundary=" + builder.Boundary;
                 reportRequest.Method = "POST";
+                reportRequest.Timeout = int.MaxValue;
                 using (Stream formStream = builder.Stream)
                 {

branches/eraser6/BlackBox/Eraser/Strings.NL.resx

@@ -154 +154 @@
     <value>Sluiten</value>
   </data>
+  <data name="Submission was cancelled." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Unknown crash report server response." xml:space="preserve">
     <value>(Untranslated)</value>

branches/eraser6/BlackBox/Eraser/Strings.en.resx

@@ -154 +154 @@
     <value>Close</value>
   </data>
+  <data name="Submission was cancelled." xml:space="preserve">
+    <value>Submission was cancelled.</value>
+  </data>
   <data name="Unknown crash report server response." xml:space="preserve">
     <value>Unknown crash report server response.</value>

branches/eraser6/BlackBox/Eraser/Strings.it.resx

@@ -154 +154 @@
     <value>Chiudi</value>
   </data>
+  <data name="Submission was cancelled." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Unknown crash report server response." xml:space="preserve">
     <value>(Untranslated)</value>

branches/eraser6/BlackBox/Eraser/Strings.resx

@@ -154 +154 @@
     <value>Close</value>
   </data>
+  <data name="Submission was cancelled." xml:space="preserve">
+    <value>Submission was cancelled.</value>
+  </data>
   <data name="Unknown crash report server response." xml:space="preserve">
     <value>Unknown crash report server response.</value>