diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs index d5d6272221..b2be0f51cd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs @@ -10,6 +10,8 @@ using System; using System.ComponentModel; using System.ComponentModel.Design; +using ICSharpCode.Reports.Addin.Dialogs; + namespace ICSharpCode.Reports.Addin.Designer { /// @@ -79,6 +81,8 @@ namespace ICSharpCode.Reports.Addin.Designer t.Commit();} } + + [TypeConverter(typeof(FormatStringConverter))] public string FormatString { get {return this.Item.FormatString;} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs index 369b77afad..7aeb84b9ae 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs @@ -93,7 +93,7 @@ namespace ICSharpCode.Reports.Addin.Designer private void OnRunTextEditor (object sender,EventArgs e) { - ITextEditorDialog ed = new TextEditorDialog (ctrl.Text,ctrl.Name); + IStringBasedEditorDialog ed = new TextEditorDialog (ctrl.Text,ctrl.Name); if (ed.ShowDialog() == DialogResult.OK) { ctrl.Text = ed.TextValue; this.SetProperty ("Name",ed.TextValue); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/DummyEditorDialog.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/DummyEditorDialog.cs index 5859e925a0..7bc8ff21dd 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/DummyEditorDialog.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/DummyEditorDialog.cs @@ -15,7 +15,7 @@ using ICSharpCode.Reports.Core; namespace ICSharpCode.Reports.Addin.Test.Dialogs { - public class DummyEditorDialog:ITextEditorDialog + public class DummyEditorDialog:IStringBasedEditorDialog { string textValue; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs index ff5af9fe88..6c1ebb7320 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs @@ -19,7 +19,7 @@ namespace ICSharpCode.Reports.Addin.Test.Dialogs [Test] public void ConstructorWithEmptyString() { - ITextEditorDialog ed = new DummyEditorDialog(String.Empty); + IStringBasedEditorDialog ed = new DummyEditorDialog(String.Empty); Assert.AreEqual(ed.TextValue,String.Empty,"TextValue should be empty"); } @@ -27,7 +27,7 @@ namespace ICSharpCode.Reports.Addin.Test.Dialogs public void ConstructorWithText () { string s = "myteststring"; - ITextEditorDialog ed = new DummyEditorDialog(s); + IStringBasedEditorDialog ed = new DummyEditorDialog(s); Assert.AreEqual (ed.TextValue,s); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj index dd55887c0f..60e05d2229 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj @@ -114,6 +114,7 @@ + diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs index ae8c7b5426..cb94520f7a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs @@ -30,7 +30,7 @@ namespace ICSharpCode.Reports.Core s = value.ToString(); } - ITextEditorDialog ed = new TextEditorDialog (s,"ReportSettings"); + IStringBasedEditorDialog ed = new TextEditorDialog (s,"ReportSettings"); if (ed.ShowDialog() == DialogResult.OK) { return ed.TextValue; } else { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs index 21d9e5e073..6ae5f06bc6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs @@ -17,15 +17,9 @@ namespace ICSharpCode.Reports.Core /// Description of EditorDialog. /// /// - public interface ITextEditorDialog - { - DialogResult ShowDialog(); - string TextValue {get;} - } - - public partial class TextEditorDialog : Form,ITextEditorDialog + public partial class TextEditorDialog : Form,IStringBasedEditorDialog { string textValue; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/IStringBasedEditorDialog.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/IStringBasedEditorDialog.cs new file mode 100644 index 0000000000..d40d7c252b --- /dev/null +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/IStringBasedEditorDialog.cs @@ -0,0 +1,24 @@ +/* + * Erstellt mit SharpDevelop. + * Benutzer: Forstmeier + * Datum: 09.04.2007 + * Zeit: 17:01 + * + * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. + */ + +using System; +using System.Windows.Forms; + +namespace ICSharpCode.Reports.Core +{ + /// + /// Description of EditorDialog. + /// + /// + public interface IStringBasedEditorDialog + { + DialogResult ShowDialog(); + string TextValue {get;} + } +}