Ignore:
Timestamp:
09/13/13 13:49:03 (8 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.Designer.cs

    r9680 r9961  
    4848      this.openButton = new System.Windows.Forms.Button();
    4949      this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
    50       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    51       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
    52       this.splitContainer.Panel1.SuspendLayout();
    53       this.splitContainer.Panel2.SuspendLayout();
    54       this.splitContainer.SuspendLayout();
     50      this.stringConvertibleValueView = new HeuristicLab.Data.Views.StringConvertibleValueView();
    5551      this.SuspendLayout();
    56       //
    57       // valueTextBox
    58       //
    59       this.errorProvider.SetIconAlignment(this.valueTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    60       this.errorProvider.SetIconPadding(this.valueTextBox, 2);
    61       this.valueTextBox.Location = new System.Drawing.Point(17, 2);
    62       this.valueTextBox.Size = new System.Drawing.Size(87, 20);
    63       //
    64       // valueLabel
    65       //
    66       this.valueLabel.Location = new System.Drawing.Point(3, 5);
    67       this.valueLabel.Size = new System.Drawing.Size(52, 13);
    68       this.valueLabel.Text = "Directory:";
    69       //
    70       // splitContainer
    71       //
    72       //
    73       // splitContainer.Panel2
    74       //
    75       this.splitContainer.Panel2.Controls.Add(this.openButton);
    76       this.splitContainer.Size = new System.Drawing.Size(194, 24);
    77       this.splitContainer.SplitterDistance = 56;
    7852      //
    7953      // openButton
     
    8155      this.openButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    8256      this.openButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
    83       this.openButton.Location = new System.Drawing.Point(110, 0);
     57      this.openButton.Location = new System.Drawing.Point(167, 0);
    8458      this.openButton.Name = "openButton";
    8559      this.openButton.Size = new System.Drawing.Size(24, 24);
     
    8862      this.openButton.Click += new System.EventHandler(this.openButton_Click);
    8963      //
     64      // stringConvertibleValueView
     65      //
     66      this.stringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     67            | System.Windows.Forms.AnchorStyles.Right)));
     68      this.stringConvertibleValueView.Caption = "StringConvertibleValue View";
     69      this.stringConvertibleValueView.Content = null;
     70      this.stringConvertibleValueView.LabelVisible = true;
     71      this.stringConvertibleValueView.Location = new System.Drawing.Point(4, 2);
     72      this.stringConvertibleValueView.Name = "stringConvertibleValueView";
     73      this.stringConvertibleValueView.ReadOnly = false;
     74      this.stringConvertibleValueView.Size = new System.Drawing.Size(157, 21);
     75      this.stringConvertibleValueView.TabIndex = 4;
     76      //
    9077      // DirectoryValueView
    9178      //
    9279      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    93       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     80      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     81      this.Controls.Add(this.stringConvertibleValueView);
     82      this.Controls.Add(this.openButton);
    9483      this.Name = "DirectoryValueView";
    9584      this.Size = new System.Drawing.Size(194, 24);
    96       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    97       this.splitContainer.Panel1.ResumeLayout(false);
    98       this.splitContainer.Panel1.PerformLayout();
    99       this.splitContainer.Panel2.ResumeLayout(false);
    100       this.splitContainer.Panel2.PerformLayout();
    101       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
    102       this.splitContainer.ResumeLayout(false);
    10385      this.ResumeLayout(false);
    10486
     
    10991    protected System.Windows.Forms.Button openButton;
    11092    protected System.Windows.Forms.FolderBrowserDialog folderBrowserDialog;
     93    private StringConvertibleValueView stringConvertibleValueView;
    11194
    11295  }
Note: See TracChangeset for help on using the changeset viewer.