Changeset 17825 for branches/3040_VectorBasedGP/HeuristicLab.MainForm.WindowsForms

Timestamp:

01/27/21 14:10:56 (4 years ago)

Author:

pfleck

Message:

#3040 Merged trunk into branch.

Location:

branches/3040_VectorBasedGP

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (8 diffs)

branches/3040_VectorBasedGP/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -179 +179 @@
 
     private void UpdateProgressValue() {
+      if (Disposing || IsDisposed) return;
       if (InvokeRequired) {
         Invoke((Action)UpdateProgressValue);

branches/3040_VectorBasedGP/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -170 +170 @@
     }
 
+
     private void OnViewTypeChanged() {
-      if (viewType != null) {
-        if (!ViewCanShowContent(viewType, Content))
-          throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
-                                                            viewType, Content.GetType()));
-        IContentView view = MainFormManager.CreateView(viewType);
-        view.Locked = Locked;
-        view.ReadOnly = ReadOnly;
-        ActiveView = view; //necessary to allow the views to change the status of the viewhost
-        view.Content = Content;
-
-        UpdateActiveMenuItem();
-      }
+      if (viewType == null) return;
+      if (!ViewCanShowContent(viewType, Content))
+        throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".", viewType, Content.GetType()));
+
+      IContentView view = MainFormManager.CreateView(viewType);
+      view.Locked = Locked;
+      view.ReadOnly = ReadOnly;
+      ActiveView = view; //necessary to allow the views to change the status of the viewhost
+      view.Content = Content;
+
+      UpdateActiveMenuItem();
+
     }
 
@@ -188 +189 @@
       activeView.CaptionChanged += new EventHandler(activeView_CaptionChanged);
       activeView.LockedChanged += new EventHandler(activeView_LockedChanged);
+      activeView.ReadOnlyChanged += new EventHandler(activeView_ReadOnlyChanged);
       activeView.Changed += new EventHandler(activeView_Changed);
     }
@@ -193 +195 @@
       activeView.CaptionChanged -= new EventHandler(activeView_CaptionChanged);
       activeView.LockedChanged -= new EventHandler(activeView_LockedChanged);
+      activeView.ReadOnlyChanged -= new EventHandler(activeView_ReadOnlyChanged);
       activeView.Changed -= new EventHandler(activeView_Changed);
     }
@@ -202 +205 @@
       configurationLabel.Enabled = !activeView.Locked;
     }
+    private void activeView_ReadOnlyChanged(object sender, EventArgs e) {
+      ReadOnly = activeView.ReadOnly;
+    }
+
     private void activeView_Changed(object sender, EventArgs e) {
       OnChanged();
@@ -228 +235 @@
 
     #region forwarding of view events
-    internal protected override void OnShown(ViewShownEventArgs e) {
+    protected internal override void OnShown(ViewShownEventArgs e) {
       base.OnShown(e);
       View view = ActiveView as View;
@@ -234 +241 @@
         view.OnShown(e);
     }
-    internal protected override void OnHidden(EventArgs e) {
+    protected internal override void OnHidden(EventArgs e) {
       base.OnHidden(e);
       View view = ActiveView as View;
@@ -240 +247 @@
         view.OnHidden(e);
     }
-    internal protected override void OnClosing(FormClosingEventArgs e) {
+    protected internal override void OnClosing(FormClosingEventArgs e) {
       base.OnClosing(e);
       View view = ActiveView as View;
@@ -246 +253 @@
         view.OnClosing(e);
     }
-    internal protected override void OnClosed(FormClosedEventArgs e) {
+    protected internal override void OnClosed(FormClosedEventArgs e) {
       base.OnClosed(e);
       View view = ActiveView as View;