Changeset 11748 for stable/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs

Timestamp:

01/13/15 13:15:03 (9 years ago)

Author:

ascheibe

Message:

#2158 merged r11555,r11557,r11592,r11736 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs) (1 diff)

stable/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs

@@ -27 +27 @@
 namespace HeuristicLab.Core.Views {
   public partial class NestingLevelErrorControl : UserControl {
-    public Func<IContent> Content { get; set; }
+    private Func<IContent> Content { get; set; }
+    private Type ViewType { get; set; }
 
-    public NestingLevelErrorControl() {
+    public NestingLevelErrorControl(Func<IContent> content, Type viewType)
+      : base() {
       InitializeComponent();
+      Content = content;
+      ViewType = viewType;
     }
 
     private void showButton_Click(object sender, System.EventArgs e) {
-      if (Content != null) {
-        if (MainFormManager.MainForm.ShowContent(Content()) == null) {
-          using (TypeSelectorDialog dialog = new TypeSelectorDialog()) {
-            dialog.Caption = "Unable to find view for content. Please choose a appropriate view.";
-            dialog.TypeSelector.Configure(typeof(IContentView), false, false);
-
-            if (dialog.ShowDialog(this) == DialogResult.OK) {
-              MainFormManager.MainForm.ShowContent(Content(), dialog.TypeSelector.SelectedType);
-            }
-          }
-        }
+      if (Content != null && ViewType != null) {
+        MainFormManager.MainForm.ShowContent(Content(), ViewType);
       }
     }