- Timestamp:
- 11/24/15 18:43:08 (8 years ago)
- Location:
- branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3
- Files:
-
- 3 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.Designer.cs
r11963 r13388 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CreateNewSingleEncodingDialog));48 47 this.label1 = new System.Windows.Forms.Label(); 49 48 this.encodingTypeComboBox = new System.Windows.Forms.ComboBox(); … … 126 125 this.Controls.Add(this.encodingTypeComboBox); 127 126 this.Controls.Add(this.label1); 128 this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));127 this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon; 129 128 this.MaximizeBox = false; 130 129 this.MinimizeBox = false; -
branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/CreateNewSingleEncodingDialog.cs
r11963 r13388 23 23 using System.Collections.Generic; 24 24 using System.Windows.Forms; 25 using HeuristicLab.Optimization;26 25 using HeuristicLab.PluginInfrastructure; 27 26 … … 46 45 var encodings = ApplicationManager.Manager.GetTypes(typeof(IEncoding)); 47 46 foreach (var enc in encodings) { 48 if (enc != typeof( MultiEncoding))47 if (enc != typeof(CombinedEncoding)) 49 48 encodingTypeComboBox.Items.Add(enc); 50 49 } -
branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj
r13336 r13388 142 142 <DependentUpon>BatchRunView.cs</DependentUpon> 143 143 </Compile> 144 <Compile Include="CreateNewSingleEncodingDialog.cs"> 145 <SubType>Form</SubType> 146 </Compile> 147 <Compile Include="CreateNewSingleEncodingDialog.Designer.cs"> 148 <DependentUpon>CreateNewSingleEncodingDialog.cs</DependentUpon> 149 </Compile> 144 150 <Compile Include="ISolutionSimilarityCalculatorView.cs"> 145 151 <SubType>UserControl</SubType> … … 153 159 <Compile Include="ExperimentListView.Designer.cs"> 154 160 <DependentUpon>ExperimentListView.cs</DependentUpon> 161 </Compile> 162 <Compile Include="MultiEncodingView.cs"> 163 <SubType>UserControl</SubType> 164 </Compile> 165 <Compile Include="MultiEncodingView.Designer.cs"> 166 <DependentUpon>MultiEncodingView.cs</DependentUpon> 155 167 </Compile> 156 168 <Compile Include="Plugin.cs" /> -
branches/ProblemRefactoring/HeuristicLab.Optimization.Views/3.3/MultiEncodingView.cs
r11963 r13388 30 30 31 31 namespace HeuristicLab.Optimization.Views { 32 [View(" MultiEncoding View")]33 [Content(typeof( MultiEncoding), IsDefaultView = true)]32 [View("CombinedEncoding View")] 33 [Content(typeof(CombinedEncoding), IsDefaultView = true)] 34 34 public sealed partial class MultiEncodingView : ParameterizedNamedItemView { 35 35 36 public new MultiEncoding Content {37 get { return ( MultiEncoding)base.Content; }36 public new CombinedEncoding Content { 37 get { return (CombinedEncoding)base.Content; } 38 38 set { base.Content = value; } 39 39 } … … 49 49 protected override void DeregisterContentEvents() { 50 50 base.DeregisterContentEvents(); 51 Content.EncodingsChanged -= ContentOnEncodingsChanged; 51 Content.Encodings.ItemsAdded -= ContentOnEncodingsChanged; 52 Content.Encodings.ItemsRemoved -= ContentOnEncodingsChanged; 52 53 } 53 54 54 55 protected override void RegisterContentEvents() { 55 Content.EncodingsChanged += ContentOnEncodingsChanged; 56 Content.Encodings.ItemsAdded += ContentOnEncodingsChanged; 57 Content.Encodings.ItemsRemoved += ContentOnEncodingsChanged; 56 58 base.RegisterContentEvents(); 57 59 }
Note: See TracChangeset
for help on using the changeset viewer.