Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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/Views
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.Designer.cs

    r15966 r16060  
    1919 */
    2020#endregion
     21
    2122using HeuristicLab.Data.Views;
    22 using System;
    2323
    2424namespace HeuristicLab.Clients.Hive.Administrator.Views {
     
    4848    private void InitializeComponent() {
    4949      this.components = new System.ComponentModel.Container();
    50       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectJobsView));
    5150      this.refreshButton = new System.Windows.Forms.Button();
    5251      this.removeButton = new System.Windows.Forms.Button();
     
    5756      // refreshButton
    5857      //
    59       this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
     58      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
    6059      this.refreshButton.Location = new System.Drawing.Point(3, 3);
    6160      this.refreshButton.Name = "refreshButton";
     
    6867      // removeButton
    6968      //
    70       this.removeButton.Image = ((System.Drawing.Image)(resources.GetObject("removeButton.Image")));
     69      this.removeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove;
    7170      this.removeButton.Location = new System.Drawing.Point(33, 3);
    7271      this.removeButton.Name = "removeButton";
     
    7978      // matrixView
    8079      //
    81       this.matrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    82             | System.Windows.Forms.AnchorStyles.Left) 
     80      this.matrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     81            | System.Windows.Forms.AnchorStyles.Left)
    8382            | System.Windows.Forms.AnchorStyles.Right)));
    8483      this.matrixView.Caption = "StringConvertibleMatrix View";
  • branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs

    r16043 r16060  
    2828using HeuristicLab.Core.Views;
    2929using HeuristicLab.MainForm;
    30 using System.Drawing;
    3130
    3231namespace HeuristicLab.Clients.Hive.Administrator.Views {
     
    115114
    116115        indefiniteCheckBox.Checked = !Content.EndDate.HasValue;
    117         if(!indefiniteCheckBox.Checked) endDateTimePicker.Value = Content.EndDate.Value;
     116        if (!indefiniteCheckBox.Checked) endDateTimePicker.Value = Content.EndDate.Value;
    118117        else endDateTimePicker.Value = Content.StartDate;
    119118        endDateTimePicker.Enabled = !indefiniteCheckBox.Checked;
     
    134133      indefiniteCheckBox.Enabled = enabled;
    135134
    136       if(Content != null) {
     135      if (Content != null) {
    137136        var parentProject = HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).LastOrDefault();
    138137        if (parentProject == null || parentProject.EndDate.HasValue) {
     
    152151    #region Event Handlers
    153152    private void Content_PropertyChanged(object sender, PropertyChangedEventArgs e) {
    154       OnContentChanged();
     153      if (InvokeRequired) Invoke((Action<object, PropertyChangedEventArgs>)Content_PropertyChanged, sender, e);
     154      else OnContentChanged();
    155155    }
    156156
     
    220220        Content.Name = nameTextBox.Text;
    221221        RegisterContentEvents();
    222       }       
     222      }
    223223    }
    224224
     
    228228        Content.Description = descriptionTextBox.Text;
    229229        RegisterContentEvents();
    230       }       
     230      }
    231231    }
    232232
     
    238238        Content.OwnerUserId = selectedOwnerUserId;
    239239        RegisterContentEvents();
    240       }       
     240      }
    241241    }
    242242
     
    248248        var parentProject = HiveAdminClient.Instance.GetAvailableProjectAncestors(Content.Id).LastOrDefault();
    249249        if (parentProject != null) {
    250           if(startDateTimePicker.Value < parentProject.StartDate)
     250          if (startDateTimePicker.Value < parentProject.StartDate)
    251251            startDateTimePicker.Value = parentProject.StartDate;
    252252        } else {
     
    261261        Content.StartDate = startDateTimePicker.Value;
    262262        RegisterContentEvents();
    263       }       
     263      }
    264264
    265265      startDateTimePicker.ValueChanged += startDateTimePicker_ValueChanged;
     
    276276            endDateTimePicker.Value = parentProject.EndDate.Value;
    277277          }
    278         } else if(Content.EndDate.HasValue) {
     278        } else if (Content.EndDate.HasValue) {
    279279          endDateTimePicker.Value = Content.EndDate.Value;
    280280        }
     
    287287        Content.EndDate = endDateTimePicker.Value;
    288288        RegisterContentEvents();
    289       }       
     289      }
    290290
    291291      endDateTimePicker.ValueChanged += endDateTimePicker_ValueChanged;
Note: See TracChangeset for help on using the changeset viewer.