Changeset 15038 for stable

Timestamp:

06/20/17 09:33:19 (8 years ago)

Author:

pfleck

Message:

#2788: merged r14995, r15003

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/ItemView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/Properties/Settings.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/Properties/Settings.Designer.cs) (2 diffs)
• HeuristicLab.Core.Views/3.3/Properties/Settings.settings (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/Properties/Settings.settings)
• HeuristicLab.Core.Views/3.3/app.config (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/app.config)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/ChangeNestingLevelDialog.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimizer/3.3/ChangeNestingLevelDialog.Designer.cs)
• HeuristicLab.Optimizer/3.3/ChangeNestingLevelDialog.cs (copied) (copied from trunk/sources/HeuristicLab.Optimizer/3.3/ChangeNestingLevelDialog.cs)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/MenuItems/ChangeNestingLevelMenuItem.cs (copied) (copied from trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/ChangeNestingLevelMenuItem.cs)

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

@@ -122 +122 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="BreadcrumbViewHost.cs">
@@ -172 +173 @@
     </Compile>
     <Compile Include="Plugin.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <Compile Include="VariableValueView.cs">
       <SubType>UserControl</SubType>
@@ -329 +335 @@
       <DependentUpon>VariableView.cs</DependentUpon>
     </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>

stable/HeuristicLab.Core.Views/3.3/ItemView.cs

@@ -29 +29 @@
   /// </summary>
   public partial class ItemView : AsynchronousContentView {
-    public const int MaximumNestingLevel = 35;
-
     public new IItem Content {
       get { return (IItem)base.Content; }
@@ -46 +44 @@
       base.OnInitialized(e);
 
-      if (CountParentControls() > MaximumNestingLevel) {
+      if (CountParentControls() > Properties.Settings.Default.MaximumNestedControls) {
         //capture content, needed because it is set at a later time
         NestingLevelErrorControl errorControl = new NestingLevelErrorControl(() => Content, this.GetType());

stable/HeuristicLab.Core.Views/3.3/Properties/Settings.Designer.cs

@@ -1 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -13 +13 @@
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

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

@@ -153 +153 @@
     <EmbeddedResource Include="Documents\SGP_Robocode.hl" />
     <None Include="Plugin.cs.frame" />
+    <Compile Include="ChangeNestingLevelDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ChangeNestingLevelDialog.Designer.cs">
+      <DependentUpon>ChangeNestingLevelDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MenuItems\ChangeNestingLevelMenuItem.cs" />
     <Compile Include="OptimizerSingleDocumentMainForm.cs">
       <SubType>Form</SubType>