- Timestamp:
- 11/20/18 15:26:57 (5 years ago)
- Location:
- branches/2845_EnhancedProgress
- Files:
-
- 2 deleted
- 29 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2845_EnhancedProgress
- Property svn:mergeinfo changed
-
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2839_HiveProjectManagement/HeuristicLab.Clients.Access.Views merged eligible /stable/HeuristicLab.Clients.Access.Views merged eligible /trunk/HeuristicLab.Clients.Access.Views merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Clients.Access.Views 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Access.Views 5516-5520 /branches/Async/HeuristicLab.Clients.Access.Views 13329-15286 /branches/Benchmarking/sources/HeuristicLab.Clients.Access.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.Clients.Access.Views 4656-4721 /branches/CodeEditor/HeuristicLab.Clients.Access.Views 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Access.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Access.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.Clients.Access.Views 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Clients.Access.Views 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Clients.Access.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Access.Views 5060 /branches/HLScript/HeuristicLab.Clients.Access.Views 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Clients.Access.Views 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Clients.Access.Views 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Clients.Access.Views 11130-12721 /branches/HiveProjectManagement/HeuristicLab.Clients.Access.Views 15377-15760 /branches/HiveStatistics/sources/HeuristicLab.Clients.Access.Views 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Clients.Access.Views 10202-10483 /branches/NET40/sources/HeuristicLab.Clients.Access.Views 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Clients.Access.Views 12033-12122 /branches/ParallelEngine/HeuristicLab.Clients.Access.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Access.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Clients.Access.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Clients.Access.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.Clients.Access.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Access.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.Clients.Access.Views 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Clients.Access.Views 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Access.Views 5370-5682 /branches/Trunk/HeuristicLab.Clients.Access.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.Clients.Access.Views 9168-9215 /branches/VNS/HeuristicLab.Clients.Access.Views 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Clients.Access.Views 12948-12950 /branches/histogram/HeuristicLab.Clients.Access.Views 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.Clients.Access.Views 14232-14825
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientInformationDialog.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientInformationDialog.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientRegistrationDialog.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientRegistrationDialog.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientView.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/ClientViews/ClientView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/HeuristicLab.Clients.Access.Views-3.3.csproj
r11623 r16311 147 147 <DependentUpon>LightweightUserInformationView.cs</DependentUpon> 148 148 </Compile> 149 <Compile Include="UserViews\RefreshableLightweightAccessClientInformationView.cs"> 150 <SubType>UserControl</SubType> 151 </Compile> 152 <Compile Include="UserViews\RefreshableLightweightAccessClientInformationView.Designer.cs"> 153 <DependentUpon>RefreshableLightweightAccessClientInformationView.cs</DependentUpon> 154 </Compile> 155 <Compile Include="UserViews\LightweightUserView.cs"> 156 <SubType>UserControl</SubType> 157 </Compile> 158 <Compile Include="UserViews\LightweightUserView.Designer.cs"> 159 <DependentUpon>LightweightUserView.cs</DependentUpon> 160 </Compile> 161 <Compile Include="UserViews\RefreshableLightweightAccessClientView.cs"> 162 <SubType>UserControl</SubType> 163 </Compile> 164 <Compile Include="UserViews\RefreshableLightweightAccessClientView.Designer.cs"> 165 <DependentUpon>RefreshableLightweightAccessClientView.cs</DependentUpon> 166 </Compile> 149 167 <Compile Include="UserViews\RefreshableLightweightUserInformationView.cs"> 150 168 <SubType>UserControl</SubType> … … 152 170 <Compile Include="UserViews\RefreshableLightweightUserInformationView.Designer.cs"> 153 171 <DependentUpon>RefreshableLightweightUserInformationView.cs</DependentUpon> 154 </Compile>155 <Compile Include="UserViews\LightweightUserView.cs">156 <SubType>UserControl</SubType>157 </Compile>158 <Compile Include="UserViews\LightweightUserView.Designer.cs">159 <DependentUpon>LightweightUserView.cs</DependentUpon>160 </Compile>161 <Compile Include="UserViews\RefreshableLightweightUserView.cs">162 <SubType>UserControl</SubType>163 </Compile>164 <Compile Include="UserViews\RefreshableLightweightUserView.Designer.cs">165 <DependentUpon>RefreshableLightweightUserView.cs</DependentUpon>166 172 </Compile> 167 173 <Compile Include="UserViews\RefreshableView.cs"> -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/MenuItems/ClientInfoMenuItem.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/MenuItems/UserInfoMenuItem.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/Plugin.cs.frame
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 /// Plugin class for HeuristicLab.Clients.Access.Views plugin. 27 27 /// </summary> 28 [Plugin("HeuristicLab.Clients.Access.Views", "3.3.1 4.$WCREV$")]28 [Plugin("HeuristicLab.Clients.Access.Views", "3.3.15.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Clients.Access.Views-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Clients.Common", "3.3")] -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/Properties/AssemblyInfo.cs.frame
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 [assembly: AssemblyCompany("")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 6HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3.1 4.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")] -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/ChangePasswordDialog.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/ChangePasswordDialog.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserGroupSelectionDialog.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserGroupSelectionDialog.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserGroupSelectionView.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserGroupSelectionView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserInformationView.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserInformationView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 65 65 } 66 66 67 protected override void SetEnabledStateOfControls() { 68 base.SetEnabledStateOfControls(); 69 bool enabled = Content != null && !Locked; 70 //userNameTextBox.ReadOnly = !enabled; 71 fullNameTextBox.ReadOnly = !enabled; 72 emailTextBox.ReadOnly = !enabled; 73 //rolesListView.Enabled = enabled; 74 //groupsListView.Enabled = enabled; 75 changePasswordButton.Enabled = enabled; 76 } 77 67 78 private void changePasswordButton_Click(object sender, System.EventArgs e) { 68 79 using (ChangePasswordDialog dialog = new ChangePasswordDialog()) { -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserView.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/LightweightUserView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 59 59 base.SetEnabledStateOfControls(); 60 60 this.showDetailsCheckBox.Enabled = false; 61 bool enabled = Content != null && !Locked; 62 addButton.Enabled = enabled; 63 removeButton.Enabled = enabled; 64 moveDownButton.Enabled = enabled; 65 moveUpButton.Enabled = enabled; 61 66 } 62 67 -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 20 20 #endregion 21 21 22 using System;23 22 namespace HeuristicLab.Clients.Access.Views { 24 23 partial class RefreshableLightweightUserInformationView { … … 34 33 protected override void Dispose(bool disposing) { 35 34 if (disposing && (components != null)) { 36 lightweightUserInformationView.UserInformationChanged -= new EventHandler(lightweightUserInformationView_Changed);37 35 components.Dispose(); 38 36 } … … 47 45 /// </summary> 48 46 private void InitializeComponent() { 47 components = new System.ComponentModel.Container(); 49 48 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshableLightweightUserInformationView)); 50 49 this.lightweightUserInformationView = new HeuristicLab.Clients.Access.Views.LightweightUserInformationView(); 51 this.storeButton = new System.Windows.Forms.Button(); 50 this.refreshButton = new System.Windows.Forms.Button(); 51 this.toolTip = new System.Windows.Forms.ToolTip(this.components); 52 52 this.SuspendLayout(); 53 53 // 54 54 // refreshButton 55 55 // 56 this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh; 56 57 this.refreshButton.Location = new System.Drawing.Point(4, 3); 58 this.refreshButton.Name = "refreshButton"; 59 this.refreshButton.Size = new System.Drawing.Size(24, 24); 60 this.refreshButton.TabIndex = 1; 61 this.toolTip.SetToolTip(this.refreshButton, "Refresh data"); 62 this.refreshButton.UseVisualStyleBackColor = true; 63 this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click); 57 64 // 58 65 // lightweightUserInformationView … … 69 76 this.lightweightUserInformationView.TabIndex = 2; 70 77 // 71 // storeButton72 //73 this.storeButton.Enabled = false;74 this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;75 this.storeButton.Location = new System.Drawing.Point(34, 3);76 this.storeButton.Name = "storeButton";77 this.storeButton.Size = new System.Drawing.Size(24, 24);78 this.storeButton.TabIndex = 3;79 this.storeButton.UseVisualStyleBackColor = true;80 this.storeButton.Click += new System.EventHandler(this.storeButton_Click);81 //82 78 // RefreshableLightweightUserInformationView 83 79 // … … 85 81 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 86 82 this.Controls.Add(this.lightweightUserInformationView); 87 this.Controls.Add(this. storeButton);83 this.Controls.Add(this.refreshButton); 88 84 this.Name = "RefreshableLightweightUserInformationView"; 89 85 this.Size = new System.Drawing.Size(384, 281); 90 this.Controls.SetChildIndex(this.storeButton, 0);91 86 this.Controls.SetChildIndex(this.lightweightUserInformationView, 0); 92 this.Controls.SetChildIndex(this.refreshButton, 0);87 this.Controls.SetChildIndex(this.refreshButton, 1); 93 88 this.ResumeLayout(false); 94 89 … … 98 93 99 94 private LightweightUserInformationView lightweightUserInformationView; 100 private System.Windows.Forms. Button storeButton;101 95 private System.Windows.Forms.ToolTip toolTip; 96 private System.Windows.Forms.Button refreshButton; 102 97 } 103 98 } -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System; 23 23 using System.Windows.Forms; 24 using HeuristicLab.MainForm; 25 using HeuristicLab.MainForm.WindowsForms; 24 26 25 27 namespace HeuristicLab.Clients.Access.Views { 26 public partial class RefreshableLightweightUserInformationView : RefreshableView { 28 [View("RefreshableLightweightUserInformation View")] 29 [Content(typeof(LightweightUser), false)] 30 public partial class RefreshableLightweightUserInformationView : AsynchronousContentView { 31 public new LightweightUser Content { 32 get { return (LightweightUser)base.Content; } 33 set { base.Content = value; } 34 } 35 27 36 public RefreshableLightweightUserInformationView() { 28 37 InitializeComponent(); 38 } 39 40 protected override void OnContentChanged() { 41 base.OnContentChanged(); 42 lightweightUserInformationView.Content = Content; 43 } 44 45 protected override void SetEnabledStateOfControls() { 46 base.SetEnabledStateOfControls(); 47 this.Locked = true; 48 refreshButton.Enabled = Content != null; 49 } 50 51 protected override void DeregisterContentEvents() { 52 Refreshing -= new EventHandler(Content_Refreshing); 53 Refreshed -= new EventHandler(Content_Refreshed); 54 base.DeregisterContentEvents(); 55 } 56 57 protected override void RegisterContentEvents() { 58 base.RegisterContentEvents(); 59 Refreshing += new EventHandler(Content_Refreshing); 60 Refreshed += new EventHandler(Content_Refreshed); 61 } 62 63 protected void Content_Refreshing(object sender, EventArgs e) { 64 if (InvokeRequired) { 65 Invoke(new EventHandler(Content_Refreshing), sender, e); 66 } else { 67 Cursor = Cursors.AppStarting; 68 refreshButton.Enabled = false; 69 70 lightweightUserInformationView.Enabled = false; 71 } 72 } 73 74 protected void Content_Refreshed(object sender, EventArgs e) { 75 if (InvokeRequired) { 76 Invoke(new EventHandler(Content_Refreshed), sender, e); 77 } else { 78 Cursor = Cursors.Default; 79 refreshButton.Enabled = true; 80 81 lightweightUserInformationView.Enabled = true; 82 if (!UserInformation.Instance.UserExists) { 83 MessageBox.Show("Couldn't fetch user information from the server." + Environment.NewLine + 84 "Please verify that you have an existing user and that your user name and password is correct. ", "HeuristicLab Access Service", MessageBoxButtons.OK, MessageBoxIcon.Error); 85 lightweightUserInformationView.Content = null; 86 } else { 87 lightweightUserInformationView.Content = Content; 88 } 89 } 90 } 91 92 void lightweightUserInformationView_Changed(object sender, EventArgs e) { 93 // nothing to do 29 94 } 30 95 … … 34 99 } 35 100 36 void lightweightUserInformationView_Changed(object sender, EventArgs e) {37 if (!storeButton.Enabled) storeButton.Enabled = true;101 private void RefreshData() { 102 ExecuteActionAsync(RefreshUserData, PluginInfrastructure.ErrorHandling.ShowErrorDialog); 38 103 } 39 104 40 p rotected override void RefreshData() {41 Content.ExecuteActionAsync(RefreshUserData, PluginInfrastructure.ErrorHandling.ShowErrorDialog);105 public void ManualRefresh() { 106 RefreshData(); 42 107 } 43 108 44 protected override void Content_Refreshing(object sender, EventArgs e) { 45 if (InvokeRequired) { 46 Invoke(new EventHandler(Content_Refreshing), sender, e); 47 } else { 48 base.Content_Refreshing(sender, e); 49 lightweightUserInformationView.Enabled = false; 50 storeButton.Enabled = false; 51 } 109 protected void refreshButton_Click(object sender, System.EventArgs e) { 110 RefreshData(); 52 111 } 53 112 54 protected override void Content_Refreshed(object sender, EventArgs e) { 55 if (InvokeRequired) { 56 Invoke(new EventHandler(Content_Refreshed), sender, e); 57 } else { 58 base.Content_Refreshed(sender, e); 59 lightweightUserInformationView.Enabled = true; 60 if (!UserInformation.Instance.UserExists) { 61 MessageBox.Show("Couldn't fetch user information from the server." + Environment.NewLine + 62 "Please verify that you have an existing user and that your user name and password is correct. ", "HeuristicLab Access Service", MessageBoxButtons.OK, MessageBoxIcon.Error); 63 lightweightUserInformationView.Content = null; 64 } else { 65 lightweightUserInformationView.Content = UserInformation.Instance.User; 113 public void ExecuteActionAsync(Action action, Action<Exception> exceptionCallback) { 114 var call = new Func<Exception>(delegate () { 115 try { 116 OnRefreshing(); 117 action(); 118 } catch (Exception ex) { 119 return ex; 120 } finally { 121 OnRefreshed(); 66 122 } 67 } 123 return null; 124 }); 125 call.BeginInvoke(delegate (IAsyncResult result) { 126 Exception ex = call.EndInvoke(result); 127 if (ex != null) exceptionCallback(ex); 128 }, null); 68 129 } 69 130 70 private void storeButton_Click(object sender, EventArgs e) { 71 AccessClient.Instance.ExecuteActionAsync(new Action(delegate { 72 AccessClient.CallAccessService(x => x.UpdateLightweightUser(UserInformation.Instance.User)); 73 }), HeuristicLab.PluginInfrastructure.ErrorHandling.ShowErrorDialog); 131 #region Events 132 public event EventHandler Refreshing; 133 private void OnRefreshing() { 134 EventHandler handler = Refreshing; 135 if (handler != null) handler(this, EventArgs.Empty); 74 136 } 137 public event EventHandler Refreshed; 138 private void OnRefreshed() { 139 EventHandler handler = Refreshed; 140 if (handler != null) handler(this, EventArgs.Empty); 141 } 142 #endregion 75 143 } 76 144 } -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableView.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 components = new System.ComponentModel.Container(); 47 48 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshableView)); 48 49 this.refreshButton = new System.Windows.Forms.Button(); 50 this.toolTip = new System.Windows.Forms.ToolTip(this.components); 49 51 this.SuspendLayout(); 50 52 // … … 56 58 this.refreshButton.Size = new System.Drawing.Size(24, 24); 57 59 this.refreshButton.TabIndex = 1; 60 this.toolTip.SetToolTip(this.refreshButton, "Refresh data"); 58 61 this.refreshButton.UseVisualStyleBackColor = true; 59 62 this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click); … … 72 75 #endregion 73 76 77 private System.Windows.Forms.ToolTip toolTip; 74 78 protected System.Windows.Forms.Button refreshButton; 75 79 } -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableView.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/UserInformationDialog.Designer.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 46 46 private void InitializeComponent() { 47 47 this.closeButton = new System.Windows.Forms.Button(); 48 this.refreshableLightweightUserInformationView = new HeuristicLab.Clients.Access.Views.RefreshableLightweight UserInformationView();48 this.refreshableLightweightUserInformationView = new HeuristicLab.Clients.Access.Views.RefreshableLightweightAccessClientInformationView(); 49 49 this.SuspendLayout(); 50 50 // … … 95 95 #endregion 96 96 97 private RefreshableLightweight UserInformationView refreshableLightweightUserInformationView;97 private RefreshableLightweightAccessClientInformationView refreshableLightweightUserInformationView; 98 98 private System.Windows.Forms.Button closeButton; 99 99 } -
branches/2845_EnhancedProgress/HeuristicLab.Clients.Access.Views/3.3/UserViews/UserInformationDialog.cs
r16308 r16311 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.