Changeset 12969 for branches/gteufl/HeuristicLab.MainForm.WindowsForms

Timestamp:

09/25/15 14:39:59 (9 years ago)

Author:

gkronber

Message:

#2478 merged all changes from trunk to branch before trunk-reintegration

Location:

branches/gteufl

Files:

• . (modified) (3 props)
• HeuristicLab.MainForm.WindowsForms/3.3/ActionUserInterfaceItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ControlExtensions.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionDialog.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionDialog.cs (modified) (7 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionTimeDialog.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionTimeDialog.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.Designer.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (7 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DocumentForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DocumentForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.Designer.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (3 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/SingleDocumentMainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/SingleDocumentMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MenuItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/ToolBarItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/AsynchronousContentView.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/AsynchronousContentView.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/ContentView.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/ContentView.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/View.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/View.cs (modified) (1 diff)

branches/gteufl

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll
+obj

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll
+obj

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/ActionUserInterfaceItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ControlExtensions.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionDialog.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionDialog.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 using System.ComponentModel;
 using System.Globalization;
-using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -31 +30 @@
     private bool allowOnlyInteger;
 
-    public double Minimum { get; private set; }
-    public double Maximum { get; private set; }
-    public double Step { get; private set; }
+    public decimal Minimum { get; private set; }
+    public decimal Maximum { get; private set; }
+    public decimal Step { get; private set; }
 
-    public IEnumerable<double> Values {
-      get { return EnumerateProgression().Reverse(); }
+    public IEnumerable<decimal> Values {
+      get { return SequenceGenerator.GenerateSteps(Minimum, Maximum, Step, includeEnd: true); }
     }
 
@@ -48 +47 @@
       this.allowOnlyInteger = allowOnlyInteger;
     }
-    public DefineArithmeticProgressionDialog(bool allowOnlyInteger, double minimum, double maximum, double step)
+    public DefineArithmeticProgressionDialog(bool allowOnlyInteger, decimal minimum, decimal maximum, decimal step)
       : this(allowOnlyInteger) {
       Minimum = minimum;
@@ -63 +62 @@
     private void textBox_Validating(object sender, CancelEventArgs e) {
       var textBox = (TextBox)sender;
-      double value = 0;
+      decimal value = 0;
       if (allowOnlyInteger) {
         int intValue;
@@ -75 +74 @@
         }
       } else {
-        if (!double.TryParse(textBox.Text, NumberStyles.Float, CultureInfo.CurrentCulture.NumberFormat, out value)) {
+        if (!decimal.TryParse(textBox.Text, NumberStyles.Float, CultureInfo.CurrentCulture.NumberFormat, out value)) {
           errorProvider.SetError(textBox, "Please enter a valid double value.");
           e.Cancel = true;
@@ -90 +89 @@
       return Minimum <= Maximum && Step >= 0;
     }
-
-    private IEnumerable<double> EnumerateProgression() {
-      double value = Maximum;
-      bool minimumIncluded = false;
-      int i = 1;
-      while (value >= Minimum) {
-        if (value.IsAlmost(Minimum)) {
-          yield return Minimum;
-          minimumIncluded = true;
-        } else yield return value;
-
-        if (Step == 0) break; // a step size of 0 will only output maximum and minimum
-        if (allowOnlyInteger) {
-          value = (int)Maximum - i * (int)Step;
-        } else {
-          value = Maximum - i * Step;
-        }
-        i++;
-      }
-      if (!minimumIncluded) {
-        yield return Minimum;
-      }
-    }
   }
 }

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionTimeDialog.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/DefineArithmeticProgressionTimeDialog.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -74 +74 @@
       this.infoRichTextBox.TabIndex = 1;
       this.infoRichTextBox.Text = "";
+      this.infoRichTextBox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.infoRichTextBox_LinkClicked);
       // 
       // InfoBox

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Dialogs/InfoBox.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -59 +59 @@
       LoadEmbeddedResource();
     }
+
+    private void infoRichTextBox_LinkClicked(object sender, LinkClickedEventArgs e) {
+      System.Diagnostics.Process.Start(e.LinkText);
+    }
   }
 }

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.MainForm.WindowsForms</RootNamespace>
     <AssemblyName>HeuristicLab.MainForm.WindowsForms-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -46 +46 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -57 +58 @@
     </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
@@ -66 +68 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
@@ -77 +80 @@
     </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -86 +90 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -97 +102 @@
     </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DocumentForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DocumentForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -87 +87 @@
       this.ResumeLayout(false);
       this.PerformLayout();
-
     }
 

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -436 +436 @@
     /// </summary>
     public void RemoveOperationProgressFromView(Control control, bool finishProgress = true) {
+      if (InvokeRequired) {
+        Invoke((Action<Control, bool>)RemoveOperationProgressFromView, control, finishProgress);
+        return;
+      }
+
       IProgress progress;
       if (!viewProgressLookup.TryGetValue(control, out progress))
@@ -550 +555 @@
       try {
         ((IActionUserInterfaceItem)item.Tag).Execute();
-      }
-      catch (Exception ex) {
+      } catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, ex);
       }

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/SingleDocumentMainForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/SingleDocumentMainForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/MenuItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  [Plugin("HeuristicLab.MainForm.WindowsForms", "3.3.9.$WCREV$")]
+  [Plugin("HeuristicLab.MainForm.WindowsForms", "3.3.12.$WCREV$")]
   [PluginFile("HeuristicLab.MainForm.WindowsForms-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.9.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/ToolBarItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Views/AsynchronousContentView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Views/AsynchronousContentView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Views/ContentView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Views/ContentView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Views/View.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.MainForm.WindowsForms/3.3/Views/View.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll
+obj