Context Navigation

← Previous Change
Next Change →

MainForms

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:

: 14 edited

. (modified) (1 prop)
HeuristicLab.MainForm.WindowsForms (modified) (1 prop)
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) (1 diff)
HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (5 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)

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.WindowsForms
- Property svn:mergeinfo deleted

branches/2839_HiveProjectManagement/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.Designer.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.WindowsForms/3.3/MainForms/DockForm.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.WindowsForms/3.3/MainForms/DockingMainForm.Designer.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.WindowsForms/3.3/MainForms/DockingMainForm.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.WindowsForms/3.3/MainForms/DocumentForm.Designer.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.WindowsForms/3.3/MainForms/DocumentForm.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.WindowsForms/3.3/MainForms/MainForm.Designer.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.WindowsForms/3.3/MainForms/MainForm.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.
 …
+    }
     public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class, IContent {
+    public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class,IContent {
       if (content == null) throw new ArgumentNullException("Content cannot be null.");
       if (!reuseExistingView) return ShowContent(content);
 …
     /// Adds a <see cref="ProgressView"/> to the <see cref="ContentView"/>s showing the specified content.
     /// </summary>
     public IProgress AddOperationProgressToContent(IContent content, string progressMessage, double progressValue = -1, bool addToObjectGraphObjects = true) {
+    public IProgress AddOperationProgressToContent(IContent content, string progressMessage, bool addToObjectGraphObjects = true) {
       if (InvokeRequired) {
         IProgress result = (IProgress)Invoke((Func<IContent, string, double, bool, IProgress>)AddOperationProgressToContent, content, progressMessage, progressValue, addToObjectGraphObjects);
+        IProgress result = (IProgress)Invoke((Func<IContent, string, bool, IProgress>)AddOperationProgressToContent, content, progressMessage, addToObjectGraphObjects);
         return result;
+      }
 …
         contentViews = contentViews.Where(v => v.Content == content);
+      var progress = new Progress();
+      progress.Start(progressMessage, progressValue);
+      var progress = new Progress(progressMessage, ProgressState.Started);
       foreach (var contentView in contentViews) {
         progressViews.Add(new ProgressView(contentView, progress));
 …
     /// </summary>
     public IProgress AddOperationProgressToView(Control control, string progressMessage) {
+      var progress = new Progress();
+      progress.Start(progressMessage);
+      var progress = new Progress(progressMessage, ProgressState.Started);
       AddOperationProgressToView(control, progress);
       return progress;

branches/2839_HiveProjectManagement/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.Designer.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.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.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.WindowsForms/3.3/MainForms/SingleDocumentMainForm.Designer.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.WindowsForms/3.3/MainForms/SingleDocumentMainForm.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.WindowsForms/3.3/MainForms

Legend:

Download in other formats: