Changeset 9363 for branches/OaaS/HeuristicLab.Problems.Instances.Views
- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.Instances.Views/3.3/HeuristicLab.Problems.Instances.Views-3.3.csproj
r7960 r9363 199 199 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 200 200 <PropertyGroup> 201 <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)201 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 202 202 set ProjectDir=$(ProjectDir) 203 203 set SolutionDir=$(SolutionDir) … … 205 205 206 206 call PreBuildEvent.cmd 207 </PreBuildEvent> 208 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 209 export ProjectDir=$(ProjectDir) 210 export SolutionDir=$(SolutionDir) 211 212 $SolutionDir/PreBuildEvent.sh 207 213 </PreBuildEvent> 208 214 </PropertyGroup> -
branches/OaaS/HeuristicLab.Problems.Instances.Views/3.3/Plugin.cs.frame
r8223 r9363 23 23 24 24 namespace HeuristicLab.Problems.Instances.Views { 25 [Plugin("HeuristicLab.Problems.Instances.Views", "3.3. 6.$WCREV$")]25 [Plugin("HeuristicLab.Problems.Instances.Views", "3.3.7.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Problems.Instances.Views-3.3.dll", PluginFileType.Assembly)] 27 27 [PluginDependency("HeuristicLab.Common", "3.3")] -
branches/OaaS/HeuristicLab.Problems.Instances.Views/3.3/ProblemInstanceProviderView.Designer.cs
r7967 r9363 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 this.components = new System.ComponentModel.Container(); 48 this.toolTip = new System.Windows.Forms.ToolTip(this.components); 47 49 this.SuspendLayout(); 50 // 51 // toolTip 52 // 53 this.toolTip.AutoPopDelay = 30000; 54 this.toolTip.InitialDelay = 500; 55 this.toolTip.ReshowDelay = 100; 48 56 // 49 57 // ProblemInstanceProviderView 50 58 // 51 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);52 59 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; 53 60 this.Name = "ProblemInstanceProviderView"; … … 59 66 #endregion 60 67 68 protected System.Windows.Forms.ToolTip toolTip; 69 70 61 71 62 72 } -
branches/OaaS/HeuristicLab.Problems.Instances.Views/3.3/ProblemInstanceProviderViewGeneric.cs
r8201 r9363 21 21 22 22 using System; 23 using System.Collections.Generic;24 23 using System.Linq; 25 24 using System.Windows.Forms; … … 40 39 private IProblemInstanceConsumer<T> GenericConsumer { get { return Consumer as IProblemInstanceConsumer<T>; } } 41 40 42 p ublicIProblemInstanceConsumer consumer;41 private IProblemInstanceConsumer consumer; 43 42 public override IProblemInstanceConsumer Consumer { 44 43 get { return consumer; } … … 59 58 } else { 60 59 instancesComboBox.DisplayMember = "Name"; 61 IEnumerable<IDataDescriptor>dataDescriptors = Content.GetDataDescriptors().ToList();62 ShowInstanceLoad(dataDescriptors. Count() > 0);60 var dataDescriptors = Content.GetDataDescriptors().ToList(); 61 ShowInstanceLoad(dataDescriptors.Any()); 63 62 instancesComboBox.DataSource = dataDescriptors; 64 63 instancesComboBox.SelectedIndex = -1; … … 85 84 if (comboBox.DataSource == null) 86 85 comboBox.Items.Clear(); 86 toolTip.SetToolTip(comboBox, String.Empty); 87 87 } 88 88 … … 93 93 try { 94 94 GenericConsumer.Load(instance); 95 } 96 catch (Exception ex) { 95 } catch (Exception ex) { 97 96 ErrorHandling.ShowErrorDialog(String.Format("This problem does not support loading the instance {0}", descriptor.Name), ex); 98 97 } 99 } 98 toolTip.SetToolTip(instancesComboBox, descriptor.Description); 99 } else toolTip.SetToolTip(instancesComboBox, String.Empty); 100 100 } 101 101 } -
branches/OaaS/HeuristicLab.Problems.Instances.Views/3.3/Properties/AssemblyInfo.cs.frame
r7830 r9363 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
Note: See TracChangeset
for help on using the changeset viewer.