Changeset 6377 for branches/GP.Grammar.Editor/HeuristicLab.Visualization.ChartControlsExtensions/3.3

Timestamp:

06/07/11 12:49:03 (13 years ago)

Author:

mkommend

Message:

#1479: Merged trunk changes into branch.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Visualization.ChartControlsExtensions/3.3

Files:

• EnhancedChart.Designer.cs (modified) (2 diffs)
• EnhancedChart.resx (copied) (copied from trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.resx)
• HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj (modified) (2 diffs)
• HistogramControl.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HistogramControl.Designer.cs)
• HistogramControl.cs (copied) (copied from trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HistogramControl.cs)

branches/GP.Grammar.Editor/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.Designer.cs

@@ -60 +60 @@
             this.copyImageToClipboardBitmapToolStripMenuItem});
       this.contextMenuStrip.Name = "contextMenuStrip";
-      this.contextMenuStrip.Size = new System.Drawing.Size(257, 48);
+      this.contextMenuStrip.Size = new System.Drawing.Size(257, 76);
       // 
       // exportChartToolStripMenuItem
@@ -78 +78 @@
       // saveFileDialog
       // 
-      this.saveFileDialog.Filter = "Bitmap (*.bmp)|*.bmp|JPEG (*.jpg)|*.jpg|EMF (*.emf)|*.emf|PNG (*.png)|*.png|GIF " +
-          "(*.gif)|*.gif|TIFF (*.tif)|*.tif\"";
+      this.saveFileDialog.Filter = "Bitmap (*.bmp)|*.bmp|JPEG (*.jpg)|*.jpg|EMF (*.emf)|*.emf|PNG (*.png)|*.png|GIF (" +
+          "*.gif)|*.gif|TIFF (*.tif)|*.tif\"";
       this.saveFileDialog.FilterIndex = 2;
       // 

branches/GP.Grammar.Editor/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj

@@ -122 +122 @@
     </Compile>
     <Compile Include="HeuristicLabVisualizationChartControlsExtensionsPlugin.cs" />
+    <Compile Include="HistogramControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="HistogramControl.Designer.cs">
+      <DependentUpon>HistogramControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -134 +140 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="EnhancedChart.resx">
+      <DependentUpon>EnhancedChart.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />