Context Navigation

← Previous Change
Next Change →

Views

Timestamp:

12/15/18 12:36:08 (6 years ago)

Author:

gkronber

Message:

#2892: Merging r15750:16382 (HEAD) from trunk to branch, resolving conflicts

Location:

branches/2892_LR-prediction-intervals

Files:

: 12 edited

. (modified) (3 props)
HeuristicLab.Clients.Access.Administration (modified) (1 prop)
HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleSelectionListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableUserGroupListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableUserListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/RoleListView.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupListView.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.Designer.cs (modified) (4 diffs)
HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.cs (modified) (3 diffs)
HeuristicLab.Clients.Access.Administration/3.3/Views/UserListView.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2892_LR-prediction-intervals

Property svn:ignore

-                      old
+                      new
+*.docstates
+*.psess
+*.resharper
+*.suo
+*.user
+*.vsp
+Doxygen
+FxCopResults.txt
+Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
+HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
+HeuristicLab.resharper.user
+ProtoGen.exe
 TestResults
+_ReSharper.HeuristicLab
+_ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
+_ReSharper.HeuristicLab.ExtLibs
+bin
+protoc.exe
+obj
+.vs

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement (added)	merged: 15761,15767-15768,15777,15792,15813,15819,15908,15913-15914,15920,15922,15925,15933,15953-15956,15966,15969,15978,15992,15995,16040,16043-16044,16050,16057,16060,16062,16064,16066,16068,16072,16089,16091-16095,16116
/branches/2915-AbsoluteSymbol (added)	merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/2937_SymReg_AnalyticalQuotient (added)	merged: 16083
/branches/HiveProjectManagement (added)	merged: 15377-15380,15399,15401,15411-15412,15422,15496-15497,15500,15503,15508,15523,15526-15528,15530,15540,15546-15547,15552,15557,15559,15567,15576-15577,15580,15627-15628,15630,15641-15644,15658-15659,15666,15671,15715-15716,15737,15742,15760
/stable (added)	merged: 15587-15588
/trunk (added)	merged: 15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054,16059,16063,16071,16084-16086,16117-16118,16120,16122,16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232,16241-16244,16252,16255,16257-16261,16263-16264,16266-16267,16269-16274,16276-16280,16283-16287,16289-16294,16296-16298,16301-16302,16305,16309,16333-16334,16341-16343,16356-16362,16365-16366,16378-16379,16381-16382
/trunk/sources (added)	merged: 15589-15590

Property svn:global-ignores set to
*.nuget
packages

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement/HeuristicLab.Clients.Access.Administration (added)	merged: 15953,16044,16057,16068
/branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Access.Administration (added)	merged: 16240
/branches/HiveProjectManagement/HeuristicLab.Clients.Access.Administration (added)	merged: 15422,15567,15576,15580
/trunk/HeuristicLab.Clients.Access.Administration (added)	merged: 16117,16356

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleListView.Designer.cs

r15583	r16388
66	66	//
67	67	this.storeButton.Enabled = false;
68		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	68	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
69	69	this.storeButton.Location = new System.Drawing.Point(33, 3);
70	70	this.storeButton.Name = "storeButton";

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleSelectionListView.Designer.cs

r15583	r16388
53	53	//
54	54	this.storeButton.Enabled = false;
55		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	55	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
56	56	this.storeButton.Location = new System.Drawing.Point(33, 3);
57	57	this.storeButton.Name = "storeButton";

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableUserGroupListView.Designer.cs

r15583	r16388
66	66	//
67	67	this.storeButton.Enabled = false;
68		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	68	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
69	69	this.storeButton.Location = new System.Drawing.Point(33, 3);
70	70	this.storeButton.Name = "storeButton";

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableUserListView.Designer.cs

r15583	r16388
66	66	this.storeButton.Enabled = false;
67	67	this.storeButton.Location = new System.Drawing.Point(33, 3);
68		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	68	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
69	69	this.storeButton.Name = "storeButton";
70	70	this.storeButton.Size = new System.Drawing.Size(24, 24);

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/RoleListView.cs

r15583	r16388
29	29	[View("RoleList View")]
30	30	[Content(typeof(IItemList<Role>), true)]
31		public partial class RoleListView : Item~~List~~View<Role> {
	31	public partial class RoleListView : ItemCollectionView<Role> {
32	32	public RoleListView() {
33	33	InitializeComponent();

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupListView.cs

r15583	r16388
29	29	[View("UserGroupList View")]
30	30	[Content(typeof(IItemList<UserGroup>), true)]
31		public partial class UserGroupListView : Item~~List~~View<UserGroup> {
	31	public partial class UserGroupListView : ItemCollectionView<UserGroup> {
32	32	public UserGroupListView() {
33	33	InitializeComponent();

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.Designer.cs

-                      r15583
+                      r16388
       this.groupNameTextBox = new System.Windows.Forms.TextBox();
       this.idTextBox = new System.Windows.Forms.TextBox();
       this.refreshableLightweightUserView = new HeuristicLab.Clients.Access.Views.RefreshableLightweightUserView();
+      this.refreshableLightweightUserView = new HeuristicLab.Clients.Access.Views.RefreshableLightweightAccessClientView();
       this.storeButton = new System.Windows.Forms.Button();
       this.SuspendLayout();
 …
       this.idTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.idTextBox.Enabled = false;
+      this.idTextBox.ReadOnly = true;
       this.idTextBox.Location = new System.Drawing.Point(79, 29);
       this.idTextBox.Name = "idTextBox";
 …
       //
       this.storeButton.Enabled = false;
       this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.storeButton.Location = new System.Drawing.Point(31, 58);
       this.storeButton.Name = "storeButton";
 …
     private System.Windows.Forms.TextBox groupNameTextBox;
     private System.Windows.Forms.TextBox idTextBox;
     private Views.RefreshableLightweightUserView refreshableLightweightUserView;
+    private Views.RefreshableLightweightAccessClientView refreshableLightweightUserView;
     private System.Windows.Forms.Button storeButton;
+  }

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.cs

-                      r15583
+                      r16388
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
       Access.AccessClient.Instance.Refreshing += new EventHandler(Content_Refreshing);
+      AccessClient.Instance.Refreshing += new EventHandler(Content_Refreshing);
       refreshableLightweightUserView.StorableStateChanged += new EventHandler(refreshableLightweightUserView_StorableStateChanged);
+    }
     protected override void DeregisterContentEvents() {
       Access.AccessClient.Instance.Refreshing -= new EventHandler(Content_Refreshing);
+      AccessClient.Instance.Refreshing -= new EventHandler(Content_Refreshing);
       refreshableLightweightUserView.StorableStateChanged -= new EventHandler(refreshableLightweightUserView_StorableStateChanged);
       base.DeregisterContentEvents();
 …
         idTextBox.Text = Content.Id.ToString();
         refreshableLightweightUserView.Content = Content.Id != Guid.Empty ? Access.AccessClient.Instance : null;
         refreshableLightweightUserView.FetchSelectedUsers = Content.Id != Guid.Empty ? new Func<List<Guid>>(delegate { return AccessAdministrationClient.CallAccessService<List<Guid>>(s => s.GetUserGroupIdsOfGroup(Content.Id)); }) : null;
+        refreshableLightweightUserView.Content = Content.Id != Guid.Empty ? AccessClient.Instance : null;
+        refreshableLightweightUserView.FetchSelectedUsers = Content.Id != Guid.Empty ? new Func<List<Guid>>(delegate { return AccessAdministrationClient.CallAccessService(s => s.GetUserGroupIdsOfGroup(Content.Id)); }) : null;
+      }
+    }
+    private void groupNameTextBox_TextChanged(object sender, System.EventArgs e) {
+      if (Content.Name != this.groupNameTextBox.Text)
+        Content.Name = this.groupNameTextBox.Text;
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      bool enabled = Content != null && !Locked;
+      groupNameTextBox.ReadOnly = !enabled;
+      idTextBox.ReadOnly = !enabled;
+      storeButton.Enabled = enabled;
+      //refreshableLightweightUserView.Enabled = enabled;
+      refreshableLightweightUserView.Locked = !enabled;
+      //refreshableLightweightUserView.ReadOnly = !enabled;
+    }
+    private void groupNameTextBox_TextChanged(object sender, EventArgs e) {
+      if (Content != null && Content.Name != groupNameTextBox.Text)
+        Content.Name = groupNameTextBox.Text;
+    }
 …
     private void Content_Refreshing(object sender, EventArgs e) {
       storeButton.Enabled = false;
+      if (!Locked) storeButton.Enabled = false;
+    }
     private void refreshableLightweightUserView_StorableStateChanged(object sender, EventArgs e) {
       storeButton.Enabled = true;
+      if (!Locked) storeButton.Enabled = true;
+    }
+  }

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/UserListView.cs

r15583	r16388
29	29	[View("UserList View")]
30	30	[Content(typeof(IItemList<User>), true)]
31		public partial class UserListView : Item~~List~~View<User> {
	31	public partial class UserListView : ItemCollectionView<User> {
32	32	public UserListView() {
33	33	InitializeComponent();

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.cs

-                      r15583
+                      r16388
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      bool enabled = Content != null && !Locked;
+      userNameTextBox.ReadOnly = !enabled;
+      fullNameTextBox.ReadOnly = !enabled;
+      emailTextBox.ReadOnly = !enabled;
       if (Content == null) {
         resetPasswordButton.Enabled = false;

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 16388 for branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Access.Administration/3.3/Views

Legend:

Download in other formats: