Changeset 2837

Timestamp:

02/19/10 11:45:51 (14 years ago)

Author:

mkommend

Message:

added ViewAttribute and adapted ViewContextMenuStrip (ticket #857)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.2/ViewContextMenuStrip.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/ViewContextMenuStrip.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj (modified) (1 diff)
• HeuristicLab.MainForm/3.2/ViewAttribute.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm/3.2/ContentAttribute.cs) (1 diff)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ViewContextMenuStrip.Designer.cs

@@ -28 +28 @@
       // ViewContextMenuStrip
       // 
-      this.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ViewContextMenuStrip_ItemClicked);
       this.ResumeLayout(false);
-
     }
 

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ViewContextMenuStrip.cs

@@ -8 +8 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public partial class ViewContextMenuStrip : ContextMenuStrip {
-    private object item;
+  public sealed partial class ViewContextMenuStrip : ContextMenuStrip {
     public ViewContextMenuStrip() {
       InitializeComponent();
+      this.menuItems = new Dictionary<Type, ToolStripMenuItem>();
     }
 
-    public ViewContextMenuStrip(object item) :this() {
-      if (item != null) {
-        this.item = item;
-        IEnumerable<Type> types = MainFormManager.GetViewTypes(item.GetType());
-        if (types != null) {
-          foreach (Type t in types) {
-            ToolStripMenuItem menuItem = new ToolStripMenuItem() {
-              Text = t.Name,
-              Tag = t
-            };
-            this.Items.Add(menuItem);
-          }
+    public ViewContextMenuStrip(object item)
+      : this() {
+      this.Item = item;
+    }
+
+    private object item;
+    public object Item {
+      get { return this.item; }
+      set {
+        if (this.item != value) {
+          this.item = value;
+          this.RefreshMenuItems();
         }
       }
     }
 
-    private void ViewContextMenuStrip_ItemClicked(object sender, ToolStripItemClickedEventArgs e) {
-      if (item != null) {
-        Type viewType = e.ClickedItem.Tag as Type;
-        IView view = MainFormManager.CreateView(viewType, this.item);
-        view.Show();
+    private Dictionary<Type, ToolStripMenuItem> menuItems;
+    public IEnumerable<KeyValuePair<Type, ToolStripMenuItem>> MenuItems {
+      get { return this.menuItems; }
+    }
+
+    private void RefreshMenuItems() {
+      this.Items.Clear();
+      this.menuItems.Clear();
+
+      if (this.item != null) {
+        ToolStripMenuItem menuItem;
+        IEnumerable<Type> types = MainFormManager.GetViewTypes(item.GetType());
+        foreach (Type t in types) {
+          menuItem = new ToolStripMenuItem();
+          menuItem.Tag = t;
+          menuItem.Text = ViewAttribute.GetViewName(t);
+
+          this.menuItems.Add(t, menuItem);
+          this.Items.Add(menuItem);
+        }
       }
     }
-
   }
 }

trunk/sources/HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj

@@ -82 +82 @@
   <ItemGroup>
     <None Include="HeuristicLabMainFormPlugin.cs.frame" />
+    <Compile Include="ViewAttribute.cs" />
     <Compile Include="Interfaces\IContentView.cs" />
     <Compile Include="Interfaces\IActionUserInterfaceItem.cs" />

trunk/sources/HeuristicLab.MainForm/3.2/ViewAttribute.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.MainForm {
-  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-  public sealed class ContentAttribute : Attribute {
-    public ContentAttribute(Type contentType) {
-      this.contentType = contentType;
+  [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+  public sealed class ViewAttribute : Attribute {
+    public ViewAttribute(string name) {
+      this.name = name;
     }
 
-    public ContentAttribute(Type contentType, bool isDefaultView)
-      : this(contentType) {
-      this.isDefaultView = isDefaultView;
+    private string name;
+    public string Name {
+      get { return this.name; }
+      set { this.name = value; }
     }
 
-    private bool isDefaultView;
-    public bool IsDefaultView {
-      get { return this.isDefaultView; }
-      set { this.isDefaultView = value; }
-    }
-
-    private Type contentType;
-    public Type ContentType {
-      get { return this.contentType; }
-    }
-
-    public static bool HasContentAttribute(MemberInfo viewType) {
-      ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), false);
+    public static bool HasViewAttribute(MemberInfo viewType) {
+      ViewAttribute[] attributes = (ViewAttribute[])viewType.GetCustomAttributes(typeof(ViewAttribute), false);
       return attributes.Length != 0;
     }
 
-    public static bool CanViewType(MemberInfo viewType, Type content) {
-      ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), false);
-      return attributes.Any(a => content.IsAssignableTo(a.contentType));
-    }
-
-    internal static IEnumerable<Type> GetDefaultViewableTypes(Type viewType) {
-      ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), false);
-      return from a in attributes
-             where a.isDefaultView
-             select a.contentType;
-    }
-
-    internal static IEnumerable<Type> GetViewableTypes(Type viewType) {
-      ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), false);
-      return from a in attributes
-             select a.contentType;
+    public static string GetViewName(MemberInfo viewType) {
+      ViewAttribute[] attributes = (ViewAttribute[])viewType.GetCustomAttributes(typeof(ViewAttribute), false);
+      if (attributes.Length == 1)
+        return attributes[0].Name;
+      return viewType.Name;
     }
   }