Changeset 15038


Ignore:
Timestamp:
06/20/17 09:33:19 (2 years ago)
Author:
pfleck
Message:

#2788: merged r14995, r15003

Location:
stable
Files:
5 edited
6 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

    r13647 r15038  
    122122  </ItemGroup>
    123123  <ItemGroup>
     124    <None Include="app.config" />
    124125    <None Include="Plugin.cs.frame" />
    125126    <Compile Include="BreadcrumbViewHost.cs">
     
    172173    </Compile>
    173174    <Compile Include="Plugin.cs" />
     175    <Compile Include="Properties\Settings.Designer.cs">
     176      <AutoGen>True</AutoGen>
     177      <DesignTimeSharedInput>True</DesignTimeSharedInput>
     178      <DependentUpon>Settings.settings</DependentUpon>
     179    </Compile>
    174180    <Compile Include="VariableValueView.cs">
    175181      <SubType>UserControl</SubType>
     
    329335      <DependentUpon>VariableView.cs</DependentUpon>
    330336    </Compile>
     337    <None Include="Properties\Settings.settings">
     338      <Generator>PublicSettingsSingleFileGenerator</Generator>
     339      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     340    </None>
    331341  </ItemGroup>
    332342  <ItemGroup>
  • stable/HeuristicLab.Core.Views/3.3/ItemView.cs

    r14186 r15038  
    2929  /// </summary>
    3030  public partial class ItemView : AsynchronousContentView {
    31     public const int MaximumNestingLevel = 35;
    32 
    3331    public new IItem Content {
    3432      get { return (IItem)base.Content; }
     
    4644      base.OnInitialized(e);
    4745
    48       if (CountParentControls() > MaximumNestingLevel) {
     46      if (CountParentControls() > Properties.Settings.Default.MaximumNestedControls) {
    4947        //capture content, needed because it is set at a later time
    5048        NestingLevelErrorControl errorControl = new NestingLevelErrorControl(() => Content, this.GetType());
  • stable/HeuristicLab.Core.Views/3.3/Properties/Settings.Designer.cs

    r14995 r15038  
    1 //------------------------------------------------------------------------------
     1//------------------------------------------------------------------------------
    22// <auto-generated>
    33//     This code was generated by a tool.
     
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")]
    16     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     16    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
    1818        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
  • stable/HeuristicLab.Optimizer

  • stable/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r14211 r15038  
    153153    <EmbeddedResource Include="Documents\SGP_Robocode.hl" />
    154154    <None Include="Plugin.cs.frame" />
     155    <Compile Include="ChangeNestingLevelDialog.cs">
     156      <SubType>Form</SubType>
     157    </Compile>
     158    <Compile Include="ChangeNestingLevelDialog.Designer.cs">
     159      <DependentUpon>ChangeNestingLevelDialog.cs</DependentUpon>
     160    </Compile>
     161    <Compile Include="MenuItems\ChangeNestingLevelMenuItem.cs" />
    155162    <Compile Include="OptimizerSingleDocumentMainForm.cs">
    156163      <SubType>Form</SubType>
Note: See TracChangeset for help on using the changeset viewer.