Changeset 16060 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator

Timestamp:

08/07/18 15:34:23 (6 years ago)

Author:

jkarder

Message:

#2839: worked on hive project management

• added .ToList() calls within some service methods to prevent TransactionExceptions
• added check for InvokeRequired
• improved RunInHiveMenuItem
• removed .resx files from projects

Location:

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3

Files:

• HeuristicLab.Clients.Hive.Administrator-3.3.csproj (modified) (1 diff)
• Views/ProjectJobsView.Designer.cs (modified) (5 diffs)
• Views/ProjectView.cs (modified) (11 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj

@@ -294 +294 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\ProjectJobsView.resx">
-      <DependentUpon>ProjectJobsView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.Designer.cs

@@ -19 +19 @@
  */
 #endregion
+
 using HeuristicLab.Data.Views;
-using System;
 
 namespace HeuristicLab.Clients.Hive.Administrator.Views {
@@ -48 +48 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectJobsView));
       this.refreshButton = new System.Windows.Forms.Button();
       this.removeButton = new System.Windows.Forms.Button();
@@ -57 +56 @@
       // 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";
@@ -68 +67 @@
       // removeButton
       // 
-      this.removeButton.Image = ((System.Drawing.Image)(resources.GetObject("removeButton.Image")));
+      this.removeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove;
       this.removeButton.Location = new System.Drawing.Point(33, 3);
       this.removeButton.Name = "removeButton";
@@ -79 +78 @@
       // matrixView
       // 
-      this.matrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.matrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.matrixView.Caption = "StringConvertibleMatrix View";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs

@@ -28 +28 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using System.Drawing;
 
 namespace HeuristicLab.Clients.Hive.Administrator.Views {
@@ -115 +114 @@
 
         indefiniteCheckBox.Checked = !Content.EndDate.HasValue;
-        if(!indefiniteCheckBox.Checked) endDateTimePicker.Value = Content.EndDate.Value;
+        if (!indefiniteCheckBox.Checked) endDateTimePicker.Value = Content.EndDate.Value;
         else endDateTimePicker.Value = Content.StartDate;
         endDateTimePicker.Enabled = !indefiniteCheckBox.Checked;
@@ -134 +133 @@
       indefiniteCheckBox.Enabled = enabled;
 
-      if(Content != null) {
+      if (Content != null) {
         var parentProject = HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).LastOrDefault();
         if (parentProject == null || parentProject.EndDate.HasValue) {
@@ -152 +151 @@
     #region Event Handlers
     private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
-      OnContentChanged();
+      if (InvokeRequired) Invoke((Action<object, PropertyChangedEventArgs>)Content_PropertyChanged, sender, e);
+      else OnContentChanged();
     }
 
@@ -220 +220 @@
         Content.Name = nameTextBox.Text;
         RegisterContentEvents();
-      }        
+      }
     }
 
@@ -228 +228 @@
         Content.Description = descriptionTextBox.Text;
         RegisterContentEvents();
-      }        
+      }
     }
 
@@ -238 +238 @@
         Content.OwnerUserId = selectedOwnerUserId;
         RegisterContentEvents();
-      }        
+      }
     }
 
@@ -248 +248 @@
         var parentProject = HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).LastOrDefault();
         if (parentProject != null) {
-          if(startDateTimePicker.Value < parentProject.StartDate)
+          if (startDateTimePicker.Value < parentProject.StartDate)
             startDateTimePicker.Value = parentProject.StartDate;
         } else {
@@ -261 +261 @@
         Content.StartDate = startDateTimePicker.Value;
         RegisterContentEvents();
-      }        
+      }
 
       startDateTimePicker.ValueChanged += startDateTimePicker_ValueChanged;
@@ -276 +276 @@
             endDateTimePicker.Value = parentProject.EndDate.Value;
           }
-        } else if(Content.EndDate.HasValue) {
+        } else if (Content.EndDate.HasValue) {
           endDateTimePicker.Value = Content.EndDate.Value;
         }
@@ -287 +287 @@
         Content.EndDate = endDateTimePicker.Value;
         RegisterContentEvents();
-      }        
+      }
 
       endDateTimePicker.ValueChanged += endDateTimePicker_ValueChanged;