Changeset 7635 for branches/ClientUserManagement/HeuristicLab.Clients.Access.Administration/3.3/Views

Timestamp:

03/19/12 16:16:18 (13 years ago)

Author:

ascheibe

Message:

#1648 added admin views for displaying user groups

Location:

branches/ClientUserManagement/HeuristicLab.Clients.Access.Administration/3.3/Views

Files:

• RefreshableUserGroupListView.Designer.cs (added)
• RefreshableUserGroupListView.cs (added)
• RefreshableUserListView.cs (modified) (2 diffs)
• RoleView.Designer.cs (added)
• RoleView.cs (added)
• UserAdministrationDialog.Designer.cs (modified) (4 diffs)
• UserAdministrationDialog.cs (modified) (1 diff)
• UserGroupListView.Designer.cs (added)
• UserGroupListView.cs (added)
• UserGroupView.Designer.cs (added)
• UserGroupView.cs (added)

branches/ClientUserManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableUserListView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 namespace HeuristicLab.Clients.Access.Administration {
   public partial class RefreshableUserListView : RefreshableView {
@@ -27 +28 @@
 
     protected override void RefreshData() {
-      Content.Refresh();
-      userListView.Content = Content.Users;
+      Content.RefreshUsersAsync(PluginInfrastructure.ErrorHandling.ShowErrorDialog);
     }
 
+    protected override void Content_Refreshing(object sender, EventArgs e) {
+      if (InvokeRequired) {
+        Invoke(new EventHandler(Content_Refreshing), sender, e);
+      } else {
+        base.Content_Refreshing(sender, e);
+        userListView.Enabled = false;
+      }
+    }
 
+    protected override void Content_Refreshed(object sender, EventArgs e) {
+      if (InvokeRequired) {
+        Invoke(new EventHandler(Content_Refreshed), sender, e);
+      } else {
+        base.Content_Refreshed(sender, e);
+        userListView.Enabled = true;
+        userListView.Content = Content.Users;
+      }
+    }
   }
 }

branches/ClientUserManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/UserAdministrationDialog.Designer.cs

@@ -25 +25 @@
     private void InitializeComponent() {
       this.refreshableUserListView = new HeuristicLab.Clients.Access.Administration.RefreshableUserListView();
+      this.mainTabControl = new System.Windows.Forms.TabControl();
+      this.usersTabPage = new System.Windows.Forms.TabPage();
+      this.UserGroupsTabPage = new System.Windows.Forms.TabPage();
+      this.refreshableUserGroupListView = new HeuristicLab.Clients.Access.Administration.RefreshableUserGroupListView();
+      this.mainTabControl.SuspendLayout();
+      this.usersTabPage.SuspendLayout();
+      this.UserGroupsTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
       // refreshableUserListView
       // 
-      this.refreshableUserListView.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.refreshableUserListView.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.refreshableUserListView.Caption = "View";
       this.refreshableUserListView.Content = null;
-      this.refreshableUserListView.Location = new System.Drawing.Point(12, 12);
+      this.refreshableUserListView.Location = new System.Drawing.Point(6, 6);
       this.refreshableUserListView.Name = "refreshableUserListView";
       this.refreshableUserListView.ReadOnly = false;
-      this.refreshableUserListView.Size = new System.Drawing.Size(782, 402);
+      this.refreshableUserListView.Size = new System.Drawing.Size(762, 364);
       this.refreshableUserListView.TabIndex = 0;
+      // 
+      // mainTabControl
+      // 
+      this.mainTabControl.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.mainTabControl.Controls.Add(this.usersTabPage);
+      this.mainTabControl.Controls.Add(this.UserGroupsTabPage);
+      this.mainTabControl.Location = new System.Drawing.Point(12, 12);
+      this.mainTabControl.Name = "mainTabControl";
+      this.mainTabControl.SelectedIndex = 0;
+      this.mainTabControl.Size = new System.Drawing.Size(782, 402);
+      this.mainTabControl.TabIndex = 1;
+      // 
+      // usersTabPage
+      // 
+      this.usersTabPage.Controls.Add(this.refreshableUserListView);
+      this.usersTabPage.Location = new System.Drawing.Point(4, 22);
+      this.usersTabPage.Name = "usersTabPage";
+      this.usersTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.usersTabPage.Size = new System.Drawing.Size(774, 376);
+      this.usersTabPage.TabIndex = 0;
+      this.usersTabPage.Text = "Users";
+      this.usersTabPage.UseVisualStyleBackColor = true;
+      // 
+      // UserGroupsTabPage
+      // 
+      this.UserGroupsTabPage.Controls.Add(this.refreshableUserGroupListView);
+      this.UserGroupsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.UserGroupsTabPage.Name = "UserGroupsTabPage";
+      this.UserGroupsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.UserGroupsTabPage.Size = new System.Drawing.Size(774, 376);
+      this.UserGroupsTabPage.TabIndex = 1;
+      this.UserGroupsTabPage.Text = "Groups";
+      this.UserGroupsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // refreshableUserGroupListView
+      // 
+      this.refreshableUserGroupListView.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.refreshableUserGroupListView.Caption = "View";
+      this.refreshableUserGroupListView.Content = null;
+      this.refreshableUserGroupListView.Location = new System.Drawing.Point(6, 6);
+      this.refreshableUserGroupListView.Name = "refreshableUserGroupListView";
+      this.refreshableUserGroupListView.ReadOnly = false;
+      this.refreshableUserGroupListView.Size = new System.Drawing.Size(762, 364);
+      this.refreshableUserGroupListView.TabIndex = 0;
       // 
       // UserAdministrationDialog
@@ -45 +100 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.ClientSize = new System.Drawing.Size(806, 426);
-      this.Controls.Add(this.refreshableUserListView);
+      this.Controls.Add(this.mainTabControl);
       this.MaximizeBox = false;
       this.MinimizeBox = false;
@@ -54 +109 @@
       this.Text = "User Administration";
       this.Load += new System.EventHandler(this.UserAdministrationDialog_Load);
+      this.mainTabControl.ResumeLayout(false);
+      this.usersTabPage.ResumeLayout(false);
+      this.UserGroupsTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -61 +119 @@
 
     private RefreshableUserListView refreshableUserListView;
+    private System.Windows.Forms.TabControl mainTabControl;
+    private System.Windows.Forms.TabPage usersTabPage;
+    private System.Windows.Forms.TabPage UserGroupsTabPage;
+    private RefreshableUserGroupListView refreshableUserGroupListView;
   }
 }

branches/ClientUserManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/UserAdministrationDialog.cs

@@ -31 +31 @@
       if (!DesignMode) {
         refreshableUserListView.Content = AccessAdministrationClient.Instance;
+        refreshableUserGroupListView.Content = AccessAdministrationClient.Instance;
       }
     }