Browse Source

Change property RightToLeft to RTL because of inheritance trouble

4.1
peterforstmeier 15 years ago
parent
commit
07700c7175
  1. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DesignerHelper.cs
  2. 12
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs
  3. 7
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs
  4. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DesignerHelper.cs

@ -110,7 +110,7 @@ namespace ICSharpCode.Reports.Addin.Designer
prop = props.Find("DataType",true); prop = props.Find("DataType",true);
allProperties.Add(prop); allProperties.Add(prop);
prop = props.Find("RightToLeft",true); prop = props.Find("RTL",true);
allProperties.Add(prop); allProperties.Add(prop);
} }

12
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs

@ -139,16 +139,20 @@ namespace ICSharpCode.Reports.Addin
} }
} }
#endregion
#region RighToLeft
[Category("Appearance")] [Category("Appearance")]
public override System.Windows.Forms.RightToLeft RightToLeft { public System.Windows.Forms.RightToLeft RTL
{
get { return base.RightToLeft; } get { return base.RightToLeft; }
set { base.RightToLeft = value; } set { base.RightToLeft = value; }
} }
#endregion #endregion
#region DataType
[Browsable(true), [Browsable(true),
Category("Databinding"), Category("Databinding"),
@ -158,6 +162,7 @@ namespace ICSharpCode.Reports.Addin
public string DataType {get;set;} public string DataType {get;set;}
#endregion
#region Expression #region Expression
@ -170,6 +175,7 @@ namespace ICSharpCode.Reports.Addin
#endregion #endregion
#region CanGrow/CanShrink #region CanGrow/CanShrink
public bool CanGrow {get;set;} public bool CanGrow {get;set;}

7
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs

@ -67,7 +67,7 @@ namespace ICSharpCode.Reports.Core
style.ContentAlignment = this.contentAlignment; style.ContentAlignment = this.contentAlignment;
style.FormatString = this.formatString; style.FormatString = this.formatString;
style.DataType = this.dataType; style.DataType = this.dataType;
style.RightToLeft = this.RightToLeft; style.RightToLeft = this.RTL;
return style; return style;
} }
@ -184,7 +184,7 @@ namespace ICSharpCode.Reports.Core
public virtual StringFormat StringFormat { public virtual StringFormat StringFormat {
get { get {
var sf = TextDrawer.BuildStringFormat (this.StringTrimming,this.ContentAlignment); var sf = TextDrawer.BuildStringFormat (this.StringTrimming,this.ContentAlignment);
if (this.RightToLeft == System.Windows.Forms.RightToLeft.Yes) { if (this.RTL == System.Windows.Forms.RightToLeft.Yes) {
sf.FormatFlags = sf.FormatFlags | StringFormatFlags.DirectionRightToLeft; sf.FormatFlags = sf.FormatFlags | StringFormatFlags.DirectionRightToLeft;
} }
return sf; return sf;
@ -192,8 +192,7 @@ namespace ICSharpCode.Reports.Core
} }
public System.Windows.Forms.RightToLeft RightToLeft {get;set;} public System.Windows.Forms.RightToLeft RTL {get;set;}
#region IExpression #region IExpression

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.Reports.Core.Exporter {
CalculatePdfFormat pdfFormat = new CalculatePdfFormat(this.StyleDecorator,font); CalculatePdfFormat pdfFormat = new CalculatePdfFormat(this.StyleDecorator,font);
ColumnText columnText = new ColumnText(contentByte); ColumnText columnText = new ColumnText(contentByte);
if (StyleDecorator.RightToLeft.ToString() == "Yes") { if (StyleDecorator.RightToLeft.ToString() == "Yes") {
columnText.RunDirection = PdfWriter.RUN_DIRECTION_RTL; columnText.RunDirection = PdfWriter.RUN_DIRECTION_RTL;
} }

Loading…
Cancel
Save