Changeset 7270 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Timestamp:

01/04/12 16:45:02 (13 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3 (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.resx (deleted)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.resx (deleted)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (7 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.resx (deleted)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3

@@ -1 +1 @@
 Plugin.cs
 obj
+*.vs10x

@@ -1 +1 @@
 Plugin.cs
 obj
+*.vs10x

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveJobManagerView));
       this.hiveExperimentListView = new RefreshableHiveJobListView();
       this.refreshButton = new System.Windows.Forms.Button();
@@ -65 +64 @@
       // refreshButton
       // 
-      this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
+      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
       this.refreshButton.Location = new System.Drawing.Point(3, 3);
       this.refreshButton.Name = "refreshButton";

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24 +24 @@
 using System.ServiceModel.Security;
 using System.Windows.Forms;
+using HeuristicLab.Clients.Hive.Views;
 using HeuristicLab.Collections;
 using HeuristicLab.MainForm;
@@ -106 +107 @@
 
     private void HandleServiceException(Exception ex) {
-      if (ex is MessageSecurityException) {
-        MessageBox.Show("A Message Security error has occured. This normally means that your user name or password is wrong.", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Error);
+      if (this.InvokeRequired) {
+        Invoke(new Action<Exception>(HandleServiceException), ex);
       } else {
-        ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex);
+        if (ex is MessageSecurityException) {
+          MessageBox.Show("A Message Security error has occured. This normally means that your user name or password is wrong.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        } else if (ex is AnonymousUserException) {
+          using (HiveInformationDialog dialog = new HiveInformationDialog()) {
+            dialog.ShowDialog(this);
+          }
+        } else {
+          ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex);
+        }
       }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs

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

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.cs

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

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -54 +54 @@
 
     protected override void removeButton_Click(object sender, EventArgs e) {
-      DialogResult result = MessageBox.Show("This action will permanently delete this job (also on the hive server). Continue?", "HeuristicLab Hive Job Manager", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
-      if (result == DialogResult.OK) {
-        base.removeButton_Click(sender, e);
+      DialogResult result = MessageBox.Show("This action will permanently delete this job (also on the Hive server). Continue?", "HeuristicLab Hive Job Manager", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+      if (result == DialogResult.Yes) {
+        System.Windows.Forms.ListView.SelectedListViewItemCollection selectedItems = itemsListView.SelectedItems;
+        bool inProgress = false;
+        foreach (ListViewItem item in selectedItems) {                                  
+          RefreshableJob job = item.Tag as RefreshableJob;
+          if (job != null && job.IsProgressing) {
+            inProgress = true;
+            break;
+          }
+        }
+
+        if (inProgress) {
+          MessageBox.Show("You can't delete jobs which are currently uploading or downloading." + Environment.NewLine + "Please wait for the jobs to complete and try again. ", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+          return;
+        } else {
+          base.removeButton_Click(sender, e);
+        }
       }
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

@@ -25 +25 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshableHiveJobView));
       this.tabControl = new System.Windows.Forms.TabControl();
       this.tasksTabPage = new System.Windows.Forms.TabPage();
@@ -125 +124 @@
       // refreshPermissionsButton
       // 
-      this.refreshPermissionsButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshPermissionsButton.Image")));
+      this.refreshPermissionsButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
       this.refreshPermissionsButton.Location = new System.Drawing.Point(3, 3);
       this.refreshPermissionsButton.Name = "refreshPermissionsButton";
@@ -228 +227 @@
       // 
       this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.startButton.Image = ((System.Drawing.Image)(resources.GetObject("startButton.Image")));
+      this.startButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
       this.startButton.Location = new System.Drawing.Point(0, 536);
       this.startButton.Name = "startButton";
@@ -240 +239 @@
       // 
       this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
+      this.stopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Stop;
       this.stopButton.Location = new System.Drawing.Point(60, 536);
       this.stopButton.Name = "stopButton";
@@ -253 +252 @@
       this.resetButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.resetButton.Enabled = false;
-      this.resetButton.Image = ((System.Drawing.Image)(resources.GetObject("resetButton.Image")));
+      this.resetButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Restart;
       this.resetButton.Location = new System.Drawing.Point(90, 536);
       this.resetButton.Name = "resetButton";
@@ -285 +284 @@
       this.pauseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.pauseButton.Enabled = false;
-      this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
+      this.pauseButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Pause;
       this.pauseButton.Location = new System.Drawing.Point(30, 536);
       this.pauseButton.Name = "pauseButton";
@@ -334 +333 @@
       // refreshButton
       // 
-      this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
+      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
       this.refreshButton.Location = new System.Drawing.Point(3, 0);
       this.refreshButton.Name = "refreshButton";

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

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

@@ -1 +1 @@
 Plugin.cs
 obj
+*.vs10x