diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.Designer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.Designer.cs index 6cc5c3bc9a..df13cab2e4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.Designer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.Designer.cs @@ -48,6 +48,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer this.comboZoom = new System.Windows.Forms.ToolStripComboBox(); this.printButton = new System.Windows.Forms.ToolStripButton(); this.pdfButton = new System.Windows.Forms.ToolStripButton(); + this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -62,36 +63,38 @@ namespace ICSharpCode.Reports.Core.ReportViewer this.panel1.AutoScrollMargin = new System.Drawing.Size(5, 5); this.panel1.BackColor = System.Drawing.SystemColors.ControlDark; this.panel1.Controls.Add(this.drawingPanel); - this.panel1.Location = new System.Drawing.Point(5, 33); + this.panel1.Location = new System.Drawing.Point(5, 35); this.panel1.Margin = new System.Windows.Forms.Padding(0); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(525, 373); + this.panel1.Size = new System.Drawing.Size(520, 373); this.panel1.TabIndex = 3; // // drawingPanel // this.drawingPanel.BackColor = System.Drawing.SystemColors.Window; + this.drawingPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.drawingPanel.ContextMenuStrip = this.contextMenuStrip1; - this.drawingPanel.Location = new System.Drawing.Point(5, 5); + this.drawingPanel.Location = new System.Drawing.Point(3, 5); this.drawingPanel.Name = "drawingPanel"; - this.drawingPanel.Size = new System.Drawing.Size(496, 500); + this.drawingPanel.Size = new System.Drawing.Size(498, 434); this.drawingPanel.TabIndex = 0; this.drawingPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.DrawingPanelPaint); // // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.createPdfMenu}); + this.createPdfMenu, + this.printToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.contextMenuStrip1.Size = new System.Drawing.Size(148, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(153, 70); this.contextMenuStrip1.Text = "Create PdfFile"; // // createPdfMenu // this.createPdfMenu.Name = "createPdfMenu"; - this.createPdfMenu.Size = new System.Drawing.Size(147, 22); + this.createPdfMenu.Size = new System.Drawing.Size(152, 22); this.createPdfMenu.Text = "Create PdfFile"; this.createPdfMenu.Click += new System.EventHandler(this.PdfButtonClick); // @@ -168,7 +171,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer this.lastPageButton.Size = new System.Drawing.Size(23, 22); this.lastPageButton.Text = "&&LastPage"; this.lastPageButton.Click += new System.EventHandler(this.LastPageButtonClick); - // // toolStripSeparator1 // @@ -201,6 +203,13 @@ namespace ICSharpCode.Reports.Core.ReportViewer this.pdfButton.Text = "toolStripButton1"; this.pdfButton.Click += new System.EventHandler(this.PdfButtonClick); // + // printToolStripMenuItem + // + this.printToolStripMenuItem.Name = "printToolStripMenuItem"; + this.printToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.printToolStripMenuItem.Text = "Print"; + this.printToolStripMenuItem.Click += new System.EventHandler(this.PrintButton); + // // PreviewControl // this.BackColor = System.Drawing.SystemColors.GradientActiveCaption; @@ -216,6 +225,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer this.ResumeLayout(false); this.PerformLayout(); } + private System.Windows.Forms.ToolStripMenuItem printToolStripMenuItem; private NumericToolStripTextBox numericToolStripTextBox2; private System.Windows.Forms.ToolStripLabel pageInfoLabel; private System.Windows.Forms.ToolStripButton pdfButton; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs index 4a24b34d13..4db42596cf 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs @@ -137,18 +137,14 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void RunFormSheet(ReportModel reportModel) { -// runner.PageCreated += OnPageCreated; runner.RunReport(reportModel,(ReportParameters)null); -// runner.PageCreated -= OnPageCreated; ShowCompleted(); } private void RunDataReport(ReportModel reportModel, IDataManager data) { -// runner.PageCreated += OnPageCreated; runner.RunReport(reportModel,data); -// runner.PageCreated -= OnPageCreated; ShowCompleted(); } @@ -503,12 +499,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void PdfButtonClick(object sender, EventArgs e) - { - this.CreatePdf(); - } - - - private void CreatePdf() { using (SaveFileDialog saveDialog = new SaveFileDialog()) { saveDialog.FileName = this.reportSettings.ReportName; @@ -524,6 +514,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer } } + #endregion private void SetPages() diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx index a42f6a5b33..90527653fc 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.resx @@ -112,18 +112,18 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 116, 17 - + 17, 17 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -176,7 +176,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKMSURBVDhPfZNrSNNRGIfta30Ikj70ISsK1Ip0Yihq3i9Z + YQUAAAAJcEhZcwAADsAAAA7AAWrWiQkAAAKMSURBVDhPfZNrSNNRGIfta30Ikj70ISsK1Ip0Yihq3i9Z SliKitIFQxMhTSgSicD6IH3QCJdixiopL2laeVlq3vKKZSPN2GJWtjbnnNO2NC/19HfC5I/aDw68nPOe 5/zOed9jhyDflBr6h3TL4YZyjKtgU3g52+Jr2Rwss+XZLUf2oTJ2xFQyojZuCNh9uh67vHFcO//gmNEk BjjEVuHy3MTexCq63/1YF7IvqYEtt0bxqDPhlCYXA/bEVrNVqsWl2oBbupyKBtUaiHNKE9ulGkJbzLhm @@ -188,24 +188,6 @@ JSp61GZRGQNLRkkamqdQYEY8WHG1LKsDiXSU7M+L9P0Ev3tq+r/+WtNIIaUaLioXeDgluCtb7VYrIKZG h+I3+JeOMaIXgnUUWqklVbXEfQFwsnpc7CBYKJ9vhQ6teWndzcuT0Q2TdMzDhBAnyFc/ndXBGeH1FXph 9T+KbjRyrnWa5HYTh58abJn/ACAoUCkuveSxAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALMSURBVDhPlZJbSFRRFIanJCkMk5JKo5LShGy8ZJiOheYl - nRobZ9TEvHTxknlDM7KMskG0tEwrTSGM6iHsJVTwkjbO6ENJ1kMQVDromfuZuyOOCGP8nXMG5vTqhg2b - tdb/rX/tvTnfvxFQKlfAWeeiNbSWQx+WZYMwt9XBKCkFWZcHfU0WdJXp0JWdhbZMAG1JCtSX46EuOAFV - 1lH8Tg3E/MtWtrH5yS3YP/TC9voxzB31MLXUwNBYDkNDCQx3C0HeLoD+RjYFFUJTmIC5jHCM8fxZ18am - CtjetMHSLYHpYTUW+7qxtmh1F6xZDLD2tjBidX4sFJkR+BS3nwWQ9RdhfnqH6bw09I5JLEsHYGymnVRg - WdrPxBb7uqCkxLQDaWIgC9BXZ8LYVAn7+24maHkugbY0DZoriVDnxVJzR8DUXMnkzK21UIhDMfE/gL4w - 8l4R/tptcEyNULOKoSnhuzuoMrhQCYPhkPXDqSOgEIVAlnCAdaAtPg3yZq6re5eEAogoByxAc54LjSgI - 5sZipmZeeAiy+H0sQHMpHvQYbkAVBbjGAnQ5XOgyAmF9UMLULKQFQH7SjwWocqIogQBrNhMcn8ehqxJC - V37GXUDmh4LMDsLql2E41XMg+H6YitnBApRiyiJ1YdZXj5igtaeR+kQp0F89BbIoGoYCLuydta6XaKuA - MskHk8e2soAF/kGoc2OgKUrC0uBbJrEyPQ5rey1s7dVY/Trmig30wMDfBmXcFkyGebKA+QR/KEVcqC9E - Q1ucDEtnA5ykyl3g1Chgf3YdBoEvyCQvELxNmDjiwQJ+xmzHn+QAzJ4Lwaw4HHPiMGpzqfc+jIX0IBCC - vSBSd4JI9AYR64lfkRsxFLzBBVASDiheNGEowgejx3dhlLcHI9Qe5/nhI283pNG+kEd5Qx7phYnwzZBz - PTBMiX903Aet5cxMK1yHdS5aMzM9h3/8fvEPYJVcPgAAAABJRU5ErkJggg==