Add ResourceString's for ReportViewer, work on Converts

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5683 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerMessages.cs

@@ -24,13 +24,13 @@ namespace ICSharpCode.Reports.Addin
 		
 		public string BackButtonText {
 			get {
-				return ResourceService.GetString("Global.BackButtonText");
+				return ResourceService.GetString("SharpReport.ReportViewer.PreviousPage");
 			}
 		}
 		
 		public string NextButtonMessage {
 			get {
-				return ResourceService.GetString("Global.NextButtonText");
+				return ResourceService.GetString("SharpReport.ReportViewer.NextPage");
 			}
 		}
 		

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs

@@ -150,5 +150,15 @@ namespace ICSharpCode.Reports.Core.Exporter
 			DataNavigator.Fill(row.Items);
 			PrintHelper.SetLayoutForRow(Graphics,Layouter,row);
 		}
+		
+		
+		protected Point BaseConvert(ExporterCollection myList,BaseReportItem parent, BaseReportItem item,int leftPos,Point curPos)
+		{
+			BaseRowItem br = item as BaseRowItem;
+			br.Location = new Point (leftPos,br.Location.Y);	
+			ExporterCollection ml = this.ConvertItems (parent,br, curPos);		
+			myList.AddRange(ml);
+			return new Point (leftPos,curPos.Y + br.Size.Height + (3 *GlobalValues.GapBetweenContainer));
+		}
 	}
 }

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/RowConverter.cs

@@ -55,8 +55,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			}
 		}
 		
-		private ExporterCollection ConvertDataRow ( BaseReportItem item)
-//		private ExporterCollection ConvertDataRow (BaseReportItem parent, BaseReportItem item)
+		private ExporterCollection ConvertDataRow (BaseReportItem item)
 		{
 			ExporterCollection mylist = new ExporterCollection();
 			Point currentPosition = new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y);
@@ -100,11 +99,14 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		private Point InternalConvertRow(ExporterCollection myList,BaseReportItem item,int leftPos,Point curPos)                                                   
 		{
+			return base.BaseConvert(myList,parent,item,leftPos,curPos);
+			/*
 			this.baseRowItem = item as BaseRowItem;
 			baseRowItem.Location = new Point (leftPos,baseRowItem.Location.Y);	
 			ExporterCollection ml = this.ConvertItems (this.parent,baseRowItem, curPos);		
 			myList.AddRange(ml);
 			return new Point (leftPos,curPos.Y + this.baseRowItem.Size.Height + (3 *GlobalValues.GapBetweenContainer));
+			                                                                       * */
 		}
 	}
 }

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/TableConverter.cs

@@ -82,8 +82,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 								base.FirePageFull(mylist);
 								mylist.Clear();
 								currentPosition = InternalConvertRow(mylist,headerRow,
-								                                   defaultLeftPos,
-								                                   base.SectionBounds.ReportHeaderRectangle.Location);
+								                                     defaultLeftPos,
+								                                     base.SectionBounds.ReportHeaderRectangle.Location);
 							}
 							
 							currentPosition = InternalConvertRow(mylist,row,defaultLeftPos,currentPosition);
@@ -106,10 +106,12 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		private Point InternalConvertRow(ExporterCollection myList,BaseRowItem row,int leftPos,Point curPos	)
 		{
+			return base.BaseConvert(myList,this.baseTable.Parent,row,leftPos,curPos);
+			/*
 			ExporterCollection ml = base.ConvertItems (this.baseTable.Parent,row, curPos);
 			myList.AddRange(ml);
 			return new Point (leftPos,curPos.Y + row.Size.Height + (3 *GlobalValues.GapBetweenContainer));
+			                                                          * */
 		}
-
 	}
 }