diff --git a/data/resources/StringResources.de.resources b/data/resources/StringResources.de.resources index 64e9acb598..eb87f6e9e6 100644 Binary files a/data/resources/StringResources.de.resources and b/data/resources/StringResources.de.resources differ diff --git a/data/resources/StringResources.es-mx.resources b/data/resources/StringResources.es-mx.resources index e6203d2d80..5fc02cba5b 100644 Binary files a/data/resources/StringResources.es-mx.resources and b/data/resources/StringResources.es-mx.resources differ diff --git a/data/resources/StringResources.es.resources b/data/resources/StringResources.es.resources index 13b22ec330..daca920de2 100644 Binary files a/data/resources/StringResources.es.resources and b/data/resources/StringResources.es.resources differ diff --git a/data/resources/StringResources.fr.resources b/data/resources/StringResources.fr.resources index a35d3a7dfa..101c8a7760 100644 Binary files a/data/resources/StringResources.fr.resources and b/data/resources/StringResources.fr.resources differ diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerMessages.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerMessages.cs index da29e397f2..e87884ff90 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerMessages.cs +++ b/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"); } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs index 76ea6cc830..832000ea04 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs +++ b/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)); + } } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/RowConverter.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/RowConverter.cs index b52db830d9..d80c3db7da 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/RowConverter.cs +++ b/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)); + * */ } } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/TableConverter.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/TableConverter.cs index 2edee999bf..a57c60804f 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/TableConverter.cs +++ b/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)); + * */ } - } } diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources index 51fe78d585..38cdacb3dd 100644 Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ