Context Navigation

Changeset 3394 for trunk

Timestamp:

04/18/10 03:01:25 (15 years ago)

Author:

mkommend

Message:

adapted mainforms to have a ShowInViewHost property (ticket #972)

Location:

trunk/sources

Files:

-                      r2963
+                      r3394
       InitializeComponent();
+    }
     public DockingMainForm(Type userInterfaceItemType)
       : base(userInterfaceItemType) {
       InitializeComponent();
+    }
+    public DockingMainForm(Type userInterfaceItemType, bool showInViewHost)
+      : this(userInterfaceItemType) {
+      this.ShowInViewHost = showInViewHost;
+    }
 …
     protected override Form CreateForm(IView view) {
+      return new DockForm(view);
+      DockForm form;
+      IContentView contentView = view as IContentView;
+      if (ShowInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
+        ViewHost viewHost = new ViewHost(contentView.Content);
+        form = new DockForm(viewHost);
+      } else
+        form = new DockForm(view);
+      return form;
+    }

-                      r3301
+                      r3394
     #region properties
+    private bool showInViewHost;
+    public bool ShowInViewHost {
+      get { return this.showInViewHost; }
+      set { this.showInViewHost = value; }
+    }
     public string Title {
       get { return this.Text; }

-                      r2790
+                      r3394
       InitializeComponent();
+    }
     public MultipleDocumentMainForm(Type userInterfaceType)
       : base(userInterfaceType) {
       InitializeComponent();
+    }
+    public MultipleDocumentMainForm(Type userInterfaceItemType, bool showInViewHost)
+      : this(userInterfaceItemType) {
+      this.ShowInViewHost = showInViewHost;
+    }
 …
     protected override Form CreateForm(IView view) {
+      Form form = new DocumentForm(view);
+      Form form;
+      IContentView contentView = view as IContentView;
+      if (ShowInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
+        ViewHost viewHost = new ViewHost(contentView.Content);
+        form = new DocumentForm(viewHost);
+      } else
+        form = new DocumentForm(view);
       form.MdiParent = this;
       return form;

-                      r2790
+                      r3394
       InitializeComponent();
+    }
     public SingleDocumentMainForm(Type userInterfaceItemType)
       : base(userInterfaceItemType) {
       InitializeComponent();
+    }
+    public SingleDocumentMainForm(Type userInterfaceItemType, bool showInViewHost)
+      : this(userInterfaceItemType) {
+      this.ShowInViewHost = showInViewHost;
+    }
 …
     protected override Form CreateForm(IView view) {
+      DocumentForm form = new DocumentForm(view);
+      Form form;
+      IContentView contentView = view as IContentView;
+      if (ShowInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
+        ViewHost viewHost = new ViewHost(contentView.Content);
+        form = new DocumentForm(viewHost);
+      } else
+        form = new DocumentForm(view);
       form.ShowInTaskbar = true;
       return form;

r3391	r3394
130	130	cachedViews.Add(viewType, view);
131	131	}
	132	this.Caption = view.Caption;
	133	this.SaveEnabled = view.SaveEnabled;
132	134
133	135	Control control = (Control)view;

r3384	r3394
40	40	public override void Run() {
41	41	OptimizerMainForm mainForm = new OptimizerMainForm(typeof(IOptimizerUserInterfaceItemProvider));
	42	mainForm.ShowInViewHost = true;
42	43	Application.Run(mainForm);
43	44	}

-                      r3376
+                      r3394
       InitializeComponent();
+    }
     public OptimizerMainForm(Type userInterfaceItemType)
       : base(userInterfaceItemType) {
       InitializeComponent();
+    }
+    public OptimizerMainForm(Type userInterfaceItemType, bool showInViewHost)
+      : this(userInterfaceItemType) {
+      this.ShowInViewHost = showInViewHost;
+    }

Note: See TracChangeset for help on using the changeset viewer.