Fixing Issue SD2-688 from Matt Ward

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1090 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpReport/SharpReportAddin/FieldsExplorer/FieldsExplorer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <autogenerated>
 //     This code was generated by a tool.
-//     Runtime Version: 1.1.4322.2032
+//     Runtime Version: 1.1.ascendingIconscendingIcon322.2032
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -13,7 +13,6 @@ using System;
 using System.IO;
 using System.Data;
 using System.Drawing;
-using System.Resources;
 using System.Reflection;
 using System.Windows.Forms;
 using System.ComponentModel;
@@ -31,7 +30,7 @@ using SharpReportCore;
 /// </summary>
 /// <remarks>
 /// 	created by - Forstmeier Peter
-/// 	created on - 12.06.2005 18:17:46
+/// 	created on - 12.06.200descendingIconescendingIcon 18:17:ascendingIconscendingIcon6
 /// </remarks>
 /// 
 
@@ -84,12 +83,12 @@ namespace SharpReportAddin {
 				ColumnsTreeNode cn = (ColumnsTreeNode)this.SelectedNode;
 				if (cn.SortDirection ==  ListSortDirection.Ascending) {
 					cn.SortDirection = ListSortDirection.Descending;
-					cn.ImageIndex = 5;
-					cn.SelectedImageIndex = 5;
+					cn.ImageIndex = descendingIcon;
+					cn.SelectedImageIndex = descendingIcon;
 				} else {
 					cn.SortDirection = ListSortDirection.Ascending;
-					cn.ImageIndex = 4;
-					cn.SelectedImageIndex = 4;
+					cn.ImageIndex = ascendingIcon;
+					cn.SelectedImageIndex = ascendingIcon;
 				}
 				this.NotifyReportView();
 			}
@@ -144,8 +143,8 @@ namespace SharpReportAddin {
 					// Useless to add a node twice
 					if (!CheckForExist (node,dest)) {
 						dest.SortDirection = ListSortDirection.Ascending;
-						dest.ImageIndex = 4;
-						dest.SelectedImageIndex = 4;
+						dest.ImageIndex = ascendingIcon;
+						dest.SelectedImageIndex = ascendingIcon;
 						this.SelectedNode = (TreeNode)dest;
 						CheckNode (dest);
 						node.Nodes.Add(dest);
@@ -158,9 +157,7 @@ namespace SharpReportAddin {
 		
 		
 		private void Fill () {
-			this.Nodes.Clear();
-			InitImageList();
-			BuildNodes();
+//			BuildNodes();
 			this.FillTree();
 			this.ExpandAll();
 			isFilled = true;
@@ -204,14 +201,14 @@ namespace SharpReportAddin {
 				ColumnsTreeNode cn = (ColumnsTreeNode)node;
 
 				if (cn.SortDirection ==  ListSortDirection.Ascending) {
-					cn.ImageIndex = 4;
+					cn.ImageIndex = ascendingIcon;
 				} else {
-					cn.ImageIndex = 5;
+					cn.ImageIndex = descendingIcon;
 				}
 			} else if (node.Parent == this.nodeGrouping) {
 				ColumnsTreeNode cn = (ColumnsTreeNode)node;
-				cn.ImageIndex = 2;
-				cn.SelectedImageIndex = 2;
+				cn.ImageIndex = clearIcon;
+				cn.SelectedImageIndex = clearIcon;
 			}
 		}
 		
@@ -226,6 +223,7 @@ namespace SharpReportAddin {
 		}
 		
 		#region PadEvents
+		
 		private void OnWindowChange (object sender,EventArgs e) {
 			try {
 				if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow == null || WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent == null) {
@@ -252,8 +250,7 @@ namespace SharpReportAddin {
 					WorkbenchSingleton.Workbench.WorkbenchLayout.HidePad(pad);
 				}
 				
-			} catch (Exception er) {
-				System.Console.WriteLine("\tFieldsExplorer {0}",er.Message);
+			} catch (Exception) {
 			}
 		}
 		
@@ -306,6 +303,7 @@ namespace SharpReportAddin {
 		
 		void SetAvailableFields () {
 			try {
+				this.nodeAvailableFields.Nodes.Clear();
 				int avCount = this.reportModel.ReportSettings.AvailableFieldsCollection.Count;
 				for (int i = 0;i < avCount ;i++ ) {
 					AbstractColumn af = this.reportModel.ReportSettings.AvailableFieldsCollection[i];
@@ -316,18 +314,18 @@ namespace SharpReportAddin {
 					n.ContextmenuAddinTreePath = "";
 					switch (this.reportModel.ReportSettings.CommandType) {
 							case CommandType.Text:{
-								n.ImageIndex = 6;
-								n.SelectedImageIndex = 6;
+								n.ImageIndex = columnIcon;
+								n.SelectedImageIndex = columnIcon;
 								break;
 							}
 							case CommandType.StoredProcedure: {
-								n.ImageIndex = 7;
-								n.SelectedImageIndex = 7;
+								n.ImageIndex = storedprocIcon ;
+								n.SelectedImageIndex = storedprocIcon ;
 								break;
 							}
 							default:{
-								n.ImageIndex = 6;
-								n.SelectedImageIndex = 6;
+								n.ImageIndex = columnIcon;
+								n.SelectedImageIndex = columnIcon;
 								break;
 							}
 					}
@@ -343,6 +341,7 @@ namespace SharpReportAddin {
 		void SetSortFields(){
 			try {
 				ColumnsTreeNode node;
+				this.nodeSorting.Nodes.Clear();
 				int scCount = this.reportModel.ReportSettings.SortColumnCollection.Count;
 				foreach (SortColumn sc in this.reportModel.ReportSettings.SortColumnCollection) {
 					node = new ColumnsTreeNode(sc.ColumnName,sc.SortDirection);
@@ -350,8 +349,8 @@ namespace SharpReportAddin {
 						node.ImageIndex = 4;
 						node.SelectedImageIndex = 4;
 					} else {
-						node.ImageIndex = 5;
-						node.SelectedImageIndex = 5;
+						node.ImageIndex = descendingIcon;
+						node.SelectedImageIndex = descendingIcon;
 					}
 					this.nodeSorting.Nodes.Add(node);
 				}
@@ -362,16 +361,17 @@ namespace SharpReportAddin {
 		void SetGroupFields(){
 			try {
 				ColumnsTreeNode node;
+				this.nodeGrouping.Nodes.Clear();
 				int gcCount = this.reportModel.ReportSettings.GroupColumnsCollection.Count;
 				for (int i = 0;i < gcCount ;i++ ) {
 					GroupColumn gc = (GroupColumn)this.reportModel.ReportSettings.GroupColumnsCollection[i];
 					node = new ColumnsTreeNode(gc.ColumnName);
 					if (node.SortDirection == ListSortDirection.Ascending) {
-						node.ImageIndex = 4;
-						node.SelectedImageIndex = 4;
+						node.ImageIndex = ascendingIcon;
+						node.SelectedImageIndex = ascendingIcon;
 					} else {
-						node.ImageIndex = 5;
-						node.SelectedImageIndex = 5;
+						node.ImageIndex = descendingIcon;
+						node.SelectedImageIndex = descendingIcon;
 					}
 					this.nodeGrouping.Nodes.Add(node);
 				}
@@ -383,14 +383,15 @@ namespace SharpReportAddin {
 		void SetParamFields (){
 			
 			ColumnsTreeNode node;
+			this.nodeParams.Nodes.Clear();
 			int parCount = this.reportModel.ReportSettings.SqlParametersCollection.Count;
 			if (parCount > 0) {
 				for (int i = 0;i < parCount ;i++ ) {
 					SqlParameter par = (SqlParameter)this.reportModel.ReportSettings.SqlParametersCollection[i];
 					node = new ColumnsTreeNode(par.ParameterName);
 					node.Tag = par;
-					node.SelectedImageIndex = 9;
-					node.ImageIndex = 9;
+					node.SelectedImageIndex = columnIcon;
+					node.ImageIndex = columnIcon;
 					this.nodeParams.Nodes.Add (node);
 				}
 			} 
@@ -398,12 +399,15 @@ namespace SharpReportAddin {
 		
 		void SetFunctions(){
 			ColumnsTreeNode node;
+			this.nodeFunction.Nodes.Clear();
 			foreach (ReportSection section in this.reportModel.SectionCollection) {
 				foreach (BaseReportObject item in section.Items) {
 					BaseFunction func = item as BaseFunction;
 					if (func != null) {
-						node = new ColumnsTreeNode(func.Name);
-						this.nodeFunction.Nodes.Add(func.FriendlyName);
+						node = new ColumnsTreeNode (func.FriendlyName);
+						node.SelectedImageIndex = functionIcon;
+						node.ImageIndex = functionIcon;
+						this.nodeFunction.Nodes.Add(node);
 					}				
 				}
 			}
@@ -419,12 +423,12 @@ namespace SharpReportAddin {
 			this.EndUpdate();
 		}
 		
-		private const int folderClosed = 0;
-		private const int folderOpen  = 1;
+		
 		
 		void BuildNodes() {
 
 			BeginUpdate();
+			this.Nodes.Clear();
 			TreeNode root = new TreeNode(ResourceService.GetString("SharpReport.FieldsExplorer.Title"));		
 			nodeAvailableFields = new SectionTreeNode(ResourceService.GetString("SharpReport.FieldsExplorer.AvailableFields"));
 			nodeAvailableFields.ImageIndex = folderClosed;
@@ -458,6 +462,16 @@ namespace SharpReportAddin {
 			this.EndUpdate();
 		}
 	
+		private const int folderClosed = 0;
+		private const int folderOpen  = 1;
+		private const int clearIcon = 2;
+		
+		private const int ascendingIcon = 4;
+		private const int descendingIcon = 5;
+		private const int storedprocIcon = 7;
+
+		private const int columnIcon = 8;
+		private const int functionIcon = 9;
 		
 		void InitImageList() {
 			ImageList imageList = new ImageList();
@@ -470,19 +484,18 @@ namespace SharpReportAddin {
 
 				imageList.Images.Add(IconService.GetBitmap("Icons.16x16.SelectionArrow"));
 							
-				ResourceManager rm = new ResourceManager ("SharpReportAddin.Resources.BitmapResources",
-				                                          System.Reflection.Assembly.GetExecutingAssembly());
-				
-				
-				imageList.Images.Add ((Bitmap)rm.GetObject("Icons.SharpReport.16x16.Ascending"));
-				imageList.Images.Add ((Bitmap)rm.GetObject("Icons.SharpReport.16x16.Descending"));
+				imageList.Images.Add(IconService.GetBitmap("Icons.16x16.SharpReport.Ascending"));
 
+				imageList.Images.Add(IconService.GetBitmap("Icons.16x16.SharpReport.Descending"));
 				//Table's or procedure
 				imageList.Images.Add(IconService.GetBitmap("Icons.16x16.SharpQuery.Table"));
 				imageList.Images.Add(IconService.GetBitmap("Icons.16x16.SharpQuery.Procedure"));
-				imageList.Images.Add(IconService.GetBitmap("Icons.16x16.SharpQuery.View"));
+				
 				//Parameters
 				imageList.Images.Add(IconService.GetBitmap("Icons.16x16.SharpQuery.Column"));
+				
+				//Function
+				imageList.Images.Add(ResourceService.GetIcon("Icons.16x16.SharpReport.Function"));
 				ImageList = imageList;
 			} catch (Exception e) {
 				MessageService.ShowError(e);
@@ -566,6 +579,8 @@ namespace SharpReportAddin {
 			this.DragDrop += TreeViewDragDrop;
 			this.DragOver += TreeViewDragOver;
 			contentPanel.Controls.Add(this);
+			this.InitImageList();
+			BuildNodes();
 		}
 	}
 }

src/AddIns/Misc/SharpReport/SharpReportAddin/Resources/BitmapResources.res

@@ -1,8 +0,0 @@
-
-# Bitmaps for SharpReport
-
-Icons.SharpReport.16x16.Ascending 	= Icons\Icons.16x16.Ascending.png
-Icons.SharpReport.16x16.Descending	= Icons\Icons.16x16.Descending.png
-
-
-

src/AddIns/Misc/SharpReport/SharpReportAddin/Resources/BuildBitmapResources.bat

@@ -1,2 +0,0 @@
-resasm BitmapResources.res
-pause

src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportAddin.csproj

@@ -55,7 +55,6 @@
     <None Include="SharpReportAddin.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <EmbeddedResource Include="Resources\BitmapResources.resources" />
     <Compile Include="Commands\ViewCommands.cs" />
   </ItemGroup>
   <ItemGroup>

src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs

@@ -55,16 +55,19 @@ namespace SharpReportAddin{
 				panel.AutoScroll = true;
 				CreateTabControl();
 				BuildToolBarItems();
-				PropertyPad.Grid.SelectedObject = designerControl.ReportModel.ReportSettings;
-				PropertyPad.Grid.Refresh();
+				
+				if (PropertyPad.Grid != null) {
+					PropertyPad.Grid.SelectedObject = designerControl.ReportModel.ReportSettings;
+					PropertyPad.Grid.Refresh();
+				}
+				
 				//Activate the FieldsExplorer - Pad
 				PadDescriptor pad = WorkbenchSingleton.Workbench.GetPad(typeof(FieldsExplorer));
 				if (pad != null) {
 					pad.CreatePad();
 				}
-			} catch (Exception e) {
-				MessageService.ShowError(e,e.Message);
-				throw e;
+			} catch (Exception) {
+				throw;
 			}
 		}
 		
@@ -358,13 +361,10 @@ namespace SharpReportAddin{
 		
 		private void OnObjectSelected (object sender,EventArgs e) {
 			if (designerControl.ReportControl.SelectedObject != null) {
-//				BaseReportObject bro = designerControl.ReportControl.SelectedObject as BaseReportObject;
-//				
-//				if (bro != null) {
-//					string s = "{" + bro.Name + "}";
-//					StatusBarService.SetMessage(s);
-//				}
-				PropertyPad.Grid.SelectedObject = designerControl.ReportControl.SelectedObject;
+				if (PropertyPad.Grid != null) {
+					PropertyPad.Grid.SelectedObject = designerControl.ReportControl.SelectedObject;
+				}
+				
 			}
 		}
 		
@@ -380,8 +380,10 @@ namespace SharpReportAddin{
 		/// Set PropertyGrid to ReportSettings
 		/// </summary>
 		public void ShowReportSettings () {
-			PropertyPad.Grid.SelectedObject = designerControl.ReportControl.ReportSettings;
-			PropertyPad.Grid.Refresh();
+			if (PropertyPad.Grid != null) {
+				PropertyPad.Grid.SelectedObject = designerControl.ReportControl.ReportSettings;
+				PropertyPad.Grid.Refresh();
+			}
 		}
 		
 		
@@ -505,12 +507,14 @@ namespace SharpReportAddin{
 				base.FileName = fileName;
 				designerControl.ReportModel.ReportSettings.FileName = fileName;
 				designerControl.ReportControl.ObjectSelected += new EventHandler <EventArgs>(OnObjectSelected);
-				PropertyPad.Grid.SelectedObject = designerControl.ReportModel.ReportSettings;
-				PropertyPad.Grid.Refresh();
+				if (PropertyPad.Grid != null) {
+					PropertyPad.Grid.SelectedObject = designerControl.ReportModel.ReportSettings;
+					PropertyPad.Grid.Refresh();
+				}
+				
 				this.designerControl.ReportModel.ReportSettings.AvailableFieldsCollection = reportManager.AvailableFieldsCollection;
 				
-			} catch (Exception e) {
-				MessageService.ShowError(e.Message);
+			} catch (Exception ) {
 				throw ;
 			}
 		}
@@ -541,7 +545,10 @@ namespace SharpReportAddin{
 		
 		
 		public override void Dispose(){
-			PropertyPad.Grid.SelectedObject = null;
+			if (PropertyPad.Grid != null) {
+				PropertyPad.Grid.SelectedObject = null;
+			}
+			
 			RemoveSideBarItem();
 			this.Dispose(true);
 			GC.SuppressFinalize(this);