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

Timestamp:

06/07/18 15:19:53 (7 years ago)

Author:

jzenisek

Message:

#2839: Several changes and fixes:

• added button tooltips
• changed position of buttons
• added refresh functionality to view of lightweight users ...

Location:

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

Files:

• ProjectPermissionsView.Designer.cs (modified) (9 diffs)
• ProjectPermissionsView.cs (modified) (3 diffs)
• ProjectResourcesView.Designer.cs (modified) (5 diffs)
• ProjectView.Designer.cs (modified) (9 diffs)
• ProjectsView.Designer.cs (modified) (6 diffs)
• ProjectsView.cs (modified) (2 diffs)
• ResourcesView.Designer.cs (modified) (1 diff)
• ResourcesView.cs (modified) (1 diff)

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

@@ -32 +32 @@
       this.permissionsGroupBox = new System.Windows.Forms.GroupBox();
       this.treeView = new Hive.Views.TreeView.NoDoubleClickTreeView();
+      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.detailsGroupBox = new System.Windows.Forms.GroupBox();
       this.detailsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
@@ -48 +49 @@
       this.refreshButton.Name = "refreshButton";
       this.refreshButton.Size = new System.Drawing.Size(24, 24);
-      this.refreshButton.TabIndex = 0;
+      this.refreshButton.TabIndex = 1;
+      this.toolTip.SetToolTip(this.refreshButton, "Refresh data");
       this.refreshButton.UseVisualStyleBackColor = true;
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
@@ -58 +60 @@
       this.inheritButton.Name = "inheritButton";
       this.inheritButton.Size = new System.Drawing.Size(24, 24);
-      this.inheritButton.TabIndex = 3;
+      this.inheritButton.TabIndex = 2;
+      this.toolTip.SetToolTip(this.inheritButton, "Save and hand down permission settings to all descendant projects");
       this.inheritButton.UseVisualStyleBackColor = true;
       this.inheritButton.Click += new System.EventHandler(this.inheritButton_Click);
@@ -68 +71 @@
       this.saveButton.Name = "saveButton";
       this.saveButton.Size = new System.Drawing.Size(24, 24);
-      this.saveButton.TabIndex = 4;
+      this.saveButton.TabIndex = 3;
+      this.toolTip.SetToolTip(this.saveButton, "Save permission settings");
       this.saveButton.UseVisualStyleBackColor = true;
       this.saveButton.Click += new System.EventHandler(this.saveButton_Click);
@@ -106 +110 @@
       this.permissionsGroupBox.Name = "permissionsGroupBox";
       this.permissionsGroupBox.Size = new System.Drawing.Size(268, 452);
-      this.permissionsGroupBox.TabIndex = 0;
+      this.permissionsGroupBox.TabIndex = 4;
       this.permissionsGroupBox.TabStop = false;
       this.permissionsGroupBox.Text = "Permissions (Assigned + Included)";
@@ -122 +126 @@
       this.treeView.SelectedImageIndex = 0;
       this.treeView.Size = new System.Drawing.Size(256, 427);
-      this.treeView.TabIndex = 0;
+      this.treeView.TabIndex = 5;
       this.treeView.BeforeCheck += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView_BeforeCheck);
       this.treeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterCheck);
@@ -136 +140 @@
       this.detailsGroupBox.Name = "detailsGroupBox";
       this.detailsGroupBox.Size = new System.Drawing.Size(540, 452);
-      this.detailsGroupBox.TabIndex = 0;
+      this.detailsGroupBox.TabIndex = 6;
       this.detailsGroupBox.TabStop = false;
       this.detailsGroupBox.Text = "Details";
@@ -152 +156 @@
       this.detailsViewHost.ReadOnly = true;
       this.detailsViewHost.Size = new System.Drawing.Size(528, 427);
-      this.detailsViewHost.TabIndex = 0;
+      this.detailsViewHost.TabIndex = 7;
       this.detailsViewHost.ViewsLabelVisible = true;
       this.detailsViewHost.ViewType = null;
@@ -185 +189 @@
     private System.Windows.Forms.GroupBox permissionsGroupBox;
     private HeuristicLab.Clients.Hive.Views.TreeView.NoDoubleClickTreeView treeView;
+    private System.Windows.Forms.ToolTip toolTip;
     private System.Windows.Forms.GroupBox detailsGroupBox;
     private MainForm.WindowsForms.ViewHost detailsViewHost;

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

@@ -53 +53 @@
     private readonly Color addedIncludeColor = Color.FromArgb(25, 169, 221, 221); // #a9dddd
     private readonly Color removedIncludeColor = Color.FromArgb(25, 249, 210, 145); // #f9d291
+    private readonly Color projectOwnerColor = Color.DarkRed;
 
     public new Project Content {
@@ -116 +117 @@
       var selectedPermission = (UserGroupBase)e.Node.Tag;
       detailsViewHost.Content = selectedPermission;
+      if (selectedPermission is LightweightUser)
+        detailsViewHost.ViewType = typeof(Access.Views.RefreshableLightweightUserInformationView);
     }
 
@@ -309 +312 @@
       }
 
+      if(Content != null && ug != null && ug.Id != Guid.Empty 
+        && Content.OwnerUserId == ug.Id) {
+        node.ForeColor = projectOwnerColor;
+      }
+
     }
 

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

@@ -32 +32 @@
       this.treeView = new Hive.Views.TreeView.NoDoubleClickTreeView();
       this.imageList = new System.Windows.Forms.ImageList(this.components);
+      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.detailsGroupBox = new System.Windows.Forms.GroupBox();
       this.detailsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
@@ -48 +49 @@
       this.refreshButton.Name = "refreshButton";
       this.refreshButton.Size = new System.Drawing.Size(24, 24);
-      this.refreshButton.TabIndex = 2;
+      this.refreshButton.TabIndex = 1;
+      this.toolTip.SetToolTip(this.refreshButton, "Refresh data");
       this.refreshButton.UseVisualStyleBackColor = true;
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
@@ -58 +60 @@
       this.inheritButton.Name = "inheritButton";
       this.inheritButton.Size = new System.Drawing.Size(24, 24);
-      this.inheritButton.TabIndex = 3;
+      this.inheritButton.TabIndex = 2;
+      this.toolTip.SetToolTip(this.inheritButton, "Save and hand down resource assignments to all descendant projects");
       this.inheritButton.UseVisualStyleBackColor = true;
       this.inheritButton.Click += new System.EventHandler(this.inheritButton_Click);
@@ -68 +71 @@
       this.saveButton.Name = "saveButton";
       this.saveButton.Size = new System.Drawing.Size(24, 24);
-      this.saveButton.TabIndex = 4;
+      this.saveButton.TabIndex = 3;
+      this.toolTip.SetToolTip(this.saveButton, "Save resource assignments");
       this.saveButton.UseVisualStyleBackColor = true;
       this.saveButton.Click += new System.EventHandler(this.saveButton_Click);
@@ -186 +190 @@
     private System.Windows.Forms.GroupBox detailsGroupBox;
     private HeuristicLab.Clients.Hive.Views.TreeView.NoDoubleClickTreeView treeView;
+    private System.Windows.Forms.ToolTip toolTip;
     private System.Windows.Forms.ImageList imageList;
     private MainForm.WindowsForms.ViewHost detailsViewHost;

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       this.idLabel = new System.Windows.Forms.Label();
       this.idTextBox = new System.Windows.Forms.TextBox();
@@ -40 +41 @@
       this.createdTextBox = new System.Windows.Forms.TextBox();
       this.refreshButton = new System.Windows.Forms.Button();
+      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.SuspendLayout();
       // 
@@ -67 +69 @@
       this.nameLabel.Name = "nameLabel";
       this.nameLabel.Size = new System.Drawing.Size(38, 13);
-      this.nameLabel.TabIndex = 2;
+      this.nameLabel.TabIndex = 0;
       this.nameLabel.Text = "Name:";
       // 
@@ -77 +79 @@
       this.nameTextBox.Name = "nameTextBox";
       this.nameTextBox.Size = new System.Drawing.Size(464, 20);
-      this.nameTextBox.TabIndex = 3;
+      this.nameTextBox.TabIndex = 2;
       this.nameTextBox.TextChanged += new System.EventHandler(this.nameTextBox_TextChanged);
       this.nameTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.nameTextBox_Validating);
@@ -87 +89 @@
       this.descriptionLabel.Name = "descriptionLabel";
       this.descriptionLabel.Size = new System.Drawing.Size(63, 13);
-      this.descriptionLabel.TabIndex = 4;
+      this.descriptionLabel.TabIndex = 0;
       this.descriptionLabel.Text = "Description:";
       // 
@@ -98 +100 @@
       this.descriptionTextBox.Name = "descriptionTextBox";
       this.descriptionTextBox.Size = new System.Drawing.Size(464, 98);
-      this.descriptionTextBox.TabIndex = 5;
+      this.descriptionTextBox.TabIndex = 3;
       this.descriptionTextBox.TextChanged += new System.EventHandler(this.descriptionTextBox_TextChanged);
-      // 
-      // ownerComboBox
-      // 
-      this.ownerComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.ownerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.ownerComboBox.FormattingEnabled = true;
-      this.ownerComboBox.Location = new System.Drawing.Point(102, 164);
-      this.ownerComboBox.Name = "ownerComboBox";
-      this.ownerComboBox.Size = new System.Drawing.Size(434, 21);
-      this.ownerComboBox.TabIndex = 6;
-      this.ownerComboBox.SelectedIndexChanged += new System.EventHandler(this.ownerComboBox_SelectedIndexChanged);
       // 
       // ownerLabel
@@ -119 +109 @@
       this.ownerLabel.Name = "ownerLabel";
       this.ownerLabel.Size = new System.Drawing.Size(41, 13);
-      this.ownerLabel.TabIndex = 7;
+      this.ownerLabel.TabIndex = 0;
       this.ownerLabel.Text = "Owner:";
+      // 
+      // ownerComboBox
+      // 
+      //this.ownerComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      //      | System.Windows.Forms.AnchorStyles.Right)));
+      this.ownerComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.ownerComboBox.FormattingEnabled = true;
+      this.ownerComboBox.Location = new System.Drawing.Point(72, 164);
+      this.ownerComboBox.Name = "ownerComboBox";
+      this.ownerComboBox.Size = new System.Drawing.Size(200, 21);
+      this.ownerComboBox.TabIndex = 4;
+      this.ownerComboBox.SelectedIndexChanged += new System.EventHandler(this.ownerComboBox_SelectedIndexChanged);
+      // 
+      // refreshButton
+      // 
+      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
+      this.refreshButton.Location = new System.Drawing.Point(278, 162);
+      this.refreshButton.Name = "refreshButton";
+      this.refreshButton.Size = new System.Drawing.Size(24, 24);
+      this.refreshButton.TabIndex = 5;
+      this.toolTip.SetToolTip(this.refreshButton, "Refresh data");
+      this.refreshButton.UseVisualStyleBackColor = true;
+      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
       // 
       // createdLabel
@@ -189 +202 @@
       this.createdTextBox.Size = new System.Drawing.Size(200, 20);
       this.createdTextBox.TabIndex = 14;
-      // 
-      // refreshButton
-      // 
-      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
-      this.refreshButton.Location = new System.Drawing.Point(72, 162);
-      this.refreshButton.Name = "refreshButton";
-      this.refreshButton.Size = new System.Drawing.Size(24, 24);
-      this.refreshButton.TabIndex = 15;
-      this.refreshButton.UseVisualStyleBackColor = true;
-      this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
       // 
       // ProjectView
@@ -246 +249 @@
     private System.Windows.Forms.TextBox createdTextBox;
     private System.Windows.Forms.Button refreshButton;
+    private System.Windows.Forms.ToolTip toolTip;
   }
 }

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

@@ -39 +39 @@
       this.resourcesTabPage = new System.Windows.Forms.TabPage();
       this.projectResourcesView = new HeuristicLab.Clients.Hive.Administrator.Views.ProjectResourcesView();
+      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -79 +80 @@
       this.refreshButton.Size = new System.Drawing.Size(24, 24);
       this.refreshButton.TabIndex = 14;
+      this.toolTip.SetToolTip(this.refreshButton, "Fetch list from server");
       this.refreshButton.UseVisualStyleBackColor = true;
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
@@ -89 +91 @@
       this.saveProjectButton.Size = new System.Drawing.Size(24, 24);
       this.saveProjectButton.TabIndex = 12;
+      this.toolTip.SetToolTip(this.saveProjectButton, "Store project on the server");
       this.saveProjectButton.UseVisualStyleBackColor = true;
       this.saveProjectButton.Click += new System.EventHandler(this.saveProjectButton_Click);
@@ -99 +102 @@
       this.removeButton.Size = new System.Drawing.Size(24, 24);
       this.removeButton.TabIndex = 11;
+      this.toolTip.SetToolTip(this.removeButton, "Remove a project");
       this.removeButton.UseVisualStyleBackColor = true;
       this.removeButton.Click += new System.EventHandler(this.removeButton_Click);
@@ -109 +113 @@
       this.addButton.Size = new System.Drawing.Size(24, 24);
       this.addButton.TabIndex = 10;
+      this.toolTip.SetToolTip(this.addButton, "Add a new project");
       this.addButton.UseVisualStyleBackColor = true;
       this.addButton.Click += new System.EventHandler(this.addButton_Click);
@@ -257 +262 @@
     private ProjectResourcesView projectResourcesView;
     private ProjectPermissionsView projectPermissionsView;
+    private System.Windows.Forms.ToolTip toolTip;
   }
 }

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -41 +41 @@
     private const int redFlagImageIndex = 1;
     private const string SELECTED_TAG = ""; // " [selected]";
-    private const string NOT_STORED_TAG = "**"; // " [not stored]";
+    private const string NOT_STORED_TAG = "*"; // " [not stored]";
     private const string CHANGES_NOT_STORED_TAG = "*"; // " [changes not stored]";
 

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

@@ -128 +128 @@
       this.btnRemoveGroup.Size = new System.Drawing.Size(24, 24);
       this.btnRemoveGroup.TabIndex = 2;
-      this.toolTip.SetToolTip(this.btnRemoveGroup, "Delete a slave or a group");
+      this.toolTip.SetToolTip(this.btnRemoveGroup, "Remove a slave or a group");
       this.btnRemoveGroup.UseVisualStyleBackColor = true;
       this.btnRemoveGroup.Click += new System.EventHandler(this.btnRemoveGroup_Click);

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

@@ -43 +43 @@
     public const string UNGROUPED_GROUP_DESCRIPTION = "Contains slaves that are not assigned to any group.";
     private const string SELECTED_TAG = ""; // " [selected]";
-    private const string NOT_STORED_TAG = "**"; // " [not stored]";
+    private const string NOT_STORED_TAG = "*"; // " [not stored]";
     private const string CHANGES_NOT_STORED_TAG = "*"; // " [changes not stored]";