- Timestamp:
- 03/28/12 15:47:26 (12 years ago)
- Location:
- branches/HeuristicLab.Hive.Azure
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive.Azure
- Property svn:ignore
-
old new 3 3 *.resharper 4 4 *.suo 5 *.user 5 6 *.vsp 6 7 Doxygen 8 FxCopResults.txt 7 9 Google.ProtocolBuffers-0.9.1.dll 8 10 HeuristicLab 3.3.5.1.ReSharper.user
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs
r7270 r7669 21 21 22 22 using System.Collections.Generic; 23 using System.Windows.Forms; 23 24 using HeuristicLab.Clients.Hive; 24 25 using HeuristicLab.MainForm; … … 38 39 get { return 10000; } 39 40 } 41 public override Keys ShortCutKeys { 42 get { return Keys.Control | Keys.H; } 43 } 40 44 } 41 45 } -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs
r7270 r7669 25 25 private void InitializeComponent() { 26 26 this.components = new System.ComponentModel.Container(); 27 this.tabControl = new System.Windows.Forms.TabControl();27 this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl(); 28 28 this.tasksTabPage = new System.Windows.Forms.TabPage(); 29 29 this.jobsTreeView = new HeuristicLab.Clients.Hive.Views.HiveTaskItemTreeView(); -
branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs
r7270 r7669 26 26 using System.Threading.Tasks; 27 27 using System.Windows.Forms; 28 using HeuristicLab.Clients.Hive.Views;29 28 using HeuristicLab.Collections; 30 29 using HeuristicLab.Common; 31 30 using HeuristicLab.Core; 32 31 using HeuristicLab.MainForm; 32 using HeuristicLab.MainForm.WindowsForms; 33 33 using HeuristicLab.Optimization; 34 34 using HeuristicLab.PluginInfrastructure; … … 114 114 logView.Content = null; 115 115 refreshAutomaticallyCheckBox.Checked = false; 116 logView.Content = null;117 116 runCollectionViewHost.Content = null; 118 117 } else { … … 302 301 } 303 302 private void Content_ExceptionOccured(object sender, EventArgs<Exception> e) { 304 throw e.Value; 303 if (InvokeRequired) 304 Invoke(new EventHandler<EventArgs<Exception>>(Content_ExceptionOccured), sender, e); 305 else { 306 //don't show the error dialog when downloading tasks, the HiveClient will throw an exception and the dialog will be shown then 307 if (sender.GetType() != typeof(ConcurrentTaskDownloader<ItemTask>) && sender.GetType() != typeof(TaskDownloader)) { 308 ErrorHandling.ShowErrorDialog(this, e.Value); 309 } 310 } 305 311 } 306 312 private void Content_StateLogListChanged(object sender, EventArgs e) {
Note: See TracChangeset
for help on using the changeset viewer.