Context Navigation

← Previous Change
Next Change →

HeuristicLab.MainForm

Timestamp:

08/06/18 18:15:29 (6 years ago)

Author:

jkarder

Message:

#2839:

merged [15377-15681/trunk/sources] into branch
merged [15683-16056/trunk] into branch

Location:

branches/2839_HiveProjectManagement

Files:

: 26 edited

. (modified) (1 prop)
HeuristicLab.MainForm/3.3/ActionUserInterfaceItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/ContentAttribute.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IActionUserInterfaceItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IConfigureableView.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IContentView.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IMenuItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IMenuSeparatorItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IPositionableUserInterfaceItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs (modified) (2 diffs)
HeuristicLab.MainForm/3.3/Interfaces/IToolBarItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IToolBarSeparatorItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IUserInterfaceItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Interfaces/IView.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/MainFormManager.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/MenuSeparatorItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.MainForm/3.3/PositionableUserInterfaceItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/Progress.cs (modified) (3 diffs)
HeuristicLab.MainForm/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.MainForm/3.3/ToolBarSeparatorItem.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/TypeExtension.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/ViewAttribute.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/ViewEventArgs.cs (modified) (1 diff)
HeuristicLab.MainForm/3.3/ViewShownEventArgs.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2839_HiveProjectManagement

Property svn:mergeinfo changed

/stable	merged: 15587-15588
/trunk (added)	merged: 15706-15708,15727-15730,15738-15739,15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054
/trunk/sources (added)	merged: 15383,15388,15390,15395-15398,15400,15402,15408-15409,15419,15427,15447-15448,15452,15461,15464,15478,15480-15481,15483,15486,15498-15499,15502,15505,15513,15517-15518,15532,15534,15545,15548,15551,15556,15560,15566,15581,15583,15589-15591,15594,15596,15598,15607,15610-15611,15619,15621-15623,15626,15637-15638,15645,15665,15667,15672-15674

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/ActionUserInterfaceItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/ContentAttribute.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IActionUserInterfaceItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IConfigureableView.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IContentView.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IMenuItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IMenuSeparatorItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IPositionableUserInterfaceItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs

-                      r15371
+                      r16057
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
     /// </summary>
     void Start();
     void Start(string status);
-    void Start(string status, double progressValue);
     /// <summary>

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IToolBarItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IToolBarSeparatorItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IUserInterfaceItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Interfaces/IView.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/MainFormManager.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/MenuSeparatorItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Plugin.cs.frame

-                      r14195
+                      r16057
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.MainForm {
   [Plugin("HeuristicLab.MainForm", "3.3.14.$WCREV$")]
+  [Plugin("HeuristicLab.MainForm", "3.3.15.$WCREV$")]
   [PluginFile("HeuristicLab.MainForm-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/PositionableUserInterfaceItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Progress.cs

-                      r15371
+                      r16057
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
       canBeCanceled = false;
+    }
+    public Progress(string status)
+      : this() {
+      this.status = status;
+    }
+    public Progress(string status, ProgressState state)
+      : this() {
+      this.status = status;
+      this.progressState = state;
+    }
     public void Cancel() {
 …
     public void Start() {
+      Start(string.Empty);
+      ProgressValue = 0.0;
+      ProgressState = ProgressState.Started;
+    }
     public void Start(string status) {
+      Start(status, -1.0);
+    }
+    public void Start(string status, double progressValue) {
+      ProgressState = ProgressState.Started;
+      Status = status ?? string.Empty;
+      ProgressValue = progressValue;
+      Start();
+      Status = status;
+    }

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/Properties/AssemblyInfo.cs.frame

-                      r14195
+                      r16057
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.14.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.15.$WCREV$")]

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/ToolBarSeparatorItem.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/TypeExtension.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/ViewAttribute.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/ViewEventArgs.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.MainForm/3.3/ViewShownEventArgs.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 16057 for branches/2839_HiveProjectManagement/HeuristicLab.MainForm

Legend:

Download in other formats: