Browse Source

Combobox for FormatString in Designer SmartTag as well

pull/1/head
peterforstmeier 16 years ago
parent
commit
25505b233a
  1. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs
  2. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextItemDesigner.cs
  3. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/DummyEditorDialog.cs
  4. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs
  5. 1
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
  6. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs
  7. 8
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs
  8. 24
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/IStringBasedEditorDialog.cs

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/TextBasedDesignerActionList.cs

@ -10,6 +10,8 @@ using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.Design; using System.ComponentModel.Design;
using ICSharpCode.Reports.Addin.Dialogs;
namespace ICSharpCode.Reports.Addin.Designer namespace ICSharpCode.Reports.Addin.Designer
{ {
/// <summary> /// <summary>
@ -79,6 +81,8 @@ namespace ICSharpCode.Reports.Addin.Designer
t.Commit();} t.Commit();}
} }
[TypeConverter(typeof(FormatStringConverter))]
public string FormatString public string FormatString
{ {
get {return this.Item.FormatString;} get {return this.Item.FormatString;}

2
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) 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) { if (ed.ShowDialog() == DialogResult.OK) {
ctrl.Text = ed.TextValue; ctrl.Text = ed.TextValue;
this.SetProperty ("Name",ed.TextValue); this.SetProperty ("Name",ed.TextValue);

2
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 namespace ICSharpCode.Reports.Addin.Test.Dialogs
{ {
public class DummyEditorDialog:ITextEditorDialog public class DummyEditorDialog:IStringBasedEditorDialog
{ {
string textValue; string textValue;

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Dialogs/TextEditorDialogFixture.cs

@ -19,7 +19,7 @@ namespace ICSharpCode.Reports.Addin.Test.Dialogs
[Test] [Test]
public void ConstructorWithEmptyString() 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"); Assert.AreEqual(ed.TextValue,String.Empty,"TextValue should be empty");
} }
@ -27,7 +27,7 @@ namespace ICSharpCode.Reports.Addin.Test.Dialogs
public void ConstructorWithText () public void ConstructorWithText ()
{ {
string s = "myteststring"; string s = "myteststring";
ITextEditorDialog ed = new DummyEditorDialog(s); IStringBasedEditorDialog ed = new DummyEditorDialog(s);
Assert.AreEqual (ed.TextValue,s); Assert.AreEqual (ed.TextValue,s);
} }

1
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@ -114,6 +114,7 @@
</Compile> </Compile>
<Compile Include="Project\Dialogs\EditorDialog.Designer.cs" /> <Compile Include="Project\Dialogs\EditorDialog.Designer.cs" />
<Compile Include="Project\Dialogs\GroupingCollectionEditor.cs" /> <Compile Include="Project\Dialogs\GroupingCollectionEditor.cs" />
<Compile Include="Project\Dialogs\IStringBasedEditorDialog.cs" />
<Compile Include="Project\Dialogs\ParametersCollectionEditor.cs" /> <Compile Include="Project\Dialogs\ParametersCollectionEditor.cs" />
<Compile Include="Project\Dialogs\ParameterDialog.cs" /> <Compile Include="Project\Dialogs\ParameterDialog.cs" />
<Compile Include="Project\Dialogs\PreviewControl.cs"> <Compile Include="Project\Dialogs\PreviewControl.cs">

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/DefaultTextEditor.cs

@ -30,7 +30,7 @@ namespace ICSharpCode.Reports.Core
s = value.ToString(); s = value.ToString();
} }
ITextEditorDialog ed = new TextEditorDialog (s,"ReportSettings"); IStringBasedEditorDialog ed = new TextEditorDialog (s,"ReportSettings");
if (ed.ShowDialog() == DialogResult.OK) { if (ed.ShowDialog() == DialogResult.OK) {
return ed.TextValue; return ed.TextValue;
} else { } else {

8
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Dialogs/EditorDialog.cs

@ -17,15 +17,9 @@ namespace ICSharpCode.Reports.Core
/// Description of EditorDialog. /// Description of EditorDialog.
/// </summary> /// </summary>
/// ///
public interface ITextEditorDialog
{
DialogResult ShowDialog();
string TextValue {get;}
}
public partial class TextEditorDialog : Form,ITextEditorDialog public partial class TextEditorDialog : Form,IStringBasedEditorDialog
{ {
string textValue; string textValue;

24
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
{
/// <summary>
/// Description of EditorDialog.
/// </summary>
///
public interface IStringBasedEditorDialog
{
DialogResult ShowDialog();
string TextValue {get;}
}
}
Loading…
Cancel
Save