Better localisation of FieldsExplorer.cs, no dragging of Functions

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

src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs

@@ -65,20 +65,22 @@ namespace SharpReport
 		
 		private void AddReportElements (AxSideTab tab) {
 
+			Bitmap bitmap = ResourceService.GetIcon("Icons.16.16.SharpReport.Textbox").ToBitmap();
+			
 			AxSideTabItem	t = sideTab.SideTabItemFactory.CreateSideTabItem(ResourceService.GetString("SharpReport.Toolbar.TextBox"),
 			                                                               GlobalEnums.ReportItemType.ReportTextItem.ToString(),
-			                                                               GlobalValues.TextBoxBitmap());
-		
+			                                                               bitmap);
 			tab.Items.Add (t);
 			t = sideTab.SideTabItemFactory.CreateSideTabItem( ResourceService.GetString("SharpReport.Toolbar.DataField"),
 			                                                 GlobalEnums.ReportItemType.ReportDataItem.ToString(),
 			                                                 ResourceService.GetBitmap("Icons.16x16.SharpQuery.Column"));
 			tab.Items.Add (t);
 			
-			Icon icon = ResourceService.GetIcon("Icons.16x16.ResourceEditor.bmp");
+			bitmap = ResourceService.GetIcon("Icons.16x16.ResourceEditor.bmp").ToBitmap();
+			
 			t = sideTab.SideTabItemFactory.CreateSideTabItem( "Image",
 			                                                 GlobalEnums.ReportItemType.ReportImageItem.ToString(),
-			                                                 icon.ToBitmap());
+			                                                 bitmap);
 			tab.Items.Add (t);
 			
 			t = sideTab.SideTabItemFactory.CreateSideTabItem( ResourceService.GetString("SharpReport.Toolbar.Rectangle"),
@@ -86,9 +88,10 @@ namespace SharpReport
 			                                                 GlobalValues.RectangleBitmap());
 			tab.Items.Add (t);
 			
+			bitmap = ResourceService.GetIcon("Icons.16.16.SharpReport.Line").ToBitmap();
 			t = sideTab.SideTabItemFactory.CreateSideTabItem( ResourceService.GetString("SharpReport.Toolbar.Line"),
 			                                                 GlobalEnums.ReportItemType.ReportLineItem.ToString(),
-			                                                 GlobalValues.LineBitmap());
+			                                                 bitmap);
 			tab.Items.Add (t);
 			t = sideTab.SideTabItemFactory.CreateSideTabItem(ResourceService.GetString("SharpReport.Toolbar.Circle"),
 			                                                 GlobalEnums.ReportItemType.ReportCircleItem.ToString(),
@@ -100,17 +103,17 @@ namespace SharpReport
 			
 			FunctionFactory ff = new FunctionFactory();
 			string localise = "SharpReport.Toolbar.Functions.";
-			
+			Bitmap functionBitmap = ResourceService.GetIcon("Icons.16x16.SharpReport.Function").ToBitmap();
+		
 			AxSideTabItem	t = sideTab.SideTabItemFactory.CreateSideTabItem(ResourceService.GetString(localise + ff.AvailableTypes[0]) ,
 			                                                               ff.AvailableTypes[0].ToString(),
-			                                                               GlobalValues.FunctionBitmap());
+			                                                               functionBitmap);
 			
 			tab.Items.Add (t);
 			
-
 			t = sideTab.SideTabItemFactory.CreateSideTabItem (ResourceService.GetString(localise + ff.AvailableTypes[1]),
 			                                                  ff.AvailableTypes[1],
-			                                                  GlobalValues.FunctionBitmap());
+			                                                  functionBitmap);
 			
 			tab.Items.Add (t);
 			

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

@@ -28,11 +28,6 @@ using SharpReportCore;
 /// <summary>
 /// This Pad shows the Available Fields from a report and is used to handel sorting /grouping
 /// </summary>
-/// <remarks>
-/// 	created by - Forstmeier Peter
-/// 	created on - 12.06.200descendingIconescendingIcon 18:17:ascendingIconscendingIcon6
-/// </remarks>
-/// 
 
 
 namespace SharpReportAddin {
@@ -98,20 +93,43 @@ namespace SharpReportAddin {
 		
 		#region TreeView Events
 		
+		private void TreeMouseDown(object sender, System.Windows.Forms.MouseEventArgs e){
+			
+			TreeNode node = this.GetNodeAt(PointToClient(Cursor.Position));
+			if (node != null) {
+				this.SelectedNode = node;
+				CheckNode (node);
+				if (e.Button == MouseButtons.Right) {
+					if (node is AbstractFieldsNode) {
+						AbstractFieldsNode abstrNode = (AbstractFieldsNode)node;
+						if (abstrNode.ContextmenuAddinTreePath.Length > 0) {
+							ContextMenuStrip ctMen = MenuService.CreateContextMenu (this,abstrNode.ContextmenuAddinTreePath);
+							ctMen.Show (this,new Point (e.X,e.Y));
+						}
+					}
+				}
+			}
+		}
 		void TreeViewItemDrag (object sender,ItemDragEventArgs e) {
+			
 			if (e.Item is ColumnsTreeNode) {
 				ColumnsTreeNode node = (ColumnsTreeNode)e.Item;
-				this.SelectedNode = node;
-				if (node != null) {
-					this.DoDragDrop(node.DragDropDataObject,
-					                DragDropEffects.Copy | DragDropEffects.Scroll);
+				// for now, only dragging of Columns is allowed
+				if (node.ImageIndex == columnIcon) {
+					this.SelectedNode = node;
+					if (node != null) {
+						this.DoDragDrop(node.DragDropDataObject,
+						                DragDropEffects.Copy | DragDropEffects.Scroll);
+					}
 				}
 			}
 		}
 		
 		
 		void TreeViewDragOver (object sender,DragEventArgs e) {
+			
 			TreeNode node  = this.GetNodeAt(PointToClient(new Point (e.X,e.Y)));
+			
 			node.EnsureVisible();
 			if (node.Nodes.Count > 0) {
 				node.Expand();
@@ -157,7 +175,6 @@ namespace SharpReportAddin {
 		
 		
 		private void Fill () {
-//			BuildNodes();
 			this.FillTree();
 			this.ExpandAll();
 			isFilled = true;
@@ -177,25 +194,6 @@ namespace SharpReportAddin {
 		}
 		
 		
-		
-		private void TreeMouseDown(object sender, System.Windows.Forms.MouseEventArgs e){
-			TreeNode node = this.GetNodeAt(PointToClient(Cursor.Position));
-			if (node != null) {
-				this.SelectedNode = node;
-				CheckNode (node);
-				if (e.Button == MouseButtons.Right) {
-					if (node is AbstractFieldsNode) {
-						AbstractFieldsNode abstrNode = (AbstractFieldsNode)node;
-						if (abstrNode.ContextmenuAddinTreePath.Length > 0) {
-							ContextMenuStrip ctMen = MenuService.CreateContextMenu (this,abstrNode.ContextmenuAddinTreePath);
-							ctMen.Show (this,new Point (e.X,e.Y));
-						}
-					}
-				}
-			}
-		}
-		
-
 		private void CheckNode (TreeNode node) {
 			if (node.Parent == nodeSorting) {
 				ColumnsTreeNode cn = (ColumnsTreeNode)node;
@@ -398,13 +396,13 @@ namespace SharpReportAddin {
 		}
 		
 		void SetFunctions(){
-			ColumnsTreeNode node;
+			AbstractFieldsNode 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.FriendlyName);
+						node = new ColumnsTreeNode (ResourceService.GetString(func.LocalisedName));
 						node.SelectedImageIndex = functionIcon;
 						node.ImageIndex = functionIcon;
 						this.nodeFunction.Nodes.Add(node);

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseFunction.cs

@@ -21,21 +21,21 @@ namespace SharpReportCore {
 	/// 	created on - 05.09.2005 22:25:18
 	/// </remarks>
 	public class BaseFunction : SharpReportCore.BaseTextItem {
-		string friendlyName;
+		string localisedName;
 
 		public BaseFunction():base() {
-			
+			this.localisedName = "SharpReport.Toolbar.Functions";
 		}
 		public BaseFunction(string friendlyName)
 		{
-			this.friendlyName = friendlyName;
+			this.localisedName = friendlyName;
 		}
 		
 		#region properties
 		
-		public virtual string FriendlyName {
+		public virtual string LocalisedName {
 			get {
-				return friendlyName;
+				return localisedName;
 			}
 		}
 		

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseTextItem.cs

@@ -7,20 +7,19 @@
 //     the code is regenerated.
 // </autogenerated>
 //------------------------------------------------------------------------------
-
-namespace SharpReportCore {
-	using System;
-	using System.ComponentModel;
-	using System.Drawing;
-	
-	using SharpReportCore;
-	
+using System;
+using System.ComponentModel;
+using System.Drawing;
 	
-	/// <summary>
-	/// Parent for all TextBased Items
-	/// </summary>
-	/// <remarks>
+using SharpReportCore;
 	
+/// <summary>
+/// This class is the BaseClass  for all TextBased Items 
+/// like <see cref="BaseDataItem"></see> etc.
+/// </summary>
+
+
+namespace SharpReportCore {
 	public class BaseTextItem : SharpReportCore.BaseReportItem,IItemRenderer {
 		private string text;
 

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Functions/BasePageNumber.cs

@@ -24,7 +24,7 @@ using System.Drawing;
 
 namespace SharpReportCore {
 		public class BasePageNumber : BaseFunction {
-			static string fnName = "PageNumber";
+			static string fnName = "SharpReport.Toolbar.Functions.PageNumber";
 			
 			public BasePageNumber():base(fnName) {
 				
@@ -58,9 +58,9 @@ namespace SharpReportCore {
 				return "PageNumber";
 			}
 			
-			public override string FriendlyName {
+			public override string LocalisedName {
 				get {
-					return base.FriendlyName;
+					return base.LocalisedName;
 				}
 			}
 			

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Functions/BaseToday.cs

@@ -20,7 +20,8 @@ using System.Globalization;
 	
 namespace SharpReportCore {
 	public class BaseToday : BaseFunction {
-		static string fnName = "Date";
+		static string fnName = "SharpReport.Toolbar.Functions.TodaysDate";
+		
 		public BaseToday():base(fnName) {
 			
 		}

src/AddIns/Misc/SharpReport/SharpReportCore/Globals/GlobalValues.cs

@@ -17,15 +17,14 @@ using System.Drawing.Printing;
 //// Alex: for spooler
 using System.ServiceProcess;
 	
-	/// <summary>
-	/// This Class contains Global Icons and Constantes
-	/// </summary>
-	/// <remarks>
-	/// 	created by - Forstmeier Peter
-	/// 	created on - 19.01.2005 10:57:33
-	/// </remarks>
+/// <summary>
+/// This Class contains Global Icons and Constantes
+/// </summary>
+/// <remarks>
+/// 	created by - Forstmeier Peter
+/// 	created on - 19.01.2005 10:57:33
+/// </remarks>
 	
-//namespace SharpReport.Globals {
 namespace SharpReportCore {
 		public  class GlobalValues : object {
 		
@@ -198,34 +197,6 @@ namespace SharpReportCore {
 		
 		
 		#region Icons
-		/// <summary>
-		/// TooboxIcon for ReportTextbox
-		/// </summary>
-		/// <returns>Bitmap</returns>
-		
-		public static Bitmap TextBoxBitmap(){
-			Bitmap b = new Bitmap (25,25);
-			using (Graphics g = Graphics.FromImage (b)){
-				g.DrawString ("ab|",
-			              new Font ("Ariel",10,FontStyle.Bold),
-			              new SolidBrush(Color.Black),0,1);
-			}
-			return b;
-		}
-		/// <summary>
-		/// TooboxIcon for Functions
-		/// </summary>
-		/// <returns>Bitmap</returns>
-		
-		public static Bitmap FunctionBitmap(){
-			Bitmap b = new Bitmap (25,25);
-			using (Graphics g = Graphics.FromImage (b)){
-				g.DrawString ("F>",
-			              new Font ("Ariel",10,FontStyle.Bold),
-			              new SolidBrush(Color.Black),0,1);
-			}
-			return b;
-		}
 		
 		/// <summary>
 		/// ToolboxIcon for ReportRectangle
@@ -239,20 +210,7 @@ namespace SharpReportCore {
 			}
 			return b;
 		}
-		/// <summary>
-		/// ToolboxIcon for ReportLine
-		/// </summary>
-		/// <returns>Bitmap</returns>
-		/// 
-		public static Bitmap LineBitmap() {
-			Bitmap b = new Bitmap (19,19);
-			using (Graphics g = Graphics.FromImage (b)){
-				g.DrawLine (new Pen(Color.Black, 1),
-				            1,1,
-				            17,17);
-			}
-			return b;
-		}
+		
 		/// <summary>
 		/// ToolboxIcon for ReportCircle
 		/// </summary>