Changeset 7582 for trunk/sources/HeuristicLab.Clients.Hive.Views/3.3

Timestamp:

03/07/12 19:14:08 (12 years ago)

Author:

ascheibe

Message:

#1762 moved ProgressView from Hive to MainForms

Location:

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3

Files:

• HeuristicLab.Clients.Hive.Views-3.3.csproj (modified) (1 diff)
• HiveTasks/OptimizerHiveTaskView.cs (modified) (2 diffs)
• Progress (deleted)

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj

@@ -165 +165 @@
     <None Include="Plugin.cs.frame" />
     <Compile Include="Plugin.cs" />
-    <Compile Include="Progress\ProgressView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Progress\ProgressView.designer.cs">
-      <DependentUpon>ProgressView.cs</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

@@ -21 +21 @@
 
 using System;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
-using System.Threading.Tasks;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.PluginInfrastructure;
 
@@ -75 +76 @@
         FinishProgressView();
         ErrorHandling.ShowErrorDialog(this, "An error occured while resuming the task.", t.Exception);
-      }, TaskContinuationOptions.OnlyOnFaulted); 
+      }, TaskContinuationOptions.OnlyOnFaulted);
     }