From 458132dd2242722ba809a7b3e5aafc689bb63ebb Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Mon, 11 Jan 2010 19:08:48 +0000 Subject: [PATCH] Cleanup git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5394 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../SampleReports/Ilist/ContributorsList.srd | 454 +++++++++++------- .../src/ReportSamples/EmployeesHireDate.cs | 23 - .../src/ReportSamples/MainForm.cs | 6 +- .../src/ReportSamples/NorthwindSalesbyYear.cs | 87 ---- .../src/ReportSamples/ProviderIndependent.cs | 47 -- .../src/ReportSamples/ReportSamples.csproj | 3 - .../SharpReportSamples/ContributorsList.cs | 21 +- .../SharpReportSamples/MainForm.Designer.cs | 20 +- .../src/SharpReportSamples/MainForm.cs | 6 +- 9 files changed, 315 insertions(+), 352 deletions(-) delete mode 100644 samples/SharpDevelopReports/src/ReportSamples/EmployeesHireDate.cs delete mode 100644 samples/SharpDevelopReports/src/ReportSamples/NorthwindSalesbyYear.cs delete mode 100644 samples/SharpDevelopReports/src/ReportSamples/ProviderIndependent.cs diff --git a/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd b/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd index ecd31f255d..b8de33e68a 100644 --- a/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd +++ b/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd @@ -1,176 +1,284 @@ - - + + - Report1 - DataReport - True - 50, 50, 50, 50 - Millimeter - 8, 8 - 5, 5, 5, 5 - - - - - - PushData - No Data for this Report - Microsoft Sans Serif, 10pt + + 8, 8 + 827, 1169 + + False + + 50 + No Data for this Report + Microsoft Sans Serif, 10pt + DataReport + True + Text + Millimeter + 50 + + 5, 5, 5, 5 + 50 + + PushData + 50 + + Report1 + + - - - - Window - 786, 35 - False - False - 50 - - False - ReportHeader - - - Window - 786, 108 - False - False - 50 - - - 661, 42 - 47, 6 - ReportImageControl - D:\SharpReport\samples\Reports\Logos\Bannerbeige2.gif - ..\Logos\Bannerbeige2.gif - False - True - - - 661, 19 - 47, 87 - 47, 87 - 708, 87 - 1 - Solid - ControlText - True - White - - - reportTextItem1 - 46, 63 - 109, 20 - Microsoft Sans Serif, 10pt - Firstname - - EllipsisCharacter - MiddleLeft - False - ControlText - True - White - - - False - ReportPageHeader - - - Window - 786, 51 - False - False - 50 - - - Row - 655, 40 - 47, 10 - Microsoft Sans Serif, 10pt - - 0 - 5, 5, 5, 5 - - - 147, 25 - 10, 10 - Microsoft Sans Serif, 10pt - First - First - System.String - - EllipsisCharacter - MiddleLeft - False - ControlText - True - unbound1 - White - - - 139, 25 - 187, 10 - Microsoft Sans Serif, 10pt - last - last - System.String - - EllipsisCharacter - MiddleLeft - False - ControlText - True - unbound2 - White - - - 216, 25 - 382, 10 - Microsoft Sans Serif, 10pt - Job - Job - System.String - - EllipsisCharacter - MiddleLeft - False - ControlText - True - unbound3 - White - - - False - ControlText - True - White - - - False - ReportDetail - - - Window - 786, 47 - False - False - 50 - - False - ReportPageFooter - - - Window - 786, 55 - False - False - 50 - - False - ReportFooter - - + + + 786, 35 + ReportHeader + False + 50 + 0 + Window + + 50, 50 + False + + + 786, 108 + ReportPageHeader + False + 50 + 0 + Window + + + White + False + None + Job + 429, 63 + TopLeft + True + False + Microsoft Sans Serif, 12pt, style=Bold + False + + Job + WindowFrame + 100, 20 + ControlText + + + White + False + None + Lastname + 234, 63 + TopLeft + True + False + Microsoft Sans Serif, 12pt, style=Bold + False + + Lastname + WindowFrame + 100, 20 + ControlText + + + File + 47, 6 + ReportImageControl + 661, 42 + False + Window + D:\SharpReport\samples\Reports\Logos\Bannerbeige2.gif + D:\Reporting3.0_branches\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif + + + Flat + 0, 0 + 47, 87 + + 661, 19 + Flat + Solid + White + Flat + ControlText + 661, 0 + 2 + + + White + False + EllipsisCharacter + Firstname + 46, 63 + TopLeft + True + False + Microsoft Sans Serif, 12pt, style=Bold + False + + reportTextItem1 + WindowFrame + 109, 20 + ControlText + + + 50, 100 + False + + + 750, 51 + ReportDetail + False + 50 + 0 + Window + + + + WindowFrame + Row + 3, 10 + True + 699, 40 + 5, 5, 5, 5 + + + System.String + First + Microsoft Sans Serif, 10pt + 43, 12 + False + ControlText + EllipsisCharacter + First + False + False + MiddleLeft + White + + unbound1 + True + 147, 25 + WindowFrame + + + System.String + last + Microsoft Sans Serif, 10pt + 231, 12 + False + ControlText + EllipsisCharacter + last + False + False + MiddleLeft + White + + unbound2 + True + 139, 25 + WindowFrame + + + System.String + Job + Microsoft Sans Serif, 10pt + 426, 10 + False + ControlText + EllipsisCharacter + Job + False + False + MiddleLeft + White + + unbound3 + True + 216, 25 + WindowFrame + + + 0 + White + False + ControlText + + + 50, 223 + False + + + 750, 49 + ReportPageFooter + False + 50 + 0 + Window + + + White + False + None + =Globals!ReportFolder + 45, 24 + TopLeft + True + False + Microsoft Sans Serif, 8.25pt + False + + =Globals!ReportFolder + WindowFrame + 483, 20 + ControlText + + + Flat + 0, 0 + 45, 3 + object_177a5444_b8e0_4202_87d2_05cdc7cd1194 + 663, 15 + Flat + Solid + White + Flat + ControlText + 656, 0 + 2 + + + White + False + None + ='Page ' + Globals!PageNumber + 602, 24 + TopLeft + True + False + Microsoft Sans Serif, 8.25pt + False + + ='Page ' + Globals!PageNumber + WindowFrame + 100, 20 + ControlText + + + 50, 289 + False + + + 750, 55 + ReportFooter + False + 50 + 0 + Window + + 50, 353 + False + + \ No newline at end of file diff --git a/samples/SharpDevelopReports/src/ReportSamples/EmployeesHireDate.cs b/samples/SharpDevelopReports/src/ReportSamples/EmployeesHireDate.cs deleted file mode 100644 index f3c9ec574c..0000000000 --- a/samples/SharpDevelopReports/src/ReportSamples/EmployeesHireDate.cs +++ /dev/null @@ -1,23 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.Reports.Core; - -namespace ReportSamples -{ - /// - /// Description of EmployeesHireDate. - /// - public class StandartPullModel:BaseSample{ - - public StandartPullModel():base(){ - base.Run(); - } - } -} - diff --git a/samples/SharpDevelopReports/src/ReportSamples/MainForm.cs b/samples/SharpDevelopReports/src/ReportSamples/MainForm.cs index 120ed3b87a..692da39353 100644 --- a/samples/SharpDevelopReports/src/ReportSamples/MainForm.cs +++ b/samples/SharpDevelopReports/src/ReportSamples/MainForm.cs @@ -113,9 +113,9 @@ namespace ReportSamples void ProviderIndependentClick(object sender, EventArgs e){ - ProviderIndependent ms = new ProviderIndependent(); - this.engine = ms.Engine; - this.DisplayPullData(ms.ReportName,ms.Parameters); +// ProviderIndependent ms = new ProviderIndependent(); +// this.engine = ms.Engine; +// this.DisplayPullData(ms.ReportName,ms.Parameters); } diff --git a/samples/SharpDevelopReports/src/ReportSamples/NorthwindSalesbyYear.cs b/samples/SharpDevelopReports/src/ReportSamples/NorthwindSalesbyYear.cs deleted file mode 100644 index 3c1c3d64c5..0000000000 --- a/samples/SharpDevelopReports/src/ReportSamples/NorthwindSalesbyYear.cs +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Forstmeier - * Datum: 04.02.2007 - * Zeit: 15:26 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ - -using System; -using System.Data; -using System.Data.OleDb; -using System.Windows.Forms; - -using ICSharpCode.Reports.Core; -namespace ReportSamples -{ - /// - /// Description of NorthwindSalesbyYear. - /// - public class NorthwindSalesbyYear:BaseSample - { -// string conString = @"Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=Northwind"; - static string start = "01.01.1997"; - static string end = "31.03.1997"; - ReportParameters parameters; - - public NorthwindSalesbyYear() - { - base.Run(); - - parameters = ReportEngine.LoadParameters(base.ReportName); -// this.parameters.ConnectionObject = ConnectionObject.CreateInstance(conString); -// base.CreateReportModel(); - parameters.SqlParameters.Add(new SqlParameter("@Beginning_Date",DbType.DateTime,start)); - parameters.SqlParameters.Add(new SqlParameter("@Ending_Date",DbType.DateTime,end)); - - - parameters.SortColumnCollection.Add(new SortColumn("ShippedDate", - System.ComponentModel.ListSortDirection.Ascending)); - -// MessageBox.Show("Not implemented","NorthwindSalesbyYear"); -// base.Engine.PreviewStandardReport(base.ReportName,parameters); -} - - - - public static void OnRenderSalesByYear (object sender, SectionRenderEventArgs e){ - - switch (e.CurrentSection) { - case GlobalEnums.ReportSection.ReportHeader: - break; - - case GlobalEnums.ReportSection.ReportPageHeader: -// BaseDataItem ss = (BaseDataItem)e.Section.Items.Find("ParamFrom"); -// string startval = String.Format("[{0}]",start); -// ss.DBValue = startval; -// BaseDataItem ee = (BaseDataItem)e.Section.Items.Find("ParamTo"); -// string endval = String.Format("[{0}]",end); -// ee.DBValue = endval; - break; - - case GlobalEnums.ReportSection.ReportDetail: -// BaseRowItem rowItem = e.Section.Items[0] as BaseRowItem; -// BaseDataItem ss1 = (BaseDataItem)rowItem.Items.Find("reportDbTextItem1"); -// System.Console.WriteLine("{0}",ss1.FormatString); - break; - - case GlobalEnums.ReportSection.ReportPageFooter: - break; - - case GlobalEnums.ReportSection.ReportFooter: -// System.Console.WriteLine("\tReportFooter"); - break; - - default: - break; - } - } - public ReportParameters Parameters { - get { return parameters; } - } - - - } -} - diff --git a/samples/SharpDevelopReports/src/ReportSamples/ProviderIndependent.cs b/samples/SharpDevelopReports/src/ReportSamples/ProviderIndependent.cs deleted file mode 100644 index 0106a7f994..0000000000 --- a/samples/SharpDevelopReports/src/ReportSamples/ProviderIndependent.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Data; -using System.Data.OleDb; -using System.Windows.Forms; - -using ICSharpCode.Reports.Core; - -namespace ReportSamples -{ - /// - /// Description of MissingConnectionString. - /// - public class ProviderIndependent:BaseSample - { - /* - Provider=Microsoft.Jet.OLEDB.4.0;Data Source=D:\SharpReport_TestReports\Nordwind.mdb;Persist Security Info=False -D:\SharpReport_TestReports\TestReports - - */ - string conOleDbString = @"Provider=Microsoft.Jet.OLEDB.4.0;Data Source=D:\SharpReport_TestReports\TestReports\Nordwind.mdb;Persist Security Info=False"; -// string conSqlConString = "Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=Northwind"; - ReportParameters parameters; - - public ProviderIndependent():base(){ - base.Run(); - parameters = ReportEngine.LoadParameters(base.ReportName); - - ConnectionObject con = ConnectionObject.CreateInstance(this.conOleDbString, - System.Data.Common.DbProviderFactories.GetFactory("System.Data.OleDb") ); - - parameters.ConnectionObject = con; - } - - public ReportParameters Parameters { - get { return parameters; } - } - - } -} - diff --git a/samples/SharpDevelopReports/src/ReportSamples/ReportSamples.csproj b/samples/SharpDevelopReports/src/ReportSamples/ReportSamples.csproj index b141a85c7c..3be644162b 100644 --- a/samples/SharpDevelopReports/src/ReportSamples/ReportSamples.csproj +++ b/samples/SharpDevelopReports/src/ReportSamples/ReportSamples.csproj @@ -45,7 +45,6 @@ - @@ -54,8 +53,6 @@ MainForm.cs - - MainForm.cs diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs b/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs index 0c755113cb..da159c6444 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs +++ b/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs @@ -17,7 +17,21 @@ namespace SharpReportSamples /// public class ContributorsReportData { - +/* + This list is by no means exhaustive: + + + + + + + + + + + +•Siegfried Pammer +*/ public static ContributorCollection CreateContributorsList () { ContributorCollection list = new ContributorCollection(); @@ -29,6 +43,11 @@ namespace SharpReportSamples list.Add(new Contributor("David","Srbecky","Debugger")); list.Add(new Contributor("Peter","Forstmeier","SharpDevelop.Reports")); list.Add(new Contributor("Markus","Palme","Prg.")); + list.Add(new Contributor("Itai","Bar-Haim","Prg.")); + list.Add(new Contributor("Russel","Wilkins","Prg.")); + list.Add(new Contributor("Justin","Dearing","Prg.")); + list.Add(new Contributor("Christian","Hornung","Prg.")); + list.Add(new Contributor("Siegfried","Pammer","Prg.")); list.Add(new Contributor("Georg","Brandl","Prg.")); list.Add(new Contributor("Roman","Taranchenko","")); list.Add(new Contributor("Denis","Erchoff","")); diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs index f05c421f67..014f19eb54 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs +++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs @@ -38,13 +38,11 @@ namespace SharpReportSamples { System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("FormSheet"); System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("PullModel"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("PushModel"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("IList"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("Sample Reports", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("IList"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Sample Reports", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, - treeNode3, - treeNode4}); + treeNode3}); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.treeView1 = new System.Windows.Forms.TreeView(); this.label1 = new System.Windows.Forms.Label(); @@ -85,14 +83,12 @@ namespace SharpReportSamples treeNode1.Text = "FormSheet"; treeNode2.Name = "PullModelItem"; treeNode2.Text = "PullModel"; - treeNode3.Name = "PushModelItem"; - treeNode3.Text = "PushModel"; - treeNode4.Name = "iListNode"; - treeNode4.Text = "IList"; - treeNode5.Name = "Knoten0"; - treeNode5.Text = "Sample Reports"; + treeNode3.Name = "iListNode"; + treeNode3.Text = "IList"; + treeNode4.Name = "Knoten0"; + treeNode4.Text = "Sample Reports"; this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode5}); + treeNode4}); this.treeView1.Size = new System.Drawing.Size(132, 444); this.treeView1.TabIndex = 0; this.treeView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TreeView1MouseDoubleClick); diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs index 9d1e9885d3..8778647943 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs +++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs @@ -52,12 +52,12 @@ namespace SharpReportSamples this.formNode = this.treeView1.Nodes[0].Nodes[0]; this.pullNode = this.treeView1.Nodes[0].Nodes[1]; - this.pushNode = this.treeView1.Nodes[0].Nodes[2]; - this.iListNode = this.treeView1.Nodes[0].Nodes[3]; +// this.pushNode = this.treeView1.Nodes[0].Nodes[2]; + this.iListNode = this.treeView1.Nodes[0].Nodes[2]; AddNodesToTree (this.formNode,startPath + @"FormSheet\" ); AddNodesToTree (this.pullNode,startPath + @"PullModel\" ); - AddNodesToTree (this.pushNode,startPath + @"PushModel\" ); +// AddNodesToTree (this.pushNode,startPath + @"PushModel\" ); AddNodesToTree (this.iListNode,startPath + @"IList\" );