Changeset 9977

Timestamp:

09/17/13 10:05:34 (11 years ago)

Author:

ascheibe

Message:

#2100 merged r9915-r9916, r9920-r9921, r9935 into stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs (modified) (4 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (3 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.Designer.cs) (3 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.cs) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (2 diffs)
• HeuristicLab.MainForm/3.3/ViewAttribute.cs (modified) (3 diffs)

stable/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs

@@ -51 +51 @@
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.configurationLabel = new System.Windows.Forms.Label();
+      this.helpLabel = new System.Windows.Forms.Label();
       this.SuspendLayout();
       // 
@@ -73 +74 @@
       this.viewsLabel.Size = new System.Drawing.Size(16, 16);
       this.viewsLabel.TabIndex = 0;
-      this.toolTip.SetToolTip(this.viewsLabel,
-        "Double-click to open a new window of the current view." + System.Environment.NewLine +
-        "Right-click to change current view." + System.Environment.NewLine +
-        "Drag icon to copy or link content to another view.");
+      this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view.\r\nRight-click to change cur" +
+        "rent view.\r\nDrag icon to copy or link content to another view.");
       this.viewsLabel.DoubleClick += new System.EventHandler(this.viewsLabel_DoubleClick);
       this.viewsLabel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.viewsLabel_MouseDown);
@@ -102 +101 @@
       this.configurationLabel.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.configurationLabel_DoubleClick);
       // 
+      // helpLabel
+      // 
+      this.helpLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.helpLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Help;
+      this.helpLabel.Location = new System.Drawing.Point(211, 44);
+      this.helpLabel.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+      this.helpLabel.Name = "helpLabel";
+      this.helpLabel.Size = new System.Drawing.Size(16, 16);
+      this.helpLabel.TabIndex = 3;
+      this.toolTip.SetToolTip(this.helpLabel, "Double-click to open help.");
+      this.helpLabel.Visible = false;
+      this.helpLabel.DoubleClick += new System.EventHandler(this.helpLabel_DoubleClick);
+      // 
       // ViewHost
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.helpLabel);
       this.Controls.Add(this.viewsLabel);
       this.Controls.Add(this.configurationLabel);
@@ -121 +134 @@
     private HeuristicLab.MainForm.WindowsForms.ViewContextMenuStrip viewContextMenuStrip;
     private System.Windows.Forms.Label configurationLabel;
+    private System.Windows.Forms.Label helpLabel;
 
   }

stable/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -103 +103 @@
           configurationLabel.Visible = activeView is IConfigureableView;
           configurationLabel.Enabled = activeView != null && !activeView.Locked;
+
+          helpLabel.Visible = activeView != null && ViewAttribute.HasHelpResourcePath(activeView.GetType());
+          helpLabel.Top = CalculateHelpLabelPosY();
         }
       }
@@ -210 +213 @@
       viewsLabel.Location = new Point(Width - viewsLabel.Margin.Right - viewsLabel.Width, viewsLabel.Margin.Top);
       configurationLabel.Location = new Point(Width - configurationLabel.Margin.Right - configurationLabel.Width, viewsLabel.Bottom + viewsLabel.Margin.Bottom + configurationLabel.Margin.Top);
-
+      helpLabel.Location = new Point(Width - helpLabel.Margin.Right - helpLabel.Width, CalculateHelpLabelPosY());
+    }
+
+    private int CalculateHelpLabelPosY() {
+      if (activeView != null && ViewAttribute.HasHelpResourcePath(activeView.GetType()) && !configurationLabel.Visible) {
+        return configurationLabel.Top;
+      }
+      return configurationLabel.Bottom + configurationLabel.Margin.Bottom + helpLabel.Margin.Top;
     }
 
@@ -302 +312 @@
       ((IConfigureableView)ActiveView).ShowConfiguration();
     }
+
+    private void helpLabel_DoubleClick(object sender, EventArgs e) {
+      using (InfoBox dialog = new InfoBox("Help for " + ViewAttribute.GetViewName(ActiveView.GetType()), ViewAttribute.GetHelpResourcePath(ActiveView.GetType()), ActiveView)) {
+        dialog.ShowDialog(this);
+      }
+    }
     #endregion
   }

stable/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.Designer.cs

@@ -59 +59 @@
       this.okButton.Text = "&OK";
       this.okButton.UseVisualStyleBackColor = true;
-      this.okButton.Click += new System.EventHandler(this.okButton_Click);
       // 
       // infoRichTextBox
@@ -78 +77 @@
       // InfoBox
       // 
+      this.AcceptButton = this.okButton;
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.ClientSize = new System.Drawing.Size(636, 494);
@@ -89 +89 @@
       this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
       this.Text = "Info Box";
+      this.Load += new System.EventHandler(this.InfoBox_Load);
       this.ResumeLayout(false);
 

stable/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.cs

@@ -27 +27 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   public partial class InfoBox : Form {
-    public string Caption {
-      get { return this.Text; }
-      set {
-        if (InvokeRequired)
-          Invoke(new Action<string>(x => this.Text = x), value);
-        else
-          this.Text = value;
-      }
+    protected string embeddedResourceName;
+    protected IView parentView;
+
+    public InfoBox(string caption, string embeddedResourceName, IView parentView) {
+      InitializeComponent();
+      this.Text = caption;
+      this.parentView = parentView;
+      this.embeddedResourceName = embeddedResourceName;
     }
 
-    protected string embeddedResourceName;
-    public string EmbeddedResourceName {
-      get { return embeddedResourceName; }
-      set {
-        if (InvokeRequired)
-          Invoke(new Action<string>(x => this.EmbeddedResourceName = x), value);
-        else {
-          embeddedResourceName = value;
-          LoadEmbeddedResource(embeddedResourceName);
-        }
-      }
-    }
-
-    public IView ParentView { get; set; }
-
-    public InfoBox() {
-      InitializeComponent();
-    }
-
-    public InfoBox(string caption, string embeddedResourceName, IView parentView)
-      : this() {
-      Caption = caption;
-      ParentView = parentView;
-      EmbeddedResourceName = embeddedResourceName;
-    }
-
-    protected virtual void LoadEmbeddedResource(string resourceName) {
-      string extension = Path.GetExtension(resourceName);
-      Assembly assembly = Assembly.GetAssembly(ParentView.GetType());
+    protected virtual void LoadEmbeddedResource() {
+      string extension = Path.GetExtension(embeddedResourceName);
+      Assembly assembly = Assembly.GetAssembly(parentView.GetType());
       try {
-        using (Stream stream = assembly.GetManifestResourceStream(resourceName)) {
+        using (Stream stream = assembly.GetManifestResourceStream(embeddedResourceName)) {
           if (extension == ".rtf") {
             infoRichTextBox.LoadFile(stream, RichTextBoxStreamType.RichText);
@@ -82 +56 @@
     }
 
-    protected virtual void okButton_Click(object sender, EventArgs e) {
-      Close();
+    private void InfoBox_Load(object sender, EventArgs e) {
+      LoadEmbeddedResource();
     }
   }

stable/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

@@ -138 +138 @@
       <DependentUpon>DefineArithmeticProgressionDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\InfoBox.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\InfoBox.Designer.cs">
+      <DependentUpon>InfoBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="Views\AsynchronousContentView.cs">
@@ -266 +272 @@
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

stable/HeuristicLab.MainForm/3.3/ViewAttribute.cs

@@ -28 +28 @@
     public ViewAttribute(string name) {
       this.name = name;
+      this.helpResourcePath = string.Empty;
+    }
+
+    public ViewAttribute(string name, string helpResourcePath) {
+      this.name = name;
+      this.helpResourcePath = helpResourcePath;
     }
 
@@ -34 +40 @@
       get { return this.name; }
       set { this.name = value; }
+    }
+
+    private string helpResourcePath;
+    public string HelpResourcePath {
+      get { return this.helpResourcePath; }
+      set { this.helpResourcePath = value; }
     }
 
@@ -47 +59 @@
       return viewType.Name;
     }
+
+    public static string GetHelpResourcePath(MemberInfo viewType) {
+      ViewAttribute[] attributes = (ViewAttribute[])viewType.GetCustomAttributes(typeof(ViewAttribute), false);
+      if (attributes.Length == 1)
+        return attributes[0].helpResourcePath;
+      return string.Empty;
+    }
+
+    public static bool HasHelpResourcePath(MemberInfo viewType) {
+      ViewAttribute[] attributes = (ViewAttribute[])viewType.GetCustomAttributes(typeof(ViewAttribute), false);
+      if (attributes.Length == 1)
+        return attributes[0].helpResourcePath != string.Empty;
+      return false;
+    }
   }
 }