Changeset 9935

Timestamp:

09/04/13 10:49:47 (11 years ago)

Author:

ascheibe

Message:

#2100 implemented review comments

Location:

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs

Files:

• InfoBox.Designer.cs (modified) (3 diffs)
• InfoBox.cs (modified) (2 diffs)

trunk/sources/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);
 

trunk/sources/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();
     }
   }