Changeset 13338 for branches/RefactorPluginInfrastructure-2522/HeuristicLab/3.3

Timestamp:

11/23/15 16:14:30 (9 years ago)

Author:

gkronber

Message:

#2522:

• moved UI components out of HeuristicLab.PluginInfrastructure -> HeuristicLab.PluginInfrastructure.UI
• moved ErrorDialog to HeuristicLab.MainForm.WindowsForms
• moved ErrorHandling (for building an error message string) to HeuristicLab.Common
• Changed exception handlers in Views to use MainForm.ShowError()
• Changed usages for ErrorDialog in non-UI components to throw exceptions instead.

Location:

branches/RefactorPluginInfrastructure-2522/HeuristicLab/3.3

Files:

• HeuristicLab-3.3.csproj (modified) (2 diffs)
• Program.cs (modified) (1 diff)

branches/RefactorPluginInfrastructure-2522/HeuristicLab/3.3/HeuristicLab-3.3.csproj

@@ -156 +156 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="GNU General Public License.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -194 +187 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure.UI\HeuristicLab.PluginInfrastructure.UI-4.0.csproj">
+      <Project>{7af3c7b6-8ba5-44f3-8d5b-2bf7a23cf12d}</Project>
+      <Name>HeuristicLab.PluginInfrastructure.UI-4.0</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/RefactorPluginInfrastructure-2522/HeuristicLab/3.3/Program.cs

@@ -21 +21 @@
 
 using System;
+using System.Windows.Forms;
+using HeuristicLab.PluginInfrastructure.UI;
 
 namespace HeuristicLab {
   static class Program {
     [STAThread]
+    /// <summary>
+    /// Main entry point of the plugin infrastructure. Loads the starter form.
+    /// </summary>
+    /// <param name="args">Command line arguments</param>
     static void Main(string[] args) {
-      HeuristicLab.PluginInfrastructure.Main.Run(args);
+      if ((!FrameworkVersionErrorDialog.NET4_5Installed && !FrameworkVersionErrorDialog.MonoInstalled)
+        || (FrameworkVersionErrorDialog.MonoInstalled && !FrameworkVersionErrorDialog.MonoCorrectVersionInstalled)) {
+        Application.EnableVisualStyles();
+        Application.SetCompatibleTextRenderingDefault(false);
+        Application.Run(new FrameworkVersionErrorDialog());
+      } else {
+        try {
+          Application.EnableVisualStyles();
+          Application.SetCompatibleTextRenderingDefault(false);
+          Application.Run(new StarterForm(args));
+        } catch (Exception ex) {
+          MessageBox.Show(ex.Message, "Exception", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+      }
     }
   }