diff --git a/samples/SharpDevelopReports/Reports/Logos/Bannerbeige2.gif b/samples/SharpDevelopReports/SampleReports/Logos/Bannerbeige2.gif
similarity index 100%
rename from samples/SharpDevelopReports/Reports/Logos/Bannerbeige2.gif
rename to samples/SharpDevelopReports/SampleReports/Logos/Bannerbeige2.gif
diff --git a/samples/SharpDevelopReports/Reports/Logos/SDLogo_JPG.jpg b/samples/SharpDevelopReports/SampleReports/Logos/SDLogo_JPG.jpg
similarity index 100%
rename from samples/SharpDevelopReports/Reports/Logos/SDLogo_JPG.jpg
rename to samples/SharpDevelopReports/SampleReports/Logos/SDLogo_JPG.jpg
diff --git a/samples/SharpDevelopReports/SampleReports/PullModel/FirstAggFunction.srd b/samples/SharpDevelopReports/SampleReports/PullModel/Parameter_Aggregate.srd
similarity index 93%
rename from samples/SharpDevelopReports/SampleReports/PullModel/FirstAggFunction.srd
rename to samples/SharpDevelopReports/SampleReports/PullModel/Parameter_Aggregate.srd
index 90f9c74880..4d04ad6fd2 100644
--- a/samples/SharpDevelopReports/SampleReports/PullModel/FirstAggFunction.srd
+++ b/samples/SharpDevelopReports/SampleReports/PullModel/Parameter_Aggregate.srd
@@ -40,6 +40,12 @@
Report1
+
+
+ p1
+ aaaaa
+
+
@@ -55,17 +61,17 @@
White
False
EllipsisCharacter
- =Report1
- 313, 5
+ ='Report with Parameter : ' + p1
+ 235, 19
MiddleLeft
- False
+ True
False
Microsoft Sans Serif, 10pt
False
Report1
WindowFrame
- 100, 20
+ 249, 20
Black
@@ -85,7 +91,7 @@
WindowFrame
AbstractItem
5, 5
- False
+ True
717, 50
0, 0, 0, 0
@@ -96,7 +102,7 @@
Kategorie-Nr
5, 5
MiddleLeft
- False
+ True
False
Microsoft Sans Serif, 10pt
False
@@ -113,7 +119,7 @@
Kategoriename
184, 5
MiddleLeft
- False
+ True
False
Microsoft Sans Serif, 10pt
False
@@ -130,7 +136,7 @@
Beschreibung
363, 5
MiddleLeft
- False
+ True
False
Microsoft Sans Serif, 10pt
False
@@ -147,7 +153,7 @@
Abbildung
542, 5
MiddleLeft
- False
+ True
False
Microsoft Sans Serif, 10pt
False
@@ -180,7 +186,7 @@
WindowFrame
AbstractItem
5, 5
- False
+ True
717, 50
0, 0, 0, 0
@@ -200,7 +206,7 @@
White
Kategorie-Nr
- False
+ True
100, 20
WindowFrame
@@ -220,7 +226,7 @@
White
Kategoriename
- False
+ True
100, 20
WindowFrame
@@ -240,7 +246,7 @@
Silver
Beschreibung
- False
+ True
100, 20
WindowFrame
@@ -279,7 +285,7 @@
=Globals!PageNumber
622, 5
MiddleLeft
- False
+ True
False
Microsoft Sans Serif, 10pt
False
@@ -306,9 +312,9 @@
False
None
='This Report contains : ' + count() + ' DataRows'
- 5, 4
+ 15, 3
MiddleCenter
- False
+ True
False
Microsoft Sans Serif, 10pt
False
diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs
index 80388a60cc..f05c421f67 100644
--- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs
+++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs
@@ -39,10 +39,12 @@ 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("Sample Reports", new System.Windows.Forms.TreeNode[] {
+ 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[] {
treeNode1,
treeNode2,
- treeNode3});
+ treeNode3,
+ treeNode4});
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.treeView1 = new System.Windows.Forms.TreeView();
this.label1 = new System.Windows.Forms.Label();
@@ -85,10 +87,12 @@ namespace SharpReportSamples
treeNode2.Text = "PullModel";
treeNode3.Name = "PushModelItem";
treeNode3.Text = "PushModel";
- treeNode4.Name = "Knoten0";
- treeNode4.Text = "Sample Reports";
+ treeNode4.Name = "iListNode";
+ treeNode4.Text = "IList";
+ treeNode5.Name = "Knoten0";
+ treeNode5.Text = "Sample Reports";
this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
- treeNode4});
+ treeNode5});
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 88537081e4..daffdd2e1c 100644
--- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
+++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
@@ -22,10 +22,10 @@ namespace SharpReportSamples
public partial class MainForm : Form
{
- private TreeNode formNode;
- private TreeNode pullNode;
- private TreeNode pushNode;
-
+ private TreeNode formNode;
+ private TreeNode pullNode;
+ private TreeNode pushNode;
+ private TreeNode iListNode;
public MainForm()
{
//
@@ -42,22 +42,23 @@ namespace SharpReportSamples
string formSheetDir = @"\FormSheet\JCA.srd";
string startupPath = Application.StartupPath;
- string samplesDir = @"samples\";
+ string samplesDir = @"SharpDevelopReports\";
int y = startupPath.IndexOf(samplesDir);
string startPath = startupPath.Substring(0,y + samplesDir.Length) + @"SampleReports\";
-
+//D:\Reporting3.0_branches\SharpDevelop\samples\SharpDevelopReports\SampleReports
string pathToFormSheet = startPath + formSheetDir;
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];
AddNodesToTree (this.formNode,startPath + @"FormSheet\" );
AddNodesToTree (this.pullNode,startPath + @"PullModel\" );
AddNodesToTree (this.pushNode,startPath + @"PushModel\" );
- AddNodesToTree (this.pullNode,startPath + @"IList\" );
+ AddNodesToTree (this.iListNode,startPath + @"IList\" );
}
@@ -91,7 +92,7 @@ namespace SharpReportSamples
ReportEngine engine = new ReportEngine();
this.previewControl1.SetupAsynchron(reportName,null);
}
-
+
@@ -104,19 +105,19 @@ namespace SharpReportSamples
Console.WriteLine("push");
} else {
RunStandardReport(selectedNode.Tag.ToString());
-
+
}
}
}
}
-
+
void TreeView1MouseDoubleClick(object sender, MouseEventArgs e)
{
SelectReport();
}
-
+
}
}