Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/13/13 13:49:03 (11 years ago)
Author:
mkommend
Message:

#2081: Merged path data types into stable.

Location:
stable
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Data.Views/3.3

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.Data.Views/3.3mergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Data.Views/3.35516-5520
      /branches/Benchmarking/sources/HeuristicLab.Data.Views/3.36917-7005
      /branches/CloningRefactoring/HeuristicLab.Data.Views/3.34656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Data.Views/3.35471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Data.Views/3.35815-6180
      /branches/DataAnalysis/HeuristicLab.Data.Views/3.34458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Data.Views/3.36284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Data.Views/3.35060
      /branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data.Views/3.39669-9706
      /branches/NET40/sources/HeuristicLab.Data.Views/3.35138-5162
      /branches/ParallelEngine/HeuristicLab.Data.Views/3.35175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Data.Views/3.37568-7810
      /branches/QAPAlgorithms/HeuristicLab.Data.Views/3.36350-6627
      /branches/Restructure trunk solution/HeuristicLab.Data.Views/3.36828
      /branches/RuntimeOptimizer/HeuristicLab.Data.Views/3.38943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Data.Views/3.37787-8333
      /branches/SlaveShutdown/HeuristicLab.Data.Views/3.38944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.Data.Views/3.35370-5682
      /branches/Trunk/HeuristicLab.Data.Views/3.36829-6865
      /branches/UnloadJobs/HeuristicLab.Data.Views/3.39168-9215
      /branches/VNS/HeuristicLab.Data.Views/3.35594-5752
      /branches/histogram/HeuristicLab.Data.Views/3.35959-6341
  • stable/HeuristicLab.Data.Views/3.3/Path Views/DirectoryValueView.cs

    r9697 r9961  
    2222using System;
    2323using System.Windows.Forms;
     24using HeuristicLab.Core.Views;
    2425using HeuristicLab.MainForm;
    2526
     
    2728  [View("DirectoryValueView")]
    2829  [Content(typeof(DirectoryValue), true)]
    29   public partial class DirectoryValueView : StringConvertibleValueView {
     30  public partial class DirectoryValueView : ItemView {
    3031    public new DirectoryValue Content {
    3132      get { return (DirectoryValue)base.Content; }
    3233      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; }
    4134    }
    4235
     
    4740    protected override void SetEnabledStateOfControls() {
    4841      base.SetEnabledStateOfControls();
    49       valueTextBox.Enabled = !Locked && !ReadOnly && Content != null;
    50       valueTextBox.ReadOnly = Locked || ReadOnly || Content == null;
    5142      openButton.Enabled = !Locked && !ReadOnly && Content != null;
    5243    }
     
    5546      base.OnContentChanged();
    5647      if (Content == null) {
    57         valueTextBox.Text = string.Empty;
     48        stringConvertibleValueView.Content = null;
    5849        return;
    5950      }
    6051
    61       valueTextBox.Text = Content.Value;
    62       openButton.Enabled = !Content.ReadOnly;
     52      stringConvertibleValueView.Content = Content.StringValue;
    6353    }
    6454
Note: See TracChangeset for help on using the changeset viewer.