Changeset 7013 for trunk

Timestamp:

11/17/11 14:09:13 (13 years ago)

Author:

ascheibe

Message:

#1652 implemented reviewing comments:

• deleted resource files
• moved UpdateTitle and OnInitialized code to Optimizer*MainForm

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (4 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MainFormTypeSelectionDialog.resx (deleted)
• HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.cs (modified) (4 diffs)
• HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.resx (deleted)
• HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.cs (modified) (4 diffs)
• HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -34 +33 @@
     private int appStartingCursors;
     private int waitingCursors;
-    private string title;
 
     protected MainForm()
@@ -177 +175 @@
     }
 
-    protected virtual void OnInitialized(EventArgs e) {
-      AssemblyFileVersionAttribute version = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).
-                                             Cast<AssemblyFileVersionAttribute>().FirstOrDefault();
-      title = "HeuristicLab Optimizer";
-      if (version != null) title += " " + version.Version;
-      Title = title;
-    }
+    protected virtual void OnInitialized(EventArgs e) { }
+
+    public virtual void UpdateTitle() { }
 
     private void FormActivated(object sender, EventArgs e) {
@@ -498 +492 @@
     }
     #endregion
-
-    public virtual void UpdateTitle() {
-      if (InvokeRequired)
-        Invoke(new Action(UpdateTitle));
-      else {
-        IContentView activeView = ActiveView as IContentView;
-        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
-          IStorableContent content = (IStorableContent)activeView.Content;
-          Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";
-        } else {
-          Title = title;
-        }
-      }
-    }
   }
 }

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -120 +120 @@
     <EmbeddedResource Include="Documents\VNS_TSP.hl" />
     <EmbeddedResource Include="Documents\PSO_Schwefel.hl" />
-    <EmbeddedResource Include="MainFormTypeSelectionDialog.resx">
-      <DependentUpon>MainFormTypeSelectionDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="OptimizerDockingMainForm.resx">
-      <DependentUpon>OptimizerDockingMainForm.cs</DependentUpon>
-    </EmbeddedResource>
     <None Include="Plugin.cs.frame" />
     <Compile Include="OptimizerSingleDocumentMainForm.cs">

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -32 +33 @@
 namespace HeuristicLab.Optimizer {
   internal partial class OptimizerDockingMainForm : DockingMainForm {
+    private string title;
 
     private Clipboard<IItem> clipboard;
@@ -53 +55 @@
     protected override void OnInitialized(EventArgs e) {
       base.OnInitialized(e);
+
+      AssemblyFileVersionAttribute version = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).
+                                         Cast<AssemblyFileVersionAttribute>().FirstOrDefault();
+      title = "HeuristicLab Optimizer";
+      if (version != null) title += " " + version.Version;
+      Title = title;
 
       ContentManager.Initialize(new PersistenceContentManager());
@@ -96 +104 @@
       UpdateTitle();
     }
+
+    public override void UpdateTitle() {
+      if (InvokeRequired)
+        Invoke(new Action(UpdateTitle));
+      else {
+        IContentView activeView = ActiveView as IContentView;
+        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
+          IStorableContent content = (IStorableContent)activeView.Content;
+          Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";
+        } else {
+          Title = title;
+        }
+      }
+    }
   }
 }

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -32 +33 @@
 namespace HeuristicLab.Optimizer {
   internal partial class OptimizerMultipleDocumentMainForm : MultipleDocumentMainForm {
+    private string title;
 
     private Clipboard<IItem> clipboard;
@@ -53 +55 @@
     protected override void OnInitialized(EventArgs e) {
       base.OnInitialized(e);
+
+      AssemblyFileVersionAttribute version = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).
+                                         Cast<AssemblyFileVersionAttribute>().FirstOrDefault();
+      title = "HeuristicLab Optimizer";
+      if (version != null) title += " " + version.Version;
+      Title = title;
 
       ContentManager.Initialize(new PersistenceContentManager());
@@ -96 +104 @@
       UpdateTitle();
     }
+
+    public override void UpdateTitle() {
+      if (InvokeRequired)
+        Invoke(new Action(UpdateTitle));
+      else {
+        IContentView activeView = ActiveView as IContentView;
+        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
+          IStorableContent content = (IStorableContent)activeView.Content;
+          Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";
+        } else {
+          Title = title;
+        }
+      }
+    }
   }
 }

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -32 +33 @@
 namespace HeuristicLab.Optimizer {
   internal partial class OptimizerSingleDocumentMainForm : SingleDocumentMainForm {
+    private string title;
 
     private Clipboard<IItem> clipboard;
@@ -53 +55 @@
     protected override void OnInitialized(EventArgs e) {
       base.OnInitialized(e);
+
+      AssemblyFileVersionAttribute version = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).
+                                         Cast<AssemblyFileVersionAttribute>().FirstOrDefault();
+      title = "HeuristicLab Optimizer";
+      if (version != null) title += " " + version.Version;
+      Title = title;
 
       ContentManager.Initialize(new PersistenceContentManager());
@@ -96 +104 @@
       UpdateTitle();
     }
+
+    public override void UpdateTitle() {
+      if (InvokeRequired)
+        Invoke(new Action(UpdateTitle));
+      else {
+        IContentView activeView = ActiveView as IContentView;
+        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
+          IStorableContent content = (IStorableContent)activeView.Content;
+          Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";
+        } else {
+          Title = title;
+        }
+      }
+    }
   }
 }