Changeset 11591 for branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3

Timestamp:

11/27/14 09:35:43 (10 years ago)

Author:

jkarder

Message:

#2116: reverted to r10041

Location:

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3

Files:

• Controls/BreadcrumbControl.Designer.cs (deleted)
• Controls/BreadcrumbControl.cs (deleted)
• Controls/ViewContextMenuStrip.cs (modified) (4 diffs)
• Controls/ViewHost.Designer.cs (modified) (5 diffs)
• Controls/ViewHost.cs (modified) (12 diffs)
• HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (1 diff)
• MainForms/MainForm.cs (modified) (4 diffs)
• Views/View.cs (modified) (2 diffs)

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs

@@ -30 +30 @@
     public ViewContextMenuStrip() {
       InitializeComponent();
-      menuItems = new Dictionary<Type, ToolStripMenuItem>();
-      ignoredViewTypes = new List<Type>();
+      this.menuItems = new Dictionary<Type, ToolStripMenuItem>();
+      this.ignoredViewTypes = new List<Type>();
     }
 
     public ViewContextMenuStrip(IContainer container)
       : base(container) {
-      InitializeComponent();
-      menuItems = new Dictionary<Type, ToolStripMenuItem>();
-      ignoredViewTypes = new List<Type>();
-      ShowBreadcrumbsToolStripMenuItem = new ToolStripMenuItem("Show Breadcrumbs");
-      ShowBreadcrumbsToolStripMenuItem.Click += ShowBreadcrumbsToolStripMenuItem_Click;
-      ShowBreadcrumbsToolStripMenuItem.CheckedChanged += ShowBreadcrumbsToolStripMenuItem_CheckedChanged;
+        InitializeComponent();
+      this.menuItems = new Dictionary<Type, ToolStripMenuItem>();
+      this.ignoredViewTypes = new List<Type>();
     }
 
     private object item;
     public object Item {
-      get { return item; }
+      get { return this.item; }
       set {
-        if (item != value) {
-          item = value;
-          RefreshMenuItems();
+        if (this.item != value) {
+          this.item = value;
+          this.RefreshMenuItems();
         }
       }
@@ -57 +54 @@
     private List<Type> ignoredViewTypes;
     public IEnumerable<Type> IgnoredViewTypes {
-      get { return ignoredViewTypes; }
-      set { ignoredViewTypes = new List<Type>(value); RefreshMenuItems(); }
+      get { return this.ignoredViewTypes; }
+      set { this.ignoredViewTypes = new List<Type>(value); RefreshMenuItems(); }
     }
 
     private Dictionary<Type, ToolStripMenuItem> menuItems;
     public IEnumerable<KeyValuePair<Type, ToolStripMenuItem>> MenuItems {
-      get { return menuItems; }
+      get { return this.menuItems; }
     }
-
-    public ToolStripMenuItem ShowBreadcrumbsToolStripMenuItem { get; private set; }
 
     private void RefreshMenuItems() {
@@ -73 +68 @@
         foreach (ToolStripMenuItem m in menuItems.Values)
           m.Dispose();
-        Items.Clear();
-        menuItems.Clear();
+        this.Items.Clear();
+        this.menuItems.Clear();
 
-        if (item != null) {
+        if (this.item != null) {
           ToolStripMenuItem menuItem;
           IEnumerable<Type> types = MainFormManager.GetViewTypes(item.GetType(), true);
@@ -84 +79 @@
             menuItem.Text = ViewAttribute.GetViewName(t);
 
-            menuItems.Add(t, menuItem);
-            Items.Add(menuItem);
+            this.menuItems.Add(t, menuItem);
+            this.Items.Add(menuItem);
           }
-          if (Items.Count > 0)
-            Items.Add(new ToolStripSeparator());
-          Items.Add(ShowBreadcrumbsToolStripMenuItem);
         }
       }
     }
-
-    public event EventHandler ShowBreadcrumbsChanged;
-    private void OnShowBreadcrumbsChanged() {
-      var handler = ShowBreadcrumbsChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    private void ShowBreadcrumbsToolStripMenuItem_CheckedChanged(object sender, EventArgs e) {
-      OnShowBreadcrumbsChanged();
-    }
-
-    private void ShowBreadcrumbsToolStripMenuItem_Click(object sender, EventArgs e) {
-      ShowBreadcrumbsToolStripMenuItem.Checked = !ShowBreadcrumbsToolStripMenuItem.Checked;
-    }
   }
 }

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs

@@ -52 +52 @@
       this.configurationLabel = new System.Windows.Forms.Label();
       this.helpLabel = new System.Windows.Forms.Label();
-      this.breadcrumbControl = new HeuristicLab.MainForm.WindowsForms.BreadcrumbControl();
       this.SuspendLayout();
       // 
@@ -87 +86 @@
       this.viewContextMenuStrip.Name = "viewContextMenuStrip";
       this.viewContextMenuStrip.Size = new System.Drawing.Size(61, 4);
-      this.viewContextMenuStrip.ShowBreadcrumbsChanged += new System.EventHandler(this.viewContextMenuStrip_ShowBreadcrumbsChanged);
       this.viewContextMenuStrip.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.viewContextMenuStrip_ItemClicked);
       // 
@@ -116 +114 @@
       this.helpLabel.DoubleClick += new System.EventHandler(this.helpLabel_DoubleClick);
       // 
-      // breadcrumbControl
-      // 
-      this.breadcrumbControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.breadcrumbControl.Location = new System.Drawing.Point(0, 0);
-      this.breadcrumbControl.Name = "breadcrumbControl";
-      this.breadcrumbControl.Size = new System.Drawing.Size(202, 15);
-      this.breadcrumbControl.TabIndex = 4;
-      this.breadcrumbControl.ViewHost = null;
-      // 
       // ViewHost
       // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.Controls.Add(this.breadcrumbControl);
       this.Controls.Add(this.helpLabel);
       this.Controls.Add(this.viewsLabel);
@@ -136 +124 @@
       this.Name = "ViewHost";
       this.Size = new System.Drawing.Size(227, 184);
-      this.VisibleChanged += new System.EventHandler(this.ViewHost_VisibleChanged);
       this.ResumeLayout(false);
 
@@ -148 +135 @@
     private System.Windows.Forms.Label configurationLabel;
     private System.Windows.Forms.Label helpLabel;
-    private BreadcrumbControl breadcrumbControl;
 
   }

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -33 +33 @@
       InitializeComponent();
       startDragAndDrop = false;
-      viewContextMenuStrip.IgnoredViewTypes = new List<Type> { typeof(ViewHost) };
+      viewContextMenuStrip.IgnoredViewTypes = new List<Type>() { typeof(ViewHost) };
 
       viewType = null;
@@ -41 +41 @@
       viewsLabel.Visible = false;
       viewsLabelVisible = true;
-
-      breadcrumbControl.ViewHost = this;
     }
 
@@ -53 +51 @@
           viewsLabel.Visible = value;
           View view = activeView as View;
-          if (view != null) AdjustActiveViewSize();
-        }
-      }
-    }
-
-    public bool HotlinkingEnabled { get; set; }
+          if (view != null) view.Dock = viewsLabelVisible ? DockStyle.None : DockStyle.Fill;
+        }
+      }
+    }
 
     private IContentView cachedView;
@@ -91 +87 @@
             #endregion
 
-            Caption = activeView.Caption;
+            this.Caption = activeView.Caption;
             viewType = activeView.GetType();
             RegisterActiveViewEvents();
@@ -97 +93 @@
             if (view != null) {
               view.Visible = true;
-              AdjustActiveViewSize();
+              if (ViewsLabelVisible) {
+                view.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
+                view.Size = new Size(Width - this.viewsLabel.Width - this.viewsLabel.Margin.Left - this.viewsLabel.Margin.Right, this.Height);
+              } else view.Dock = DockStyle.Fill;
               if (!Controls.Contains((view))) Controls.Add(view);
               view.OnShown(new ViewShownEventArgs(view, false));
@@ -126 +125 @@
       }
     }
-
-    public bool ShowBreadcrumbs {
-      get { return viewContextMenuStrip.ShowBreadcrumbsToolStripMenuItem.Checked; }
-      set { viewContextMenuStrip.ShowBreadcrumbsToolStripMenuItem.Checked = value; }
-    }
-
-    public IEnumerable<IContent> Breadcrumbs { get { return breadcrumbControl.Breadcrumbs; } }
 
     protected override void SetEnabledStateOfControls() {
@@ -159 +151 @@
       UpdateLabels();
       UpdateActiveMenuItem();
-      UpdateBreadcrumbControl();
     }
 
@@ -210 +201 @@
       OnChanged();
     }
-    private void ViewHost_VisibleChanged(object sender, EventArgs e) {
-      PerformOutermostViewHostDetection();
-    }
-    private void viewContextMenuStrip_ShowBreadcrumbsChanged(object sender, EventArgs e) {
-      UpdateBreadcrumbControl();
-      AdjustActiveViewSize();
-    }
 
     protected override void OnSizeChanged(EventArgs e) {
@@ -279 +263 @@
     }
 
-    private void UpdateBreadcrumbControl() {
-      breadcrumbControl.Visible = ShowBreadcrumbs && Content != null;
-      if (ShowBreadcrumbs)
-        UpdateBreadcrumbTrail(breadcrumbControl.Breadcrumbs, BuildBreadcrumbTrail());
-    }
-
     private bool ViewCanShowContent(Type viewType, object content) {
       if (content == null) // every view can display null
@@ -296 +274 @@
       IContentView view = MainFormManager.MainForm.ShowContent(this.Content, this.ViewType);
       if (view != null) {
-        view.ReadOnly = ReadOnly;
-        view.Locked = Locked;
+        view.ReadOnly = this.ReadOnly;
+        view.Locked = this.Locked;
       }
     }
@@ -307 +285 @@
     private bool startDragAndDrop;
     private void viewsLabel_MouseDown(object sender, MouseEventArgs e) {
-      if (e.Button == MouseButtons.Right) {
+      if (e.Button == System.Windows.Forms.MouseButtons.Right) {
         Screen screen = Screen.FromControl(viewsLabel);
-        int rightBorder = viewsLabel.PointToScreen(viewsLabel.Location).X + viewContextMenuStrip.Width;
+        int rightBorder = viewsLabel.PointToScreen(viewsLabel.Location).X + viewContextMenuStrip.Width; //
         rightBorder = rightBorder - screen.Bounds.X; //pixel position on active screen
 
@@ -341 +319 @@
     }
     #endregion
-
-    #region Helpers
-    private void AdjustActiveViewSize() {
-      var view = activeView as View;
-      if (view == null) return;
-      int width = viewsLabelVisible ? Width - viewsLabel.Width - viewsLabel.Margin.Left - viewsLabel.Margin.Right : Width;
-      int height = ShowBreadcrumbs ? Height - viewsLabel.Height - viewsLabel.Margin.Top - viewsLabel.Margin.Bottom : Height;
-      view.Location = new Point(0, Height - height);
-      view.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right;
-      view.Size = new Size(width, height);
-    }
-
-    private IEnumerable<IContent> BuildBreadcrumbTrail() {
-      var ll = new LinkedList<IContent>();
-      for (var control = (Control)this; control != null; control = control.Parent) {
-        var viewHost = control as ViewHost;
-        if (viewHost != null && viewHost.Content != null)
-          ll.AddFirst(viewHost.Content);
-      }
-      return ll;
-    }
-
-    public void UpdateBreadcrumbTrail(IEnumerable<IContent> oldCrumbs, IEnumerable<IContent> newCrumbs) {
-      if (!newCrumbs.Any()) return;
-      var ll = new LinkedList<IContent>();
-      if (newCrumbs.Contains(oldCrumbs.LastOrDefault())) {
-        foreach (var c in oldCrumbs) {
-          if (c != newCrumbs.First())
-            ll.AddLast(c);
-          else break;
-        }
-      }
-      foreach (var c in newCrumbs)
-        ll.AddLast(c);
-      breadcrumbControl.Breadcrumbs = ll;
-    }
-
-    private void PerformOutermostViewHostDetection() {
-      var parentContentViews = GetParentViewsOfType<ContentView>();
-      viewContextMenuStrip.ShowBreadcrumbsToolStripMenuItem.Checked = !parentContentViews.Any();
-    }
-    #endregion
   }
 }

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

@@ -120 +120 @@
   <ItemGroup>
     <Compile Include="ActionUserInterfaceItem.cs" />
-    <Compile Include="Controls\BreadcrumbControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\BreadcrumbControl.Designer.cs">
-      <DependentUpon>BreadcrumbControl.cs</DependentUpon>
-    </Compile>
     <Compile Include="Controls\DragOverTabControl.cs">
       <SubType>Component</SubType>

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -223 +223 @@
     }
 
-    public T GetOutermostControlOfType<T>(Control childControl) where T : Control {
-      if (childControl == null) throw new ArgumentNullException("childControl", "ChildControl cannot be null.");
-
-      T outermostControl = null;
-      for (var control = childControl; control != null; control = control.Parent) {
-        var c = control as T;
-        if (c != null) outermostControl = c;
-      }
-      return outermostControl;
-    }
-
     public IContentView ShowContent(IContent content) {
       if (content == null) throw new ArgumentNullException("Content cannot be null.");
@@ -241 +230 @@
     }
 
-    public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class, IContent {
+    public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class,IContent {
       if (content == null) throw new ArgumentNullException("Content cannot be null.");
       if (!reuseExistingView) return ShowContent(content);
@@ -273 +262 @@
         return view;
       }
-    }
-
-    public ViewHost ShowContentInOutermostViewHost(IContent content, Control childControl, bool requireHotlinking = false) {
-      if (content == null) throw new ArgumentNullException("content", "Content cannot be null.");
-      if (childControl == null) throw new ArgumentNullException("childControl", "ChildControl cannot be null.");
-
-      var outermostViewHost = GetOutermostControlOfType<ViewHost>(childControl);
-      if (outermostViewHost == null) return null;
-
-      if (!requireHotlinking || outermostViewHost.HotlinkingEnabled) {
-        var oldCrumbs = outermostViewHost.Breadcrumbs;
-        var newCrumbs = new LinkedList<IContent>();
-        for (var control = childControl; control != null; control = control.Parent) {
-          var vh = control as ViewHost;
-          if (vh != null && vh.Content != null)
-            newCrumbs.AddFirst(vh.Content);
-        }
-        bool showBreadcrumbs = outermostViewHost.ShowBreadcrumbs;
-        outermostViewHost.Content = null;
-        var viewType = MainFormManager.GetDefaultViewType(content.GetType());
-        outermostViewHost.ViewType = viewType;
-        outermostViewHost.Content = content;
-        outermostViewHost.UpdateBreadcrumbTrail(oldCrumbs, newCrumbs.Concat(new[] { content }));
-        outermostViewHost.ShowBreadcrumbs = showBreadcrumbs;
-      }
-      return outermostViewHost;
     }
 
@@ -587 +550 @@
       try {
         ((IActionUserInterfaceItem)item.Tag).Execute();
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, ex);
       }

branches/Breadcrumbs/HeuristicLab.MainForm.WindowsForms/3.3/Views/View.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -262 +261 @@
         ((Control)this).ResumeRepaint(refresh);
     }
-
-    public IEnumerable<T> GetParentViewsOfType<T>() where T : View {
-      for (var view = Parent; view != null; view = view.Parent)
-        if (view is View) yield return view as T;
-    }
   }
 }