Changeset 13389 for branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI

Timestamp:

11/24/15 19:02:57 (8 years ago)

Author:

gkronber

Message:

#2522: removed Starter form and instead init plugin discovery and launch of application from Startup project (.exe)

Location:

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI

Files:

• HeuristicLab.PluginInfrastructure.UI-4.0.csproj (modified) (1 diff)
• Properties (modified) (1 prop)
• SplashScreen.cs (modified) (5 diffs)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/HeuristicLab.PluginInfrastructure.UI-4.0.csproj

@@ -74 +74 @@
       <DependentUpon>SplashScreen.cs</DependentUpon>
     </Compile>
-    <Compile Include="StarterForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="StarterForm.Designer.cs">
-      <DependentUpon>StarterForm.cs</DependentUpon>
-    </Compile>
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/SplashScreen.cs

@@ -24 +24 @@
 using System.Reflection;
 using System.Windows.Forms;
-using HeuristicLab.PluginInfrastructure.Manager;
 
 namespace HeuristicLab.PluginInfrastructure.UI {
-  internal partial class SplashScreen : Form {
+  public partial class SplashScreen : Form {
     private const int FADE_INTERVAL = 50;
     private Timer fadeTimer;
     private int initialInterval;
-    private PluginManager pluginManager;
 
-    internal SplashScreen() {
+    private SplashScreen() {
       InitializeComponent();
     }
 
-    internal SplashScreen(PluginManager manager, int initialInterval)
+    public SplashScreen(string initialText, int initialInterval)
       : this() {
       this.initialInterval = initialInterval;
-      this.pluginManager = manager;
 
       var entryAssembly = Assembly.GetEntryAssembly();
-      RegisterPluginManagerEventHandlers();
+      // RegisterPluginManagerEventHandlers();
 
-      versionLabel.Text = "Version " + entryAssembly.GetFileVersion() + " " 
+      versionLabel.Text = "Version " + entryAssembly.GetFileVersion() + " "
         + entryAssembly.GetCustomAttributes().OfType<AssemblyInformationalVersionAttribute>().First().InformationalVersion; // code name
       infoLabel.Text = "";
@@ -55 +52 @@
       fadeTimer.Tick += fadeTimer_Elapsed;
       fadeTimer.Interval = initialInterval;
+      fadeTimer.Start();
+
+      Opacity = 1;
+      infoLabel.Text = initialText;
+
     }
 
-    #region events
-    private void RegisterPluginManagerEventHandlers() {
-      pluginManager.ApplicationStarted += new EventHandler<PluginInfrastructureEventArgs>(manager_ApplicationStarted);
-      pluginManager.ApplicationStarting += new EventHandler<PluginInfrastructureEventArgs>(manager_ApplicationStarting);
-      pluginManager.Initializing += new EventHandler<PluginInfrastructureEventArgs>(manager_Initializing);
-      pluginManager.Initialized += new EventHandler<PluginInfrastructureEventArgs>(manager_Initialized);
-      pluginManager.PluginLoaded += new EventHandler<PluginInfrastructureEventArgs>(manager_PluginLoaded);
-      pluginManager.PluginUnloaded += new EventHandler<PluginInfrastructureEventArgs>(manager_PluginUnloaded);
-    }
-
-    private void DeregisterPluginManagerEventHandlers() {
-      pluginManager.ApplicationStarted -= new EventHandler<PluginInfrastructureEventArgs>(manager_ApplicationStarted);
-      pluginManager.ApplicationStarting -= new EventHandler<PluginInfrastructureEventArgs>(manager_ApplicationStarting);
-      pluginManager.Initializing -= new EventHandler<PluginInfrastructureEventArgs>(manager_Initializing);
-      pluginManager.Initialized -= new EventHandler<PluginInfrastructureEventArgs>(manager_Initialized);
-      pluginManager.PluginLoaded -= new EventHandler<PluginInfrastructureEventArgs>(manager_PluginLoaded);
-      pluginManager.PluginUnloaded -= new EventHandler<PluginInfrastructureEventArgs>(manager_PluginUnloaded);
-    }
-
-    private void manager_PluginUnloaded(object sender, PluginInfrastructureEventArgs e) {
-      SafeUpdateMessage("Unloaded " + e.Entity);
-    }
-
-    private void manager_PluginLoaded(object sender, PluginInfrastructureEventArgs e) {
-      SafeUpdateMessage("Loaded " + e.Entity);
-    }
-
-    private void manager_Initialized(object sender, PluginInfrastructureEventArgs e) {
-      SafeUpdateMessage("Initialized");
-    }
-
-    private void manager_Initializing(object sender, PluginInfrastructureEventArgs e) {
-      SafeUpdateMessage("Initializing");
-    }
-
-    private void manager_ApplicationStarting(object sender, PluginInfrastructureEventArgs e) {
-      SafeUpdateMessage("Starting " + e.Entity);
-    }
-
-    private void manager_ApplicationStarted(object sender, PluginInfrastructureEventArgs e) {
-      SafeUpdateMessage("Started " + e.Entity);
-    }
-    // called from event handlers
-    private void SafeUpdateMessage(string msg) {
+    public void UpdateMessage(string msg) {
       try {
-        Invoke((Action<string>)UpdateMessage, msg);
+        if (InvokeRequired) Invoke((Action<string>)UpdateMessage, msg);
+        else {
+          ResetFadeTimer();
+          infoLabel.Text = msg;
+        }
       } catch (ObjectDisposedException) { }
     }
@@ -111 +74 @@
       FadeOut();
     }
-    #endregion
-
-    public void Show(string initialText) {
-      if (InvokeRequired) Invoke((Action<string>)Show, initialText);
-      else {
-        Opacity = 1;
-        infoLabel.Text = initialText;
-        ResetFadeTimer();
-        Show();
-      }
-    }
-
-    public void Show(IWin32Window owner, string initialText) {
-      if (InvokeRequired) Invoke((Action<IWin32Window, string>)Show, owner, initialText);
-      else {
-        Opacity = 1;
-        infoLabel.Text = initialText;
-        ResetFadeTimer();
-        Show(owner);
-      }
-    }
 
     private void ResetFadeTimer() {
@@ -138 +80 @@
       fadeTimer.Interval = initialInterval;
       fadeTimer.Start();
-    }
-
-    private void UpdateMessage(string msg) {
-      ResetFadeTimer();
-      infoLabel.Text = msg;
-      Application.DoEvents(); // force immediate update of splash screen control
     }
 
@@ -156 +92 @@
         Opacity = 0;
         fadeTimer.Stop();
-        Hide();
+        Close();
       }
-    }
-
-    protected override void OnClosing(System.ComponentModel.CancelEventArgs e) {
-      // deregister events when form is closing
-      DeregisterPluginManagerEventHandlers();
-      base.OnClosing(e);
     }
   }