Update WizardPages

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml

@@ -6,14 +6,13 @@
                  xmlns:sdr="clr-namespace:ICSharpCode.Reporting.Globals;assembly=ICSharpCode.Reporting"
                  Title="Base Settings"
                  Description="Basic Settings and Layout"
-                 PageType="Interior"
+            	 PageType="Interior"
-                 Background="LightGray"
                  CanFinish="true"
                  CanSelectNextPage="false">
 	
-	<xctk:WizardPage.ExteriorPanelContent >
+	<!--<xctk:WizardPage.ExteriorPanelContent >
-		<Image Name="_image" Stretch="Fill"></Image>
+		<Image Name="_image" Stretch="Fill"  HorizontalAlignment="Center" VerticalAlignment="Center"></Image>
-	</xctk:WizardPage.ExteriorPanelContent>
+	</xctk:WizardPage.ExteriorPanelContent>-->
 	
 	<xctk:WizardPage.Resources>
 		<ObjectDataProvider x:Key="pushpullEnum" MethodName="GetValues"

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/BaseSettingsPage.xaml.cs

@@ -7,7 +7,6 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
-using System.Windows;
 using System.Windows.Controls;
 using ICSharpCode.Reporting.Globals;
 using Xceed.Wpf.Toolkit;
@@ -26,8 +25,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog{
 		{
 			InitializeComponent();
 			_DataModel.SelectedItem = PushPullModel.FormSheet;
-			_ReportType.SelectedItem = ReportType.FormSheet;
+			_ReportType.SelectedItem = ReportType.FormSheet;	
-			_image.Source = WizardHelper.GetWizardIcon();
 			_Legal.IsChecked = true;
 			this.context = new PageOneContext();
 		}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml

@@ -14,20 +14,14 @@
 	             PageChanged="_wizard_PageChanged"
 	             Next="_wizard_Next">
 		
-		<local:WelcomePage ></local:WelcomePage>
+		<local:WelcomePage x:Name="WelcomePage"></local:WelcomePage>
 		
-		<local:BaseSettingsPage x:Name="BaseSettings"></local:BaseSettingsPage>
+		<local:BaseSettingsPage x:Name="BaseSettingsPage" PreviousPage="{Binding ElementName=WelcomePage}" ></local:BaseSettingsPage>
 		
-		<local:PushDataReport PreviousPage="{Binding ElementName=BaseSettings}"></local:PushDataReport>
+		<local:PushDataReport PreviousPage="{Binding ElementName=BaseSettingsPage}"></local:PushDataReport>
 		
-		<local:PullModelPage PreviousPage="{Binding ElementName=BaseSettings}"></local:PullModelPage>
+		<local:PullModelPage PreviousPage="{Binding ElementName=BaseSettingsPage}"></local:PullModelPage>
 		
-		<!--<xctk:WizardPage PageType="Interior"
-		                 Title="dritte Seite"
-		                 Description="this Page will guide you to creating an DataDriven Report"
-		                 CanCancel="true"
-		                 CanFinish="True"
-		/>-->
 	</xctk:Wizard>
 
 </Window>

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/ReportWizard.xaml.cs

@@ -7,13 +7,8 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
 using System.Windows;
-using System.Windows.Media.Imaging;
 using ICSharpCode.Reporting.Globals;
-using ICSharpCode.SharpDevelop;
 using Xceed.Wpf.Toolkit;
 using ICSharpCode.Reporting.Addin.ReportWizard.Dialog;
 using ICSharpCode.Reporting.Addin.ReportWizard.ViewModels;
@@ -85,10 +80,9 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog
 					}
 				}
 			}
-			
-			Console.WriteLine("CurrentPage {0}",current.Name);
-			
 		}
+		
+		
 		void _wizard_PageChanged(object sender, RoutedEventArgs e)
 		{
 			var x = _wizard.CurrentPage;

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/Dialog/WelcomePage.xaml

@@ -1,4 +1,4 @@
-<xctk:WizardPage x:Class="ICSharpCode.Reporting.Addin.ReportWizard.Dialog.WelcomePage"
+<xctk:WizardPage x:Class="ICSharpCode.Reporting.Addin.ReportWizard.Dialog.WelcomePage"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -7,15 +7,19 @@
                  xmlns:sdr="clr-namespace:ICSharpCode.Reporting.Globals;assembly=ICSharpCode.Reporting"
                  Name="Welcome"
                  Title="SharpDevelop Reporting"
-                 Description="Welcome to Sharpdevelop Reporting Wizard"
+                  PageType="Exterior"
-                 PageType="Interior"
                  NextButtonVisibility="Visible"
                  CancelButtonVisibility="Visible">
 	
-	<Grid>
+	<xctk:WizardPage.ExteriorPanelContent >
-		<Border  BorderThickness="3" Margin="10,10,10,10">
+		<Image Name="_image" Stretch="Fill"  HorizontalAlignment="Center" VerticalAlignment="Center"></Image>
-			<Image Name="_image" Margin="0,8,0,0" ></Image>
+	</xctk:WizardPage.ExteriorPanelContent>
-		</Border>
 	
+	<Grid ShowGridLines="True">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto"></RowDefinition>
+		</Grid.RowDefinitions>
+		
+		<TextBlock Text="Welcome to SharpDevelop ReportWizard" FontSize="20"></TextBlock>
 	</Grid>
 </xctk:WizardPage>

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs

@@ -34,11 +34,27 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
 		public void  Generate(ReportWizardContext context) {
 			if (context == null)
 				throw new ArgumentNullException("context");
+			
+			var poc = (PageOneContext)context.PageOneContext;
+			if (IsDataReport(poc)) {
+				CreateDataReport (context);
+			} else {
+				CreateFormSheetReport(context);
+			}
+		}
+
+		void CreateFormSheetReport(ReportWizardContext context)
+		{
 			GenerateBaseSettings(context);
-			GeneratePushModel(context);
 			CreateReportHeader(context);
 		}
-
+		
+		void CreateDataReport(ReportWizardContext context)
+		{
+			GenerateBaseSettings(context);
+			CreateReportHeader(context);
+			GeneratePushModel(context);
+		}
 		
 		void GenerateBaseSettings (ReportWizardContext context)	{
 			var pageOneContext = (PageOneContext)context.PageOneContext;
@@ -51,6 +67,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
 		}
 
 		
+		
 		void GeneratePushModel(ReportWizardContext context){
 			var pushModelContext = (PushModelContext)context.PushModelContext;
 			var xLocation = 5;
@@ -83,14 +100,17 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
 			
 			headerText.Size = GlobalValues.PreferedSize;
 			var printableWith = ReportModel.ReportSettings.PageSize.Width - ReportModel.ReportSettings.LeftMargin - ReportModel.ReportSettings.RightMargin;
-			var x = (int)(printableWith - headerText.Size.Width) / 2;
 			
+			var x = (int)(printableWith - headerText.Size.Width) / 2;
 			headerText.Location = new Point(x,4);
 			ReportModel.ReportHeader.Items.Add(headerText);
-			Console.WriteLine("");
+			
-			Console.WriteLine("Createreportheader Size {0}",ReportModel.ReportHeader.Size);
+		}
+
+		static bool IsDataReport(PageOneContext poc)
+		{
+			return poc.ReportType.Equals(ReportType.DataReport);
 		}
-		
 		
 		public IReportModel ReportModel {get;private set;}
 	}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs

@@ -82,14 +82,15 @@ namespace ICSharpCode.Reporting.Items
 
 			SortColumnsCollection = new SortColumnCollection();
 			GroupColumnsCollection = new GroupColumnCollection();
-//			this.sqlParameters = new SqlParameterCollection();
 			ParameterCollection = new ParameterCollection();
+//			this.sqlParameters = new SqlParameterCollection();
+			
 //			this.NoDataMessage = "No Data for this Report";
 		}
 		
 		#region BaseSettings
 		
-		private string reportName;
+		string reportName;
 		
 		[Category("Base Settings")]
 		[DefaultValueAttribute ("")]
@@ -154,7 +155,7 @@ namespace ICSharpCode.Reporting.Items
 		public int RightMargin  {get;set;}
 			
 		
-		private Size pageSize;
+		Size pageSize;
 		
 		[Category("Page Settings")]
 		public Size PageSize {
@@ -177,14 +178,8 @@ namespace ICSharpCode.Reporting.Items
 		
 		#region
 		
-		
 //		[Category("Data")]
 		
-		
-		
-		
-		
-		
 //		[Category("Parameters")]
 //		[EditorAttribute ( typeof(ParameterCollectionEditor),
 //		                  typeof(System.Drawing.Design.UITypeEditor) )]

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/FixedDocumentCreator.cs

@@ -64,7 +64,6 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
 		{
 			var culture = CultureInfo.CurrentCulture;
 			var flowDirection = culture.TextInfo.IsRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;
-			
 			var emSize = ExtensionMethodes.ToPoints((int)exportText.Font.SizeInPoints +1);
 			
 			var formattedText = new FormattedText(exportText.Text,