Fixing Issue SD2-669 from Matt Ward

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1091 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportAddin.csproj

@@ -62,7 +62,6 @@
     <Folder Include="Commands\AbstractCommand" />
     <Folder Include="FieldsExplorer" />
     <Folder Include="Configuration" />
-    <Folder Include="Resources" />
     <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
       <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
       <Name>ICSharpCode.SharpDevelop</Name>

src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportDisplayBinding.cs

@@ -18,19 +18,17 @@
 
 
 using System;
-using System.IO;
-using System.Windows.Forms;
 
 using ICSharpCode.Core;
 
 using SharpReportCore;
-	/// <summary>
+/// <summary>
-	/// Displaybinding for SharpReport
+/// Displaybinding for SharpReport
-	/// </summary>
+/// </summary>
-	/// <remarks>
+/// <remarks>
-	/// 	created by - Forstmeier Peter
+/// 	created by - Forstmeier Peter
-	/// 	created on - 11.04.2005 23:36:45
+/// 	created on - 11.04.2005 23:36:45
-	/// </remarks>
+/// </remarks>
 namespace SharpReportAddin {	
 	public class SharpReportDisplayBinding : object, ICSharpCode.Core.IDisplayBinding {
 		
@@ -41,10 +39,11 @@ namespace SharpReportAddin {
 				if (view != null) {
 					try {
 						ReportGenerator.CreateReport cmd = new ReportGenerator.CreateReport(view.DesignerControl.ReportModel);
-						cmd.Run();
+						cmd.Run();							
-						view.FileName = view.DesignerControl.ReportModel.ReportSettings.FileName;
+						view.FileName = view.DesignerControl.ReportModel.ReportSettings.FileName;							
-						view.UpdateView(true);
+						view.UpdateView(true);							
-						view.Selected();
+						view.Selected();							
+						view.ShowReportSettings();							
 						return view;
 					} catch (SharpReportException) {
 						if (view != null) {

src/AddIns/Misc/SharpReport/SharpReportWizard/GeneratorCommands.cs

@@ -50,15 +50,12 @@ namespace ReportGenerator{
 				customizer.Set("Language",  ".XSD");
 				using (WizardDialog wizard = new WizardDialog("Report Wizard", customizer, WizardPath)) {
 					if (wizard.ShowDialog() == DialogResult.OK) {
-						
 						try {
 							gen.FillReportModel (reportModel);
 							DoCreate(reportModel);
 						} catch (Exception) {
 							throw;
 						}
-					} else {
-						throw new SharpReportException("Chancel");
 					}
 				}
 			} else {
@@ -79,7 +76,8 @@ namespace ReportGenerator{
 					generatePushDataReport.GenerateReport();
 					break;
 				case GlobalEnums.enmPushPullModel.FormSheet:
-					model.ReportSettings.ReportType = GlobalEnums.enmReportType.FormSheet;
+					GenerateFormSheetReport generateFormSheetReport = new GenerateFormSheetReport (customizer,model);
+					generateFormSheetReport.GenerateReport();
 					break;
 			}
 		}

src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GenerateFormSheetReport.cs

@@ -0,0 +1,37 @@
+/*
+ * Created by SharpDevelop.
+ * User: Forstmeier Helmut
+ * Date: 07.02.2006
+ * Time: 15:32
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using ICSharpCode.Core;
+
+using SharpReportCore;
+
+namespace ReportGenerator
+{
+	/// <summary>
+	/// Description of GenerateFormSheetReport.
+	/// </summary>
+	public class GenerateFormSheetReport:AbstractReportGenerator
+	{
+		public GenerateFormSheetReport(Properties customizer,
+		                              ReportModel reportModel):base(customizer,reportModel){
+
+			if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.FormSheet) {
+				throw new ArgumentException ("Wrong DataModel in GeneratePullDataReport");
+			}
+		}
+		
+		public override void GenerateReport() {
+			base.ReportModel.ReportSettings.ReportType = GlobalEnums.enmReportType.FormSheet;
+			base.ReportModel.ReportSettings.DataModel = GlobalEnums.enmPushPullModel.FormSheet;
+			base.GenerateReport();	
+			base.AdjustAll();
+		}
+	}
+}

src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.cs

@@ -22,14 +22,14 @@ using SharpQuery;
 using SharpQuery.Collections;
 using SharpQuery.SchemaClass;
 	
-	/// <summary>
+/// <summary>
-	/// This class creates settings for a report
+/// This class creates settings for a report
-	/// </summary>
+/// </summary>
-	/// <remarks>
+/// <remarks>
-	/// 	created by - Forstmeier Peter
+/// 	created by - Forstmeier Peter
-	/// 	created on - 28.01.2005 10:31:01
+/// 	created on - 28.01.2005 10:31:01
-	/// </remarks>
+/// </remarks>
-using System.Diagnostics;
+using System.Windows.Forms;
 
 namespace ReportGenerator {	
 	public class ReportGenerator : object {
@@ -61,12 +61,11 @@ namespace ReportGenerator {
 		
 		public ReportModel FillReportModel (ReportModel model) {
 			if (model == null) {
-				throw new ArgumentNullException("model");
+				throw new MissingModelException();
 			}
 			model.ReportSettings.ReportName = this.reportName;
 			model.ReportSettings.FileName = this.path + this.fileName;
 			
-			
 			model.ReportSettings.GraphicsUnit = this.graphicsUnit;
 			model.ReportSettings.ReportType = this.reportType;
 
@@ -82,9 +81,7 @@ namespace ReportGenerator {
 		/// from the queryParameters
 		/// </summary>
 		/// <returns></returns>
-		public   AbstractParametersCollection BuildSqlParameterList(){
+		public   AbstractParametersCollection BuildSqlParameterList(){			
-			Debug.Assert (sharpQueryProcedure != null,"ReportGenerator:BuildSqlParameterList : Wrong sharpQueryProcedure");
-			
 			if (this.queryParameters != null && this.queryParameters.Count > 0) {
 				AbstractParametersCollection paramCol = new  AbstractParametersCollection();
 				SqlParameter reportPar;

src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.csproj

@@ -57,6 +57,7 @@
     <None Include="ReportGenerator.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <Compile Include="Generators\GenerateFormSheetReport.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Generators" />

src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs

@@ -10,12 +10,9 @@
 using System;
 using System.Drawing;
 using System.Globalization;
-//using System.ComponentModel;
-
 using System.Windows.Forms;
 
 using ICSharpCode.Core;
-//using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
 
 using SharpReportCore;
@@ -265,6 +262,7 @@ namespace ReportGenerator{
 			this.txtFileName.Size = new System.Drawing.Size(248, 20);
 			this.txtFileName.TabIndex = 11;
 			this.txtFileName.Text = String.Empty;
+			this.txtFileName.TextChanged += new System.EventHandler(this.ChangedEvent);
 			// 
 			// cboGraphicsUnit
 			// 
@@ -272,6 +270,7 @@ namespace ReportGenerator{
 			this.cboGraphicsUnit.Name = "cboGraphicsUnit";
 			this.cboGraphicsUnit.Size = new System.Drawing.Size(248, 21);
 			this.cboGraphicsUnit.TabIndex = 17;
+			this.cboGraphicsUnit.TextChanged += new System.EventHandler(this.ChangedEvent);
 			// 
 			// cboReportType
 			//