Changeset 2481 for branches/PluginInfrastructure Refactoring/HeuristicLab/SplashScreen.cs

Timestamp:

11/11/09 18:25:15 (14 years ago)

Author:

gkronber

Message:

Refactored class Loader in plugin infrastructure. #799

File:

• branches/PluginInfrastructure Refactoring/HeuristicLab/SplashScreen.cs (modified) (9 diffs)

branches/PluginInfrastructure Refactoring/HeuristicLab/SplashScreen.cs

@@ -27 +27 @@
 using System.Reflection;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.PluginInfrastructure.Manager;
 
 namespace HeuristicLab {
@@ -35 +36 @@
     private object bigLock = new object();
     private bool closing = false;
+    private PluginManager manager;
 
     public SplashScreen() {
       InitializeComponent();
+    }
 
+    public SplashScreen(PluginManager manager, int initialInterval, string initialText)
+      : this() {
+      this.initialInterval = initialInterval;
+      infoLabel.Text = initialText;
+      this.manager = manager;
+      manager.Action += new PluginManagerActionEventHandler(Manager_Action);
       Assembly assembly = this.GetType().Assembly;
       object[] attributes = assembly.GetCustomAttributes(false);
@@ -47 +56 @@
       infoLabel.Text = "";
 
-      foreach(object obj in attributes) {
-        if(obj is AssemblyCopyrightAttribute) {
+      foreach (object obj in attributes) {
+        if (obj is AssemblyCopyrightAttribute) {
           copyrightLabel.Text = "Copyright " + ((AssemblyCopyrightAttribute)obj).Copyright;
         }
@@ -57 +66 @@
         company = HeuristicLab.Properties.Settings.Default.Organization;
 
-        if((user == null) || (user.Equals(""))) {
+        if ((user == null) || (user.Equals(""))) {
           userNameLabel.Text = "-";
         } else {
@@ -63 +72 @@
         }
 
-        if((company == null) || (company.Equals(""))) {
+        if ((company == null) || (company.Equals(""))) {
           companyLabel.Text = "-";
         } else {
           companyLabel.Text = company;
         }
-      } catch(Exception) {
+      }
+      catch (Exception) {
         userNameLabel.Text = "-";
         companyLabel.Text = "-";
       }
-    }
-
-    public SplashScreen(int initialInterval, string initialText)
-      : this() {
-      this.initialInterval = initialInterval;
-      infoLabel.Text = initialText;
     }
 
@@ -86 +90 @@
     public void Manager_Action(object sender, PluginManagerActionEventArgs e) {
       string info;
-      if(e.Action == PluginManagerAction.Initializing) info = "Initializing ...";
-      else if(e.Action == PluginManagerAction.InitializingPlugin) info = "Initializing Plugin " + e.Id + " ...";
-      else if(e.Action == PluginManagerAction.InitializedPlugin) info = "Initializing Plugin " + e.Id + " ... Initialized";
-      else if(e.Action == PluginManagerAction.Initialized) {
+      if (e.Action == PluginManagerAction.Initializing) info = "Initializing ...";
+      else if (e.Action == PluginManagerAction.PluginLoaded) info = "Loaded plugin " + e.Id + " ...";
+      else if (e.Action == PluginManagerAction.Initialized) {
         info = "Initialization Completed";
         fadeTimer = new System.Timers.Timer();
@@ -98 +101 @@
         fadeTimer.Start();
       } else {
-        if(e.Id != null) info = e.Action.ToString() + "   (" + e.Id + ")";
+        if (e.Id != null) info = e.Action.ToString() + "   (" + e.Id + ")";
         else info = e.Action.ToString();
       }
@@ -107 +110 @@
     private void fadeTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) {
       fadeTimer.Stop();
-      if(InvokeRequired) {
+      if (InvokeRequired) {
         Invoke((MethodInvoker)UpdateOpacity);
       } else {
@@ -140 +143 @@
           closing = true;
           if (fadeTimer != null) fadeTimer.Stop();
-          PluginManager.Manager.Action -= new PluginManagerActionEventHandler(this.Manager_Action); // remove event before calling close
+          manager.Action -= new PluginManagerActionEventHandler(this.Manager_Action); // remove event before calling close
           Application.DoEvents(); // work up all existing events
           Close(); // close