Enabled Forms Designer Smart Tags. Designer Verbs menu item set to be of type Builder in the .addin file

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

src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.addin

@@ -46,7 +46,7 @@
 		          icon        = "Icons.16x16.FormsDesigner.LockControls"
 		          class = "ICSharpCode.FormDesigner.Commands.LockControls"/>
 		<MenuItem id = "LockSeparator" type = "Separator"/>
-		<MenuItem id = "DesignerVerbsBuilder" label = "" class = "ICSharpCode.FormDesigner.Commands.DesignerVerbSubmenuBuilder" />
+		<MenuItem id = "DesignerVerbsBuilder" type="Builder" class = "ICSharpCode.FormDesigner.Commands.DesignerVerbSubmenuBuilder" />
 		<MenuItem id = "Cut"
 		          label = "${res:XML.MainMenu.EditMenu.Cut}"
 		          icon = "Icons.16x16.CutIcon"
@@ -101,7 +101,7 @@
 		          icon        = "Icons.16x16.FormsDesigner.ViewCode"
 		          class       = "ICSharpCode.FormDesigner.Commands.ViewCode"/>
 		<MenuItem id = "ViewCodeSeparator" type = "Separator"/>
-		<MenuItem id = "DesignerVerbsBuilder" label = "" class = "ICSharpCode.FormDesigner.Commands.DesignerVerbSubmenuBuilder" />
+		<MenuItem id = "DesignerVerbsBuilder" type = "Builder" class = "ICSharpCode.FormDesigner.Commands.DesignerVerbSubmenuBuilder" />
 		<MenuItem id = "Cut"
 		          label = "${res:XML.MainMenu.EditMenu.Cut}"
 		          icon = "Icons.16x16.CutIcon"

src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs

@@ -128,9 +128,8 @@ namespace ICSharpCode.FormDesigner
 			serviceContainer.AddService(typeof(AmbientProperties), ambientProperties);
 			serviceContainer.AddService(typeof(ITypeResolutionService), ToolboxProvider.TypeResolutionService);
 			serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerEventService), new DesignerEventService());
-			serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerOptionService), new ICSharpCode.FormDesigner.Services.DesignerOptionService());
+			serviceContainer.AddService(typeof(System.ComponentModel.Design.DesignerOptionService), new ICSharpCode.FormDesigner.Services.DesignerOptionService());
 			serviceContainer.AddService(typeof(ITypeDiscoveryService), new TypeDiscoveryService());
-			serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerOptionService), new System.Windows.Forms.Design.WindowsFormsDesignerOptionService());
 			
 			serviceContainer.AddService(typeof(MemberRelationshipService), new DefaultMemberRelationshipService());
 			

src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DesignerOptionService.cs

@@ -14,85 +14,63 @@ using ICSharpCode.Core;
 
 namespace ICSharpCode.FormDesigner.Services
 {
-	public class DesignerOptionService : IDesignerOptionService
+	public class SharpDevelopDesignerOptions : DesignerOptions
 	{
-		public const string GridSize   = "GridSize";
+		public SharpDevelopDesignerOptions()
-		public const string ShowGrid   = "ShowGrid";
-		public const string SnapToGrid = "SnapToGrid";
-		public const string LayoutMode = "LayoutMode";
-		
-		const string GridSizeWidth  = "GridSize.Width";
-		const string GridSizeHeight = "GridSize.Height";
-		
-		public const string FormsDesignerPageName = "SharpDevelop Forms Designer\\General";
-		
-		Hashtable pageOptionTable = new Hashtable();
-		
-		
-		
-		public DesignerOptionService()
 		{
-			pageOptionTable[FormsDesignerPageName] = new Hashtable();
+			UseSmartTags = true;
+			UseSnapLines = true;
 		}
 		
-		public object GetOptionValue(string pageName, string valueName)
+//		public override Size GridSize { 
+//			get {
+//				return new Size(PropertyService.Get("FormsDesigner.DesignerOptions.GridSizeWidth", 8),
+//					PropertyService.Get("FormsDesigner.DesignerOptions.GridSizeHeight", 8));
+//			}
+//			set {
+//				LoggingService.Debug("GridSize set");
+//				PropertyService.Set("FormsDesigner.DesignerOptions.GridSizeWidth",  value.Width);
+//				PropertyService.Set("FormsDesigner.DesignerOptions.GridSizeHeight", value.Height);
+//			}
+//		}
+//		
+//		public override bool ShowGrid {
+//			get {
+//				LoggingService.Debug("ShowGrid get");
+//				return PropertyService.Get("FormsDesigner.DesignerOptions.ShowGrid", true);
+//			}
+//			set {
+//				LoggingService.Debug("ShowGrid set");
+//				PropertyService.Set("FormsDesigner.DesignerOptions.ShowGrid", value);
+//			}
+//		}
+//		
+//		public override bool SnapToGrid {
+//			get {
+//				LoggingService.Debug("SnapToGrid get");
+//				return PropertyService.Get("FormsDesigner.DesignerOptions.SnapToGrid", true);
+//			}
+//			set {
+//				LoggingService.Debug("SnapToGrid set");
+//			}
+//		}
+	}
+	
+	public class DesignerOptionService : WindowsFormsDesignerOptionService
+	{		
+		DesignerOptions options;
+		
+		public DesignerOptionService()
 		{
-			switch (valueName) {
-				case GridSize:
-					return new Size(PropertyService.Get("FormsDesigner.DesignerOptions.GridSizeWidth", 8),
-					                PropertyService.Get("FormsDesigner.DesignerOptions.GridSizeHeight", 8));
-				case ShowGrid:
-					return PropertyService.Get("FormsDesigner.DesignerOptions.ShowGrid", true);
-				case SnapToGrid:
-					return PropertyService.Get("FormsDesigner.DesignerOptions.SnapToGrid", true);
-				case GridSizeWidth:
-					return PropertyService.Get("FormsDesigner.DesignerOptions.GridSizeWidth", 8);
-				case GridSizeHeight:
-					return PropertyService.Get("FormsDesigner.DesignerOptions.GridSizeHeight", 8);
-//				case LayoutMode:
-//					return PropertyService.Get("FormsDesigner.DesignerOptions.LayoutMode", LayoutOptions.SnapLines);
-				default:
-					Hashtable pageTable = (Hashtable)pageOptionTable[pageName];
-					
-					if (pageTable == null) {
-						return null;
-					}
-					return pageTable[valueName];
-			}
 		}
 		
-		public void SetOptionValue(string pageName, string valueName, object val)
+		public override DesignerOptions CompatibilityOptions { 
-		{
+			get {
-			switch (valueName) {
+				if (options == null) {
-				case GridSize:
+					options = new SharpDevelopDesignerOptions();
-					Size size = (Size)val;
+				}
-					PropertyService.Set("FormsDesigner.DesignerOptions.GridSizeWidth",  size.Width);
+				return options;
-					PropertyService.Set("FormsDesigner.DesignerOptions.GridSizeHeight", size.Height);
+			}		
-					break;
-				case ShowGrid:
-					PropertyService.Set("FormsDesigner.DesignerOptions.ShowGrid", (bool)val);
-					break;
-				case SnapToGrid:
-					PropertyService.Set("FormsDesigner.DesignerOptions.SnapToGrid", (bool)val);
-					break;
-				case GridSizeWidth:
-					PropertyService.Set("FormsDesigner.DesignerOptions.GridSizeWidth", (int)val);
-					break;
-				case GridSizeHeight:
-					PropertyService.Set("FormsDesigner.DesignerOptions.GridSizeHeight", (int)val);
-					break;
-//				case LayoutMode:
-//					PropertyService.Set("FormsDesigner.DesignerOptions.LayoutMode", (LayoutOptions)val);
-//					break;
-					
-				default:
-					Hashtable pageTable = (Hashtable)pageOptionTable[pageName];
-					if (pageTable == null) {
-						pageOptionTable[pageName] = pageTable = new Hashtable();
-					}
-					pageTable[valueName] = val;
-					break;
-			}
 		}
 	}
 }