Changeset 9851

Timestamp:

08/06/13 12:15:20 (11 years ago)

Author:

jkarder

Message:

#1042: fixed file name shown in ProgressView overlays

File:

• trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -99 +99 @@
         else {
           MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().SetAppStartingCursor();
-          SetEnabledStateOfContentViews(content, false);
+          SetSaveOperationProgressInContentViews(content, true);
           ContentManager.SaveAsync(content, content.Filename, true, SavingCompleted);
         }
@@ -124 +124 @@
         if (saveFileDialog.ShowDialog() == DialogResult.OK) {
           MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().SetAppStartingCursor();
-          SetEnabledStateOfContentViews(content, false);
+          SetSaveOperationProgressInContentViews(content, true, saveFileDialog.FileName);
           if (saveFileDialog.FilterIndex == 1) {
             ContentManager.SaveAsync(content, saveFileDialog.FileName, false, SavingCompleted);
@@ -142 +142 @@
       }
       finally {
-        SetEnabledStateOfContentViews(content, true);
+        SetSaveOperationProgressInContentViews(content, false);
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().ResetAppStartingCursor();
       }
     }
 
-    private static void SetEnabledStateOfContentViews(IStorableContent content, bool enabled) {
+    private static void SetSaveOperationProgressInContentViews(IStorableContent content, bool showProgress, string fileName = null) {
       HeuristicLab.MainForm.WindowsForms.MainForm mainForm = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>();
       #region Mono Compatibility
       // removed the InvokeRequired check because of Mono
       mainForm.Invoke((Action)delegate {
-        if (enabled)
+        if (showProgress) {
+          var progress = new Progress(string.Format("Saving file \"{0}\"...", Path.GetFileName(fileName ?? content.Filename)));
+          mainForm.AddOperationProgressToContent(content, progress);
+        } else
           mainForm.RemoveOperationProgressFromContent(content);
-        else
-          mainForm.AddOperationProgressToContent(content, new Progress(string.Format("Saving file \"{0}\"...", Path.GetFileName(content.Filename))));
       });
       #endregion