Changeset 9977 for stable/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.cs

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/Dialogs/InfoBox.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.cs) (2 diffs)

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