From 49a28f03a925f63df0f56eca0e6806ca6a19e1d8 Mon Sep 17 00:00:00 2001 From: Gianni Alberti Date: Sat, 20 Apr 2024 09:16:24 +0200 Subject: [PATCH 1/3] Fix Color on Band Separators. Fix error on GroupCtl calling formula editor --- RdlDesign/DesignRuler.cs | 6 +++--- RdlDesign/GroupingCtl.cs | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/RdlDesign/DesignRuler.cs b/RdlDesign/DesignRuler.cs index c1eaa5cc..b9e49235 100644 --- a/RdlDesign/DesignRuler.cs +++ b/RdlDesign/DesignRuler.cs @@ -286,7 +286,7 @@ private void Ruler_DrawVert(Graphics g) SectionHeigth = Design.SepHeight * _Design.SCALEY; rf = new RectangleF(0, off - sp, width, SectionHeigth); if (rf.IntersectsWith(g.ClipBounds)) - g.FillRectangle(Brushes.Yellow, rf); + g.FillRectangle(bb, rf); off += SectionHeigth; // 4) Body @@ -301,7 +301,7 @@ private void Ruler_DrawVert(Graphics g) SectionHeigth = Design.SepHeight * _Design.SCALEY; rf = new RectangleF(0, off - sp, width, SectionHeigth); if (rf.IntersectsWith(g.ClipBounds)) - g.FillRectangle(Brushes.Yellow, rf); + g.FillRectangle(bb, rf); off += SectionHeigth; @@ -317,7 +317,7 @@ private void Ruler_DrawVert(Graphics g) SectionHeigth = Design.SepHeight * _Design.SCALEY; rf = new RectangleF(0, off - sp, width, SectionHeigth); if (rf.IntersectsWith(g.ClipBounds)) - g.FillRectangle(Brushes.Yellow, rf); + g.FillRectangle(bb, rf); off += SectionHeigth; // 8) The rest to end diff --git a/RdlDesign/GroupingCtl.cs b/RdlDesign/GroupingCtl.cs index fc668642..fc503ead 100644 --- a/RdlDesign/GroupingCtl.cs +++ b/RdlDesign/GroupingCtl.cs @@ -642,8 +642,12 @@ private void tbName_Validating(object sender, System.ComponentModel.CancelEventA private void bValueExpr_Click(object sender, System.EventArgs e) { - int cr = dgGroup.CurrentRow.Index; - if (cr < 0) + int cr = -1; + if (dgGroup.CurrentRow != null) + { + cr = dgGroup.CurrentRow.Index; + } + if (cr < 0) { // No rows yet; create one string[] rowValues = new string[1]; rowValues[0] = null; From 0e4a7c2df07b4ef88cc5ffa8e40442adb86e02c8 Mon Sep 17 00:00:00 2001 From: Gianni Alberti Date: Thu, 25 Apr 2024 14:40:46 +0200 Subject: [PATCH 2/3] Insert Option on RdlDesign to display alignment grid on editing. TODO option to align controls to grid. --- RdlDesign/DesignXmlDraw.cs | 29 +- RdlDesign/RdlDesigner.Designer.cs | 301 +- RdlDesign/RdlDesigner.cs | 43 +- RdlDesign/RdlDesigner.resx | 4230 +++++++++++++++++------------ RdlDesign/ReportDesigner.csproj | 8 +- 5 files changed, 2911 insertions(+), 1700 deletions(-) diff --git a/RdlDesign/DesignXmlDraw.cs b/RdlDesign/DesignXmlDraw.cs index 76d7858f..28717797 100644 --- a/RdlDesign/DesignXmlDraw.cs +++ b/RdlDesign/DesignXmlDraw.cs @@ -91,8 +91,13 @@ public class DesignXmlDraw: UserControl bool _ShowReportItemOutline=false; + + // For Scaling and AlignMent grid display public float SCALAX = 1; public float SCALAY = 1; + public bool EnableDrawGriglia = false; + public Size SizeGridPt = new Size(4, 4); + public Size SizeGridTwips = new Size(8, 8); internal DesignXmlDraw():base() { @@ -1080,7 +1085,9 @@ private XmlNode CreatePrimaryRegion(string name) private float DrawReportPrimaryRegions(XmlNode xNode, float xLoc, float yLoc, string title) { - if (xNode == null) + RectangleF TempRect = new RectangleF(); // To be used on grid backgroung design + + if (xNode == null) return yLoc; XmlNode items=null; @@ -1126,8 +1133,24 @@ private float DrawReportPrimaryRegions(XmlNode xNode, float xLoc, float yLoc, st b = new RectangleF(xLoc + lMargin, yLoc + 1, /*PointsX(Width)*/(pWidth - lMargin - rMargin) /*+ _hScroll*/, /*height*/ ((CurrentSectionheight > TotalPageHeight /* - yLoc*/) ? TotalPageHeight/* - yLoc*/ : CurrentSectionheight));//displayHeight > 0 ? displayHeight : 0); DrawBackground(b, si); - //Edge of paper - DrawLine(Color.Gray, BorderStyleEnum.Solid, 1, pWidth, yLoc + 1, pWidth, yLoc + CurrentSectionheight); + // The alignment grid is displayed on Work area + + // La griglia e' disegnata sulla superficie di lavoro e deve tenere conto dei valori dello scroll + // perche' i valori dello scroll dei singoli items sono computati nelle varie routines che disegnano + // la linea o il background + // + if (EnableDrawGriglia == true) + { + TempRect = b; + // adjust coordinates for scrolling + TempRect.X -= _hScroll - 1; + TempRect.Y -= _vScroll - 1; + ControlPaint.DrawGrid(g, Rectangle.Round(TempRect), SizeGridPt, Color.White); + } + + + //Edge of paper + DrawLine(Color.Gray, BorderStyleEnum.Solid, 1, pWidth, yLoc + 1, pWidth, yLoc + CurrentSectionheight); //End "Paper" // Josh: diff --git a/RdlDesign/RdlDesigner.Designer.cs b/RdlDesign/RdlDesigner.Designer.cs index 8ca94db7..af866afc 100644 --- a/RdlDesign/RdlDesigner.Designer.cs +++ b/RdlDesign/RdlDesigner.Designer.cs @@ -198,6 +198,7 @@ private void InitializeComponent() this.MenuTBCloseAllButThis = new System.Windows.Forms.ToolStripMenuItem(); this.mainProperties = new fyiReporting.RdlDesign.PropertyCtl(); this.userZoomControl1 = new fyiReporting.RdlDesign.UserZoomControl(); + this.AlignmentGridEnable = new System.Windows.Forms.CheckBox(); this.menuStrip1.SuspendLayout(); this.mainTB.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -208,6 +209,7 @@ private void InitializeComponent() // // menuStrip1 // + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.editToolStripMenuItem, @@ -1063,6 +1065,7 @@ private void InitializeComponent() // // mainTB // + this.mainTB.ImageScalingSize = new System.Drawing.Size(20, 20); this.mainTB.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripButton1, this.openToolStripButton1, @@ -1233,13 +1236,14 @@ private void InitializeComponent() // // ctlEditTextbox // - this.ctlEditTextbox.Name = "ctlEditTextbox"; resources.ApplyResources(this.ctlEditTextbox, "ctlEditTextbox"); + this.ctlEditTextbox.Name = "ctlEditTextbox"; this.ctlEditTextbox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.EditTextBox_KeyDown); this.ctlEditTextbox.Validated += new System.EventHandler(this.EditTextbox_Validated); // // toolStrip1 // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.boldToolStripButton1, this.italiacToolStripButton1, @@ -2719,7 +2723,147 @@ private void InitializeComponent() resources.GetString("foreColorPicker1.Items1256"), resources.GetString("foreColorPicker1.Items1257"), resources.GetString("foreColorPicker1.Items1258"), - resources.GetString("foreColorPicker1.Items1259")}); + resources.GetString("foreColorPicker1.Items1259"), + resources.GetString("foreColorPicker1.Items1260"), + resources.GetString("foreColorPicker1.Items1261"), + resources.GetString("foreColorPicker1.Items1262"), + resources.GetString("foreColorPicker1.Items1263"), + resources.GetString("foreColorPicker1.Items1264"), + resources.GetString("foreColorPicker1.Items1265"), + resources.GetString("foreColorPicker1.Items1266"), + resources.GetString("foreColorPicker1.Items1267"), + resources.GetString("foreColorPicker1.Items1268"), + resources.GetString("foreColorPicker1.Items1269"), + resources.GetString("foreColorPicker1.Items1270"), + resources.GetString("foreColorPicker1.Items1271"), + resources.GetString("foreColorPicker1.Items1272"), + resources.GetString("foreColorPicker1.Items1273"), + resources.GetString("foreColorPicker1.Items1274"), + resources.GetString("foreColorPicker1.Items1275"), + resources.GetString("foreColorPicker1.Items1276"), + resources.GetString("foreColorPicker1.Items1277"), + resources.GetString("foreColorPicker1.Items1278"), + resources.GetString("foreColorPicker1.Items1279"), + resources.GetString("foreColorPicker1.Items1280"), + resources.GetString("foreColorPicker1.Items1281"), + resources.GetString("foreColorPicker1.Items1282"), + resources.GetString("foreColorPicker1.Items1283"), + resources.GetString("foreColorPicker1.Items1284"), + resources.GetString("foreColorPicker1.Items1285"), + resources.GetString("foreColorPicker1.Items1286"), + resources.GetString("foreColorPicker1.Items1287"), + resources.GetString("foreColorPicker1.Items1288"), + resources.GetString("foreColorPicker1.Items1289"), + resources.GetString("foreColorPicker1.Items1290"), + resources.GetString("foreColorPicker1.Items1291"), + resources.GetString("foreColorPicker1.Items1292"), + resources.GetString("foreColorPicker1.Items1293"), + resources.GetString("foreColorPicker1.Items1294"), + resources.GetString("foreColorPicker1.Items1295"), + resources.GetString("foreColorPicker1.Items1296"), + resources.GetString("foreColorPicker1.Items1297"), + resources.GetString("foreColorPicker1.Items1298"), + resources.GetString("foreColorPicker1.Items1299"), + resources.GetString("foreColorPicker1.Items1300"), + resources.GetString("foreColorPicker1.Items1301"), + resources.GetString("foreColorPicker1.Items1302"), + resources.GetString("foreColorPicker1.Items1303"), + resources.GetString("foreColorPicker1.Items1304"), + resources.GetString("foreColorPicker1.Items1305"), + resources.GetString("foreColorPicker1.Items1306"), + resources.GetString("foreColorPicker1.Items1307"), + resources.GetString("foreColorPicker1.Items1308"), + resources.GetString("foreColorPicker1.Items1309"), + resources.GetString("foreColorPicker1.Items1310"), + resources.GetString("foreColorPicker1.Items1311"), + resources.GetString("foreColorPicker1.Items1312"), + resources.GetString("foreColorPicker1.Items1313"), + resources.GetString("foreColorPicker1.Items1314"), + resources.GetString("foreColorPicker1.Items1315"), + resources.GetString("foreColorPicker1.Items1316"), + resources.GetString("foreColorPicker1.Items1317"), + resources.GetString("foreColorPicker1.Items1318"), + resources.GetString("foreColorPicker1.Items1319"), + resources.GetString("foreColorPicker1.Items1320"), + resources.GetString("foreColorPicker1.Items1321"), + resources.GetString("foreColorPicker1.Items1322"), + resources.GetString("foreColorPicker1.Items1323"), + resources.GetString("foreColorPicker1.Items1324"), + resources.GetString("foreColorPicker1.Items1325"), + resources.GetString("foreColorPicker1.Items1326"), + resources.GetString("foreColorPicker1.Items1327"), + resources.GetString("foreColorPicker1.Items1328"), + resources.GetString("foreColorPicker1.Items1329"), + resources.GetString("foreColorPicker1.Items1330"), + resources.GetString("foreColorPicker1.Items1331"), + resources.GetString("foreColorPicker1.Items1332"), + resources.GetString("foreColorPicker1.Items1333"), + resources.GetString("foreColorPicker1.Items1334"), + resources.GetString("foreColorPicker1.Items1335"), + resources.GetString("foreColorPicker1.Items1336"), + resources.GetString("foreColorPicker1.Items1337"), + resources.GetString("foreColorPicker1.Items1338"), + resources.GetString("foreColorPicker1.Items1339"), + resources.GetString("foreColorPicker1.Items1340"), + resources.GetString("foreColorPicker1.Items1341"), + resources.GetString("foreColorPicker1.Items1342"), + resources.GetString("foreColorPicker1.Items1343"), + resources.GetString("foreColorPicker1.Items1344"), + resources.GetString("foreColorPicker1.Items1345"), + resources.GetString("foreColorPicker1.Items1346"), + resources.GetString("foreColorPicker1.Items1347"), + resources.GetString("foreColorPicker1.Items1348"), + resources.GetString("foreColorPicker1.Items1349"), + resources.GetString("foreColorPicker1.Items1350"), + resources.GetString("foreColorPicker1.Items1351"), + resources.GetString("foreColorPicker1.Items1352"), + resources.GetString("foreColorPicker1.Items1353"), + resources.GetString("foreColorPicker1.Items1354"), + resources.GetString("foreColorPicker1.Items1355"), + resources.GetString("foreColorPicker1.Items1356"), + resources.GetString("foreColorPicker1.Items1357"), + resources.GetString("foreColorPicker1.Items1358"), + resources.GetString("foreColorPicker1.Items1359"), + resources.GetString("foreColorPicker1.Items1360"), + resources.GetString("foreColorPicker1.Items1361"), + resources.GetString("foreColorPicker1.Items1362"), + resources.GetString("foreColorPicker1.Items1363"), + resources.GetString("foreColorPicker1.Items1364"), + resources.GetString("foreColorPicker1.Items1365"), + resources.GetString("foreColorPicker1.Items1366"), + resources.GetString("foreColorPicker1.Items1367"), + resources.GetString("foreColorPicker1.Items1368"), + resources.GetString("foreColorPicker1.Items1369"), + resources.GetString("foreColorPicker1.Items1370"), + resources.GetString("foreColorPicker1.Items1371"), + resources.GetString("foreColorPicker1.Items1372"), + resources.GetString("foreColorPicker1.Items1373"), + resources.GetString("foreColorPicker1.Items1374"), + resources.GetString("foreColorPicker1.Items1375"), + resources.GetString("foreColorPicker1.Items1376"), + resources.GetString("foreColorPicker1.Items1377"), + resources.GetString("foreColorPicker1.Items1378"), + resources.GetString("foreColorPicker1.Items1379"), + resources.GetString("foreColorPicker1.Items1380"), + resources.GetString("foreColorPicker1.Items1381"), + resources.GetString("foreColorPicker1.Items1382"), + resources.GetString("foreColorPicker1.Items1383"), + resources.GetString("foreColorPicker1.Items1384"), + resources.GetString("foreColorPicker1.Items1385"), + resources.GetString("foreColorPicker1.Items1386"), + resources.GetString("foreColorPicker1.Items1387"), + resources.GetString("foreColorPicker1.Items1388"), + resources.GetString("foreColorPicker1.Items1389"), + resources.GetString("foreColorPicker1.Items1390"), + resources.GetString("foreColorPicker1.Items1391"), + resources.GetString("foreColorPicker1.Items1392"), + resources.GetString("foreColorPicker1.Items1393"), + resources.GetString("foreColorPicker1.Items1394"), + resources.GetString("foreColorPicker1.Items1395"), + resources.GetString("foreColorPicker1.Items1396"), + resources.GetString("foreColorPicker1.Items1397"), + resources.GetString("foreColorPicker1.Items1398"), + resources.GetString("foreColorPicker1.Items1399")}); this.foreColorPicker1.Name = "foreColorPicker1"; this.foreColorPicker1.Tag = "Fore Color"; this.foreColorPicker1.SelectedValueChanged += new System.EventHandler(this.ctlForeColor_Change); @@ -3992,7 +4136,147 @@ private void InitializeComponent() resources.GetString("backColorPicker1.Items1256"), resources.GetString("backColorPicker1.Items1257"), resources.GetString("backColorPicker1.Items1258"), - resources.GetString("backColorPicker1.Items1259")}); + resources.GetString("backColorPicker1.Items1259"), + resources.GetString("backColorPicker1.Items1260"), + resources.GetString("backColorPicker1.Items1261"), + resources.GetString("backColorPicker1.Items1262"), + resources.GetString("backColorPicker1.Items1263"), + resources.GetString("backColorPicker1.Items1264"), + resources.GetString("backColorPicker1.Items1265"), + resources.GetString("backColorPicker1.Items1266"), + resources.GetString("backColorPicker1.Items1267"), + resources.GetString("backColorPicker1.Items1268"), + resources.GetString("backColorPicker1.Items1269"), + resources.GetString("backColorPicker1.Items1270"), + resources.GetString("backColorPicker1.Items1271"), + resources.GetString("backColorPicker1.Items1272"), + resources.GetString("backColorPicker1.Items1273"), + resources.GetString("backColorPicker1.Items1274"), + resources.GetString("backColorPicker1.Items1275"), + resources.GetString("backColorPicker1.Items1276"), + resources.GetString("backColorPicker1.Items1277"), + resources.GetString("backColorPicker1.Items1278"), + resources.GetString("backColorPicker1.Items1279"), + resources.GetString("backColorPicker1.Items1280"), + resources.GetString("backColorPicker1.Items1281"), + resources.GetString("backColorPicker1.Items1282"), + resources.GetString("backColorPicker1.Items1283"), + resources.GetString("backColorPicker1.Items1284"), + resources.GetString("backColorPicker1.Items1285"), + resources.GetString("backColorPicker1.Items1286"), + resources.GetString("backColorPicker1.Items1287"), + resources.GetString("backColorPicker1.Items1288"), + resources.GetString("backColorPicker1.Items1289"), + resources.GetString("backColorPicker1.Items1290"), + resources.GetString("backColorPicker1.Items1291"), + resources.GetString("backColorPicker1.Items1292"), + resources.GetString("backColorPicker1.Items1293"), + resources.GetString("backColorPicker1.Items1294"), + resources.GetString("backColorPicker1.Items1295"), + resources.GetString("backColorPicker1.Items1296"), + resources.GetString("backColorPicker1.Items1297"), + resources.GetString("backColorPicker1.Items1298"), + resources.GetString("backColorPicker1.Items1299"), + resources.GetString("backColorPicker1.Items1300"), + resources.GetString("backColorPicker1.Items1301"), + resources.GetString("backColorPicker1.Items1302"), + resources.GetString("backColorPicker1.Items1303"), + resources.GetString("backColorPicker1.Items1304"), + resources.GetString("backColorPicker1.Items1305"), + resources.GetString("backColorPicker1.Items1306"), + resources.GetString("backColorPicker1.Items1307"), + resources.GetString("backColorPicker1.Items1308"), + resources.GetString("backColorPicker1.Items1309"), + resources.GetString("backColorPicker1.Items1310"), + resources.GetString("backColorPicker1.Items1311"), + resources.GetString("backColorPicker1.Items1312"), + resources.GetString("backColorPicker1.Items1313"), + resources.GetString("backColorPicker1.Items1314"), + resources.GetString("backColorPicker1.Items1315"), + resources.GetString("backColorPicker1.Items1316"), + resources.GetString("backColorPicker1.Items1317"), + resources.GetString("backColorPicker1.Items1318"), + resources.GetString("backColorPicker1.Items1319"), + resources.GetString("backColorPicker1.Items1320"), + resources.GetString("backColorPicker1.Items1321"), + resources.GetString("backColorPicker1.Items1322"), + resources.GetString("backColorPicker1.Items1323"), + resources.GetString("backColorPicker1.Items1324"), + resources.GetString("backColorPicker1.Items1325"), + resources.GetString("backColorPicker1.Items1326"), + resources.GetString("backColorPicker1.Items1327"), + resources.GetString("backColorPicker1.Items1328"), + resources.GetString("backColorPicker1.Items1329"), + resources.GetString("backColorPicker1.Items1330"), + resources.GetString("backColorPicker1.Items1331"), + resources.GetString("backColorPicker1.Items1332"), + resources.GetString("backColorPicker1.Items1333"), + resources.GetString("backColorPicker1.Items1334"), + resources.GetString("backColorPicker1.Items1335"), + resources.GetString("backColorPicker1.Items1336"), + resources.GetString("backColorPicker1.Items1337"), + resources.GetString("backColorPicker1.Items1338"), + resources.GetString("backColorPicker1.Items1339"), + resources.GetString("backColorPicker1.Items1340"), + resources.GetString("backColorPicker1.Items1341"), + resources.GetString("backColorPicker1.Items1342"), + resources.GetString("backColorPicker1.Items1343"), + resources.GetString("backColorPicker1.Items1344"), + resources.GetString("backColorPicker1.Items1345"), + resources.GetString("backColorPicker1.Items1346"), + resources.GetString("backColorPicker1.Items1347"), + resources.GetString("backColorPicker1.Items1348"), + resources.GetString("backColorPicker1.Items1349"), + resources.GetString("backColorPicker1.Items1350"), + resources.GetString("backColorPicker1.Items1351"), + resources.GetString("backColorPicker1.Items1352"), + resources.GetString("backColorPicker1.Items1353"), + resources.GetString("backColorPicker1.Items1354"), + resources.GetString("backColorPicker1.Items1355"), + resources.GetString("backColorPicker1.Items1356"), + resources.GetString("backColorPicker1.Items1357"), + resources.GetString("backColorPicker1.Items1358"), + resources.GetString("backColorPicker1.Items1359"), + resources.GetString("backColorPicker1.Items1360"), + resources.GetString("backColorPicker1.Items1361"), + resources.GetString("backColorPicker1.Items1362"), + resources.GetString("backColorPicker1.Items1363"), + resources.GetString("backColorPicker1.Items1364"), + resources.GetString("backColorPicker1.Items1365"), + resources.GetString("backColorPicker1.Items1366"), + resources.GetString("backColorPicker1.Items1367"), + resources.GetString("backColorPicker1.Items1368"), + resources.GetString("backColorPicker1.Items1369"), + resources.GetString("backColorPicker1.Items1370"), + resources.GetString("backColorPicker1.Items1371"), + resources.GetString("backColorPicker1.Items1372"), + resources.GetString("backColorPicker1.Items1373"), + resources.GetString("backColorPicker1.Items1374"), + resources.GetString("backColorPicker1.Items1375"), + resources.GetString("backColorPicker1.Items1376"), + resources.GetString("backColorPicker1.Items1377"), + resources.GetString("backColorPicker1.Items1378"), + resources.GetString("backColorPicker1.Items1379"), + resources.GetString("backColorPicker1.Items1380"), + resources.GetString("backColorPicker1.Items1381"), + resources.GetString("backColorPicker1.Items1382"), + resources.GetString("backColorPicker1.Items1383"), + resources.GetString("backColorPicker1.Items1384"), + resources.GetString("backColorPicker1.Items1385"), + resources.GetString("backColorPicker1.Items1386"), + resources.GetString("backColorPicker1.Items1387"), + resources.GetString("backColorPicker1.Items1388"), + resources.GetString("backColorPicker1.Items1389"), + resources.GetString("backColorPicker1.Items1390"), + resources.GetString("backColorPicker1.Items1391"), + resources.GetString("backColorPicker1.Items1392"), + resources.GetString("backColorPicker1.Items1393"), + resources.GetString("backColorPicker1.Items1394"), + resources.GetString("backColorPicker1.Items1395"), + resources.GetString("backColorPicker1.Items1396"), + resources.GetString("backColorPicker1.Items1397"), + resources.GetString("backColorPicker1.Items1398"), + resources.GetString("backColorPicker1.Items1399")}); this.backColorPicker1.Name = "backColorPicker1"; this.backColorPicker1.Tag = "Back Color"; this.backColorPicker1.SelectedValueChanged += new System.EventHandler(this.ctlBackColor_Change); @@ -4000,6 +4284,7 @@ private void InitializeComponent() // // statusStrip1 // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusSelected, this.toolStripStatusLabel2, @@ -4031,6 +4316,7 @@ private void InitializeComponent() // // ContextMenuTB // + this.ContextMenuTB.ImageScalingSize = new System.Drawing.Size(20, 20); this.ContextMenuTB.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MenuTBClose, this.MenuTBSave, @@ -4072,10 +4358,18 @@ private void InitializeComponent() this.userZoomControl1.Step = 0.1F; this.userZoomControl1.ZoomChanged += new System.EventHandler(this.ZoomControl1_ValueChanged); // + // AlignmentGridEnable + // + resources.ApplyResources(this.AlignmentGridEnable, "AlignmentGridEnable"); + this.AlignmentGridEnable.Name = "AlignmentGridEnable"; + this.AlignmentGridEnable.UseVisualStyleBackColor = true; + this.AlignmentGridEnable.CheckedChanged += new System.EventHandler(this.AlignmentGridEnable_CheckedChanged); + // // RdlDesigner // this.AllowDrop = true; resources.ApplyResources(this, "$this"); + this.Controls.Add(this.AlignmentGridEnable); this.Controls.Add(this.userZoomControl1); this.Controls.Add(this.mainSP); this.Controls.Add(this.mainProperties); @@ -4299,5 +4593,6 @@ protected override void Dispose( bool disposing ) private ToolStripMenuItem MenuTBCloseAllButThis; private ToolStripMenuItem Excel2007ToolStripMenuItem; private UserZoomControl userZoomControl1; + private CheckBox AlignmentGridEnable; } } diff --git a/RdlDesign/RdlDesigner.cs b/RdlDesign/RdlDesigner.cs index b673ec6f..dc0918c2 100644 --- a/RdlDesign/RdlDesigner.cs +++ b/RdlDesign/RdlDesigner.cs @@ -3887,36 +3887,29 @@ private void ZoomControl1_ValueChanged(object sender, UserZoomControl.CambiaValo mc.Editor.DesignCtl._hScroll.Maximum = (int)mc.Editor.DesignCtl._DrawPanel.ReportVisualSize; mc.Editor.DesignCtl._vScroll.Maximum = (int)(mc.Editor.DesignCtl._DrawPanel.VerticalMax * mc.Editor.DesignCtl._DrawPanel.SCALAY); - - - - } - private void menuFormat_Popup(object sender, UserZoomControl.CambiaValori e) - { + - } /// - /// Abilita Flag per allineamento griglia + /// Enable Alignment grid on RdlEditor /// - /// - /// - //private void AlignmentGridEnable_CheckedChanged(object sender, EventArgs e) - //{ - // MDIChild mc = this.ActiveMdiChild as MDIChild; - // if (mc == null) - // return; - // if (mc.Editor == null) - // { - // return; - // } - // mc.Editor.DesignCtl._DrawPanel.EnableDrawGriglia = AlignmentGridEnable.Checked; - // mc.Editor.DesignCtl._DrawPanel.Invalidate(); - // mc.Editor.dcTopRuler.Invalidate(); - // mc.Editor.dcLeftRuler.Invalidate(); - - //} + /// + /// < param name="e"> + private void AlignmentGridEnable_CheckedChanged(object sender, EventArgs e) + { + MDIChild mc = this.ActiveMdiChild as MDIChild; + if (mc == null) + return; + if (mc.Editor == null) + { + return; + } + mc.Editor.DesignCtl._DrawPanel.EnableDrawGriglia = AlignmentGridEnable.Checked; + mc.Editor.DesignCtl._DrawPanel.Invalidate(); + mc.Editor.dcTopRuler.Invalidate(); + mc.Editor.dcLeftRuler.Invalidate(); + } } diff --git a/RdlDesign/RdlDesigner.resx b/RdlDesign/RdlDesigner.resx index 3a51cf4c..f1de358d 100644 --- a/RdlDesign/RdlDesigner.resx +++ b/RdlDesign/RdlDesigner.resx @@ -120,13 +120,44 @@ 17, 17 + + + 0, 0 + + + 1651, 28 + + + + 29 + + + menuStrip1 + + + menuStrip1 + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + 46, 24 + + + &File + Ctrl+N - - 188, 22 + 233, 26 &New Report... @@ -135,7 +166,7 @@ Ctrl+O - 188, 22 + 233, 26 &Open... @@ -144,15 +175,14 @@ Ctrl+W - 188, 22 + 233, 26 &Close - 185, 6 + 230, 6 - False @@ -160,7 +190,7 @@ Ctrl+S - 188, 22 + 233, 26 &Save @@ -169,7 +199,7 @@ False - 188, 22 + 233, 26 Save &As @@ -181,121 +211,121 @@ Ctrl+P - 188, 22 + 233, 26 Print + + False + + + 233, 26 + + + Export + - 235, 22 + 291, 26 PDF... - 235, 22 + 291, 26 PDF (Old Style)... - 235, 22 + 291, 26 TIF... - 235, 22 + 291, 26 CSV... - 235, 22 + 291, 26 Excel 2007 (Table Only) - 235, 22 + 291, 26 Excel 2007 - 235, 22 + 291, 26 DOC - 235, 22 + 291, 26 RTF - 235, 22 + 291, 26 XML... - 235, 22 + 291, 26 Web Page, HTML... - 235, 22 + 291, 26 Web Archive, single file MHT... - - False - - - 188, 22 - - - Export - - 185, 6 + 230, 6 False - 188, 22 + 233, 26 Recent &Files - 185, 6 + 230, 6 Ctrl+Q - 188, 22 + 233, 26 E&xit - - 37, 20 + + 49, 24 - - &File + + &Edit Ctrl+Z - 171, 22 + 212, 26 &Undo @@ -304,19 +334,19 @@ Ctrl+Y - 171, 22 + 212, 26 &Redo - 168, 6 + 209, 6 Ctrl+X - 171, 22 + 212, 26 Cu&t @@ -325,7 +355,7 @@ Ctrl+C - 171, 22 + 212, 26 &Copy @@ -334,7 +364,7 @@ Ctrl+V - 171, 22 + 212, 26 &Paste @@ -343,31 +373,31 @@ Ctrl+Del - 171, 22 + 212, 26 &Del - 168, 6 + 209, 6 Ctrl+A - 171, 22 + 212, 26 Select &All - 168, 6 + 209, 6 Ctrl+F - 171, 22 + 212, 26 &Find @@ -376,7 +406,7 @@ Ctrl+F3 - 171, 22 + 212, 26 Find Next @@ -385,7 +415,7 @@ Ctrl+H - 171, 22 + 212, 26 &Replace @@ -394,31 +424,31 @@ Ctrl+G - 171, 22 + 212, 26 &Go To... - 168, 6 + 209, 6 - 171, 22 + 212, 26 Format XM&L - - 39, 20 + + 55, 24 - - &Edit + + &View F7 - 218, 22 + 274, 26 Designer @@ -427,7 +457,7 @@ Shift+F7 - 218, 22 + 274, 26 RDL Text @@ -436,7 +466,7 @@ F5 - 218, 22 + 274, 26 Preview @@ -445,7 +475,7 @@ F6 - 218, 22 + 274, 26 Show Report in Browser @@ -454,397 +484,403 @@ F4 - 218, 22 + 274, 26 Properties Windows - - 44, 20 + + 59, 24 - - &View + + &Insert - 126, 22 + 158, 26 &Chart... - 126, 22 + 158, 26 &Grid - 126, 22 + 158, 26 &Image - 126, 22 + 158, 26 &Line - 126, 22 + 158, 26 Lis&t - 126, 22 + 158, 26 &Matrix... - 126, 22 + 158, 26 &Rectangle - 126, 22 + 158, 26 &Subreport - 126, 22 + 158, 26 &Table... - 126, 22 + 158, 26 T&extbox - - 48, 20 + + 55, 24 - - &Insert + + &Data - 222, 22 + 279, 26 &Data Sets - 222, 22 + 279, 26 Data &Sources - 219, 6 + 276, 6 - 222, 22 + 279, 26 &Embedded Images... - 219, 6 + 276, 6 - 222, 22 + 279, 26 &Create Shared Data Source... - - 43, 20 + + 70, 24 - - &Data + + F&ormat + + + 219, 26 + + + &Align - 119, 22 + 148, 26 &Lefts - 119, 22 + 148, 26 &Centers - 119, 22 + 148, 26 &Rights - 116, 6 + 145, 6 - 119, 22 + 148, 26 &Tops - 119, 22 + 148, 26 &Middles - 119, 22 + 148, 26 &Bottoms - - 174, 22 + + 219, 26 - - &Align + + &Size - 110, 22 + 137, 26 &Width - 110, 22 + 137, 26 &Height - 110, 22 + 137, 26 &Both - - 174, 22 + + 219, 26 - - &Size + + &Horizontal Spacing - 135, 22 + 169, 26 &Make Equal - 135, 22 + 169, 26 &Increase - 135, 22 + 169, 26 &Decrease - 135, 22 + 169, 26 &Zero - - 174, 22 + + 219, 26 - - &Horizontal Spacing + + Vertical Spacing - 135, 22 + 169, 26 &Make Equal - 135, 22 + 169, 26 &Increase - 135, 22 + 169, 26 &Decrease - 135, 22 + 169, 26 &Zero - - 174, 22 + + 216, 6 - - Vertical Spacing + + 219, 26 - - 171, 6 + + Padding &Left - 121, 22 + 153, 26 &Increase - 121, 22 + 153, 26 &Decrease - 121, 22 + 153, 26 &Zero - - 174, 22 + + 219, 26 - - Padding &Left + + Padding &Right - 121, 22 + 153, 26 &Increase - 121, 22 + 153, 26 &Decrease - 121, 22 + 153, 26 &Zero - - 174, 22 + + 219, 26 - - Padding &Right + + Padding &Top - 121, 22 + 153, 26 &Increase - 121, 22 + 153, 26 &Decrease - 121, 22 + 153, 26 &Zero - - 174, 22 + + 219, 26 - - Padding &Top + + Padding &Bottom - 121, 22 + 153, 26 &Increase - 121, 22 + 153, 26 &Decrease - 121, 22 + 153, 26 &Zero - - 174, 22 - - - Padding &Bottom - - - 57, 20 + + 58, 24 - - F&ormat + + &Tools - 179, 22 + 227, 26 &Validate RDL - 176, 6 + 224, 6 - 179, 22 + 227, 26 &Start Desktop Server - 176, 6 + 224, 6 - 179, 22 + 227, 26 &Options - - 46, 20 + + 78, 24 - - &Tools + + &Window Ctrl+Shift+J - 197, 22 + 246, 26 &Cascade + + 246, 26 + + + &Tile + Ctrl+Shift+K - 211, 22 + 264, 26 &Horizontally @@ -853,88 +889,76 @@ Ctrl+Shift+L - 211, 22 + 264, 26 &Vertically - - 197, 22 - - - &Tile - Ctrl+Shift+W - 197, 22 + 246, 26 Close &All - - 63, 20 + + 55, 24 - - &Window + + &Help - 116, 22 + 145, 26 &Help - 116, 22 + 145, 26 &Support - 116, 22 + 145, 26 &About - - 44, 20 - - - &Help - - - 0, 0 + + 132, 17 + + + 0, 28 - - 1263, 24 + + 1651, 27 - - 29 + + 30 - - menuStrip1 + + toolStrip1 - - menuStrip1 + + mainTB - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 8 - - 132, 17 - Magenta - 23, 22 + 29, 24 New @@ -943,7 +967,7 @@ Magenta - 23, 22 + 29, 24 Open @@ -952,7 +976,7 @@ Magenta - 23, 22 + 29, 24 Save @@ -961,7 +985,7 @@ Magenta - 23, 22 + 29, 24 Cut @@ -970,7 +994,7 @@ Magenta - 23, 22 + 29, 24 Copy @@ -979,7 +1003,7 @@ Magenta - 23, 22 + 29, 24 Paste @@ -988,7 +1012,7 @@ Magenta - 23, 22 + 29, 24 Undo @@ -996,7 +1020,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABOSURBVDhP5YxRCgAgDEK9/6UXgcE2I6LtrwchThNWpGcA + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABOSURBVDhP5YxRCgAgDEK9/6UXgcE2I6LtrwchThNWpGcA wNXb0TOQOX3I/DLgvWTUgJScl4wayKXJusmdGmgf8F4yakBKzktGfaY4YDYA0LdC6GTV0nUAAAAASUVO RK5CYII= @@ -1005,7 +1029,7 @@ Magenta - 71, 22 + 89, 24 Text Box @@ -1014,7 +1038,7 @@ Magenta - 56, 22 + 68, 24 Chart @@ -1022,7 +1046,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABLSURBVDhP7Y5BCgAgCAT9/6cNo5UtDNIuHRpYVj0Mil7S + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABLSURBVDhP7Y5BCgAgCAT9/6cNo5UtDNIuHRpYVj0Mil7S BSJSyiTIEgpgRkB09+bF4JlZ71vBKbHAmgOC+//AajQvGR78oBIX1FFtqeUDKMm9WRgAAAAASUVORK5C YII= @@ -1031,7 +1055,7 @@ Magenta - 54, 22 + 68, 24 Table @@ -1039,7 +1063,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABrSURBVDhPpZEBCoBACAT9/6cvhBtRucWrBhbbyinK1k9C + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABrSURBVDhPpZEBCoBACAT9/6cvhBtRucWrBhbbyinK1k9C YGYRyL1fgyJQk9AztX1AC3iSmhstAF8gB2bBQAj6x7qlCPK85d3dB7SAN1FzowXgC+TALBgIQf8L+djp HYogT4clwrlMba9Z6wH7k32tztsDcQAAAABJRU5ErkJggg== @@ -1048,7 +1072,7 @@ Magenta - 45, 22 + 55, 24 List @@ -1057,7 +1081,7 @@ Magenta - 60, 22 + 75, 24 Image @@ -1065,7 +1089,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABcSURBVDhPzY5RDoAwCEO5//l2H7RLauqGmbAPfUkD3ccb + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABcSURBVDhPzY5RDoAwCEO5//l2H7RLauqGmbAPfUkD3ccb 5pt0gZmVchNkeSUY37UvBXhjnnqfWjKEAkwGtHMiurOHggyhAJMB/7hA+eYC/qg7CAUZJkEll6CO+wEV wABNUS6u4wAAAABJRU5ErkJggg== @@ -1074,7 +1098,7 @@ Magenta - 61, 22 + 75, 24 Matrix @@ -1082,7 +1106,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABdSURBVDhP7Y5RDsAgCEO5/6VZalYCWuN0v76kEiopmP+k + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABdSURBVDhP7Y5RDsAgCEO5/6VZalYCWuN0v76kEiopmP+k BZjZUjMiYMVspgRwG0WUR0oAUEOAfv8/BHyhLGwPDdQsIvy4KDc76ADULCL8ewHKW3OzwxBwogg4x/0B zrQYE6q0TO4AAAAASUVORK5CYII= @@ -1091,7 +1115,7 @@ Magenta - 79, 22 + 99, 24 Subreport @@ -1099,7 +1123,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAuSURBVDhPY/hPIaCeAQwMDCRhGEAxgFgwasCoASCA0wBS + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAAuSURBVDhPY/hPIaCeAQwMDCRhGEAxgFgwasCoASCA0wBS MAwQby0OMNAG/P8PAC/Ffqw7zhfAAAAAAElFTkSuQmCC @@ -1107,7 +1131,7 @@ Magenta - 79, 22 + 99, 24 Rectangle @@ -1115,7 +1139,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABJSURBVDhP1Yy5DQAgDMSy/9JBLgN5RYFwe2eLXvJhQMQq + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABJSURBVDhP1Yy5DQAgDMSy/9JBLgN5RYFwe2eLXvJhQMQq o8AuQzvgydAKRDKUgUyGdK1kCB8dGdxXV4bjOZHBvKcyzI2N1wHVBZfk3kzElYBzAAAAAElFTkSuQmCC @@ -1123,7 +1147,7 @@ Magenta - 49, 22 + 60, 24 Line @@ -1132,7 +1156,7 @@ Segoe UI, 9pt, style=Bold - 19, 22 + 23, 24 fx @@ -1140,36 +1164,39 @@ fx + + Segoe UI, 9pt + - 250, 25 + 300, 27 - - 0, 24 + + 224, 17 + + + 0, 55 - - 1263, 25 + + 1651, 28 - - 30 + + 31 - + toolStrip1 - - mainTB + + toolStrip1 - + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 7 - - 224, 17 - Segoe UI, 9pt, style=Bold @@ -1177,7 +1204,7 @@ Magenta - 23, 22 + 29, 25 B @@ -1192,7 +1219,7 @@ Magenta - 23, 22 + 29, 25 I @@ -1207,7 +1234,7 @@ Magenta - 23, 22 + 29, 25 U @@ -1219,7 +1246,7 @@ Magenta - 23, 22 + 29, 25 Left Align @@ -1228,7 +1255,7 @@ Magenta - 23, 22 + 29, 25 Center Align @@ -1237,19 +1264,19 @@ Magenta - 23, 22 + 29, 25 Right Align - 121, 25 + 145, 28 Font - 75, 25 + 90, 28 Font Size @@ -1258,13 +1285,13 @@ Magenta - 23, 22 + 29, 25 Print - 75, 25 + 90, 28 Zoom @@ -1272,7 +1299,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAuSURBVDhPY/hPIcBrAAMDAxjjA6MGUMsAmEJSMfUMwAWQ + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAAuSURBVDhPY/hPIcBrAAMDAxjjA6MGUMsAmEJSMfUMwAWQ FeICowbQ2gDC4P9/AFoiYMp9UrIYAAAAAElFTkSuQmCC @@ -1280,7 +1307,7 @@ Magenta - 23, 22 + 29, 25 Select Tool @@ -1288,7 +1315,7 @@ iVBORw0KGgoAAAANSUhEUgAAABIAAAAQCAYAAAAbBi9cAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABaSURBVDhP3ZPbCQAgDAOdx/1HcZ9KxEKQKj4qiAdRm9D8 + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABaSURBVDhP3ZPbCQAgDAOdx/1HcZ9KxEKQKj4qiAdRm9D8 GcSJB4tCTMJSej5osyIcjM49H7QZmC4Cw2y3iFU8ywT8VtQzM8sE14p4Xi5iMdbOz1+k3sc4FYlkjsIT 8WJzcpcAAAAASUVORK5CYII= @@ -1297,7 +1324,7 @@ Magenta - 23, 22 + 29, 25 PDF @@ -1305,7 +1332,7 @@ iVBORw0KGgoAAAANSUhEUgAAABoAAAAQCAYAAAAI0W+oAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABYSURBVDhPY/hPJzAMLWLQugJlIgBMDESjY5g4NoBPHq9F + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABYSURBVDhPY/hPJzAMLWLQugJlIgBMDESjY5g4NoBPHq9F MICNj08MXQ4E6GsRNowMcPEJ0ciAbB8RQyODoWERCGBjo6sHAZpZhIHBMnQAoxaRDehk0f//APc76hR2 Y9y2AAAAAElFTkSuQmCC @@ -1314,7 +1341,7 @@ Magenta - 23, 22 + 29, 25 HTML @@ -1322,7 +1349,7 @@ iVBORw0KGgoAAAANSUhEUgAAABUAAAAQCAYAAAD52jQlAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABgSURBVDhP7ZFRCgAgCEM7T/c/SvcxCgdjlB9SH0EPpHRr + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABgSURBVDhP7ZFRCgAgCEM7T/c/SvcxCgdjlB9SH0EPpHRr IBW7wEOhpTYbBbhXTYGuvnSoatzP9TFgYaA9E2p+Lk3hQ9dWnnQogIe96fUV9t75qFD0uxbYzv08yg89 jVkHIj6jSQaaleYAAAAASUVORK5CYII= @@ -1331,7 +1358,7 @@ Magenta - 23, 22 + 29, 25 Excel @@ -1339,7 +1366,7 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABaSURBVDhPY/hPZTAEDGTQugJlIgBMDJscCOCTB7sQWQKd + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABaSURBVDhPY/hPZTAEDGTQugJlIgBMDJscCOCTB7sQWQKd ja4JWQxdDgRoYyAI4NJMDI0MaGMgsgQ2NiEaGRBlIAhgYyOLwQDRyQYbG0RjYLAMFcGogZSC//8BGteL dcZuF4EAAAAASUVORK5CYII= @@ -1348,7 +1375,7 @@ Magenta - 23, 22 + 29, 25 XML @@ -1356,7 +1383,7 @@ iVBORw0KGgoAAAANSUhEUgAAABUAAAAQCAYAAAD52jQlAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABnSURBVDhP7YxRCsAwCEN7nt3/KLuPw1IhTbLtp/0Y7IFo + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABnSURBVDhP7YxRCsAwCEN7nt3/KLuPw1IhTbLtp/0Y7IFo oqbFBj4U2o5zjDPluz3uuLqPopgOaJe4e2RfaB8euitEdBlvHWFP9F0Id4Q90Wi4mR8SCWHtgpKa+SGR ENajL+UPXU3EBVw8wzkRFW5BAAAAAElFTkSuQmCC @@ -1365,7 +1392,7 @@ Magenta - 23, 22 + 29, 25 MHT @@ -1373,7 +1400,7 @@ iVBORw0KGgoAAAANSUhEUgAAABUAAAAQCAYAAAD52jQlAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABoSURBVDhP7ZJRCsAgDEN7nt3/KLtPR2SR0Fkp4j4Ge+DU + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABoSURBVDhP7ZJRCsAgDEN7nt3/KLtPR2SR0Fkp4j4Ge+DU Jr6vmb/AB6V2nH0pOtcs9kjr8aDwPno4ywDmloVgloGY8z6VAuRZZ1lKMnkXSVaWktgfStunUCSV2fIv pTze3PtWfulu3C97Gt8rXJb7sAAAAABJRU5ErkJggg== @@ -1382,7 +1409,7 @@ Magenta - 23, 22 + 29, 25 CSV @@ -1390,7 +1417,7 @@ iVBORw0KGgoAAAANSUhEUgAAABQAAAAQCAYAAAAWGF8bAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABLSURBVDhPY/hPZTAEDGRguAIkUDEMYJODYdzyQAIdUCZG + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAABLSURBVDhPY/hPZTAEDGRguAIkUDEMYJODYdzyQAIdUCZG CwPRMTaATRybPhQXIrPRATY57GJogrgMHTwGggBFYlCaamDUQErB//8A1OuNEoRaw2QAAAAASUVORK5C YII= @@ -1399,7 +1426,7 @@ Magenta - 23, 22 + 29, 25 RTF @@ -1407,7 +1434,7 @@ iVBORw0KGgoAAAANSUhEUgAAABUAAAAQCAYAAAD52jQlAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAA/SURBVDhPY/hPAzDEDGXQuoKBkQE6HwTQ1SOrQXEpsgQy + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAA/SURBVDhPY/hPAzDEDGXQuoKBkQE6HwTQ1SOrQXEpsgQy wCaOSy0IDD5DkTEyGCHexwVobyi1wKih1Ab//wMAw/n1IMf7Fj0AAAAASUVORK5CYII= @@ -1415,46 +1442,22 @@ Magenta - 23, 22 + 29, 25 TIF - - 0, 49 - - - 1263, 25 - - - 31 - - - toolStrip1 - - - toolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 6 - Top, Left, Right - 3, 39 + 4, 45 True - 1257, 21 + 1643, 24 34 @@ -1478,10 +1481,10 @@ NoControl - 4, 15 + 5, 17 - 58, 13 + 73, 16 0 @@ -1508,10 +1511,10 @@ NoControl - 209, 15 + 251, 17 - 62, 13 + 76, 16 35 @@ -1531,14 +1534,62 @@ 1 - - Arial, 8pt, style=Bold, Italic + + foreColorPicker1 - - False + + fyiReporting.RdlDesign.ColorPicker, RdlDesigner, Version=4.16.0.0, Culture=neutral, PublicKeyToken=null - - Aliceblue + + panel1 + + + 2 + + + backColorPicker1 + + + fyiReporting.RdlDesign.ColorPicker, RdlDesigner, Version=4.16.0.0, Culture=neutral, PublicKeyToken=null + + + panel1 + + + 3 + + + Top + + + 0, 83 + + + 1651, 76 + + + 36 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Arial, 8pt, style=Bold, Italic + + + False + + + Aliceblue Antiquewhite @@ -5317,3818 +5368,4658 @@ Yellowgreen - - 66, 12 - - - 121, 21 - - - 32 - - - foreColorPicker1 - - - fyiReporting.RdlDesign.ColorPicker, RdlDesigner, Version=4.16.0.0, Culture=neutral, PublicKeyToken=null - - - panel1 - - - 2 - - - Arial, 8pt, style=Bold, Italic - - - False - - + Aliceblue - + Antiquewhite - + Aqua - + Aquamarine - + Azure - + Beige - + Bisque - + Black - + Blanchedalmond - + Blue - + Blueviolet - + Brown - + Burlywood - + Cadetblue - + Chartreuse - + Chocolate - + Coral - + Cornflowerblue - + Cornsilk - + Crimson - + Cyan - + Darkblue - + Darkcyan - + Darkgoldenrod - + Darkgray - + Darkgreen - + Darkkhaki - + Darkmagenta - + Darkolivegreen - + Darkorange - + Darkorchid - + Darkred - + Darksalmon - + Darkseagreen - + Darkslateblue - + Darkslategray - + Darkturquoise - + Darkviolet - + Deeppink - + Deepskyblue - + Dimgray - + Dodgerblue - + Firebrick - + Floralwhite - + Forestgreen - + Fuchsia - + Gainsboro - + Ghostwhite - + Gold - + Goldenrod - + Gray - + Green - + Greenyellow - + Honeydew - + Hotpink - + Indianred - + Indigo - + Ivory - + Khaki - + Lavender - + Lavenderblush - + Lawngreen - + Lemonchiffon - + Lightblue - + Lightcoral - + Lightcyan - + Lightgoldenrodyellow - + Lightgreen - + Lightgrey - + Lightpink - + Lightsalmon - + Lightseagreen - + Lightskyblue - + Lightslategrey - + Lightsteelblue - + Lightyellow - + Lime - + Limegreen - + Linen - + Magenta - + Maroon - + Mediumaquamarine - + Mediumblue - + Mediumorchid - + Mediumpurple - + Mediumseagreen - + Mediumslateblue - + Mediumspringgreen - + Mediumturquoise - + Mediumvioletred - + Midnightblue - + Mintcream - + Mistyrose - + Moccasin - + Navajowhite - + Navy - + Oldlace - + Olive - + Olivedrab - + Orange - + Orangered - + Orchid - + Palegoldenrod - + Palegreen - + Paleturquoise - + Palevioletred - + Papayawhip - + Peachpuff - + Peru - + Pink - + Plum - + Powderblue - + Purple - + Red - + Rosybrown - + Royalblue - + Saddlebrown - + Salmon - + Sandybrown - + Seagreen - + Seashell - + Sienna - + Silver - + Skyblue - + Slateblue - + Slategray - + Snow - + Springgreen - + Steelblue - + Tan - + Teal - + Thistle - + Tomato - + Turquoise - + Violet - + Wheat - + White - + Whitesmoke - + Yellow - + Yellowgreen - + + 79, 14 + + + 145, 24 + + + 32 + + + foreColorPicker1 + + + fyiReporting.RdlDesign.ColorPicker, RdlDesigner, Version=4.16.0.0, Culture=neutral, PublicKeyToken=null + + + panel1 + + + 2 + + + Arial, 8pt, style=Bold, Italic + + + False + + Aliceblue - + Antiquewhite - + Aqua - + Aquamarine - + Azure - + Beige - + Bisque - + Black - + Blanchedalmond - + + Blue + + + Blueviolet + + + Brown + + + Burlywood + + + Cadetblue + + + Chartreuse + + + Chocolate + + + Coral + + + Cornflowerblue + + + Cornsilk + + + Crimson + + + Cyan + + + Darkblue + + + Darkcyan + + + Darkgoldenrod + + + Darkgray + + + Darkgreen + + + Darkkhaki + + + Darkmagenta + + + Darkolivegreen + + + Darkorange + + + Darkorchid + + + Darkred + + + Darksalmon + + + Darkseagreen + + + Darkslateblue + + + Darkslategray + + + Darkturquoise + + + Darkviolet + + + Deeppink + + + Deepskyblue + + + Dimgray + + + Dodgerblue + + + Firebrick + + + Floralwhite + + + Forestgreen + + + Fuchsia + + + Gainsboro + + + Ghostwhite + + + Gold + + + Goldenrod + + + Gray + + + Green + + + Greenyellow + + + Honeydew + + + Hotpink + + + Indianred + + + Indigo + + + Ivory + + + Khaki + + + Lavender + + + Lavenderblush + + + Lawngreen + + + Lemonchiffon + + + Lightblue + + + Lightcoral + + + Lightcyan + + + Lightgoldenrodyellow + + + Lightgreen + + + Lightgrey + + + Lightpink + + + Lightsalmon + + + Lightseagreen + + + Lightskyblue + + + Lightslategrey + + + Lightsteelblue + + + Lightyellow + + + Lime + + + Limegreen + + + Linen + + + Magenta + + + Maroon + + + Mediumaquamarine + + + Mediumblue + + + Mediumorchid + + + Mediumpurple + + + Mediumseagreen + + + Mediumslateblue + + + Mediumspringgreen + + + Mediumturquoise + + + Mediumvioletred + + + Midnightblue + + + Mintcream + + + Mistyrose + + + Moccasin + + + Navajowhite + + + Navy + + + Oldlace + + + Olive + + + Olivedrab + + + Orange + + + Orangered + + + Orchid + + + Palegoldenrod + + + Palegreen + + + Paleturquoise + + + Palevioletred + + + Papayawhip + + + Peachpuff + + + Peru + + + Pink + + + Plum + + + Powderblue + + + Purple + + + Red + + + Rosybrown + + + Royalblue + + + Saddlebrown + + + Salmon + + + Sandybrown + + + Seagreen + + + Seashell + + + Sienna + + + Silver + + + Skyblue + + + Slateblue + + + Slategray + + + Snow + + + Springgreen + + + Steelblue + + + Tan + + + Teal + + + Thistle + + + Tomato + + + Turquoise + + + Violet + + + Wheat + + + White + + + Whitesmoke + + + Yellow + + + Yellowgreen + + + Aliceblue + + + Antiquewhite + + + Aqua + + + Aquamarine + + + Azure + + + Beige + + + Bisque + + + Black + + + Blanchedalmond + + Blue Blueviolet - + + Brown + + + Burlywood + + + Cadetblue + + + Chartreuse + + + Chocolate + + + Coral + + + Cornflowerblue + + + Cornsilk + + + Crimson + + + Cyan + + + Darkblue + + + Darkcyan + + + Darkgoldenrod + + + Darkgray + + + Darkgreen + + + Darkkhaki + + + Darkmagenta + + + Darkolivegreen + + + Darkorange + + + Darkorchid + + + Darkred + + + Darksalmon + + + Darkseagreen + + + Darkslateblue + + + Darkslategray + + + Darkturquoise + + + Darkviolet + + + Deeppink + + + Deepskyblue + + + Dimgray + + + Dodgerblue + + + Firebrick + + + Floralwhite + + + Forestgreen + + + Fuchsia + + + Gainsboro + + + Ghostwhite + + + Gold + + + Goldenrod + + + Gray + + + Green + + + Greenyellow + + + Honeydew + + + Hotpink + + + Indianred + + + Indigo + + + Ivory + + + Khaki + + + Lavender + + + Lavenderblush + + + Lawngreen + + + Lemonchiffon + + + Lightblue + + + Lightcoral + + + Lightcyan + + + Lightgoldenrodyellow + + + Lightgreen + + + Lightgrey + + + Lightpink + + + Lightsalmon + + + Lightseagreen + + + Lightskyblue + + + Lightslategrey + + + Lightsteelblue + + + Lightyellow + + + Lime + + + Limegreen + + + Linen + + + Magenta + + + Maroon + + + Mediumaquamarine + + + Mediumblue + + + Mediumorchid + + + Mediumpurple + + + Mediumseagreen + + + Mediumslateblue + + + Mediumspringgreen + + + Mediumturquoise + + + Mediumvioletred + + + Midnightblue + + + Mintcream + + + Mistyrose + + + Moccasin + + + Navajowhite + + + Navy + + + Oldlace + + + Olive + + + Olivedrab + + + Orange + + + Orangered + + + Orchid + + + Palegoldenrod + + + Palegreen + + + Paleturquoise + + + Palevioletred + + + Papayawhip + + + Peachpuff + + + Peru + + + Pink + + + Plum + + + Powderblue + + + Purple + + + Red + + + Rosybrown + + + Royalblue + + + Saddlebrown + + + Salmon + + + Sandybrown + + + Seagreen + + + Seashell + + + Sienna + + + Silver + + + Skyblue + + + Slateblue + + + Slategray + + + Snow + + + Springgreen + + + Steelblue + + + Tan + + + Teal + + + Thistle + + + Tomato + + + Turquoise + + + Violet + + + Wheat + + + White + + + Whitesmoke + + + Yellow + + + Yellowgreen + + + Aliceblue + + + Antiquewhite + + + Aqua + + + Aquamarine + + + Azure + + + Beige + + + Bisque + + + Black + + + Blanchedalmond + + + Blue + + + Blueviolet + + Brown - + Burlywood - + Cadetblue - + Chartreuse - + Chocolate - + Coral - + Cornflowerblue - + Cornsilk - + Crimson - + Cyan - + Darkblue - + Darkcyan - + Darkgoldenrod - + Darkgray - + Darkgreen - + Darkkhaki - + Darkmagenta - + Darkolivegreen - + Darkorange - + Darkorchid - + Darkred - + Darksalmon - + Darkseagreen - + Darkslateblue - + Darkslategray - + Darkturquoise - + Darkviolet - + Deeppink - + Deepskyblue - + Dimgray - + Dodgerblue - + Firebrick - + Floralwhite - + Forestgreen - + Fuchsia - + Gainsboro - + Ghostwhite - + Gold - + Goldenrod - + Gray - + Green - + Greenyellow - + Honeydew - + Hotpink - + Indianred - + Indigo - + Ivory - + Khaki - + Lavender - + Lavenderblush - + Lawngreen - + Lemonchiffon - + Lightblue - + Lightcoral - + Lightcyan - + Lightgoldenrodyellow - + Lightgreen - + Lightgrey - + Lightpink - + Lightsalmon - + Lightseagreen - + Lightskyblue - + Lightslategrey - + Lightsteelblue - + Lightyellow - + Lime - + Limegreen - + Linen - + Magenta - + Maroon - + Mediumaquamarine - + Mediumblue - + Mediumorchid - + Mediumpurple - + Mediumseagreen - + Mediumslateblue - + Mediumspringgreen - + Mediumturquoise - + Mediumvioletred - + Midnightblue - + Mintcream - + Mistyrose - + Moccasin - + Navajowhite - + Navy - + Oldlace - + Olive - + Olivedrab - + Orange - + Orangered - + Orchid - + Palegoldenrod - + Palegreen - + Paleturquoise - + Palevioletred - + Papayawhip - + Peachpuff - + Peru - + Pink - + Plum - + Powderblue - + Purple - + Red - + Rosybrown - + Royalblue - + Saddlebrown - + Salmon - + Sandybrown - + Seagreen - + Seashell - + Sienna - + Silver - + Skyblue - + Slateblue - + Slategray - + Snow - + Springgreen - + Steelblue - + Tan - + Teal - + Thistle - + Tomato - + Turquoise - + Violet - + Wheat - + White - + Whitesmoke - + Yellow - + Yellowgreen - + Aliceblue - + Antiquewhite - + Aqua - + Aquamarine - + Azure - + Beige - + Bisque - + Black - + Blanchedalmond - + Blue - + Blueviolet - + Brown - + Burlywood - + Cadetblue - + Chartreuse - + Chocolate - + Coral - + Cornflowerblue - + Cornsilk - + Crimson - + Cyan - + Darkblue - + Darkcyan - + Darkgoldenrod - + Darkgray - + Darkgreen - + Darkkhaki - + Darkmagenta - + Darkolivegreen - + Darkorange - + Darkorchid - + Darkred - + Darksalmon - + Darkseagreen - + Darkslateblue - + Darkslategray - + Darkturquoise - + Darkviolet - + Deeppink - + Deepskyblue - + Dimgray - + Dodgerblue - + Firebrick - + Floralwhite - + Forestgreen - + Fuchsia - + Gainsboro - + Ghostwhite - + Gold - + Goldenrod - + Gray - + Green - + Greenyellow - + Honeydew - + Hotpink - + Indianred - + Indigo - + Ivory - + Khaki - + Lavender - + Lavenderblush - + Lawngreen - + Lemonchiffon - + Lightblue - + Lightcoral - + Lightcyan - + Lightgoldenrodyellow - + Lightgreen - + Lightgrey - + Lightpink - + Lightsalmon - + Lightseagreen - + Lightskyblue - + Lightslategrey - + Lightsteelblue - + Lightyellow - + Lime - + Limegreen - + Linen - + Magenta - + Maroon - + Mediumaquamarine - + Mediumblue - + Mediumorchid - + Mediumpurple - + Mediumseagreen - + Mediumslateblue - + Mediumspringgreen - + Mediumturquoise - + Mediumvioletred - + Midnightblue - + Mintcream - + Mistyrose - + Moccasin - + Navajowhite - + Navy - + Oldlace - + Olive - + Olivedrab - + Orange - + Orangered - + Orchid - + Palegoldenrod - + Palegreen - + Paleturquoise - + Palevioletred - + Papayawhip - + Peachpuff - + Peru - + Pink - + Plum - + Powderblue - + Purple - + Red - + Rosybrown - + Royalblue - + Saddlebrown - + Salmon - + Sandybrown - + Seagreen - + Seashell - + Sienna - + Silver - + Skyblue - + Slateblue - + Slategray - + Snow - + Springgreen - + Steelblue - + Tan - + Teal - + Thistle - + Tomato - + Turquoise - + Violet - + Wheat - + White - + Whitesmoke - + Yellow - + Yellowgreen - + Aliceblue - + Antiquewhite - + Aqua - + Aquamarine - + Azure - + Beige - + Bisque - + Black - + Blanchedalmond - + Blue - + Blueviolet - + Brown - + Burlywood - + Cadetblue - + Chartreuse - + Chocolate - + Coral - + Cornflowerblue - + Cornsilk - + Crimson - + Cyan - + Darkblue - + Darkcyan - + Darkgoldenrod - + Darkgray - + Darkgreen - + Darkkhaki - + Darkmagenta - + Darkolivegreen - + Darkorange - + Darkorchid - + Darkred - + Darksalmon - + Darkseagreen - + Darkslateblue - + Darkslategray - + Darkturquoise - + Darkviolet - + Deeppink - + Deepskyblue - + Dimgray - + Dodgerblue - + Firebrick - + Floralwhite - + Forestgreen - + Fuchsia - + Gainsboro - + Ghostwhite - + Gold - + Goldenrod - + Gray - + Green - + Greenyellow - + Honeydew - + Hotpink - + Indianred - + Indigo - + Ivory - + Khaki - + Lavender - + Lavenderblush - + Lawngreen - + Lemonchiffon - + Lightblue - + Lightcoral - + Lightcyan - + Lightgoldenrodyellow - + Lightgreen - + Lightgrey - + Lightpink - + Lightsalmon - + Lightseagreen - + Lightskyblue - + Lightslategrey - + Lightsteelblue - + Lightyellow - + Lime - + Limegreen - + Linen - + Magenta - + Maroon - + Mediumaquamarine - + Mediumblue - + Mediumorchid - + Mediumpurple - + Mediumseagreen - + Mediumslateblue - + Mediumspringgreen - + Mediumturquoise - + Mediumvioletred - + Midnightblue - + Mintcream - + Mistyrose - + Moccasin - + Navajowhite - + Navy - + Oldlace - + Olive - + Olivedrab - + Orange - + Orangered - + Orchid - + Palegoldenrod - + Palegreen - + Paleturquoise - + Palevioletred - + Papayawhip - + Peachpuff - + Peru - + Pink - + Plum - + Powderblue - + Purple - + Red - + Rosybrown - + Royalblue - + Saddlebrown - + Salmon - + Sandybrown - + Seagreen - + Seashell - + Sienna - + Silver - + Skyblue - + Slateblue - + Slategray - + Snow - + Springgreen - + Steelblue - + Tan - + Teal - + Thistle - + Tomato - + Turquoise - + Violet - + Wheat - + White - + Whitesmoke - + Yellow - + Yellowgreen - + Aliceblue - + Antiquewhite - + Aqua - + Aquamarine - + Azure - + Beige - + Bisque - + Black - + Blanchedalmond - + Blue - + Blueviolet - + Brown - + Burlywood - + Cadetblue - + Chartreuse - + Chocolate - + Coral - + Cornflowerblue - + Cornsilk - + Crimson - + Cyan - + Darkblue - + Darkcyan - + Darkgoldenrod - + Darkgray - + Darkgreen - + Darkkhaki - + Darkmagenta - + Darkolivegreen - + Darkorange - + Darkorchid - + Darkred - + Darksalmon - + Darkseagreen - + Darkslateblue - + Darkslategray - + Darkturquoise - + Darkviolet - + Deeppink - + Deepskyblue - + Dimgray - + Dodgerblue - + Firebrick - + Floralwhite - + Forestgreen - + Fuchsia - + Gainsboro - + Ghostwhite - + Gold - + Goldenrod - + Gray - + Green - + Greenyellow - + Honeydew - + Hotpink - + Indianred - + Indigo - + Ivory - + Khaki - + Lavender - + Lavenderblush - + Lawngreen - + Lemonchiffon - + Lightblue - + Lightcoral - + Lightcyan - + Lightgoldenrodyellow - + Lightgreen - + Lightgrey - + Lightpink - + Lightsalmon - + Lightseagreen - + Lightskyblue - + Lightslategrey - + Lightsteelblue - + Lightyellow - + Lime - + Limegreen - + Linen - + Magenta - + Maroon - + Mediumaquamarine - + Mediumblue - + Mediumorchid - + Mediumpurple - + Mediumseagreen - + Mediumslateblue - + Mediumspringgreen - + Mediumturquoise - + Mediumvioletred - + Midnightblue - + Mintcream - + Mistyrose - + Moccasin - + Navajowhite - + Navy - + Oldlace - + Olive - + Olivedrab - + Orange - + Orangered - + Orchid - + Palegoldenrod - + Palegreen - + Paleturquoise - + Palevioletred - + Papayawhip - + Peachpuff - + Peru - + Pink - + Plum - + Powderblue - + Purple - + Red - + Rosybrown - + Royalblue - + Saddlebrown - + Salmon - + Sandybrown - + Seagreen - + Seashell - + Sienna - + Silver - + Skyblue - + Slateblue - + Slategray - + Snow - + Springgreen - + Steelblue - + Tan - + Teal - + Thistle - + Tomato - + Turquoise - + Violet - + Wheat - + White - + Whitesmoke - + Yellow - + Yellowgreen - + Aliceblue - + Antiquewhite - + Aqua - + Aquamarine - + Azure - + Beige - + Bisque - + Black - + Blanchedalmond - + Blue - + Blueviolet - + Brown - + Burlywood - + Cadetblue - + Chartreuse - + Chocolate - + Coral - + Cornflowerblue - + Cornsilk - + Crimson - + Cyan - + Darkblue - + Darkcyan - + Darkgoldenrod - + Darkgray - + Darkgreen - + Darkkhaki - + Darkmagenta - + Darkolivegreen - + Darkorange - + Darkorchid - + Darkred - + Darksalmon - + Darkseagreen - + Darkslateblue - + Darkslategray - + Darkturquoise - + Darkviolet - + Deeppink - + Deepskyblue - + Dimgray - + Dodgerblue - + Firebrick - + Floralwhite - + Forestgreen - + Fuchsia - + Gainsboro - + Ghostwhite - + Gold - + Goldenrod - + Gray - + Green - + Greenyellow - + Honeydew - + Hotpink - + Indianred - + Indigo - + Ivory - + Khaki - + Lavender - + Lavenderblush - + Lawngreen - + Lemonchiffon - + Lightblue - + Lightcoral - + Lightcyan - + Lightgoldenrodyellow - + Lightgreen - + Lightgrey - + Lightpink - + Lightsalmon - + Lightseagreen - + Lightskyblue - + Lightslategrey - + Lightsteelblue - + Lightyellow - + Lime - + Limegreen - + Linen - + Magenta - + Maroon - + Mediumaquamarine - + Mediumblue - + Mediumorchid - + Mediumpurple - + Mediumseagreen - + Mediumslateblue - + Mediumspringgreen - + Mediumturquoise - + Mediumvioletred - + Midnightblue - + Mintcream - + Mistyrose - + Moccasin - + Navajowhite - + Navy - + Oldlace - + Olive - + Olivedrab - + Orange - + Orangered - + Orchid - + Palegoldenrod - + Palegreen - + Paleturquoise - + Palevioletred - + Papayawhip - + Peachpuff - + Peru - + Pink - + Plum - + Powderblue - + Purple - + Red - + Rosybrown - + Royalblue - + Saddlebrown - + Salmon - + Sandybrown - + Seagreen - + Seashell - + Sienna - + Silver - + Skyblue - + Slateblue - + Slategray - + Snow - + Springgreen - + Steelblue - + Tan - + Teal - + Thistle - + Tomato - + Turquoise - + Violet - + Wheat - + White - + Whitesmoke - + Yellow - + Yellowgreen - + Aliceblue - + Antiquewhite - + Aqua - + Aquamarine - + Azure - + Beige - + Bisque - + Black - + Blanchedalmond - + Blue - + Blueviolet - + Brown - + Burlywood - + Cadetblue - + Chartreuse - + Chocolate - + Coral - + Cornflowerblue - + Cornsilk - + Crimson - + Cyan - + Darkblue - + Darkcyan - + Darkgoldenrod - + Darkgray - + Darkgreen - + Darkkhaki - + Darkmagenta - + Darkolivegreen - + Darkorange - + Darkorchid - + Darkred - + Darksalmon - + Darkseagreen - + Darkslateblue - + Darkslategray - + Darkturquoise - + Darkviolet - + Deeppink - + Deepskyblue - + Dimgray - + Dodgerblue - + Firebrick - + Floralwhite - + Forestgreen - + Fuchsia - + Gainsboro - + Ghostwhite - + Gold - + Goldenrod - + Gray - + Green - + Greenyellow - + Honeydew - + Hotpink - + Indianred - + Indigo - + Ivory - + Khaki - + Lavender - + Lavenderblush - + Lawngreen - + Lemonchiffon - + Lightblue - + Lightcoral - + Lightcyan - + Lightgoldenrodyellow - + Lightgreen - + Lightgrey - + Lightpink - + Lightsalmon - + Lightseagreen - + Lightskyblue - + Lightslategrey - + Lightsteelblue - + Lightyellow - + Lime - + Limegreen - + Linen - + Magenta - + Maroon - + Mediumaquamarine - + Mediumblue - + Mediumorchid - + Mediumpurple - + Mediumseagreen - + Mediumslateblue - + Mediumspringgreen - + Mediumturquoise - + Mediumvioletred - + Midnightblue - + Mintcream - + Mistyrose - + Moccasin - + Navajowhite - + Navy - + Oldlace - + Olive - + Olivedrab - + Orange - + Orangered - + Orchid - + Palegoldenrod - + Palegreen - + Paleturquoise - + Palevioletred - + Papayawhip - + Peachpuff - + Peru - + Pink - + Plum - + Powderblue - + Purple - + Red - + Rosybrown - + Royalblue - + Saddlebrown - + Salmon - + Sandybrown - + Seagreen - + Seashell - + Sienna - + Silver - + Skyblue - + Slateblue - + Slategray - + Snow - + Springgreen - + Steelblue - + Tan - + Teal - + Thistle - + Tomato - + Turquoise - + Violet - + Wheat - + White - + Whitesmoke - + Yellow - + Yellowgreen - + Aliceblue - + Antiquewhite - + Aqua - + Aquamarine - + Azure - + Beige - + Bisque - + Black - + Blanchedalmond - + Blue - + Blueviolet - + Brown - + Burlywood - + Cadetblue - + Chartreuse - + Chocolate - + Coral - + Cornflowerblue - + Cornsilk - + Crimson - + Cyan - + Darkblue - + Darkcyan - + Darkgoldenrod - + Darkgray - + Darkgreen - + Darkkhaki - + Darkmagenta - + Darkolivegreen - + Darkorange - + Darkorchid - + Darkred - + Darksalmon - + Darkseagreen - + Darkslateblue - + Darkslategray - + Darkturquoise - + Darkviolet - + Deeppink - + Deepskyblue - + Dimgray - + Dodgerblue - + Firebrick - + Floralwhite - + Forestgreen - + Fuchsia - + Gainsboro - + Ghostwhite - + Gold - + Goldenrod - + Gray - + Green - + Greenyellow - + Honeydew - + Hotpink - + Indianred - + Indigo - + Ivory - + Khaki - + Lavender - + Lavenderblush - + Lawngreen - + Lemonchiffon - + Lightblue - + Lightcoral - + Lightcyan - + Lightgoldenrodyellow - + Lightgreen - + Lightgrey - + Lightpink - + Lightsalmon - + Lightseagreen - + Lightskyblue - + Lightslategrey - + Lightsteelblue - + Lightyellow - + Lime - + Limegreen - + Linen - + Magenta - + Maroon - + Mediumaquamarine - + Mediumblue - + Mediumorchid - + Mediumpurple - + Mediumseagreen - + Mediumslateblue - + Mediumspringgreen - + Mediumturquoise - + Mediumvioletred - + Midnightblue - + Mintcream - + Mistyrose - + Moccasin - + Navajowhite - + Navy - + Oldlace - + Olive - + Olivedrab - + Orange - + Orangered - + Orchid - + Palegoldenrod - + Palegreen - + Paleturquoise - + Palevioletred - + Papayawhip - + Peachpuff - + Peru - + Pink - + Plum - + Powderblue - + Purple - + Red - + Rosybrown - + Royalblue - + Saddlebrown - + Salmon - + Sandybrown - + Seagreen - + Seashell - + Sienna - + Silver - + Skyblue - + Slateblue - + Slategray - + Snow - + Springgreen - + Steelblue - + Tan - + Teal - + Thistle - + Tomato - + Turquoise - + Violet - + Wheat - + White - + Whitesmoke - + Yellow - + Yellowgreen - + Aliceblue - + Antiquewhite - + Aqua - + Aquamarine - + Azure - + Beige - + Bisque - + Black - + Blanchedalmond - + Blue - + Blueviolet - + Brown - + Burlywood - + Cadetblue - + Chartreuse - + Chocolate - + Coral - + Cornflowerblue - + Cornsilk - + Crimson - + Cyan - + Darkblue - + Darkcyan - + Darkgoldenrod - + Darkgray - + Darkgreen - + Darkkhaki - + Darkmagenta - + Darkolivegreen - + Darkorange - + Darkorchid - + Darkred - + Darksalmon - + Darkseagreen - + Darkslateblue - + Darkslategray - + Darkturquoise - + Darkviolet - + Deeppink - + Deepskyblue - + Dimgray - + Dodgerblue - + Firebrick - + Floralwhite - + Forestgreen - + Fuchsia - + Gainsboro - + Ghostwhite - + Gold - + Goldenrod - + Gray - + Green - + Greenyellow - + Honeydew - + Hotpink - + Indianred - + Indigo - + Ivory - + Khaki - + Lavender - + Lavenderblush - + Lawngreen - + Lemonchiffon - + Lightblue - + Lightcoral - + Lightcyan - + Lightgoldenrodyellow - + Lightgreen - + Lightgrey - + Lightpink - + Lightsalmon - + Lightseagreen - + Lightskyblue - + Lightslategrey - + Lightsteelblue - + Lightyellow - + Lime - + Limegreen - + Linen - + Magenta - + Maroon - + Mediumaquamarine - + Mediumblue - + Mediumorchid - + Mediumpurple - + Mediumseagreen - + Mediumslateblue - + Mediumspringgreen - + Mediumturquoise - + Mediumvioletred - + Midnightblue - + Mintcream - + Mistyrose - + Moccasin - + Navajowhite - + Navy - + Oldlace - + Olive - + Olivedrab - + Orange - + Orangered - + Orchid - + Palegoldenrod - + Palegreen - + Paleturquoise - + Palevioletred - + Papayawhip - + Peachpuff - + Peru - + Pink - + Plum - + Powderblue - + Purple - + Red - + Rosybrown - + Royalblue - + Saddlebrown - + Salmon - + Sandybrown - + Seagreen - + Seashell - + Sienna - + Silver - + Skyblue - + Slateblue - + Slategray - + Snow - + Springgreen - + Steelblue - + Tan - + Teal - + Thistle - + Tomato - + Turquoise - + Violet - + Wheat - + White - + Whitesmoke - + Yellow - + Yellowgreen - 273, 12 + 328, 14 - 121, 21 + 145, 24 33 @@ -9145,35 +10036,35 @@ 3 - - Top + + 329, 17 + + + 0, 444 - - 0, 74 + + 1651, 26 - - 1263, 66 + + 40 - - 36 + + statusStrip1 - - panel1 + + statusStrip1 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 5 - - 329, 17 - - 31, 17 + 41, 20 @@ -9182,13 +10073,13 @@ Name of selected ReportItem - 10, 17 + 13, 20 | - 31, 17 + 41, 20 @@ -9196,30 +10087,6 @@ Position of selected ReportItem - - 0, 448 - - - 1263, 22 - - - 40 - - - statusStrip1 - - - statusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - Right @@ -9227,10 +10094,10 @@ NoControl - 1020, 140 + 1359, 159 - 3, 308 + 4, 285 42 @@ -9245,46 +10112,46 @@ $this - 2 + 3 445, 17 + + 193, 76 + + + ContextMenuTB + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - 165, 22 + 192, 24 &Close - 165, 22 + 192, 24 &Save - 165, 22 + 192, 24 Close All But This - - 166, 70 - - - ContextMenuTB - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Right - 1023, 140 + 1363, 159 - 240, 308 + 288, 285 41 @@ -9299,7 +10166,7 @@ $this - 3 + 4 True @@ -9311,13 +10178,13 @@ Segoe UI Semibold, 9pt, style=Bold - 1062, 16 + 1274, 14 0, 0, 0, 0 - 126, 35 + 150, 40 43 @@ -9332,16 +10199,43 @@ $this - 1 + 2 + + + NoControl + + + 1274, 57 + + + 163, 26 + + + 44 + + + Enable Alignment Grid + + + AlignmentGridEnable + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 True - 5, 13 + 6, 15 - 1263, 470 + 1651, 470 diff --git a/RdlDesign/ReportDesigner.csproj b/RdlDesign/ReportDesigner.csproj index 666d5dde..cfd2db9e 100644 --- a/RdlDesign/ReportDesigner.csproj +++ b/RdlDesign/ReportDesigner.csproj @@ -21,6 +21,7 @@ 4.16.0 false Majorsilence.Reporting.ReportDesigner + True @@ -221,5 +222,10 @@ - + + False + + + False + \ No newline at end of file From 512bf484cdc80b41c438c8ebd2831de433bbedd3 Mon Sep 17 00:00:00 2001 From: Gianni Alberti Date: Thu, 25 Apr 2024 14:42:18 +0200 Subject: [PATCH 3/3] Test to Hide/Display Table Row using formula --- Examples/Examples.416/HIDERIGA_ON_COMMAND.rdl | 239 ++++++++++++++++++ Examples/Examples.416/HIDERIGA_ON_COMMAND.xml | 7 + Examples/Examples.416/TESTRIG.rdl | 239 ++++++++++++++++++ Examples/Examples.416/TESTXGRUPPO.XML | 9 - 4 files changed, 485 insertions(+), 9 deletions(-) create mode 100644 Examples/Examples.416/HIDERIGA_ON_COMMAND.rdl create mode 100644 Examples/Examples.416/HIDERIGA_ON_COMMAND.xml create mode 100644 Examples/Examples.416/TESTRIG.rdl delete mode 100644 Examples/Examples.416/TESTXGRUPPO.XML diff --git a/Examples/Examples.416/HIDERIGA_ON_COMMAND.rdl b/Examples/Examples.416/HIDERIGA_ON_COMMAND.rdl new file mode 100644 index 00000000..3bb63065 --- /dev/null +++ b/Examples/Examples.416/HIDERIGA_ON_COMMAND.rdl @@ -0,0 +1,239 @@ + + + + + 11in + 8.5in + 7.5in + .25in + .25in + .25in + .25in + + 33.9pt + true + true + + + 114.3pt + + + DS + Query returned no rows! + + + + 140.5pt + + + 142.1pt + + +
+ + + 12.0pt + + + + + VALORE + + + + + + + + + + + + + + + + true +
+
+ + + 18pt + + + + + ={VALORE} + true + + + + + + + + + + + + + + + + 8.8pt + + + + + ----------------------------------------------------------------------------- + + + + + + true + + + 2 + + + + =iIF(UCase({?RIGAPRESENTE})='S',False,True) + + + +
+ 41.9pt + 13.5pt +
+ + + .2in + + + + + + + + + + + + + + + + + + + + +
+
+ + 1 + + + 148.4pt + + + 1pt + 10pt + 12pt + 3in + =Globals!PageNumber + ' of ' + Globals!TotalPages + + + + true + true + + + + + + + false + + + + + + + XML + + + + + VALORE + System.String + + + + + + Report + AttributeNormal + + + String + false + false + false + RIGA PRESENTE 1 ? + + + \ No newline at end of file diff --git a/Examples/Examples.416/HIDERIGA_ON_COMMAND.xml b/Examples/Examples.416/HIDERIGA_ON_COMMAND.xml new file mode 100644 index 00000000..3f3c441b --- /dev/null +++ b/Examples/Examples.416/HIDERIGA_ON_COMMAND.xml @@ -0,0 +1,7 @@ + +A +B +C +D + + diff --git a/Examples/Examples.416/TESTRIG.rdl b/Examples/Examples.416/TESTRIG.rdl new file mode 100644 index 00000000..f6a2b049 --- /dev/null +++ b/Examples/Examples.416/TESTRIG.rdl @@ -0,0 +1,239 @@ + + + + + 11in + 8.5in + 7.5in + .25in + .25in + .25in + .25in + + 33.9pt + true + true + + + 114.3pt + + + DS + Query returned no rows! + + + + 142.1pt + + + 142.1pt + + +
+ + + 11.2pt + + + + + VALORE + + + + + + + + + + + + + + + + true +
+
+ + + 18pt + + + + + ={VALORE} + true + + + + + + + + + + + + + + + + 8.8pt + + + + + ----------------------------------------------------------------------------- + + + + + + true + + + 2 + + + + =iIF(UCase({?RIGAPRESENTE})='S',False,True) + + + +
+ 62.48pt + 11.92pt +
+ + + .2in + + + + + + + + + + + + + + + + + + + + +
+
+ + 1 + + + 148.4pt + + + 1pt + 10pt + 12pt + 3in + =Globals!PageNumber + ' of ' + Globals!TotalPages + + + + true + true + + + + + + + false + + + + + + + XML + + + + + VALORE + System.String + + + + + + Report + AttributeNormal + + + String + false + false + false + RIGA PRESENTE 1 ? + + + \ No newline at end of file diff --git a/Examples/Examples.416/TESTXGRUPPO.XML b/Examples/Examples.416/TESTXGRUPPO.XML deleted file mode 100644 index ac92ac4d..00000000 --- a/Examples/Examples.416/TESTXGRUPPO.XML +++ /dev/null @@ -1,9 +0,0 @@ - -CIN1INF D1-CIN D2-CIN -DUE1INF D1-DUE D2-DUE -QUA1INF D1-QUATTROD2-QUA -SEI1INF D1-SEI D2-SEI -SET2MA D1-SET D2-SET -TRE3BLANK D1-TRE D2-TRE -UNO3BLANK D1-UNO D2-UNO -