Update ReportViewer - Toolbar (remove CancelButton), add reportViewerMessages to localize ReportViewer.cs

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5681 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj

@@ -139,6 +139,7 @@
       <DependentUpon>LayoutPanelControl.cs</DependentUpon>
     </Compile>
     <Compile Include="Project\SecondaryViews\ReportPreview.cs" />
+    <Compile Include="Project\SecondaryViews\ReportViewerMessages.cs" />
     <Compile Include="Project\SecondaryViews\ReportViewerSecondaryView.cs" />
     <Compile Include="Project\SecondaryViews\XmlView.cs" />
     <Compile Include="Project\Services\DefaultMemberRelationshipService.cs" />

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerMessages.cs

@@ -0,0 +1,76 @@
+/*
+ * Erstellt mit SharpDevelop.
+ * Benutzer: Peter Forstmeier
+ * Datum: 07.04.2010
+ * Zeit: 20:09
+ * 
+ * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
+ */
+using System;
+using ICSharpCode.Core;
+using ICSharpCode.Reports.Core.ReportViewer;
+
+namespace ICSharpCode.Reports.Addin
+{
+	/// <summary>
+	/// Description of ReportViewerMessages.
+	/// </summary>
+	public class ReportViewerMessages:IReportViewerMessages
+	{
+		public ReportViewerMessages()
+		{
+		}
+		
+		
+		public string BackButtonText {
+			get {
+				return ResourceService.GetString("Global.BackButtonText");
+			}
+		}
+		
+		public string NextButtonMessage {
+			get {
+				return ResourceService.GetString("Global.NextButtonText");
+			}
+		}
+		
+		public string PrintButtonMessage {
+			get {
+				return ResourceService.GetString("SharpReport.DesignView.Toolbar.Printer");
+			}
+		}
+		
+		
+		public string PagesCreatedMessage {
+			get {
+				return ResourceService.GetString("SharpReport.ReportViewer.PagesCreatedMessage");
+			}
+		}
+		
+		
+		public string FirstPageMessage {
+			get {
+				return ResourceService.GetString("SharpReport.ReportViewer.FirstPageMessage");
+			}
+		}
+		
+		
+		public string LastPageMessage {
+			get {
+				return ResourceService.GetString("SharpReport.ReportViewer.LastPageMessage");
+			}
+		}
+		
+		public string PdfFileMessage {
+			get {
+				return ResourceService.GetString("SharpReport.ReportViewer.PdfFileMessage");
+			}
+		}
+		
+		public string ZoomMessage {
+			get {
+				return ResourceService.GetString("SharpReport.ReportViewer.ZoomMessage");
+			}
+		}
+	}
+}

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs

@@ -37,6 +37,7 @@ namespace ICSharpCode.Reports.Addin
 			}
 			this.designerLoader = designerLoader;
 			this.control = new ICSharpCode.Reports.Core.ReportViewer.PreviewControl();
+			this.control.Messages = new ReportViewerMessages();
 			this.control.PreviewLayoutChanged += OnPreviewLayoutChanged;
 			base.TabPageText = ResourceService.GetString("SharpReport.ReportViewer");
 		}

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/IReportViewerMessages.cs

@@ -17,16 +17,12 @@ namespace ICSharpCode.Reports.Core.ReportViewer{
 		
 		string PrintButtonMessage {get;}
 		
-		string CancelButtonMessage {get;}
-		
-//		string PagesOfMessage {get;}
 		string PagesCreatedMessage {get;}
 		
 		string FirstPageMessage {get;}
 		
 		string LastPageMessage {get;}
 		
-//		string NoDataMessage {get;}
 		string PdfFileMessage {get;}
 		
 		string ZoomMessage {get;}

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/PageNavigationEventArgs.cs

@@ -15,7 +15,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 	/// Description of PageNavigationEventArgs.
 	/// </summary>
 	public class PageNavigationEventArgs: EventArgs
-	{
+	{ 
 		private ExporterPage page;
 		private int pageNumber;
 		

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.Designer.cs

@@ -49,7 +49,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 			this.pageInfoLabel = new System.Windows.Forms.ToolStripLabel();
 			this.forwardButton = new System.Windows.Forms.ToolStripButton();
 			this.lastPageButton = new System.Windows.Forms.ToolStripButton();
-			this.cancelButton = new System.Windows.Forms.ToolStripButton();
 			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
 			this.comboZoom = new System.Windows.Forms.ToolStripComboBox();
 			this.printButton = new System.Windows.Forms.ToolStripButton();
@@ -111,7 +110,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 									this.pageInfoLabel,
 									this.forwardButton,
 									this.lastPageButton,
-									this.cancelButton,
 									this.toolStripSeparator1,
 									this.comboZoom,
 									this.printButton,
@@ -175,16 +173,7 @@ 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);
-			// 
-			// cancelButton
-			// 
-			this.cancelButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.cancelButton.Image = ((System.Drawing.Image)(resources.GetObject("cancelButton.Image")));
-			this.cancelButton.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.cancelButton.Name = "cancelButton";
-			this.cancelButton.Size = new System.Drawing.Size(23, 22);
-			this.cancelButton.Text = "toolStripButton1";
-			this.cancelButton.Click += new System.EventHandler(this.StopButtonClick);
+			
 			// 
 			// toolStripSeparator1
 			// 
@@ -239,7 +228,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		private System.Windows.Forms.ToolStripButton firstPageButton;
 		private System.Windows.Forms.ToolStripMenuItem createPdfMenu;
 		private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-		private System.Windows.Forms.ToolStripButton cancelButton;
 		private System.Windows.Forms.ToolStripButton forwardButton;
 		private System.Windows.Forms.ToolStripButton printButton;
 		private System.Windows.Forms.ToolStripComboBox comboZoom;

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

@@ -321,7 +321,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		{
 			this.pages = new PagesCollection();
 			this.reportSettings = reportModel.ReportSettings;
-			this.cancelButton.Enabled = true;
 			this.AdjustDrawArea();
 		}
 		
@@ -338,7 +337,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 			}
 			this.SetPages();
 			this.CheckEnable();
-			this.cancelButton.Enabled = false;
 			this.printButton.Enabled = true;
 			this.pdfButton.Enabled = true;
 			this.UpdateToolStrip();
@@ -395,7 +393,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 				this.forwardButton.ToolTipText = this.reportViewerMessages.NextButtonMessage;
 				this.lastPageButton.ToolTipText = this.reportViewerMessages.LastPageMessage;
 				
-				this.cancelButton.ToolTipText = this.reportViewerMessages.CancelButtonMessage;
 				this.printButton.ToolTipText = this.reportViewerMessages.PrintButtonMessage;
 				this.comboZoom.ToolTipText = this.reportViewerMessages.ZoomMessage;
 				this.createPdfMenu.Text = this.reportViewerMessages.PdfFileMessage;
@@ -579,12 +576,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		}
 		
 		
-		private void StopButtonClick(object sender, System.EventArgs e)
-		{
-//			this.bgw.CancelAsync();
-			this.cancelButton.Enabled = false;
-		}
-		
 		
 		private void PrintButton(object sender, System.EventArgs e)
 		{