Cleanup

data/resources/StringResources.resx

@@ -8294,4 +8294,7 @@ a line break</value>
   <data name="SharpReport.Wizard.PageLayout" xml:space="preserve">
     <value>Page Layout </value>
   </data>
+  <data name="SharpReport.Wizard.PushModel.NoProject" xml:space="preserve">
+    <value>No project selected, please enter FieldNames</value>
+  </data>
 </root>

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignableItems/ReportSettings.cs

@@ -34,7 +34,7 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems
 //			this.GraphicsUnit = GraphicsUnit.Pixel;
 //			this.Padding = new Padding(5);
 //			this.DefaultFont = GlobalValues.DefaultFont;
-			this.ReportType = ReportType.FormSheet;
+//			this.ReportType = ReportType.FormSheet;
 //			
 			this.DataModel = PushPullModel.FormSheet;
 //			
@@ -93,9 +93,9 @@ namespace ICSharpCode.Reporting.Addin.DesignableItems
 		}
 		
 		
-		[Browsable(true), Category("Base Settings")]
-		public ReportType ReportType {get;set;}
-		
+//		[Browsable(true), Category("Base Settings")]
+//		public ReportType ReportType {get;set;}
+//		
 		
 		[Category("Page Settings")]
 		public int BottomMargin {get;set;}

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

@@ -19,12 +19,12 @@
 			</ObjectDataProvider.MethodParameters>
 		</ObjectDataProvider>
 		
-		<ObjectDataProvider x:Key="reportTypeEnum" MethodName="GetValues"
+	<!--	<ObjectDataProvider x:Key="reportTypeEnum" MethodName="GetValues"
 			ObjectType="{x:Type System:Enum}">
 			<ObjectDataProvider.MethodParameters>
 				<x:Type TypeName="sdr:ReportType"/>
 			</ObjectDataProvider.MethodParameters>
-		</ObjectDataProvider>
+		</ObjectDataProvider>-->
 	</xctk:WizardPage.Resources>
 	
 	<Grid>
@@ -54,11 +54,11 @@
 		          ItemsSource="{Binding Source={StaticResource pushpullEnum}}">
 		</ComboBox>
 		
-		<Label Content="ReportType :" Margin="0,5,0,5" Grid.Column="1" Grid.Row="2"></Label>
+		<!--<Label Content="ReportType :" Margin="0,5,0,5" Grid.Column="1" Grid.Row="2"></Label>
 		<ComboBox Name="_ReportType" Margin="10,5,0,5"
 		          Grid.Row="2" Grid.Column="2"
 		          ItemsSource="{Binding Source={StaticResource reportTypeEnum}}">
-		</ComboBox>
+		</ComboBox>-->
 		
 		<Label Content="{core:Localize SharpReport.Wizard.BaseSettings.ReportName}" Margin="0,5,0,5" Grid.Column="1" Grid.Row="4"></Label>
 		<TextBox Name="_ReportName" Margin="10,5,0,5"  Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="3"></TextBox>

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

@@ -25,7 +25,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog{
 		{
 			InitializeComponent();
 			_DataModel.SelectedItem = PushPullModel.FormSheet;
-			_ReportType.SelectedItem = ReportType.FormSheet;	
+//			_ReportType.SelectedItem = ReportType.FormSheet;	
 			_Legal.IsChecked = true;
 			this.context = new PageOneContext();
 		}
@@ -44,7 +44,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog{
 		
 		void UpdateContext(){
 			context.DataModel = (PushPullModel) _DataModel.SelectedItem;
-			context.ReportType = (ReportType) _ReportType.SelectedItem;
+//			context.ReportType = (ReportType) _ReportType.SelectedItem;
 			context.ReportName = this._ReportName.Text;
 			context.FileName = this._Filename.Text;
 			context.Legal = _Legal.IsChecked == true;
@@ -59,7 +59,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog{
 			
 			switch (pushPullModel) {
 					case PushPullModel.PushData: {
-						this._ReportType.SelectedItem = ReportType.DataReport;
+//						this._ReportType.SelectedItem = ReportType.DataReport;
 						this.CanFinish = false;
 						this.CanSelectNextPage = true;
 						break;
@@ -74,7 +74,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog{
 					case PushPullModel.FormSheet: {
 						this.CanFinish = true;
 						CanSelectNextPage = false;
-						this._ReportType.SelectedItem = ReportType.FormSheet;
+//						this._ReportType.SelectedItem = ReportType.FormSheet;
 						break;
 					}
 			}

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

@@ -12,7 +12,7 @@
                  CanSelectPreviousPage="true"
             	  CanSelectNextPage="false">
 	
-	<Grid>
+	<Grid ShowGridLines="True">
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition Width="Auto"></ColumnDefinition>
 			<ColumnDefinition></ColumnDefinition>
@@ -23,12 +23,13 @@
 			<RowDefinition Height="Auto"></RowDefinition>
 			<RowDefinition Height="200"></RowDefinition>
 		</Grid.RowDefinitions>
+	
+		<TextBlock Name="_projTxt"  Text="{core:Localize SharpReport.Wizard.PushModel.SelectProject}"
+		            FontSize="15" ></TextBlock>
 		
-		<TextBlock Text="{core:Localize SharpReport.Wizard.PushModel.SelectProject}"
-		           Grid.ColumnSpan="2" FontSize="15" ></TextBlock>
-		<ComboBox Name="_cboTypes" Visibility="Hidden" Grid.Row="1" SelectionChanged="_cboTypes_SelectionChanged" MinWidth="100" ></ComboBox>
+		<ComboBox Name="_cboTypes" Visibility="Hidden" Grid.Row="1" SelectionChanged="_cboTypes_SelectionChanged" MinWidth="150" ></ComboBox>
 		
-		<TextBlock Text="{core:Localize SharpReport.Wizard.PushModel.AvailableFields}" FontSize="15" Grid.Column ="1" Margin="15,0,0,0"></TextBlock>
+		<TextBlock Name="_availTxt"  Visibility="Hidden " Text="{core:Localize SharpReport.Wizard.PushModel.AvailableFields}" FontSize="15" Grid.Column ="1" Margin="15,0,0,0"></TextBlock>
 		<DataGrid  Name="_DataGrid"
 		          ItemsSource="{Binding}"
 		          CanUserAddRows="True"

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

@@ -8,12 +8,13 @@
  */
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.Core;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.Reporting.BaseClasses;
 using Xceed.Wpf.Toolkit;
 using ICSharpCode.Reporting.Addin.Globals;
 using ICSharpCode.Reporting.Addin.ReportWizard.ViewModels;
-using System.Linq;
 
 namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog
 {
@@ -31,17 +32,19 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog
 			items = new List<AbstractColumn>();
 			_DataGrid.ItemsSource = items;
 			this.context = new PushModelContext();
-			var data = new AbstractColumn("MyColumn",typeof(string));
-			items.Add(data);
 			cboType.ItemsSource = GlobalLists.DataTypeList();
-			var definitions = GetTypeDefinitions();
 			
-			if (definitions != null) {
+			var definitions = GetTypeDefinitions();
+			if (definitions.Any()) {
 				_cboTypes.Visibility = System.Windows.Visibility.Visible;
+				_availTxt.Visibility = System.Windows.Visibility.Visible;
 				_cboTypes.ItemsSource = definitions;
 				_cboTypes.SelectedIndex = 0;
+			} else {
+				var data = new AbstractColumn("MyColumn", typeof(string));
+				items.Add(data);
+				_projTxt.Text = ResourceService.GetString("SharpReport.Wizard.PushModel.NoProject");
 			}
-			
 		}
 
 		static IEnumerable<ITypeDefinition> GetTypeDefinitions()
@@ -57,15 +60,16 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog
 		
 		void _cboTypes_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e){
 		
-			var s = (ITypeDefinition)e.AddedItems[0];
-			var l = CreateItemsSource(s);
-			if (l.Count > 0) {
-				_DataGrid.ItemsSource = l;
+			var typeDefinition = (ITypeDefinition)e.AddedItems[0];
+			var itemsList = CreateItemsSource(typeDefinition);
+			if (itemsList.Count > 0) {
+				_DataGrid.ItemsSource = itemsList;
 			}
 		}
 
-		static List<AbstractColumn>  CreateItemsSource(ITypeDefinition s){
-			return s.Properties.Select(p => new AbstractColumn(){
+		
+		static List<AbstractColumn>  CreateItemsSource(ITypeDefinition typeDefinitions){
+			return typeDefinitions.Properties.Select(p => new AbstractColumn(){
 				                        	ColumnName = p.Name,
 				                        	DataTypeName = p.ReturnType.ReflectionName
 				                        }).ToList();
@@ -90,44 +94,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.Dialog
 			get {return WizardPageType.PushModelPage;}	
 		}
 		
-		
-
 		#endregion
 	}
 	
-	/*
-	private void PopulateTestItems()
-        {
-            TestItems = new ObservableCollection<TestItem>();
-            for (int i = 0; i < 5; i++)
-            {
-                TestItem ti = new TestItem();
-                ti.Name = "TestItem" + i;
-                ti.IsSelected = true;
-                TestItems.Add(ti);
-            }
-        }
-
-        private bool _AllSelected;
-        public bool AllSelected
-        {
-            get { return _AllSelected; }
-            set
-            {
-                _AllSelected = value;
-                TestItems.ToList().ForEach(x => x.IsSelected = value);
-                NotifyPropertyChanged(m => m.AllSelected);
-            }
-        }
-
-    private ObservableCollection<TestItem> _TestItems;
-    public ObservableCollection<TestItem> TestItems
-    {
-        get { return _TestItems; }
-        set
-        {
-            _TestItems = value;
-            NotifyPropertyChanged(m => m.TestItems);
-        }
-    }*/
 }

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

@@ -71,7 +71,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
 			reportSettings.FileName = pageOneContext.FileName;
 			reportSettings.Landscape = !pageOneContext.Legal;
 			reportSettings.ReportName = pageOneContext.ReportName;
-			reportSettings.ReportType = pageOneContext.ReportType;
+//			reportSettings.ReportType = pageOneContext.ReportType;
 			return reportSettings;
 		}
 
@@ -184,7 +184,8 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
 		static bool IsDataReport(ReportWizardContext context)
 		{
 			var poc = (PageOneContext)context.PageOneContext;
-			return poc.ReportType.Equals(ReportType.DataReport);
+//			return poc.ReportType.Equals(ReportType.DataReport);
+			return poc.DataModel != PushPullModel.FormSheet;
 		}
 		
 		

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ViewModels/PageOneContext.cs

@@ -18,7 +18,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard.ViewModels
 	public class PageOneContext:IWizardContext
 	{
 		public PushPullModel DataModel {get;set;}
-		public ReportType ReportType {get;set;}
+//		public ReportType ReportType {get;set;}
 		public string ReportName {get;set;}
 		public string FileName {get;set;}
 		public bool Legal {get;set;}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Toolbox/ToolboxProvider.cs

@@ -157,13 +157,13 @@ namespace ICSharpCode.Reporting.Addin.Toolbox
 		/// <returns>Bitmap</returns>
 		static Bitmap CircleBitmap()
 		{
-			Bitmap b = new Bitmap (19,19);
-			using (Graphics g = Graphics.FromImage (b)){
+			var bmp = new Bitmap (19,19);
+			using (var g = Graphics.FromImage (bmp)){
 				g.DrawEllipse (new Pen(Color.Black, 1),
 				               1,1,
 				               17,17);
 			}
-			return b;
+			return bmp;
 		}
 		
 		

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/GlobalEnums.cs

@@ -37,12 +37,12 @@ namespace ICSharpCode.Reporting.Globals
 	/// FormSheet means a blank form with Labels, Lines and Checkboxes
 	/// DataReport handles all Reports with Data
 	/// </summary>
-	public enum ReportType {
+	/*public enum ReportType {
 		FormSheet,
 		DataReport,
 	}
 
-	
+	*/
 	public enum ReportSection {
 		ReportHeader,
 		ReportPageHeader,

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

@@ -65,7 +65,7 @@ namespace ICSharpCode.Reporting.Items
 //			this.GraphicsUnit = GraphicsUnit.Pixel;
 //			this.Padding = new Padding(5);
 //			this.DefaultFont = GlobalValues.DefaultFont;
-			ReportType = ReportType.FormSheet;
+//			ReportType = ReportType.FormSheet;
 //			
 			this.DataModel = PushPullModel.FormSheet;
 //			
@@ -124,10 +124,10 @@ namespace ICSharpCode.Reporting.Items
 			}
 		}
 		
-		
-		[Browsable(true), Category("Base Settings")]
-		public ReportType ReportType {get;set;}
-		
+//		
+//		[Browsable(true), Category("Base Settings")]
+//		public ReportType ReportType {get;set;}
+//		
 		
 		[Browsable(true), Category("Base Settings")]
 		public PushPullModel DataModel {get;set;}