- Timestamp:
- 09/13/13 13:49:03 (11 years ago)
- Location:
- stable
- Files:
-
- 3 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 9714,9833,9841,9850,9949
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Data.Views/3.3
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Data.Views/3.3 merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Data.Views/3.3 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Data.Views/3.3 6917-7005 /branches/CloningRefactoring/HeuristicLab.Data.Views/3.3 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Data.Views/3.3 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Data.Views/3.3 5815-6180 /branches/DataAnalysis/HeuristicLab.Data.Views/3.3 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Data.Views/3.3 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Data.Views/3.3 5060 /branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data.Views/3.3 9669-9706 /branches/NET40/sources/HeuristicLab.Data.Views/3.3 5138-5162 /branches/ParallelEngine/HeuristicLab.Data.Views/3.3 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Data.Views/3.3 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Data.Views/3.3 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Data.Views/3.3 6828 /branches/RuntimeOptimizer/HeuristicLab.Data.Views/3.3 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Data.Views/3.3 7787-8333 /branches/SlaveShutdown/HeuristicLab.Data.Views/3.3 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Data.Views/3.3 5370-5682 /branches/Trunk/HeuristicLab.Data.Views/3.3 6829-6865 /branches/UnloadJobs/HeuristicLab.Data.Views/3.3 9168-9215 /branches/VNS/HeuristicLab.Data.Views/3.3 5594-5752 /branches/histogram/HeuristicLab.Data.Views/3.3 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.Data.Views/3.3/Path Views/FileValueView.cs
r9697 r9961 22 22 using System; 23 23 using System.Windows.Forms; 24 using HeuristicLab.Core.Views; 24 25 using HeuristicLab.MainForm; 25 26 … … 27 28 [View("FileValueView")] 28 29 [Content(typeof(FileValue), true)] 29 public partial class FileValueView : StringConvertibleValueView {30 public partial class FileValueView : ItemView { 30 31 public new FileValue Content { 31 32 get { return (FileValue)base.Content; } 32 33 set { base.Content = value; } 33 }34 35 public override bool ReadOnly {36 get {37 if ((Content != null) && Content.ReadOnly) return true;38 return base.ReadOnly;39 }40 set { base.ReadOnly = value; }41 34 } 42 35 … … 45 38 } 46 39 47 protected override void RegisterContentEvents() {48 base.RegisterContentEvents();49 Content.FileOpenDialogFilterChanged += new EventHandler(Content_FileOpenDialogFilterChanged);50 }51 protected override void DeregisterContentEvents() {52 Content.FileOpenDialogFilterChanged -= new EventHandler(Content_FileOpenDialogFilterChanged);53 base.DeregisterContentEvents();54 }55 40 protected override void SetEnabledStateOfControls() { 56 41 base.SetEnabledStateOfControls(); 57 valueTextBox.Enabled = !Locked && !ReadOnly && Content != null;58 valueTextBox.ReadOnly = Locked || ReadOnly || Content == null;59 42 openButton.Enabled = !Locked && !ReadOnly && Content != null; 60 43 } … … 63 46 base.OnContentChanged(); 64 47 if (Content == null) { 65 valueTextBox.Text = string.Empty;48 stringConvertibleValueView.Content = null; 66 49 return; 67 50 } 68 51 69 valueTextBox.Text = Content.Value; 70 openButton.Enabled = !Content.ReadOnly; 71 openFileDialog.Filter = Content.FileDialogFilter; 72 } 73 74 protected virtual void Content_FileOpenDialogFilterChanged(object sender, EventArgs e) { 52 stringConvertibleValueView.Content = Content.StringValue; 75 53 openFileDialog.Filter = Content.FileDialogFilter; 76 54 } 77 55 78 56 protected virtual void openButton_Click(object sender, EventArgs e) { 57 openFileDialog.Filter = Content.FileDialogFilter; 79 58 if (openFileDialog.ShowDialog(this) != DialogResult.OK) return; 80 59 Content.Value = openFileDialog.FileName;
Note: See TracChangeset
for help on using the changeset viewer.